From 7782d7c85ba315abed776dc7fb137bb780984f50 Mon Sep 17 00:00:00 2001
From: yangxu52 <yyswj10@163.com>
Date: Fri, 7 Mar 2025 10:49:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8defineOptions?=
 =?UTF-8?q?=E5=AE=8F=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 个别文件代码样式异常，自动修复
 - 有两个组件名与HTML标签冲突，已添加TODO（考虑keep-alive问题，可能需要修改菜单定义）
---
 src/components/BuildCode/render.vue           |  3 +-
 src/components/Pagination/index.vue           |  3 +-
 src/layout/components/AppMain.vue             | 14 +--
 src/views/demo/demo/index.vue                 |  3 +-
 src/views/demo/tree/index.vue                 |  3 +-
 src/views/index.vue                           |  3 +-
 src/views/monitor/cache/index.vue             |  3 +-
 src/views/monitor/logininfor/index.vue        |  3 +-
 src/views/monitor/online/index.vue            |  3 +-
 src/views/monitor/operlog/index.vue           |  3 +-
 src/views/system/client/index.vue             |  3 +-
 src/views/system/config/index.vue             |  3 +-
 src/views/system/dept/index.vue               |  3 +-
 src/views/system/dict/data.vue                |  4 +-
 src/views/system/dict/index.vue               |  3 +-
 src/views/system/menu/index.vue               |  4 +-
 src/views/system/notice/index.vue             |  3 +-
 src/views/system/oss/config.vue               |  3 +-
 src/views/system/oss/index.vue                |  3 +-
 src/views/system/post/index.vue               |  3 +-
 src/views/system/role/authUser.vue            |  3 +-
 src/views/system/role/index.vue               |  3 +-
 src/views/system/role/selectUser.vue          |  3 +-
 src/views/system/tenant/index.vue             |  3 +-
 src/views/system/tenantPackage/index.vue      |  3 +-
 src/views/system/user/authRole.vue            |  4 +-
 src/views/system/user/index.vue               |  4 +-
 src/views/system/user/profile/index.vue       |  3 +-
 .../system/user/profile/onlineDevice.vue      |  3 +-
 src/views/tool/gen/editTable.vue              |  3 +-
 src/views/tool/gen/index.vue                  |  7 +-
 src/views/workflow/category/index.vue         | 85 +++++++++----------
 src/views/workflow/leave/index.vue            |  4 +-
 src/views/workflow/leave/leaveEdit.vue        |  3 +-
 .../workflow/processDefinition/index.vue      |  6 +-
 35 files changed, 119 insertions(+), 91 deletions(-)

diff --git a/src/components/BuildCode/render.vue b/src/components/BuildCode/render.vue
index aeb9312b..e78ab33b 100644
--- a/src/components/BuildCode/render.vue
+++ b/src/components/BuildCode/render.vue
@@ -5,7 +5,8 @@
 </template>
 
 <!-- 动态表单渲染 -->
-<script setup name="Render" lang="ts">
+<script setup lang="ts">
+defineOptions({ name: 'Render' });
 interface Props {
   formJson: string | object;
   formData: string | object;
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index f615f61c..df7568c3 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -14,7 +14,8 @@
   </div>
 </template>
 
-<script setup name="Pagination" lang="ts">
+<script setup lang="ts">
+defineOptions({ name: 'Pagination' });
 import { scrollTo } from '@/utils/scroll-to';
 import { propTypes } from '@/utils/propTypes';
 
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 1d8025d0..1743b30d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -14,11 +14,11 @@
   </section>
 </template>
 
-<script setup name="AppMain" lang="ts">
+<script setup lang="ts">
 import useSettingsStore from '@/store/modules/settings';
 import useTagsViewStore from '@/store/modules/tagsView';
-
 import IframeToggle from './IframeToggle/index.vue';
+defineOptions({ name: 'AppMain' });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const tagsViewStore = useTagsViewStore();
@@ -40,16 +40,16 @@ watch(
 );
 
 onMounted(() => {
-  addIframe()
-})
+  addIframe();
+});
 
 watchEffect((route) => {
-  addIframe()
-})
+  addIframe();
+});
 
 function addIframe() {
   if (route.meta.link) {
-    useTagsViewStore().addIframeView(route)
+    useTagsViewStore().addIframeView(route);
   }
 }
 </script>
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index da1bc167..182aa241 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -100,9 +100,10 @@
   </div>
 </template>
 
-<script setup name="Demo" lang="ts">
+<script setup lang="ts">
 import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
 import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
+defineOptions({ name: 'Demo' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 566d0719..c234a983 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -88,9 +88,10 @@
   </div>
 </template>
 
-<script setup name="Tree" lang="ts">
+<script setup lang="ts">
 import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree';
 import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
+defineOptions({ name: 'Tree' });
 
 type TreeOption = {
   id: number;
diff --git a/src/views/index.vue b/src/views/index.vue
index 9a51200a..aad67236 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -94,7 +94,8 @@
   </div>
 </template>
 
-<script setup name="Index" lang="ts">
+<script setup lang="ts">
+defineOptions({ name: 'Index' });
 const goTarget = (url: string) => {
   window.open(url, '__blank');
 };
diff --git a/src/views/monitor/cache/index.vue b/src/views/monitor/cache/index.vue
index f8945863..2bc01c34 100644
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@@ -123,10 +123,11 @@
   </div>
 </template>
 
-<script setup name="Cache" lang="ts">
+<script setup lang="ts">
 import { getCache } from '@/api/monitor/cache';
 import * as echarts from 'echarts';
 import { CacheVO } from '@/api/monitor/cache/types';
+defineOptions({ name: 'Cache' });
 
 const cache = ref<Partial<CacheVO>>({});
 const commandstats = ref();
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index d9145446..31e6d6f5 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -104,9 +104,10 @@
   </div>
 </template>
 
-<script setup name="Logininfor" lang="ts">
+<script setup lang="ts">
 import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from '@/api/monitor/loginInfo';
 import { LoginInfoQuery, LoginInfoVO } from '@/api/monitor/loginInfo/types';
+defineOptions({ name: 'Logininfor' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 7a58bb7e..f68969d0 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -60,11 +60,12 @@
   </div>
 </template>
 
-<script setup name="Online" lang="ts">
+<script setup lang="ts">
 import { forceLogout, list as initData } from '@/api/monitor/online';
 import { OnlineQuery, OnlineVO } from '@/api/monitor/online/types';
 import api from '@/api/system/user';
 import { to } from 'await-to-js';
+defineOptions({ name: 'Online' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 0c64af4d..7eeaa427 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -127,10 +127,11 @@
   </div>
 </template>
 
-<script setup name="Operlog" lang="ts">
+<script setup lang="ts">
 import { list, delOperlog, cleanOperlog } from '@/api/monitor/operlog';
 import { OperLogForm, OperLogQuery, OperLogVO } from '@/api/monitor/operlog/types';
 import OperInfoDialog from './oper-info-dialog.vue';
+defineOptions({ name: 'Operlog' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_oper_type, sys_common_status } = toRefs<any>(proxy?.useDict('sys_oper_type', 'sys_common_status'));
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 1f14b4ca..b8bf0889 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -141,9 +141,10 @@
   </div>
 </template>
 
-<script setup name="Client" lang="ts">
+<script setup lang="ts">
 import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
 import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
+defineOptions({ name: 'Client' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ddc07537..40631db1 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -122,9 +122,10 @@
   </div>
 </template>
 
-<script setup name="Config" lang="ts">
+<script setup lang="ts">
 import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from '@/api/system/config';
 import { ConfigForm, ConfigQuery, ConfigVO } from '@/api/system/config/types';
+defineOptions({ name: 'Config' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1f5facb9..5d53b233 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -140,11 +140,12 @@
   </div>
 </template>
 
-<script setup name="Dept" lang="ts">
+<script setup lang="ts">
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from '@/api/system/dept';
 import { DeptForm, DeptQuery, DeptVO } from '@/api/system/dept/types';
 import { UserVO } from '@/api/system/user/types';
 import { listUserByDeptId } from '@/api/system/user';
+defineOptions({ name: 'Dept' });
 
 interface DeptOptionsType {
   deptId: number | string;
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 3e9b0a1c..ed190269 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -125,13 +125,15 @@
   </div>
 </template>
 
-<script setup name="Data" lang="ts">
+<script setup lang="ts">
 import useDictStore from '@/store/modules/dict';
 import { optionselect as getDictOptionselect, getType } from '@/api/system/dict/type';
 import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data';
 import { DictTypeVO } from '@/api/system/dict/type/types';
 import { DictDataForm, DictDataQuery, DictDataVO } from '@/api/system/dict/data/types';
 import { RouteLocationNormalized } from 'vue-router';
+//TODO name与html标签冲突;
+defineOptions({ name: 'Data' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index d30ad548..4f5deafe 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -107,10 +107,11 @@
   </div>
 </template>
 
-<script setup name="Dict" lang="ts">
+<script setup lang="ts">
 import useDictStore from '@/store/modules/dict';
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
+defineOptions({ name: 'Dict' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 05630f4c..b250fe50 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -260,10 +260,12 @@
   </div>
 </template>
 
-<script setup name="Menu" lang="ts">
+<script setup lang="ts">
 import { addMenu, delMenu, getMenu, listMenu, updateMenu } from '@/api/system/menu';
 import { MenuForm, MenuQuery, MenuVO } from '@/api/system/menu/types';
 import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+// TODO name与html标签冲突
+defineOptions({ name: 'Menu' });
 
 interface MenuOptionsType {
   menuId: number;
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 5d7d9ba5..168c1d63 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -118,9 +118,10 @@
   </div>
 </template>
 
-<script setup name="Notice" lang="ts">
+<script setup lang="ts">
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/notice';
 import { NoticeForm, NoticeQuery, NoticeVO } from '@/api/system/notice/types';
+defineOptions({ name: 'Notice' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_status', 'sys_notice_type'));
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 0563a022..9f0b8573 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -133,9 +133,10 @@
   </div>
 </template>
 
-<script setup name="OssConfig" lang="ts">
+<script setup lang="ts">
 import { listOssConfig, getOssConfig, delOssConfig, addOssConfig, updateOssConfig, changeOssConfigStatus } from '@/api/system/ossConfig';
 import { OssConfigForm, OssConfigQuery, OssConfigVO } from '@/api/system/ossConfig/types';
+defineOptions({ name: 'OssConfig' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index f76dbab4..91d310f7 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -130,10 +130,11 @@
   </div>
 </template>
 
-<script setup name="Oss" lang="ts">
+<script setup lang="ts">
 import { listOss, delOss } from '@/api/system/oss';
 import ImagePreview from '@/components/ImagePreview/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
+defineOptions({ name: 'Oss' });
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 4aa4e3a2..07064d76 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -169,11 +169,12 @@
   </div>
 </template>
 
-<script setup name="Post" lang="ts">
+<script setup lang="ts">
 import { listPost, addPost, delPost, getPost, updatePost } from '@/api/system/post';
 import { PostForm, PostQuery, PostVO } from '@/api/system/post/types';
 import { DeptVO } from '@/api/system/dept/types';
 import api from '@/api/system/user';
+defineOptions({ name: 'Post' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 49bac805..96cc7354 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -64,12 +64,13 @@
   </div>
 </template>
 
-<script setup name="AuthUser" lang="ts">
+<script setup lang="ts">
 import { allocatedUserList, authUserCancel, authUserCancelAll } from '@/api/system/role';
 import { UserQuery } from '@/api/system/user/types';
 import { UserVO } from '@/api/system/user/types';
 import SelectUser from './selectUser.vue';
 import { RouteLocationNormalized } from 'vue-router';
+defineOptions({ name: 'AuthUser' });
 
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fc42cd5d..bbe0fa90 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -191,11 +191,12 @@
   </div>
 </template>
 
-<script setup name="Role" lang="ts">
+<script setup lang="ts">
 import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from '@/api/system/role';
 import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
 import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
 import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
+defineOptions({ name: 'Role' });
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 12df8282..c9c03c91 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -43,10 +43,11 @@
   </el-row>
 </template>
 
-<script setup name="SelectUser" lang="ts">
+<script setup lang="ts">
 import { authUserSelectAll, unallocatedUserList } from '@/api/system/role';
 import { UserVO } from '@/api/system/user/types';
 import { UserQuery } from '@/api/system/user/types';
+defineOptions({ name: 'SelectUser' });
 
 const props = defineProps({
   roleId: {
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index df97b649..75298206 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -143,7 +143,7 @@
   </div>
 </template>
 
-<script setup name="Tenant" lang="ts">
+<script setup lang="ts">
 import {
   listTenant,
   getTenant,
@@ -158,6 +158,7 @@ import { selectTenantPackage } from '@/api/system/tenantPackage';
 import useUserStore from '@/store/modules/user';
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
 import { TenantPkgVO } from '@/api/system/tenantPackage/types';
+defineOptions({ name: 'Tenant' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index f97bb352..9984f2f4 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -99,7 +99,7 @@
   </div>
 </template>
 
-<script setup name="TenantPackage" lang="ts">
+<script setup lang="ts">
 import {
   listTenantPackage,
   getTenantPackage,
@@ -112,6 +112,7 @@ import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api
 import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types';
 import { MenuTreeOption } from '@/api/system/menu/types';
 import to from 'await-to-js';
+defineOptions({ name: 'TenantPackage' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index fe2e9741..2e4d6548 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -54,13 +54,13 @@
   </div>
 </template>
 
-<script setup name="AuthRole" lang="ts">
+<script setup lang="ts">
 import { RoleVO } from '@/api/system/role/types';
 import { getAuthRole, updateAuthRole } from '@/api/system/user';
 import { UserForm } from '@/api/system/user/types';
 import { RouteLocationNormalized } from 'vue-router';
 import { parseTime } from '@/utils/ruoyi';
-
+defineOptions({ name: 'AuthRole' });
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b9b7a9aa..2012557d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -285,7 +285,7 @@
   </div>
 </template>
 
-<script setup name="User" lang="ts">
+<script setup lang="ts">
 import api from '@/api/system/user';
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
 import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
@@ -297,7 +297,7 @@ import { to } from 'await-to-js';
 import { optionselect } from '@/api/system/post';
 import { hasPermi } from '@/directive/permission';
 import { checkPermi } from '@/utils/permission';
-
+defineOptions({ name: 'User' });
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 7c1389a3..10a99598 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -68,7 +68,7 @@
   </div>
 </template>
 
-<script setup name="Profile" lang="ts">
+<script setup lang="ts">
 import UserAvatar from './userAvatar.vue';
 import UserInfo from './userInfo.vue';
 import ResetPwd from './resetPwd.vue';
@@ -78,6 +78,7 @@ import { getAuthList } from '@/api/system/social/auth';
 import { getUserProfile } from '@/api/system/user';
 import { getOnline } from '@/api/monitor/online';
 import { UserVO } from '@/api/system/user/types';
+defineOptions({ name: 'Profile' });
 
 const activeTab = ref('userinfo');
 interface State {
diff --git a/src/views/system/user/profile/onlineDevice.vue b/src/views/system/user/profile/onlineDevice.vue
index b8844466..e36bd29c 100644
--- a/src/views/system/user/profile/onlineDevice.vue
+++ b/src/views/system/user/profile/onlineDevice.vue
@@ -26,9 +26,10 @@
   </div>
 </template>
 
-<script setup name="Online" lang="ts">
+<script setup lang="ts">
 import { delOnline } from '@/api/monitor/online';
 import { propTypes } from '@/utils/propTypes';
+defineOptions({ name: 'Online' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 173f7f22..c197f501 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -112,7 +112,7 @@
   </el-card>
 </template>
 
-<script setup name="GenEdit" lang="ts">
+<script setup lang="ts">
 import { getGenTable, updateGenTable } from '@/api/tool/gen';
 import { DbColumnVO, DbTableVO } from '@/api/tool/gen/types';
 import { optionselect as getDictOptionselect } from '@/api/system/dict/type';
@@ -120,6 +120,7 @@ import { DictTypeVO } from '@/api/system/dict/type/types';
 import BasicInfoForm from './basicInfoForm.vue';
 import GenInfoForm from './genInfoForm.vue';
 import { RouteLocationNormalized } from 'vue-router';
+defineOptions({ name: 'GenEdit' });
 
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index b4df31b5..e3f2e2eb 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -112,11 +112,12 @@
   </div>
 </template>
 
-<script setup name="Gen" lang="ts">
-import {delTable, genCode, getDataNames, listTable, previewTable, synchDb} from '@/api/tool/gen';
-import {TableQuery, TableVO} from '@/api/tool/gen/types';
+<script setup lang="ts">
+import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
+import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
 import ImportTable from './importTable.vue';
+defineOptions({ name: 'Gen' });
 
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index d3e87ea3..df3a0392 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -34,7 +34,7 @@
         :default-expand-all="isExpandAll"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
-        <el-table-column label="分类名称" prop="categoryName" width="260"/>
+        <el-table-column label="分类名称" prop="categoryName" width="260" />
         <el-table-column label="显示顺序" align="center" prop="orderNum" width="200" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
@@ -77,7 +77,7 @@
           </el-col>
         </el-row>
       </el-form>
-    <template #footer>
+      <template #footer>
         <div class="dialog-footer">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -87,18 +87,18 @@
   </div>
 </template>
 
-<script setup name="Category" lang="ts">
-import { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/workflow/category";
+<script setup lang="ts">
+import { listCategory, getCategory, delCategory, addCategory, updateCategory } from '@/api/workflow/category';
 import { CategoryVO, CategoryQuery, CategoryForm } from '@/api/workflow/category/types';
+defineOptions({ name: 'Category' });
 
 type CategoryOption = {
   categoryId: number;
   categoryName: string;
   children?: CategoryOption[];
-}
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+};
 
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const categoryList = ref<CategoryVO[]>([]);
 const categoryOptions = ref<CategoryOption[]>([]);
@@ -109,32 +109,29 @@ const loading = ref(false);
 
 const queryFormRef = ref<ElFormInstance>();
 const categoryFormRef = ref<ElFormInstance>();
-const categoryTableRef = ref<ElTableInstance>()
+const categoryTableRef = ref<ElTableInstance>();
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-
 const initFormData: CategoryForm = {
   categoryId: undefined,
-  categoryName: "",
+  categoryName: '',
   parentId: undefined,
-  orderNum: 0,
-}
+  orderNum: 0
+};
 
 const data = reactive<PageData<CategoryForm, CategoryQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
-    categoryName: undefined,
+    categoryName: undefined
   },
   rules: {
-    categoryId: [
-      { required: true, message: "流程分类ID不能为空", trigger: "blur" }
-    ],
-    parentId: [{ required: true, message: "请选择上级分类", trigger: "change" }],
-    categoryName: [{ required: true, message: "请输入分类名称", trigger: "blur" }]
+    categoryId: [{ required: true, message: '流程分类ID不能为空', trigger: 'blur' }],
+    parentId: [{ required: true, message: '请选择上级分类', trigger: 'change' }],
+    categoryName: [{ required: true, message: '请输入分类名称', trigger: 'blur' }]
   }
 });
 
@@ -144,19 +141,19 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listCategory(queryParams.value);
-  const data = proxy?.handleTree<CategoryVO>(res.data, "categoryId", "parentId");
+  const data = proxy?.handleTree<CategoryVO>(res.data, 'categoryId', 'parentId');
   if (data) {
     categoryList.value = data;
     loading.value = false;
   }
-}
+};
 
 /** 查询流程分类下拉树结构 */
 const getTreeselect = async () => {
   const res = await listCategory();
   categoryOptions.value = [];
   // 处理树形数据
-  const data = proxy?.handleTree<CategoryOption>(res.data, "categoryId", "parentId");
+  const data = proxy?.handleTree<CategoryOption>(res.data, 'categoryId', 'parentId');
   if (data) {
     categoryOptions.value = data; // 将处理后的树形数据赋值
   }
@@ -166,24 +163,24 @@ const getTreeselect = async () => {
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 // 表单重置
 const reset = () => {
-  form.value = {...initFormData}
+  form.value = { ...initFormData };
   categoryFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = (row?: CategoryVO) => {
@@ -195,22 +192,22 @@ const handleAdd = (row?: CategoryVO) => {
     form.value.parentId = undefined;
   }
   dialog.visible = true;
-  dialog.title = "添加流程分类";
-}
+  dialog.title = '添加流程分类';
+};
 
 /** 展开/折叠操作 */
 const handleToggleExpandAll = () => {
   isExpandAll.value = !isExpandAll.value;
-  toggleExpandAll(categoryList.value, isExpandAll.value)
-}
+  toggleExpandAll(categoryList.value, isExpandAll.value);
+};
 
 /** 展开/折叠操作 */
 const toggleExpandAll = (data: CategoryVO[], status: boolean) => {
   data.forEach((item) => {
-    categoryTableRef.value?.toggleRowExpansion(item, status)
-    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
-  })
-}
+    categoryTableRef.value?.toggleRowExpansion(item, status);
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
+  });
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row: CategoryVO) => {
@@ -222,8 +219,8 @@ const handleUpdate = async (row: CategoryVO) => {
   const res = await getCategory(row.categoryId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改流程分类";
-}
+  dialog.title = '修改流程分类';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -231,25 +228,25 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.categoryId) {
-        await updateCategory(form.value).finally(() => buttonLoading.value = false);
+        await updateCategory(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addCategory(form.value).finally(() => buttonLoading.value = false);
+        await addCategory(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row: CategoryVO) => {
   await proxy?.$modal.confirm('是否确认删除"' + row.categoryName + '"的分类？');
   loading.value = true;
-  await delCategory(row.categoryId).finally(() => loading.value = false);
+  await delCategory(row.categoryId).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess("删除成功");
-}
+  proxy?.$modal.msgSuccess('删除成功');
+};
 
 onMounted(() => {
   getList();
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 2c8da0ec..1fccdf96 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -87,11 +87,11 @@
   </div>
 </template>
 
-<script setup name="Leave" lang="ts">
+<script setup lang="ts">
 import { delLeave, listLeave } from '@/api/workflow/leave';
 import { cancelProcessApply } from '@/api/workflow/instance';
 import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
-
+defineOptions({ name: 'Leave' });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const leaveList = ref<LeaveVO[]>([]);
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index a8c1bfda..074b3489 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -58,7 +58,7 @@
   </div>
 </template>
 
-<script setup name="Leave" lang="ts">
+<script setup lang="ts">
 import { addLeave, getLeave, updateLeave } from '@/api/workflow/leave';
 import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
 import { startWorkFlow } from '@/api/workflow/task';
@@ -66,6 +66,7 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+defineOptions({ name: 'Leave' });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const buttonLoading = ref(false);
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index d2b39068..8384f580 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -190,14 +190,14 @@
   </div>
 </template>
 
-<script setup name="processDefinition" lang="ts">
+<script setup lang="ts">
 import { listDefinition, deleteDefinition, active, importDef, unPublishList, publish, add, edit, getInfo, copy } from '@/api/workflow/definition';
 import { categoryTree } from '@/api/workflow/category';
 import { CategoryTreeVO } from '@/api/workflow/category/types';
 import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types';
 import { UploadRequestOptions, TabsPaneContext } from 'element-plus';
-import { ElMessageBoxOptions } from "element-plus/es/components/message-box/src/message-box.type";
-
+import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
+defineOptions({ name: 'processDefinition' });
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const queryFormRef = ref<ElFormInstance>();
-- 
Gitee


From 10c9e0cec9ce0b37b187749d61606485c83d7248 Mon Sep 17 00:00:00 2001
From: yangxu52 <yyswj10@163.com>
Date: Fri, 7 Mar 2025 10:56:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84vue-setup-extend-plus=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

插件用于在setup下用属性定义name/inheritAttrs
vue3.3提供了defineOptions宏定义
---
 package.json                 | 1 -
 vite/plugins/index.ts        | 4 +---
 vite/plugins/setup-extend.ts | 5 -----
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 vite/plugins/setup-extend.ts

diff --git a/package.json b/package.json
index 86ceffcf..a6dc6bcc 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "unplugin-auto-import": "0.17.5",
     "unplugin-icons": "0.18.5",
     "unplugin-vue-components": "28.0.0",
-    "unplugin-vue-setup-extend-plus": "1.0.1",
     "vite": "5.4.11",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons-ng": "1.0.2",
diff --git a/vite/plugins/index.ts b/vite/plugins/index.ts
index 2f16e542..f93e685c 100644
--- a/vite/plugins/index.ts
+++ b/vite/plugins/index.ts
@@ -7,7 +7,6 @@ import createComponents from './components';
 import createIcons from './icons';
 import createSvgIconsPlugin from './svg-icon';
 import createCompression from './compression';
-import createSetupExtend from './setup-extend';
 import path from 'path';
 
 export default (viteEnv: any, isBuild = false): [] => {
@@ -19,7 +18,6 @@ export default (viteEnv: any, isBuild = false): [] => {
   vitePlugins.push(createComponents(path));
   vitePlugins.push(createCompression(viteEnv));
   vitePlugins.push(createIcons());
-  vitePlugins.push(createSvgIconsPlugin(path, isBuild));
-  vitePlugins.push(createSetupExtend());
+  vitePlugins.push(createSvgIconsPlugin(path));
   return vitePlugins;
 };
diff --git a/vite/plugins/setup-extend.ts b/vite/plugins/setup-extend.ts
deleted file mode 100644
index ed3423f0..00000000
--- a/vite/plugins/setup-extend.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import setupExtend from 'unplugin-vue-setup-extend-plus/vite';
-
-export default () => {
-  return setupExtend({});
-};
-- 
Gitee