Skip to content

Commit df57191

Browse files
committed
所有菜单的 name 都加上模块的前缀,避免冲突
1 parent 7cc8d90 commit df57191

File tree

64 files changed

+144
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+144
-130
lines changed

src/router/modules/remaining.ts

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
116116
{
117117
path: 'type/data/:dictType',
118118
component: () => import('@/views/system/dict/data/index.vue'),
119-
name: 'data',
119+
name: 'SystemDictData',
120120
meta: {
121121
title: '字典数据',
122122
noCache: true,
@@ -140,7 +140,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
140140
{
141141
path: 'edit',
142142
component: () => import('@/views/infra/codegen/EditTable.vue'),
143-
name: 'EditTable',
143+
name: 'InfraCodegenEditTable',
144144
meta: {
145145
noCache: true,
146146
hidden: true,
@@ -163,7 +163,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
163163
{
164164
path: 'job-log',
165165
component: () => import('@/views/infra/job/logger/index.vue'),
166-
name: 'JobLog',
166+
name: 'InfraJobLog',
167167
meta: {
168168
noCache: true,
169169
hidden: true,
@@ -226,7 +226,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
226226
{
227227
path: '/manager/form/edit',
228228
component: () => import('@/views/bpm/form/editor/index.vue'),
229-
name: 'bpmFormEditor',
229+
name: 'BpmFormEditor',
230230
meta: {
231231
noCache: true,
232232
hidden: true,
@@ -238,7 +238,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
238238
{
239239
path: '/manager/model/edit',
240240
component: () => import('@/views/bpm/model/editor/index.vue'),
241-
name: 'modelEditor',
241+
name: 'BpmModelEditor',
242242
meta: {
243243
noCache: true,
244244
hidden: true,
@@ -250,7 +250,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
250250
{
251251
path: '/manager/definition',
252252
component: () => import('@/views/bpm/definition/index.vue'),
253-
name: 'BpmProcessDefinitionList',
253+
name: 'BpmProcessDefinition',
254254
meta: {
255255
noCache: true,
256256
hidden: true,
@@ -262,7 +262,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
262262
{
263263
path: '/manager/task-assign-rule',
264264
component: () => import('@/views/bpm/taskAssignRule/index.vue'),
265-
name: 'BpmTaskAssignRuleList',
265+
name: 'BpmTaskAssignRule',
266266
meta: {
267267
noCache: true,
268268
hidden: true,
@@ -305,30 +305,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
305305
title: '发起 OA 请假',
306306
activeMenu: 'bpm/oa/leave/create'
307307
}
308-
},
309-
{
310-
path: '/bpm/task/todo',
311-
component: () => import('@/views/bpm/task/todo/index.vue'),
312-
name: 'TaskTodo',
313-
meta: {
314-
noCache: true,
315-
hidden: true,
316-
canTo: true,
317-
title: '代办任务',
318-
activeMenu: 'bpm/task/todo/index'
319-
}
320-
},
321-
{
322-
path: '/bpm/processInstance',
323-
component: () => import('@/views/bpm/processInstance/index.vue'),
324-
name: 'processInstance',
325-
meta: {
326-
noCache: true,
327-
hidden: true,
328-
canTo: true,
329-
title: '流程办理',
330-
activeMenu: 'bpm/processInstance/index'
331-
}
332308
}
333309
]
334310
},
@@ -343,7 +319,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
343319
{
344320
path: 'value/:propertyId(\\d+)',
345321
component: () => import('@/views/mall/product/property/value/index.vue'),
346-
name: 'PropertyValue',
322+
name: 'ProductPropertyValue',
347323
meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
348324
}
349325
]

src/types/auto-components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ declare module '@vue/runtime-core' {
7777
ElTimeline: typeof import('element-plus/es')['ElTimeline']
7878
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
7979
ElTooltip: typeof import('element-plus/es')['ElTooltip']
80+
ElTree: typeof import('element-plus/es')['ElTree']
8081
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
8182
ElUpload: typeof import('element-plus/es')['ElUpload']
8283
Error: typeof import('./../components/Error/src/Error.vue')['default']

src/views/bpm/definition/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</Dialog>
9494
</template>
9595

96-
<script setup lang="ts" name="Form">
96+
<script setup lang="ts" name="BpmProcessDefinition">
9797
import { DICT_TYPE } from '@/utils/dict'
9898
import { dateFormatter } from '@/utils/formatTime'
9999
import * as DefinitionApi from '@/api/bpm/definition'

src/views/bpm/form/index.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,11 @@
8383
</Dialog>
8484
</template>
8585

86-
<script setup lang="ts" name="Form">
86+
<script setup lang="ts" name="BpmForm">
8787
import { DICT_TYPE } from '@/utils/dict'
8888
import { dateFormatter } from '@/utils/formatTime'
8989
import * as FormApi from '@/api/bpm/form'
9090
import { setConfAndFields2 } from '@/utils/formCreate'
91-
9291
const message = useMessage() // 消息弹窗
9392
const { t } = useI18n() // 国际化
9493
const { push } = useRouter() // 路由
@@ -130,7 +129,7 @@ const resetQuery = () => {
130129
/** 添加/修改操作 */
131130
const openForm = (id?: number) => {
132131
push({
133-
name: 'bpmFormEditor',
132+
name: 'BpmFormEditor',
134133
query: {
135134
id
136135
}

src/views/bpm/group/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<UserGroupForm ref="formRef" @success="getList" />
112112
</template>
113113

114-
<script setup lang="ts" name="UserGroup">
114+
<script setup lang="ts" name="BpmUserGroup">
115115
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
116116
import { dateFormatter } from '@/utils/formatTime'
117117
import * as UserGroupApi from '@/api/bpm/userGroup'

src/views/bpm/model/editor/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ContentWrap>
2525
</template>
2626

27-
<script setup lang="ts">
27+
<script setup lang="ts" name="BpmModelEditor">
2828
// 自定义元素选中时的弹出菜单(修改 默认任务 为 用户任务)
2929
import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/designer/plugins/content-pad'
3030
// 自定义左侧菜单(修改 默认任务 为 用户任务)

src/views/bpm/model/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</Dialog>
225225
</template>
226226

227-
<script setup lang="ts" name="Form">
227+
<script setup lang="ts" name="BpmModel">
228228
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
229229
import { dateFormatter, formatDate } from '@/utils/formatTime'
230230
import * as ModelApi from '@/api/bpm/model'
@@ -319,7 +319,7 @@ const handleChangeState = async (row) => {
319319
/** 设计流程 */
320320
const handleDesign = (row) => {
321321
push({
322-
name: 'modelEditor',
322+
name: 'BpmModelEditor',
323323
query: {
324324
modelId: row.id
325325
}
@@ -352,7 +352,7 @@ const handleAssignRule = (row) => {
352352
/** 跳转到指定流程定义列表 */
353353
const handleDefinitionList = (row) => {
354354
push({
355-
name: 'BpmProcessDefinitionList',
355+
name: 'BpmProcessDefinition',
356356
query: {
357357
key: row.key
358358
}

src/views/bpm/processInstance/create/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML" />
4747
</ContentWrap>
4848
</template>
49-
<script setup lang="ts">
49+
<script setup lang="ts" name="BpmProcessInstanceCreate">
5050
import { DICT_TYPE } from '@/utils/dict'
5151
import * as DefinitionApi from '@/api/bpm/definition'
5252
import * as ProcessInstanceApi from '@/api/bpm/processInstance'

src/views/bpm/processInstance/detail/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
9797
</ContentWrap>
9898
</template>
99-
<script setup lang="ts">
99+
<script setup lang="ts" name="BpmProcessInstanceDetail">
100100
import { useUserStore } from '@/store/modules/user'
101101
import { setConfAndFields2 } from '@/utils/formCreate'
102102
import type { ApiAttrs } from '@form-create/element-ui/types/config'

src/views/bpm/processInstance/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
v-hasPermi="['bpm:process-instance:query']"
8282
@click="handleCreate"
8383
>
84-
发起流程
84+
<Icon icon="ep:plus" class="mr-5px" /> 发起流程
8585
</el-button>
8686
</el-form-item>
8787
</el-form>
@@ -159,7 +159,7 @@
159159
/>
160160
</ContentWrap>
161161
</template>
162-
<script setup lang="ts">
162+
<script setup lang="ts" name="BpmProcessInstance">
163163
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
164164
import { dateFormatter } from '@/utils/formatTime'
165165
import { ElMessageBox } from 'element-plus'

0 commit comments

Comments
 (0)