From c6a9c0c5fb77a81b67829d909b936f364233d3d3 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Mon, 10 Jul 2023 19:11:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=20name=20=E9=83=BD=E5=8A=A0=E4=B8=8A=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=89=8D=E7=BC=80=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts               | 38 +++++++------------
 src/views/bpm/definition/index.vue            |  4 +-
 src/views/bpm/form/index.vue                  |  4 +-
 src/views/bpm/group/UserGroupForm.vue         |  2 +-
 src/views/bpm/group/index.vue                 |  2 +-
 src/views/bpm/model/index.vue                 |  8 ++--
 src/views/bpm/model/modelEditor.vue           |  2 +-
 src/views/bpm/oa/leave/create.vue             |  2 +-
 src/views/bpm/oa/leave/detail.vue             |  2 +-
 src/views/bpm/oa/leave/index.vue              |  6 +--
 src/views/bpm/processInstance/create.vue      |  2 +-
 src/views/bpm/processInstance/detail.vue      |  2 +-
 src/views/bpm/processInstance/index.vue       |  2 +-
 src/views/bpm/task/done/index.vue             |  2 +-
 src/views/bpm/task/todo/index.vue             |  2 +-
 src/views/bpm/taskAssignRule/index.vue        |  2 +-
 src/views/infra/apiAccessLog/index.vue        |  2 +-
 src/views/infra/apiErrorLog/index.vue         |  2 +-
 src/views/infra/build/index.vue               |  2 +-
 src/views/infra/codegen/index.vue             |  2 +-
 src/views/infra/config/index.vue              |  2 +-
 src/views/infra/dataSourceConfig/index.vue    |  2 +-
 src/views/infra/dbDoc/index.vue               |  2 +-
 src/views/infra/druid/index.vue               |  2 +-
 src/views/infra/file/index.vue                |  2 +-
 src/views/infra/fileConfig/index.vue          |  2 +-
 src/views/infra/job/JobLog.vue                |  2 +-
 src/views/infra/job/index.vue                 |  2 +-
 src/views/infra/redis/index.vue               |  2 +-
 src/views/infra/server/index.vue              |  2 +-
 src/views/infra/skywalking/index.vue          |  2 +-
 src/views/infra/swagger/index.vue             |  2 +-
 src/views/infra/webSocket/index.vue           |  2 +-
 .../mall/product/property/value/index.vue     |  2 +-
 src/views/pay/app/index.vue                   |  2 +-
 src/views/pay/merchant/index.vue              |  2 +-
 src/views/pay/order/index.vue                 |  2 +-
 src/views/pay/refund/index.vue                |  2 +-
 src/views/system/area/index.vue               |  2 +-
 src/views/system/dept/index.vue               |  2 +-
 src/views/system/dict/index.vue               |  2 +-
 src/views/system/errorCode/index.vue          |  2 +-
 src/views/system/loginlog/index.vue           |  2 +-
 src/views/system/mail/account/index.vue       |  2 +-
 src/views/system/mail/log/index.vue           |  2 +-
 src/views/system/mail/template/index.vue      |  2 +-
 src/views/system/menu/index.vue               |  2 +-
 src/views/system/notice/index.vue             |  2 +-
 src/views/system/notify/message/index.vue     |  2 +-
 src/views/system/notify/template/index.vue    |  2 +-
 src/views/system/oauth2/client/index.vue      |  2 +-
 src/views/system/oauth2/token/index.vue       |  2 +-
 src/views/system/operatelog/index.vue         |  2 +-
 src/views/system/post/index.vue               |  2 +-
 src/views/system/role/index.vue               |  2 +-
 src/views/system/sensitiveWord/index.vue      |  2 +-
 src/views/system/sms/channel/index.vue        |  2 +-
 src/views/system/sms/log/index.vue            |  2 +-
 src/views/system/sms/template/index.vue       |  2 +-
 src/views/system/tenant/index.vue             |  2 +-
 src/views/system/tenantPackage/index.vue      |  2 +-
 src/views/system/user/index.vue               |  2 +-
 62 files changed, 81 insertions(+), 93 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index e09da7b7..b9bf8f9f 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -116,7 +116,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'type/data/:dictType',
         component: () => import('@/views/system/dict/index.vue'),
-        name: 'data',
+        name: 'SystemDictData',
         meta: {
           title: '字典数据',
           noCache: true,
@@ -140,7 +140,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'edit',
         component: () => import('@/views/infra/codegen/EditTable.vue'),
-        name: 'EditTable',
+        name: 'InfraCodegenEditTable',
         meta: {
           noCache: true,
           hidden: true,
@@ -163,7 +163,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'job-log',
         component: () => import('@/views/infra/job/JobLog.vue'),
-        name: 'JobLog',
+        name: 'InfraJobLog',
         meta: {
           noCache: true,
           hidden: true,
@@ -236,7 +236,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: '/manager/form/edit',
         component: () => import('@/views/bpm/form/formEditor.vue'),
-        name: 'bpmFormEditor',
+        name: 'BpmFormEditor',
         meta: {
           noCache: true,
           hidden: true,
@@ -248,7 +248,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: '/manager/model/edit',
         component: () => import('@/views/bpm/model/modelEditor.vue'),
-        name: 'modelEditor',
+        name: 'BpmModelEditor',
         meta: {
           noCache: true,
           hidden: true,
@@ -260,7 +260,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: '/manager/definition',
         component: () => import('@/views/bpm/definition/index.vue'),
-        name: 'BpmProcessDefinitionList',
+        name: 'BpmProcessDefinition',
         meta: {
           noCache: true,
           hidden: true,
@@ -272,7 +272,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: '/manager/task-assign-rule',
         component: () => import('@/views/bpm/taskAssignRule/index.vue'),
-        name: 'BpmTaskAssignRuleList',
+        name: 'BpmTaskAssignRule',
         meta: {
           noCache: true,
           hidden: true,
@@ -307,31 +307,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: '/bpm/oa/leave/create',
         component: () => import('@/views/bpm/oa/leave/create.vue'),
-        name: 'OALeaveCreate',
+        name: 'BpmOALeaveCreate',
         meta: {
           noCache: true,
           hidden: true,
           canTo: true,
           title: '发起 OA 请假',
-          activeMenu: '/bpm/oa/leave'
+          activeMenu: '/bpm/oa/leave/create'
         }
       },
       {
         path: '/bpm/oa/leave/detail',
         component: () => import('@/views/bpm/oa/leave/detail.vue'),
-        name: 'OALeaveDetail',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          title: '查看 OA 请假',
-          activeMenu: '/bpm/oa/leave'
-        }
-      },
-      {
-        path: '/bpm/oa/leave/detail',
-        component: () => import('@/views/bpm/oa/leave/detail.vue'),
-        name: 'OALeaveDetail',
+        name: 'BpmOALeaveDetail',
         meta: {
           noCache: true,
           hidden: true,
@@ -345,7 +333,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/property',
     component: Layout,
-    name: 'property',
+    name: 'ProductProperty',
     meta: {
       hidden: true
     },
@@ -353,7 +341,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'value/:propertyId(\\d+)',
         component: () => import('@/views/mall/product/property/value/index.vue'),
-        name: 'PropertyValue',
+        name: 'ProductPropertyValue',
         meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
       }
     ]
@@ -382,7 +370,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'productSpuEdit/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'productSpuEdit',
+        name: 'ProductSpuEdit',
         meta: {
           noCache: true,
           hidden: true,
diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue
index d6e42a1f..6d7b1687 100644
--- a/src/views/bpm/definition/index.vue
+++ b/src/views/bpm/definition/index.vue
@@ -59,7 +59,7 @@
     </XModal>
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmProcessDefinition">
 // 业务相关的 import
 import * as DefinitionApi from '@/api/bpm/definition'
 // import * as ModelApi from '@/api/bpm/model'
@@ -123,7 +123,7 @@ const handleBpmnDetail = (row) => {
 // 点击任务分配按钮
 const handleAssignRule = (row) => {
   router.push({
-    name: 'BpmTaskAssignRuleList',
+    name: 'BpmTaskAssignRule',
     query: {
       processDefinitionId: row.id
     }
diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue
index b4b208a9..e6aef3a0 100644
--- a/src/views/bpm/form/index.vue
+++ b/src/views/bpm/form/index.vue
@@ -63,14 +63,14 @@ const [registerTable, { deleteData }] = useXTable({
 // 新增操作
 const handleCreate = () => {
   push({
-    name: 'bpmFormEditor'
+    name: 'BpmFormEditor'
   })
 }
 
 // 修改操作
 const handleUpdate = async (rowId: number) => {
   await push({
-    name: 'bpmFormEditor',
+    name: 'BpmFormEditor',
     query: {
       id: rowId
     }
diff --git a/src/views/bpm/group/UserGroupForm.vue b/src/views/bpm/group/UserGroupForm.vue
index 8f4892c6..174197bb 100644
--- a/src/views/bpm/group/UserGroupForm.vue
+++ b/src/views/bpm/group/UserGroupForm.vue
@@ -41,7 +41,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="UserGroupForm" setup>
+<script lang="ts" name="BpmUserGroupForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as UserGroupApi from '@/api/bpm/userGroup'
diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue
index b0f08516..8fdb5299 100644
--- a/src/views/bpm/group/index.vue
+++ b/src/views/bpm/group/index.vue
@@ -85,7 +85,7 @@
   </XModal>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmUserGroup">
 // 业务相关的 import
 import * as UserGroupApi from '@/api/bpm/userGroup'
 import { getListSimpleUsersApi, UserVO } from '@/api/system/user'
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index 4afd5f4a..0064a2a0 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -316,7 +316,7 @@
   </ContentWrap>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmModel">
 // 全局相关的 import
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
@@ -349,7 +349,7 @@ const forms = ref() // 流程表单的下拉框的数据
 const handleDesign = (row) => {
   console.log(row, '设计流程')
   router.push({
-    name: 'modelEditor',
+    name: 'BpmModelEditor',
     query: {
       modelId: row.id
     }
@@ -359,7 +359,7 @@ const handleDesign = (row) => {
 // 跳转到指定流程定义列表
 const handleDefinitionList = (row) => {
   router.push({
-    name: 'BpmProcessDefinitionList',
+    name: 'BpmProcessDefinition',
     query: {
       key: row.key
     }
@@ -402,7 +402,7 @@ const handleBpmnDetail = (row) => {
 // 点击任务分配按钮
 const handleAssignRule = (row) => {
   router.push({
-    name: 'BpmTaskAssignRuleList',
+    name: 'BpmTaskAssignRule',
     query: {
       modelId: row.id
     }
diff --git a/src/views/bpm/model/modelEditor.vue b/src/views/bpm/model/modelEditor.vue
index 4c07a928..4ecf2cb0 100644
--- a/src/views/bpm/model/modelEditor.vue
+++ b/src/views/bpm/model/modelEditor.vue
@@ -26,7 +26,7 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmModelEditor">
 import { MyProcessDesigner, MyProcessPenal } from '@/components/bpmnProcessDesigner/package'
 // import { translations } from '@/components/bpmnProcessDesigner/src/translations'
 // 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index b4293f5b..f1446006 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -11,7 +11,7 @@
     />
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmOALeaveCreate">
 import { FormExpose } from '@/components/Form'
 // import XEUtils from 'xe-utils'
 
diff --git a/src/views/bpm/oa/leave/detail.vue b/src/views/bpm/oa/leave/detail.vue
index 25ac9981..f9ceb29b 100644
--- a/src/views/bpm/oa/leave/detail.vue
+++ b/src/views/bpm/oa/leave/detail.vue
@@ -6,7 +6,7 @@
   </ContentWrap>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmOALeaveDetail">
 // 业务相关的 import
 import * as LeaveApi from '@/api/bpm/leave'
 import { allSchemas } from '@/views/bpm/oa/leave/leave.data'
diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue
index 91e7ccda..a64b1c3d 100644
--- a/src/views/bpm/oa/leave/index.vue
+++ b/src/views/bpm/oa/leave/index.vue
@@ -23,7 +23,7 @@
   </ContentWrap>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmOALeave">
 // 全局相关的 import
 import { ElMessageBox } from 'element-plus'
 // 业务相关的 import
@@ -43,7 +43,7 @@ const [registerTable, { reload }] = useXTable({
 // 发起请假
 const handleCreate = () => {
   push({
-    name: 'OALeaveCreate'
+    name: 'BpmOALeaveCreate'
   })
 }
 
@@ -64,7 +64,7 @@ const cancelLeave = (row) => {
 // 详情
 const handleDetail = (row) => {
   push({
-    name: 'OALeaveDetail',
+    name: 'BpmOALeaveDetail',
     query: {
       id: row.id
     }
diff --git a/src/views/bpm/processInstance/create.vue b/src/views/bpm/processInstance/create.vue
index 7414be9e..6f6b1bbc 100644
--- a/src/views/bpm/processInstance/create.vue
+++ b/src/views/bpm/processInstance/create.vue
@@ -53,7 +53,7 @@
     </div>
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmProcessInstanceCreate">
 // 业务相关的 import
 import { allSchemas } from './process.create'
 import * as DefinitionApi from '@/api/bpm/definition'
diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue
index 88ecb520..61e09680 100644
--- a/src/views/bpm/processInstance/detail.vue
+++ b/src/views/bpm/processInstance/detail.vue
@@ -191,7 +191,7 @@
     </XModal>
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmProcessInstanceDetail">
 import dayjs from 'dayjs'
 import * as UserApi from '@/api/system/user'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue
index f43e53ef..4a67a9a6 100644
--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -41,7 +41,7 @@
     </XTable>
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmProcessInstance">
 // 全局相关的 import
 import { ElMessageBox } from 'element-plus'
 import { DICT_TYPE } from '@/utils/dict'
diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue
index da05549a..acb246ac 100644
--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -12,7 +12,7 @@
     </XTable>
   </ContentWrap>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="BpmDoneTask">
 // 业务相关的 import
 import { allSchemas } from './done.data'
 import * as TaskApi from '@/api/bpm/task'
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
index bc21c597..6030c0b0 100644
--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -13,7 +13,7 @@
   </ContentWrap>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="BpmTodoTask">
 // 业务相关的 import
 import { allSchemas } from './todo.data'
 import * as TaskApi from '@/api/bpm/task'
diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue
index e981d2d7..f6a9feb0 100644
--- a/src/views/bpm/taskAssignRule/index.vue
+++ b/src/views/bpm/taskAssignRule/index.vue
@@ -133,7 +133,7 @@
     </XModal>
   </ContentWrap>
 </template>
-<script setup lang="ts" name="TaskAssignRule">
+<script setup lang="ts" name="BpmTaskAssignRule">
 // 全局相关的 import
 import { FormInstance } from 'element-plus'
 // 业务相关的 import
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
index 6a09927d..1e8c2c0f 100644
--- a/src/views/infra/apiAccessLog/index.vue
+++ b/src/views/infra/apiAccessLog/index.vue
@@ -35,7 +35,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="ApiAccessLog">
+<script setup lang="ts" name="InfraApiAccessLog">
 import { allSchemas } from './apiAccessLog.data'
 import * as ApiAccessLogApi from '@/api/infra/apiAccessLog'
 
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
index 4193351a..6d64fb3e 100644
--- a/src/views/infra/apiErrorLog/index.vue
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -51,7 +51,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="ApiErrorLog">
+<script setup lang="ts" name="InfraApiErrorLog">
 import { allSchemas } from './apiErrorLog.data'
 import * as ApiErrorLogApi from '@/api/infra/apiErrorLog'
 import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue
index 7c734f20..fc118b9c 100644
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
@@ -29,7 +29,7 @@
     </div>
   </Dialog>
 </template>
-<script setup lang="ts" name="Build">
+<script setup lang="ts" name="InfraBuild">
 import FcDesigner from '@form-create/designer'
 // import { useClipboard } from '@vueuse/core'
 import { isString } from '@/utils/is'
diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue
index 8337d2d4..f6aa2be6 100644
--- a/src/views/infra/codegen/index.vue
+++ b/src/views/infra/codegen/index.vue
@@ -56,7 +56,7 @@
   <!-- 弹窗：预览代码 -->
   <Preview ref="previewRef" />
 </template>
-<script setup lang="ts" name="Codegen">
+<script setup lang="ts" name="InfraCodegen">
 import download from '@/utils/download'
 import * as CodegenApi from '@/api/infra/codegen'
 import { CodegenTableVO } from '@/api/infra/codegen/types'
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
index 6ecbfa5e..d776680b 100644
--- a/src/views/infra/config/index.vue
+++ b/src/views/infra/config/index.vue
@@ -82,7 +82,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Config">
+<script setup lang="ts" name="InfraConfig">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as ConfigApi from '@/api/infra/config'
diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue
index 1e3db49d..545c7612 100644
--- a/src/views/infra/dataSourceConfig/index.vue
+++ b/src/views/infra/dataSourceConfig/index.vue
@@ -65,7 +65,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="DataSourceConfig">
+<script setup lang="ts" name="InfraDataSourceConfig">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as DataSourceConfiggApi from '@/api/infra/dataSourceConfig'
diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue
index e8ec12ef..d5793423 100644
--- a/src/views/infra/dbDoc/index.vue
+++ b/src/views/infra/dbDoc/index.vue
@@ -14,7 +14,7 @@
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="DbDoc">
+<script setup lang="ts" name="InfraDBDoc">
 import download from '@/utils/download'
 import * as DbDocApi from '@/api/infra/dbDoc'
 
diff --git a/src/views/infra/druid/index.vue b/src/views/infra/druid/index.vue
index 35cd0c6a..c1691512 100644
--- a/src/views/infra/druid/index.vue
+++ b/src/views/infra/druid/index.vue
@@ -3,7 +3,7 @@
     <IFrame v-if="!loading" :src="url" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="Druid">
+<script setup lang="ts" name="InfraDruid">
 import * as ConfigApi from '@/api/infra/config'
 
 const loading = ref(true) // 是否加载中
diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
index 743dbad5..0924b53d 100644
--- a/src/views/infra/file/index.vue
+++ b/src/views/infra/file/index.vue
@@ -78,7 +78,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="FileList">
+<script setup lang="ts" name="InfraFile">
 import type { UploadInstance, UploadRawFile, UploadProps, UploadFile } from 'element-plus'
 // 业务相关的 import
 import { allSchemas } from './fileList.data'
diff --git a/src/views/infra/fileConfig/index.vue b/src/views/infra/fileConfig/index.vue
index bd9a978a..749fcd41 100644
--- a/src/views/infra/fileConfig/index.vue
+++ b/src/views/infra/fileConfig/index.vue
@@ -157,7 +157,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="FileConfig">
+<script setup lang="ts" name="InfraFileConfig">
 import type { FormInstance } from 'element-plus'
 // 业务相关的 import
 import * as FileConfigApi from '@/api/infra/fileConfig'
diff --git a/src/views/infra/job/JobLog.vue b/src/views/infra/job/JobLog.vue
index 5bc2fc68..c7bc1e27 100644
--- a/src/views/infra/job/JobLog.vue
+++ b/src/views/infra/job/JobLog.vue
@@ -47,7 +47,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="JobLog">
+<script setup lang="ts" name="InfraJobLog">
 import dayjs from 'dayjs'
 
 import * as JobLogApi from '@/api/infra/jobLog'
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
index 613f84c4..3df7030e 100644
--- a/src/views/infra/job/index.vue
+++ b/src/views/infra/job/index.vue
@@ -128,7 +128,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Job">
+<script setup lang="ts" name="InfraJob">
 import type { FormExpose } from '@/components/Form'
 import * as JobApi from '@/api/infra/job'
 import { rules, allSchemas } from './job.data'
diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue
index 05d065c6..360e7c55 100644
--- a/src/views/infra/redis/index.vue
+++ b/src/views/infra/redis/index.vue
@@ -127,7 +127,7 @@
     </el-row>
   </XModal>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="InfraRedis">
 import * as RedisApi from '@/api/infra/redis'
 import { RedisKeyInfo, RedisMonitorInfoVO } from '@/api/infra/redis/types'
 import { DICT_TYPE } from '@/utils/dict'
diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue
index 983dcd95..4dd79d69 100644
--- a/src/views/infra/server/index.vue
+++ b/src/views/infra/server/index.vue
@@ -3,7 +3,7 @@
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="AdminServer">
+<script setup lang="ts" name="InfraAdminServer">
 import * as ConfigApi from '@/api/infra/config'
 
 const loading = ref(true) // 是否加载中
diff --git a/src/views/infra/skywalking/index.vue b/src/views/infra/skywalking/index.vue
index 6e86520f..28a2365a 100644
--- a/src/views/infra/skywalking/index.vue
+++ b/src/views/infra/skywalking/index.vue
@@ -3,7 +3,7 @@
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="Skywalking">
+<script setup lang="ts" name="InfraSkyWalking">
 import * as ConfigApi from '@/api/infra/config'
 
 const loading = ref(true) // 是否加载中
diff --git a/src/views/infra/swagger/index.vue b/src/views/infra/swagger/index.vue
index 32664ff7..ff576622 100644
--- a/src/views/infra/swagger/index.vue
+++ b/src/views/infra/swagger/index.vue
@@ -3,7 +3,7 @@
     <IFrame :src="src" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="Swagger">
+<script setup lang="ts" name="InfraSwagger">
 import * as ConfigApi from '@/api/infra/config'
 
 const loading = ref(true) // 是否加载中
diff --git a/src/views/infra/webSocket/index.vue b/src/views/infra/webSocket/index.vue
index c1690db2..71f32c06 100644
--- a/src/views/infra/webSocket/index.vue
+++ b/src/views/infra/webSocket/index.vue
@@ -55,7 +55,7 @@
     </el-card>
   </div>
 </template>
-<script lang="ts" name="InfraWebSocket" setup>
+<script lang="ts" name="WebSocket" setup>
 import { formatDate } from '@/utils/formatTime'
 import { useUserStore } from '@/store/modules/user'
 import { useWebSocket } from '@vueuse/core'
diff --git a/src/views/mall/product/property/value/index.vue b/src/views/mall/product/property/value/index.vue
index 6f5ae5c8..f878f62a 100644
--- a/src/views/mall/product/property/value/index.vue
+++ b/src/views/mall/product/property/value/index.vue
@@ -88,7 +88,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <ValueForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="Config">
+<script setup lang="ts" name="ProductProperty">
 import { dateFormatter } from '@/utils/formatTime'
 import * as PropertyApi from '@/api/mall/product/property'
 import ValueForm from './ValueForm.vue'
diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue
index 8972a8bb..0908f0f5 100644
--- a/src/views/pay/app/index.vue
+++ b/src/views/pay/app/index.vue
@@ -75,7 +75,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="App">
+<script setup lang="ts" name="PayApp">
 import type { FormExpose } from '@/components/Form'
 import { rules, allSchemas } from './app.data'
 import * as AppApi from '@/api/pay/app'
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index 1ea460ec..0822518b 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -74,7 +74,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Merchant">
+<script setup lang="ts" name="PayMerchant">
 import type { FormExpose } from '@/components/Form'
 import { rules, allSchemas } from './merchant.data'
 import * as MerchantApi from '@/api/pay/merchant'
diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue
index d2a2a541..0e6430fd 100644
--- a/src/views/pay/order/index.vue
+++ b/src/views/pay/order/index.vue
@@ -64,7 +64,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Order">
+<script setup lang="ts" name="PayOrder">
 import type { FormExpose } from '@/components/Form'
 import { rules, allSchemas } from './order.data'
 import * as OrderApi from '@/api/pay/order'
diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue
index 6b7b3d46..3c285799 100644
--- a/src/views/pay/refund/index.vue
+++ b/src/views/pay/refund/index.vue
@@ -33,7 +33,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Refund">
+<script setup lang="ts" name="PayRefund">
 import { allSchemas } from './refund.data'
 import * as RefundApi from '@/api/pay/refund'
 
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 23b2da60..5be4dd8e 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -37,7 +37,7 @@
   </div>
 </template>
 
-<script lang="ts" setup name="Area">
+<script lang="ts" setup name="SystemArea">
 import * as areaApi from '@/api/system/area'
 import type { FormInstance } from 'element-plus'
 // import { allSchemas } from './area.data'
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 3b182e2a..c97085b3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -74,7 +74,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Dept">
+<script setup lang="ts" name="SystemDept">
 import { handleTree, defaultProps } from '@/utils/tree'
 import type { FormExpose } from '@/components/Form'
 import { allSchemas, rules } from './dept.data'
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 713fde97..973e9941 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -121,7 +121,7 @@
     </XModal>
   </div>
 </template>
-<script setup lang="ts" name="Dict">
+<script setup lang="ts" name="SystemDictType">
 import { VxeTableEvents } from 'vxe-table'
 import type { FormExpose } from '@/components/Form'
 import * as DictTypeSchemas from './dict.type'
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
index 1ff3d103..4fef1cb2 100644
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@@ -66,7 +66,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="ErrorCode">
+<script setup lang="ts" name="SystemErrorCode">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import { rules, allSchemas } from './errorCode.data'
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index f2bb8c67..a8343c4e 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -27,7 +27,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Loginlog">
+<script setup lang="ts" name="SystemLoginLog">
 // 业务相关的 import
 import { allSchemas } from './loginLog.data'
 import { getLoginLogPageApi, exportLoginLogApi, LoginLogVO } from '@/api/system/loginLog'
diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue
index 7c4ad0f9..27d53535 100644
--- a/src/views/system/mail/account/index.vue
+++ b/src/views/system/mail/account/index.vue
@@ -66,7 +66,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="MailAccount">
+<script setup lang="ts" name="SystemMailAccount">
 import { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import { rules, allSchemas } from './account.data'
diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue
index 7a7186f5..57178497 100644
--- a/src/views/system/mail/log/index.vue
+++ b/src/views/system/mail/log/index.vue
@@ -44,7 +44,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="MailLog">
+<script setup lang="ts" name="SystemMailLog">
 // 业务相关的 import
 import { DICT_TYPE } from '@/utils/dict'
 import { allSchemas } from './log.data'
diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue
index a0e62627..3166c383 100644
--- a/src/views/system/mail/template/index.vue
+++ b/src/views/system/mail/template/index.vue
@@ -138,7 +138,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="MailTemplate">
+<script setup lang="ts" name="SystemMailTemplate">
 import { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import { rules, allSchemas } from './template.data'
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 012ac1ba..e64baaea 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -200,7 +200,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Menu">
+<script setup lang="ts" name="SystemMenu">
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { FormInstance } from 'element-plus'
 // 业务相关的 import
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 862ad289..901dd1fc 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -70,7 +70,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Notice">
+<script setup lang="ts" name="SystemNotice">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as NoticeApi from '@/api/system/notice'
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
index 93a8ed68..7c28d38c 100644
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@@ -27,7 +27,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="NotifyMessage">
+<script setup lang="ts" name="SystemNotifyMessage">
 // 业务相关的 import
 import { allSchemas } from './message.data'
 import * as NotifyMessageApi from '@/api/system/notify/message'
diff --git a/src/views/system/notify/template/index.vue b/src/views/system/notify/template/index.vue
index 8033321a..d888a7af 100644
--- a/src/views/system/notify/template/index.vue
+++ b/src/views/system/notify/template/index.vue
@@ -114,7 +114,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="NotifyTemplate">
+<script setup lang="ts" name="SystemNotifyTemplate">
 import { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import { rules, allSchemas } from './template.data'
diff --git a/src/views/system/oauth2/client/index.vue b/src/views/system/oauth2/client/index.vue
index 6bac1913..dfdb1722 100644
--- a/src/views/system/oauth2/client/index.vue
+++ b/src/views/system/oauth2/client/index.vue
@@ -134,7 +134,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Client">
+<script setup lang="ts" name="SystemOAuth2Client">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as ClientApi from '@/api/system/oauth2/client'
diff --git a/src/views/system/oauth2/token/index.vue b/src/views/system/oauth2/token/index.vue
index e9a41ee3..e1a269ca 100644
--- a/src/views/system/oauth2/token/index.vue
+++ b/src/views/system/oauth2/token/index.vue
@@ -24,7 +24,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Token">
+<script setup lang="ts" name="SystemTokenClient">
 import { allSchemas } from './token.data'
 import * as TokenApi from '@/api/system/oauth2/token'
 
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 7f1e9bb4..e523d1cc 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -41,7 +41,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="OperateLog">
+<script setup lang="ts" name="SystemOperateLog">
 // 业务相关的 import
 import * as OperateLogApi from '@/api/system/operatelog'
 import { allSchemas } from './operatelog.data'
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 1e9da634..5c6d125d 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -75,7 +75,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Post">
+<script setup lang="ts" name="SystemPost">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as PostApi from '@/api/system/post'
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index eef67306..8b24e8a8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -157,7 +157,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Role">
+<script setup lang="ts" name="SystemRole">
 import type { ElTree } from 'element-plus'
 import type { FormExpose } from '@/components/Form'
 import { handleTree, defaultProps } from '@/utils/tree'
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
index c3de895d..868d5701 100644
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@@ -102,7 +102,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="SensitiveWord">
+<script setup lang="ts" name="SystemSensitiveWord">
 import type { FormExpose } from '@/components/Form'
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import { rules, allSchemas } from './sensitiveWord.data'
diff --git a/src/views/system/sms/channel/index.vue b/src/views/system/sms/channel/index.vue
index ee47a51a..c94a0b8a 100644
--- a/src/views/system/sms/channel/index.vue
+++ b/src/views/system/sms/channel/index.vue
@@ -67,7 +67,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="SmsChannel">
+<script setup lang="ts" name="SystemSmsChannel">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
index 334da2ad..f5fb2c76 100644
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@@ -30,7 +30,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="SmsLog">
+<script setup lang="ts" name="SystemSmsLog">
 import { allSchemas } from './sms.log.data'
 import * as SmsLoglApi from '@/api/system/sms/smsLog'
 const { t } = useI18n() // 国际化
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
index bbc7c863..4a50033e 100644
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@@ -108,7 +108,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="SmsTemplate">
+<script setup lang="ts" name="SystemSmsTemplate">
 import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index ef726bc5..4c408c80 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -85,7 +85,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="Tenant">
+<script setup lang="ts" name="SystemTenant">
 import type { FormExpose } from '@/components/Form'
 import * as TenantApi from '@/api/system/tenant'
 import { rules, allSchemas, tenantPackageOption } from './tenant.data'
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index c8f5756a..36e6ff72 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -64,7 +64,7 @@
     </XModal>
   </ContentWrap>
 </template>
-<script setup lang="ts" name="TenantPackage">
+<script setup lang="ts" name="SystemTenantPackage">
 import { handleTree, defaultProps } from '@/utils/tree'
 import type { FormExpose } from '@/components/Form'
 import type { ElTree } from 'element-plus'
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e5ad860f..e5f7b483 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -262,7 +262,7 @@
     </template>
   </XModal>
 </template>
-<script setup lang="ts" name="User">
+<script setup lang="ts" name="SystemUser">
 import type { ElTree, UploadRawFile, UploadInstance } from 'element-plus'
 import { handleTree, defaultProps } from '@/utils/tree'
 import download from '@/utils/download'

From 9af3734b784c098679b6936cdee6369648e8010b Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 11 Jul 2023 12:46:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/web/useVxeCrudSchemas.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hooks/web/useVxeCrudSchemas.ts b/src/hooks/web/useVxeCrudSchemas.ts
index 5c765d4f..0ed3f5fe 100644
--- a/src/hooks/web/useVxeCrudSchemas.ts
+++ b/src/hooks/web/useVxeCrudSchemas.ts
@@ -269,7 +269,8 @@ const filterFormSchema = (crudSchema: VxeCrudSchema): FormSchema[] => {
           defaultValue = 0
         }
       }
-      let comonentProps = {}
+      const componentProps =
+        schemaItem.form?.componentProps != null ? schemaItem.form?.componentProps : {}
       if (schemaItem.dictType) {
         const options: ComponentOptions[] = []
         if (schemaItem.dictClass && schemaItem.dictClass === 'number') {
@@ -285,14 +286,12 @@ const filterFormSchema = (crudSchema: VxeCrudSchema): FormSchema[] => {
             options.push(dict)
           })
         }
-        comonentProps = {
-          options: options
-        }
+        componentProps.options = options
         if (!(schemaItem.form && schemaItem.form.component)) component = 'Select'
       }
       const formSchemaItem = {
         component: component,
-        componentProps: comonentProps,
+        componentProps: componentProps,
         value: defaultValue,
         ...schemaItem.form,
         field: schemaItem.field,