diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index b6d30745..bb8b8768 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -15,5 +15,17 @@
   "htmlWhitespaceSensitivity": "ignore",
   "experimentalSortPackageJson": {
     "sortScripts": true
+  },
+  "sortImports": {
+    "newlinesBetween": false,
+    "groups": [
+      "type-import",
+      ["value-builtin", "value-external"],
+      "type-internal",
+      "value-internal",
+      ["type-parent", "type-sibling", "type-index"],
+      ["value-parent", "value-sibling", "value-index"],
+      "unknown"
+    ]
   }
 }
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 5c25b249..487ff02b 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -8,7 +8,14 @@
     "typescript/no-this-alias": "off",
     "typescript/no-empty-object-type": "off",
     "typescript/no-unused-expressions": "off",
-    "prefer-rest-params": "off"
+    "prefer-rest-params": "off",
+    "import/no-unassigned-import": "off",
+    "import/no-named-as-default-member": "off",
+    "import/no-named-as-default": "off",
+    "no-shadow": "off",
+    "unicorn/prefer-add-event-listener": "off",
+    "unicorn/consistent-function-scoping": "off",
+    "unicorn/no-instanceof-builtins": "off"
   },
   "categories": {
     "correctness": "error",
diff --git a/src/App.vue b/src/App.vue
index 617a10eb..e6f70819 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,9 +5,9 @@
 </template>
 
 <script setup lang="ts">
+import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
 import { handleThemeStyle } from '@/utils/theme';
-import { useAppStore } from '@/store/modules/app';
 
 const appStore = useAppStore();
 
diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
index 7c1019df..23fcbd27 100644
--- a/src/api/demo/demo/index.ts
+++ b/src/api/demo/demo/index.ts
@@ -1,7 +1,7 @@
+import type { DemoForm, DemoQuery, DemoVO } from '@/api/demo/demo/types';
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询测试单列表
diff --git a/src/api/demo/tree/index.ts b/src/api/demo/tree/index.ts
index 562deb6f..69ebcba4 100644
--- a/src/api/demo/tree/index.ts
+++ b/src/api/demo/tree/index.ts
@@ -1,6 +1,6 @@
+import type { TreeForm, TreeQuery, TreeVO } from '@/api/demo/tree/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { TreeVO, TreeForm, TreeQuery } from '@/api/demo/tree/types';
 
 /**
  * 查询测试树列表
diff --git a/src/api/login.ts b/src/api/login.ts
index e9134d09..646677ab 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,8 +1,8 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { LoginData, LoginResult, VerifyCodeResult } from './types';
-import { UserInfo } from '@/api/system/user/types';
+import type { UserInfo } from '@/api/system/user/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import { closePush } from '@/utils/push';
+import request from '@/utils/request';
+import type { LoginData, LoginResult, VerifyCodeResult } from './types';
 
 // pc端固定客户端授权id
 const clientId = import.meta.env.VITE_APP_CLIENT_ID;
diff --git a/src/api/menu.ts b/src/api/menu.ts
index a3ae80e1..3be30a06 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -1,6 +1,6 @@
+import type { RouteRecordRaw } from 'vue-router';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { RouteRecordRaw } from 'vue-router';
 
 // 获取路由
 export function getRouters(): AxiosPromise<RouteRecordRaw[]> {
diff --git a/src/api/monitor/cache/index.ts b/src/api/monitor/cache/index.ts
index e45d6fb1..30afa876 100644
--- a/src/api/monitor/cache/index.ts
+++ b/src/api/monitor/cache/index.ts
@@ -1,6 +1,6 @@
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { CacheVO } from './types';
+import type { CacheVO } from './types';
 
 // 查询缓存详细
 export function getCache(): AxiosPromise<CacheVO> {
diff --git a/src/api/monitor/loginInfo/index.ts b/src/api/monitor/loginInfo/index.ts
index a557e229..23e30a04 100644
--- a/src/api/monitor/loginInfo/index.ts
+++ b/src/api/monitor/loginInfo/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { LoginInfoQuery, LoginInfoVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { LoginInfoQuery, LoginInfoVO } from './types';
 
 // 查询登录日志列表
 export function list(query: LoginInfoQuery): AxiosPromise<PageResult<LoginInfoVO>> {
diff --git a/src/api/monitor/online/index.ts b/src/api/monitor/online/index.ts
index c6192011..6fbb841c 100644
--- a/src/api/monitor/online/index.ts
+++ b/src/api/monitor/online/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { OnlineQuery, OnlineVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { OnlineQuery, OnlineVO } from './types';
 
 // 查询在线用户列表
 export function list(query: OnlineQuery): AxiosPromise<PageResult<OnlineVO>> {
diff --git a/src/api/monitor/operlog/index.ts b/src/api/monitor/operlog/index.ts
index f6ea1b92..006011ba 100644
--- a/src/api/monitor/operlog/index.ts
+++ b/src/api/monitor/operlog/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { OperLogQuery, OperLogVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { OperLogQuery, OperLogVO } from './types';
 
 // 查询操作日志列表
 export function list(query: OperLogQuery): AxiosPromise<PageResult<OperLogVO>> {
diff --git a/src/api/system/client/index.ts b/src/api/system/client/index.ts
index 933d678f..cff3916e 100644
--- a/src/api/system/client/index.ts
+++ b/src/api/system/client/index.ts
@@ -1,7 +1,7 @@
+import type { ClientForm, ClientQuery, ClientVO } from '@/api/system/client/types';
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ClientVO, ClientForm, ClientQuery } from '@/api/system/client/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询客户端管理列表
diff --git a/src/api/system/config/index.ts b/src/api/system/config/index.ts
index 0c9bfb8c..11778a46 100644
--- a/src/api/system/config/index.ts
+++ b/src/api/system/config/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { ConfigForm, ConfigQuery, ConfigVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { ConfigForm, ConfigQuery, ConfigVO } from './types';
 
 // 查询参数列表
 export function listConfig(query: ConfigQuery): AxiosPromise<PageResult<ConfigVO>> {
diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts
index 03c54d5c..5c2ed78c 100644
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -1,6 +1,6 @@
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { DeptForm, DeptQuery, DeptTreeVO, DeptVO } from './types';
+import { type DeptForm, type DeptQuery, type DeptVO } from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {
diff --git a/src/api/system/dict/data/index.ts b/src/api/system/dict/data/index.ts
index 7692abc5..ad6f0887 100644
--- a/src/api/system/dict/data/index.ts
+++ b/src/api/system/dict/data/index.ts
@@ -1,6 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { DictDataForm, DictDataQuery, DictDataVO } from './types';
+import type { DictDataForm, DictDataQuery, DictDataVO } from './types';
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType: string): AxiosPromise<DictDataVO[]> {
   return request({
@@ -10,7 +11,7 @@ export function getDicts(dictType: string): AxiosPromise<DictDataVO[]> {
 }
 
 // 查询字典数据列表
-export function listData(query: DictDataQuery): AxiosPromise<DictDataVO[]> {
+export function listData(query: DictDataQuery): AxiosPromise<PageResult<DictDataVO>> {
   return request({
     url: '/system/dict/data/list',
     method: 'get',
diff --git a/src/api/system/dict/type/index.ts b/src/api/system/dict/type/index.ts
index 0d8c536b..ca69c59a 100644
--- a/src/api/system/dict/type/index.ts
+++ b/src/api/system/dict/type/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { DictTypeForm, DictTypeVO, DictTypeQuery } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { DictTypeForm, DictTypeQuery, DictTypeVO } from './types';
 
 // 查询字典类型列表
 export function listType(query: DictTypeQuery): AxiosPromise<PageResult<DictTypeVO>> {
diff --git a/src/api/system/menu/index.ts b/src/api/system/menu/index.ts
index 0e633d10..39caa15e 100644
--- a/src/api/system/menu/index.ts
+++ b/src/api/system/menu/index.ts
@@ -1,6 +1,6 @@
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MenuQuery, MenuVO, MenuForm, MenuTreeOption, RoleMenuTree } from './types';
+import type { MenuForm, MenuQuery, MenuTreeOption, MenuVO, RoleMenuTree } from './types';
 
 // 查询菜单列表
 export const listMenu = (query?: MenuQuery): AxiosPromise<MenuVO[]> => {
diff --git a/src/api/system/menu/types.ts b/src/api/system/menu/types.ts
index d566fbed..8951f7dc 100644
--- a/src/api/system/menu/types.ts
+++ b/src/api/system/menu/types.ts
@@ -1,4 +1,4 @@
-import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+import type { MenuTypeEnum } from '@/enums/MenuTypeEnum';
 
 /**
  * 菜单树形结构类型
diff --git a/src/api/system/message/index.ts b/src/api/system/message/index.ts
index 376a5451..eb5c0b10 100644
--- a/src/api/system/message/index.ts
+++ b/src/api/system/message/index.ts
@@ -1,6 +1,6 @@
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MessageBoxVO } from './types';
+import type { MessageBoxVO } from './types';
 
 export function getMessageBox(): AxiosPromise<MessageBoxVO> {
   return request({
diff --git a/src/api/system/notice/index.ts b/src/api/system/notice/index.ts
index 731f78c6..e729ded7 100644
--- a/src/api/system/notice/index.ts
+++ b/src/api/system/notice/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { NoticeForm, NoticeQuery, NoticeVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { NoticeForm, NoticeQuery, NoticeVO } from './types';
 // 查询公告列表
 export function listNotice(query: NoticeQuery): AxiosPromise<PageResult<NoticeVO>> {
   return request({
diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts
index bc78a17e..f0de00dd 100644
--- a/src/api/system/oss/index.ts
+++ b/src/api/system/oss/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { OssQuery, OssVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { OssQuery, OssVO } from './types';
 
 // 查询OSS对象存储列表
 export function listOss(query: OssQuery): AxiosPromise<PageResult<OssVO>> {
diff --git a/src/api/system/ossConfig/index.ts b/src/api/system/ossConfig/index.ts
index 9d5fca51..1c999e14 100644
--- a/src/api/system/ossConfig/index.ts
+++ b/src/api/system/ossConfig/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { OssConfigForm, OssConfigQuery, OssConfigVO } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { OssConfigForm, OssConfigQuery, OssConfigVO } from './types';
 
 // 查询对象存储配置列表
 export function listOssConfig(query: OssConfigQuery): AxiosPromise<PageResult<OssConfigVO>> {
diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts
index ebf169f5..2b52f069 100644
--- a/src/api/system/post/index.ts
+++ b/src/api/system/post/index.ts
@@ -1,8 +1,8 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { PostForm, PostQuery, PostVO } from './types';
-import { AxiosPromise } from 'axios';
-import { DeptTreeVO } from '../dept/types';
-import { PageResult } from '@/api/types';
+import type { DeptTreeVO } from '../dept/types';
+import type { PostForm, PostQuery, PostVO } from './types';
 
 // 查询岗位列表
 export function listPost(query: PostQuery): AxiosPromise<PageResult<PostVO>> {
diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
index f9577922..00546bbe 100644
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@@ -1,9 +1,8 @@
-import { UserVO } from '@/api/system/user/types';
-import { UserQuery } from '@/api/system/user/types';
-import { AxiosPromise } from 'axios';
-import { RoleQuery, RoleVO, RoleDeptTree } from './types';
+import type { UserQuery, UserVO } from '@/api/system/user/types';
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { PageResult } from '@/api/types';
+import type { RoleDeptTree, RoleQuery, RoleVO } from './types';
 
 export const listRole = (query: RoleQuery): AxiosPromise<PageResult<RoleVO>> => {
   return request({
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 9323437e..5619d032 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -1,10 +1,10 @@
-import { DeptTreeVO } from './../dept/types';
-import { RoleVO } from '@/api/system/role/types';
+import type { RoleVO } from '@/api/system/role/types';
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { UserForm, UserQuery, UserVO, UserInfoVO } from './types';
 import { parseStrEmpty } from '@/utils/ruoyi';
-import { PageResult } from '@/api/types';
+import type { DeptTreeVO } from './../dept/types';
+import type { UserForm, UserInfoVO, UserQuery, UserVO } from './types';
 
 /**
  * 查询用户列表
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index d38efd74..3976325d 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -1,5 +1,5 @@
-import { RoleVO } from '@/api/system/role/types';
-import { PostVO } from '@/api/system/post/types';
+import type { PostVO } from '@/api/system/post/types';
+import type { RoleVO } from '@/api/system/role/types';
 
 /**
  * 用户信息
@@ -43,6 +43,8 @@ export interface UserVO extends BaseEntity {
   loginDate: string;
   remark: string;
   deptName: string;
+  /** 详情接口可能返回嵌套部门 */
+  dept?: { deptName?: string };
   roles: RoleVO[];
   roleIds: any;
   postIds: any;
diff --git a/src/api/tool/gen/index.ts b/src/api/tool/gen/index.ts
index 25318735..a7c523e3 100644
--- a/src/api/tool/gen/index.ts
+++ b/src/api/tool/gen/index.ts
@@ -1,7 +1,9 @@
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { DbTableQuery, DbTableVO, TableQuery, TableVO, GenTableVO, DbTableForm } from './types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { DbTableForm, DbTableQuery, DbTableVO, GenTableDetailPayload, TableQuery, TableVO } from './types';
+
+export type { GenTableDetailPayload } from './types';
 
 // 查询生成表数据
 export const listTable = (query: TableQuery): AxiosPromise<PageResult<TableVO>> => {
@@ -21,7 +23,7 @@ export const listDbTable = (query: DbTableQuery): AxiosPromise<PageResult<DbTabl
 };
 
 // 查询表详细信息
-export const getGenTable = (tableId: string | number): AxiosPromise<GenTableVO> => {
+export const getGenTable = (tableId: string | number): AxiosPromise<GenTableDetailPayload> => {
   return request({
     url: '/tool/gen/' + tableId,
     method: 'get'
@@ -29,7 +31,7 @@ export const getGenTable = (tableId: string | number): AxiosPromise<GenTableVO>
 };
 
 // 修改代码生成信息
-export const updateGenTable = (data: DbTableForm): AxiosPromise<GenTableVO> => {
+export const updateGenTable = (data: DbTableForm): AxiosPromise<unknown> => {
   return request({
     url: '/tool/gen',
     method: 'put',
@@ -38,7 +40,7 @@ export const updateGenTable = (data: DbTableForm): AxiosPromise<GenTableVO> => {
 };
 
 // 导入表
-export const importTable = (data: { tables: string; dataName: string }): AxiosPromise<GenTableVO> => {
+export const importTable = (data: { tables: string; dataName: string }): AxiosPromise<unknown> => {
   return request({
     url: '/tool/gen/importTable',
     method: 'post',
diff --git a/src/api/tool/gen/types.ts b/src/api/tool/gen/types.ts
index 7f7b62fb..39c6c33f 100644
--- a/src/api/tool/gen/types.ts
+++ b/src/api/tool/gen/types.ts
@@ -103,7 +103,13 @@ export interface DbTableQuery extends PageQuery {
   tableComment: string;
 }
 
-export interface GenTableVO {
+/**
+ * 代码生成表详情接口 data 结构（与后端 Map 三键一致）
+ * - info：当前表 GenTable
+ * - rows：字段列表 GenTableColumn[]
+ * - tables：全部表 GenTable[]（主子表等选项）
+ */
+export interface GenTableDetailPayload {
   info: DbTableVO;
   rows: DbColumnVO[];
   tables: DbTableVO[];
diff --git a/src/api/workflow/category/index.ts b/src/api/workflow/category/index.ts
index b6a83ea6..68795e3f 100644
--- a/src/api/workflow/category/index.ts
+++ b/src/api/workflow/category/index.ts
@@ -1,6 +1,6 @@
+import type { CategoryForm, CategoryQuery, CategoryTreeVO, CategoryVO } from '@/api/workflow/category/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { CategoryVO, CategoryForm, CategoryQuery, CategoryTreeVO } from '@/api/workflow/category/types';
 
 /**
  * 查询流程分类列表
diff --git a/src/api/workflow/definition/index.ts b/src/api/workflow/definition/index.ts
index 58a14b54..7419fcae 100644
--- a/src/api/workflow/definition/index.ts
+++ b/src/api/workflow/definition/index.ts
@@ -1,12 +1,12 @@
-import request from '@/utils/request';
-import {
-  FlowDefinitionQuery,
+import type { PageResult } from '@/api/types';
+import type {
   definitionXmlVO,
   FlowDefinitionForm,
+  FlowDefinitionQuery,
   FlowDefinitionVo
 } from '@/api/workflow/definition/types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
+import request from '@/utils/request';
 
 /**
  * 获取流程定义列表
diff --git a/src/api/workflow/instance/index.ts b/src/api/workflow/instance/index.ts
index 09ff87a9..4f53a9a8 100644
--- a/src/api/workflow/instance/index.ts
+++ b/src/api/workflow/instance/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
-import { AxiosPromise } from 'axios';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询运行中实例列表
@@ -34,7 +34,7 @@ export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise<PageResult<
  */
 export const flowHisTaskList = (businessId: string | number) => {
   return request({
-    url: `/workflow/instance/flowHisTaskList/${businessId}` + '?t' + Math.random(),
+    url: `/workflow/instance/flowHisTaskList/${businessId}?t=${Math.random()}`,
     method: 'get'
   });
 };
diff --git a/src/api/workflow/instance/types.ts b/src/api/workflow/instance/types.ts
index 7cb7f971..a40a5087 100644
--- a/src/api/workflow/instance/types.ts
+++ b/src/api/workflow/instance/types.ts
@@ -1,11 +1,11 @@
-import { FlowTaskVO } from '@/api/workflow/task/types';
+import type { FlowTaskVO } from '@/api/workflow/task/types';
 
 export interface FlowInstanceQuery extends PageQuery {
   category?: string | number;
   nodeName?: string;
   flowCode?: string;
   flowName?: string;
-  createByIds?: string[] | number[];
+  createByIds?: Array<string | number>;
   businessId?: string;
 }
 
diff --git a/src/api/workflow/leave/index.ts b/src/api/workflow/leave/index.ts
index f4c31949..749ea1bc 100644
--- a/src/api/workflow/leave/index.ts
+++ b/src/api/workflow/leave/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/workflow/leave/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询请假列表
diff --git a/src/api/workflow/spel/index.ts b/src/api/workflow/spel/index.ts
index fc033ad4..2a8efd57 100644
--- a/src/api/workflow/spel/index.ts
+++ b/src/api/workflow/spel/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { SpelForm, SpelQuery, SpelVO } from '@/api/workflow/spel/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { SpelVO, SpelForm, SpelQuery } from '@/api/workflow/spel/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询流程spel表达式定义列表
diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index 8a2a42ea..f4f47b47 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -1,7 +1,7 @@
+import type { PageResult } from '@/api/types';
+import type { FlowTaskVO, TaskOperationBo, TaskQuery } from '@/api/workflow/task/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { TaskQuery, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询待办列表
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index 482bd338..1d550ece 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -2,7 +2,7 @@ export interface TaskQuery extends PageQuery {
   nodeName?: string;
   flowCode?: string;
   flowName?: string;
-  createByIds?: string[] | number[];
+  createByIds?: Array<string | number>;
 }
 
 export interface ParticipantVo {
diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts
index 0f5ce1b2..3aad766d 100644
--- a/src/api/workflow/workflowCommon/index.ts
+++ b/src/api/workflow/workflowCommon/index.ts
@@ -1,9 +1,11 @@
-import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+import type { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+import tab from '@/plugins/tab';
+import router from '@/router';
 
 export default {
-  routerJump(routerJumpVo: RouterJumpVo, proxy) {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
+  routerJump(routerJumpVo: RouterJumpVo) {
+    tab.closePage(router.currentRoute.value);
+    router.push({
       path: routerJumpVo.formPath,
       query: {
         id: routerJumpVo.businessId,
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index a47f5d00..6e705a21 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -4,7 +4,7 @@
       <template v-if="isValueMatch(item.value)">
         <span
           v-if="
-            (item.elTagType === 'default' || item.elTagType === '') &&
+            ((item.elTagType as string) === 'default' || (item.elTagType as string) === '') &&
             (item.elTagClass === '' || item.elTagClass == null)
           "
           :key="item.value"
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 29c68520..d9c23716 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -15,15 +15,14 @@
 
 <script setup lang="ts">
 import '@wangeditor-next/editor/dist/css/style.css';
-
-import { Editor as WangEditor, Toolbar as EditorToolbar } from '@wangeditor-next/editor-for-vue';
 import type { IDomEditor, IEditorConfig, IToolbarConfig } from '@wangeditor-next/editor';
+import { Editor as WangEditor, Toolbar as EditorToolbar } from '@wangeditor-next/editor-for-vue';
+import { listByIds } from '@/api/system/oss';
+import modal from '@/plugins/modal';
 import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
-import { listByIds } from '@/api/system/oss';
 
 const OSS_MARKER_RE = /oss:\/\/([\w-]+)/g;
-
 const props = defineProps({
   /* 编辑器的内容 */
   modelValue: propTypes.string,
@@ -42,7 +41,6 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['update:modelValue']);
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const editorRef = shallowRef<IDomEditor>();
 const content = ref('');
@@ -123,7 +121,7 @@ const decodeOssContent = async (html: string): Promise<string> => {
   const matches = [...html.matchAll(OSS_MARKER_RE)];
   if (matches.length === 0) return html;
 
-  const ossIds = [...new Set(matches.map((m) => m[1]))];
+  const ossIds = [...new Set(matches.map(m => m[1]))];
 
   try {
     const res = await listByIds(ossIds.join(','));
@@ -144,14 +142,14 @@ const decodeOssContent = async (html: string): Promise<string> => {
 const validateImageFile = (file: File) => {
   const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg', 'image/svg+xml'];
   if (!allowedTypes.includes(file.type)) {
-    proxy?.$modal.msgError('图片格式错误!');
+    modal.msgError('图片格式错误!');
     return false;
   }
 
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy?.$modal.msgError(`上传图片大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传图片大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
@@ -162,14 +160,14 @@ const validateImageFile = (file: File) => {
 const validateVideoFile = (file: File) => {
   const allowedTypes = ['video/mp4', 'video/webm', 'video/ogg'];
   if (!allowedTypes.includes(file.type)) {
-    proxy?.$modal.msgError('视频格式错误, 请上传 mp4/webm/ogg 格式!');
+    modal.msgError('视频格式错误, 请上传 mp4/webm/ogg 格式!');
     return false;
   }
 
   if (props.videoSize) {
     const isLt = file.size / 1024 / 1024 < props.videoSize;
     if (!isLt) {
-      proxy?.$modal.msgError(`上传视频大小不能超过 ${props.videoSize} MB!`);
+      modal.msgError(`上传视频大小不能超过 ${props.videoSize} MB!`);
       return false;
     }
   }
@@ -186,17 +184,17 @@ const getUploadImageMenuConfig = () => {
       customUpload(file: File, insertFn: (url: string, alt?: string, href?: string) => void) {
         if (!validateImageFile(file)) return;
 
-        proxy?.$modal.loading('正在上传图片，请稍候...');
+        modal.loading('正在上传图片，请稍候...');
         const reader = new FileReader();
 
         reader.onload = () => {
           insertFn(reader.result as string, file.name);
-          proxy?.$modal.closeLoading();
+          modal.closeLoading();
         };
 
         reader.onerror = () => {
-          proxy?.$modal.msgError('图片插入失败');
-          proxy?.$modal.closeLoading();
+          modal.msgError('图片插入失败');
+          modal.closeLoading();
         };
 
         reader.readAsDataURL(file);
@@ -209,14 +207,14 @@ const getUploadImageMenuConfig = () => {
     async customUpload(file: File, insertFn: (url: string, alt?: string, href?: string) => void) {
       if (!validateImageFile(file)) return;
 
-      proxy?.$modal.loading('正在上传图片，请稍候...');
+      modal.loading('正在上传图片，请稍候...');
       try {
         const result = await uploadToOss(file);
         insertFn(result.url, file.name, result.url);
       } catch {
-        proxy?.$modal.msgError('图片上传失败');
+        modal.msgError('图片上传失败');
       } finally {
-        proxy?.$modal.closeLoading();
+        modal.closeLoading();
       }
     }
   };
@@ -227,14 +225,14 @@ const getUploadVideoMenuConfig = () => ({
   async customUpload(file: File, insertFn: (url: string, poster?: string) => void) {
     if (!validateVideoFile(file)) return;
 
-    proxy?.$modal.loading('正在上传视频，请稍候...');
+    modal.loading('正在上传视频，请稍候...');
     try {
       const result = await uploadToOss(file);
       insertFn(result.url);
     } catch {
-      proxy?.$modal.msgError('视频上传失败');
+      modal.msgError('视频上传失败');
     } finally {
-      proxy?.$modal.closeLoading();
+      modal.closeLoading();
     }
   }
 });
@@ -265,7 +263,7 @@ const syncReadOnly = () => {
 
 watch(
   () => props.modelValue,
-  async (value) => {
+  async value => {
     const nextValue = value || '';
 
     // 跳过由自身 emit 引起的回传
@@ -283,7 +281,7 @@ watch(
   { immediate: true }
 );
 
-watch(content, (value) => {
+watch(content, value => {
   if (isResolvingContent.value) return;
 
   const encoded = encodeOssContent(value);
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 6e9669a1..d0c6931f 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -47,8 +47,9 @@
 </template>
 
 <script setup lang="ts">
-import { propTypes } from '@/utils/propTypes';
 import { delOss, listByIds } from '@/api/system/oss';
+import modal from '@/plugins/modal';
+import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
 
 const props = defineProps({
@@ -68,7 +69,6 @@ const props = defineProps({
   disabled: propTypes.bool.def(false)
 });
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const emit = defineEmits(['update:modelValue']);
 const number = ref(0);
 const uploadList = ref<any[]>([]);
@@ -94,7 +94,7 @@ watch(
       let list: any[] = [];
       if (Array.isArray(val)) {
         list = val;
-      } else {
+      } else if (typeof val === 'string' || typeof val === 'number') {
         const res = await listByIds(val);
         list = res.data.map(oss => {
           return {
@@ -103,6 +103,8 @@ watch(
             ossId: oss.ossId
           };
         });
+      } else {
+        list = [];
       }
       // 然后将数组转为对象数组
       fileList.value = list.map(item => {
@@ -126,36 +128,36 @@ const handleBeforeUpload = (file: any) => {
     const fileExt = fileName[fileName.length - 1];
     const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
     if (!isTypeOk) {
-      proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
+      modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
       return false;
     }
   }
   // 校检文件名是否包含特殊字符
   if (file.name.includes(',')) {
-    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
+    modal.msgError('文件名不正确，不能包含英文逗号!');
     return false;
   }
   // 校检文件大小
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
-  proxy?.$modal.loading('正在上传文件，请稍候...');
+  modal.loading('正在上传文件，请稍候...');
   number.value++;
   return true;
 };
 
 // 文件个数超出
 const handleExceed = () => {
-  proxy?.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+  modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
 };
 
 // 上传失败
 const handleUploadError = () => {
-  proxy?.$modal.msgError('上传文件失败');
+  modal.msgError('上传文件失败');
 };
 
 // 上传成功回调
@@ -169,8 +171,8 @@ const handleUploadSuccess = (res: any, file: UploadFile) => {
     uploadedSuccessfully();
   } else {
     number.value--;
-    proxy?.$modal.closeLoading();
-    proxy?.$modal.msgError(res.msg);
+    modal.closeLoading();
+    modal.msgError(res.msg);
     fileUploadRef.value?.handleRemove(file);
     uploadedSuccessfully();
   }
@@ -191,7 +193,7 @@ const uploadedSuccessfully = () => {
     uploadList.value = [];
     number.value = 0;
     emit('update:modelValue', listToString(fileList.value));
-    proxy?.$modal.closeLoading();
+    modal.closeLoading();
   }
 };
 
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index b9788d8e..d9dd0fd5 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -43,11 +43,12 @@
 </template>
 
 <script setup lang="ts">
+import { compressAccurately } from 'image-conversion';
 import { listByIds, delOss } from '@/api/system/oss';
 import { OssVO } from '@/api/system/oss/types';
+import modal from '@/plugins/modal';
 import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
-import { compressAccurately } from 'image-conversion';
 
 const props = defineProps({
   modelValue: {
@@ -74,7 +75,6 @@ const props = defineProps({
   compressTargetSize: propTypes.number.def(300)
 });
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const emit = defineEmits(['update:modelValue']);
 const number = ref(0);
 const uploadList = ref<any[]>([]);
@@ -142,46 +142,50 @@ const handleBeforeUpload = (file: any) => {
     isImg = file.type.indexOf('image') > -1;
   }
   if (!isImg) {
-    proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}图片格式文件!`);
+    modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}图片格式文件!`);
     return false;
   }
   if (file.name.includes(',')) {
-    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
+    modal.msgError('文件名不正确，不能包含英文逗号!');
     return false;
   }
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy?.$modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
 
   //压缩图片，开启压缩并且大于指定的压缩大小时才压缩
   if (props.compressSupport && file.size / 1024 > props.compressTargetSize) {
-    proxy?.$modal.loading('正在上传图片，请稍候...');
+    modal.loading('正在上传图片，请稍候...');
     number.value++;
     return compressAccurately(file, props.compressTargetSize);
   } else {
-    proxy?.$modal.loading('正在上传图片，请稍候...');
+    modal.loading('正在上传图片，请稍候...');
     number.value++;
   }
 };
 
 // 文件个数超出
 const handleExceed = () => {
-  proxy?.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+  modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
 };
 
 // 上传成功回调
 const handleUploadSuccess = (res: any, file: UploadFile) => {
   if (res.code === 200) {
-    uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+    uploadList.value.push({
+      name: res.data.fileName,
+      url: res.data.url,
+      ossId: res.data.ossId
+    });
     uploadedSuccessfully();
   } else {
     number.value--;
-    proxy?.$modal.closeLoading();
-    proxy?.$modal.msgError(res.msg);
+    modal.closeLoading();
+    modal.msgError(res.msg);
     imageUploadRef.value?.handleRemove(file);
     uploadedSuccessfully();
   }
@@ -207,14 +211,14 @@ const uploadedSuccessfully = () => {
     uploadList.value = [];
     number.value = 0;
     emit('update:modelValue', listToString(fileList.value));
-    proxy?.$modal.closeLoading();
+    modal.closeLoading();
   }
 };
 
 // 上传失败
 const handleUploadError = () => {
-  proxy?.$modal.msgError('上传图片失败');
-  proxy?.$modal.closeLoading();
+  modal.msgError('上传图片失败');
+  modal.closeLoading();
 };
 
 // 预览
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index c79623d6..6245bdc9 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -14,8 +14,8 @@
 
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import { useAppStore } from '@/store/modules/app';
 import SvgIcon from '@/components/SvgIcon/index.vue';
+import { useAppStore } from '@/store/modules/app';
 
 const appStore = useAppStore();
 const { locale } = useI18n();
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 8883452f..f4e7f421 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup name="Pagination" lang="ts">
-import { scrollTo } from '@/utils/scroll-to';
 import { propTypes } from '@/utils/propTypes';
+import { scrollTo } from '@/utils/scroll-to';
 
 const props = defineProps({
   total: propTypes.number,
diff --git a/src/components/Process/MessageType.vue b/src/components/Process/MessageType.vue
index 7c6a377c..6e4d18ed 100644
--- a/src/components/Process/MessageType.vue
+++ b/src/components/Process/MessageType.vue
@@ -29,10 +29,9 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue';
-import { ComponentInternalInstance } from 'vue';
 import { ElForm, FormInstance } from 'element-plus';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { ref } from 'vue';
+
 const emits = defineEmits(['submitCallback', 'cancelCallback']);
 const props = defineProps({
   title: {
diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue
index 662fa706..a2221c41 100644
--- a/src/components/Process/approvalButton.vue
+++ b/src/components/Process/approvalButton.vue
@@ -26,8 +26,12 @@
   </div>
 </template>
 <script setup lang="ts">
+import { useRoute } from 'vue-router';
+import tab from '@/plugins/tab';
+import router from '@/router';
 import { propTypes } from '@/utils/propTypes';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const route = useRoute();
 const props = defineProps({
   status: propTypes.string.def(''),
   pageType: propTypes.string.def(''),
@@ -66,7 +70,7 @@ const approvalButtonShow = computed(() => {
 
 //返回
 const goBack = () => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.go(-1);
+  tab.closePage(route);
+  router.go(-1);
 };
 </script>
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index a2d84404..26aef919 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -98,12 +98,14 @@
   </div>
 </template>
 <script setup lang="ts">
-import { flowHisTaskList } from '@/api/workflow/instance';
-import { propTypes } from '@/utils/propTypes';
 import { listByIds } from '@/api/system/oss';
+import { flowHisTaskList } from '@/api/workflow/instance';
 import FlowChart from '@/components/Process/flowChart.vue';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
+import download from '@/plugins/download';
+import { useDict } from '@/utils/dict';
+import { propTypes } from '@/utils/propTypes';
+
+const { wf_task_status } = toRefs<any>(useDict('wf_task_status'));
 const props = defineProps({
   width: propTypes.string.def('80%'),
   height: propTypes.string.def('100%')
@@ -146,7 +148,7 @@ const getIds = async (ids: string | number) => {
 
 /** 下载按钮操作 */
 const handleDownload = (ossId: string) => {
-  proxy?.$download.oss(ossId);
+  download.oss(ossId);
 };
 
 /**
diff --git a/src/components/Process/flowChartImg.vue b/src/components/Process/flowChartImg.vue
index ba35565e..b54f561f 100644
--- a/src/components/Process/flowChartImg.vue
+++ b/src/components/Process/flowChartImg.vue
@@ -111,7 +111,13 @@ const applyTransform = () => {
 };
 
 const getBounds = () => {
-  if (!imageWrapperRef.value) return { minTranslateX: 0, maxTranslateX: 0, minTranslateY: 0, maxTranslateY: 0 };
+  if (!imageWrapperRef.value)
+    return {
+      minTranslateX: 0,
+      maxTranslateX: 0,
+      minTranslateY: 0,
+      maxTranslateY: 0
+    };
 
   const imgRect = imageWrapperRef.value.getBoundingClientRect();
   const containerRect = imageWrapperRef.value.parentElement?.getBoundingClientRect() ?? imgRect;
diff --git a/src/components/Process/processMeddle.vue b/src/components/Process/processMeddle.vue
index 2710f13f..de8d5efc 100644
--- a/src/components/Process/processMeddle.vue
+++ b/src/components/Process/processMeddle.vue
@@ -87,11 +87,12 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { propTypes } from '@/utils/propTypes';
-import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
-import UserSelect from '@/components/UserSelect';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { getTask, taskOperation, currentTaskAllUser, terminationTask } from '@/api/workflow/task';
+import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
+import UserSelect from '@/components/UserSelect/index.vue';
+import modal from '@/plugins/modal';
+import { propTypes } from '@/utils/propTypes';
+
 const props = defineProps({
   width: propTypes.string.def('50%'),
   height: propTypes.string.def('100%')
@@ -128,8 +129,10 @@ const task = ref<FlowTaskVO>({
   nodeRatio: undefined,
   version: undefined,
   applyNode: undefined,
-  buttonList: []
-});
+  buttonList: [],
+  businessCode: '',
+  businessTitle: ''
+} as FlowTaskVO);
 
 const open = (taskId: string) => {
   visible.value = true;
@@ -153,7 +156,7 @@ const handleTransferTask = async data => {
       message: '',
       messageType: ['1']
     });
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
     await taskOperation(taskOperationBo, 'transferTask').finally(() => {
@@ -162,9 +165,9 @@ const handleTransferTask = async data => {
     });
     visible.value = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 //加签
@@ -180,7 +183,7 @@ const addMultiInstanceUser = async data => {
       message: '',
       messageType: ['1']
     });
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
     await taskOperation(taskOperationBo, 'addSignature').finally(() => {
@@ -189,14 +192,14 @@ const addMultiInstanceUser = async data => {
     });
     visible.value = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 //减签
 const deleteMultiInstanceUser = async row => {
-  await proxy?.$modal.confirm('是否确认提交？');
+  await modal.confirm('是否确认提交？');
   loading.value = true;
   buttonDisabled.value = true;
   const taskOperationBo = reactive<TaskOperationBo>({
@@ -211,7 +214,7 @@ const deleteMultiInstanceUser = async row => {
   });
   visible.value = false;
   emits('submitCallback');
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
 };
 //获取办理人
 const handleTaskUser = async () => {
@@ -231,7 +234,7 @@ const handleTerminationTask = async () => {
     taskId: task.value.id,
     comment: ''
   };
-  await proxy?.$modal.confirm('是否确认终止？');
+  await modal.confirm('是否确认终止？');
   loading.value = true;
   buttonDisabled.value = true;
   await terminationTask(params).finally(() => {
@@ -240,7 +243,7 @@ const handleTerminationTask = async () => {
   });
   visible.value = false;
   emits('submitCallback');
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
 };
 /**
  * 对外暴露子组件方法
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 360f3d84..75b53036 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -196,9 +196,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-import { ComponentInternalInstance } from 'vue';
 import { ElForm } from 'element-plus';
+import { ref } from 'vue';
 import {
   completeTask,
   backProcess,
@@ -209,10 +208,9 @@ import {
   currentTaskAllUser,
   getNextNodeList
 } from '@/api/workflow/task';
-import UserSelect from '@/components/UserSelect';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { FlowCopyVo, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
+import UserSelect from '@/components/UserSelect/index.vue';
+import modal from '@/plugins/modal';
 
 const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
 const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
@@ -362,7 +360,7 @@ const handleCompleteTask = async () => {
       }
     });
     if (verify) {
-      proxy?.$modal.msgWarning('请选择审批人！');
+      modal.msgWarning('请选择审批人！');
       return false;
     }
   } else {
@@ -379,14 +377,14 @@ const handleCompleteTask = async () => {
     });
     form.value.flowCopyList = flowCopyList;
   }
-  await proxy?.$modal.confirm('是否确认提交？');
+  await modal.confirm('是否确认提交？');
   loading.value = true;
   buttonDisabled.value = true;
   try {
     await completeTask(form.value);
     dialog.visible = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } finally {
     loading.value = false;
     buttonDisabled.value = false;
@@ -409,7 +407,7 @@ const handleBackProcessOpen = async () => {
 /** 驳回流程 */
 const handleBackProcess = async () => {
   backForm.value.taskId = taskId.value;
-  await proxy?.$modal.confirm('是否确认驳回到申请人？');
+  await modal.confirm('是否确认驳回到申请人？');
   loading.value = true;
   backLoading.value = true;
   backButtonDisabled.value = true;
@@ -421,7 +419,7 @@ const handleBackProcess = async () => {
   backLoading.value = false;
   backButtonDisabled.value = false;
   emits('submitCallback');
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
 };
 //取消
 const cancel = async () => {
@@ -463,7 +461,7 @@ const addMultiInstanceUser = async data => {
       message: form.value.message,
       messageType: ['1']
     });
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
     await taskOperation(taskOperationBo, 'addSignature').finally(() => {
@@ -472,14 +470,14 @@ const addMultiInstanceUser = async data => {
     });
     dialog.visible = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 //减签
 const deleteMultiInstanceUser = async row => {
-  await proxy?.$modal.confirm('是否确认提交？');
+  await modal.confirm('是否确认提交？');
   loading.value = true;
   buttonDisabled.value = true;
   const taskOperationBo = reactive<TaskOperationBo>({
@@ -494,7 +492,7 @@ const deleteMultiInstanceUser = async row => {
   });
   dialog.visible = false;
   emits('submitCallback');
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
 };
 //打开转办
 const openTransferTask = () => {
@@ -509,7 +507,7 @@ const handleTransferTask = async data => {
       message: form.value.message,
       messageType: ['1']
     });
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
     await taskOperation(taskOperationBo, 'transferTask').finally(() => {
@@ -518,9 +516,9 @@ const handleTransferTask = async data => {
     });
     dialog.visible = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 
@@ -537,7 +535,7 @@ const handleDelegateTask = async data => {
       message: form.value.message,
       messageType: ['1']
     });
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
     await taskOperation(taskOperationBo, 'delegateTask').finally(() => {
@@ -546,9 +544,9 @@ const handleDelegateTask = async data => {
     });
     dialog.visible = false;
     emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 //终止任务
@@ -557,7 +555,7 @@ const handleTerminationTask = async () => {
     taskId: taskId.value,
     comment: form.value.message
   };
-  await proxy?.$modal.confirm('是否确认终止？');
+  await modal.confirm('是否确认终止？');
   loading.value = true;
   buttonDisabled.value = true;
   await terminationTask(params).finally(() => {
@@ -566,7 +564,7 @@ const handleTerminationTask = async () => {
   });
   dialog.visible = false;
   emits('submitCallback');
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
 };
 const handleTaskUser = async () => {
   const data = await currentTaskAllUser(taskId.value);
@@ -581,7 +579,7 @@ const handleTaskUser = async () => {
 // 选择人员
 const choosePeople = async data => {
   if (!data.permissionFlag) {
-    proxy?.$modal.msgError('没有可选择的人员，请联系管理员！');
+    modal.msgError('没有可选择的人员，请联系管理员！');
   }
   popUserIds.value = data.permissionFlag;
   nodeCode.value = data.nodeCode;
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 92402a84..caa81941 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -36,8 +36,8 @@
 </template>
 
 <script setup lang="ts">
-import { propTypes } from '@/utils/propTypes';
 import cache from '@/plugins/cache';
+import { propTypes } from '@/utils/propTypes';
 
 const props = defineProps({
   showSearch: propTypes.bool.def(true),
diff --git a/src/components/RoleSelect/index.vue b/src/components/RoleSelect/index.vue
index cdc8c545..6e5e3b66 100644
--- a/src/components/RoleSelect/index.vue
+++ b/src/components/RoleSelect/index.vue
@@ -9,8 +9,8 @@
     >
       <div class="p-2 role-select-shell">
         <transition
-          :enter-active-class="proxy?.animate.searchAnimate.enter"
-          :leave-active-class="proxy?.animate.searchAnimate.leave"
+          :enter-active-class="animateConfig.searchAnimate.enter"
+          :leave-active-class="animateConfig.searchAnimate.leave"
         >
           <div v-show="showSearch">
             <el-card shadow="hover" class="search-panel selector-card">
@@ -81,7 +81,7 @@
             </vxe-column>
             <vxe-column field="createTime" title="创建时间" align="center">
               <template #default="scope">
-                <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </vxe-column>
           </vxe-table>
@@ -104,10 +104,14 @@
 </template>
 
 <script setup lang="ts">
-import { RoleVO, RoleQuery } from '@/api/system/role/types';
 import { VxeTableInstance } from 'vxe-table';
-import useDialog from '@/hooks/useDialog';
+import animateConfig from '@/animate';
 import api from '@/api/system/role';
+import { RoleVO, RoleQuery } from '@/api/system/role/types';
+import useDialog from '@/hooks/useDialog';
+import { useDict } from '@/utils/dict';
+import { parseTime, addDateRange } from '@/utils/ruoyi';
+
 interface PropType {
   modelValue?: RoleVO[] | RoleVO | undefined;
   multiple?: boolean;
@@ -120,14 +124,13 @@ const prop = withDefaults(defineProps<PropType>(), {
 });
 const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const roleList = ref<RoleVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const selectRoleList = ref<RoleVO[]>([]);
 
 const roleDialog = useDialog({
@@ -171,7 +174,7 @@ const computedIds = data => {
  */
 const getList = () => {
   loading.value = true;
-  api.listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
+  api.listRole(addDateRange(queryParams.value, dateRange.value)).then(res => {
     roleList.value = res.data?.rows;
     total.value = res.data?.total;
     loading.value = false;
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 26c79b54..3374da41 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -35,12 +35,12 @@
 </template>
 
 <script setup lang="ts">
-import { constantRoutes } from '@/router';
-import { isHttp } from '@/utils/validate';
-import { useAppStore } from '@/store/modules/app';
-import { useSettingsStore } from '@/store/modules/settings';
-import { usePermissionStore } from '@/store/modules/permission';
 import { RouteRecordRaw } from 'vue-router';
+import { constantRoutes } from '@/router';
+import { useAppStore } from '@/store/modules/app';
+import { usePermissionStore } from '@/store/modules/permission';
+import { useSettingsStore } from '@/store/modules/settings';
+import { isHttp } from '@/utils/validate';
 
 // 顶部栏初始数
 const visibleNumber = ref<number>(-1);
diff --git a/src/components/TreePanel/index.vue b/src/components/TreePanel/index.vue
index 7e969127..0861dbb2 100644
--- a/src/components/TreePanel/index.vue
+++ b/src/components/TreePanel/index.vue
@@ -24,7 +24,7 @@
           class="mt-2 dept-tree"
           :node-key="nodeKey"
           :data="data"
-          :props="(treeProps as any)"
+          :props="treeProps as any"
           :expand-on-click-node="false"
           :filter-node-method="internalFilterNode"
           highlight-current
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 08aa9f33..8b49e7d3 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -63,8 +63,8 @@
           >
             <div class="p-2user-select-main">
               <transition
-                :enter-active-class="proxy?.animate.searchAnimate.enter"
-                :leave-active-class="proxy?.animate.searchAnimate.leave"
+                :enter-active-class="animateConfig.searchAnimate.enter"
+                :leave-active-class="animateConfig.searchAnimate.leave"
               >
                 <div v-show="showSearch">
                   <el-card shadow="hover" class="search-panel selector-card">
@@ -167,11 +167,14 @@
 </template>
 
 <script setup lang="ts">
+import { VxeTableInstance } from 'vxe-table';
+import animateConfig from '@/animate';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
 import api from '@/api/system/user';
 import { UserQuery, UserVO } from '@/api/system/user/types';
-import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
-import { VxeTableInstance } from 'vxe-table';
 import useDialog from '@/hooks/useDialog';
+import { useDict } from '@/utils/dict';
+import { addDateRange } from '@/utils/ruoyi';
 
 interface PropType {
   modelValue?: UserVO[] | UserVO | undefined;
@@ -187,14 +190,13 @@ const prop = withDefaults(defineProps<PropType>(), {
 });
 const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const userList = ref<UserVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const deptName = ref('');
 const treeCollapsed = ref(false);
 const deptOptions = ref<DeptTreeVO[]>([]);
@@ -269,7 +271,7 @@ const getTreeSelect = async () => {
 const getList = async () => {
   loading.value = true;
   queryParams.value.userIds = prop.userIds;
-  const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await api.listUser(addDateRange(queryParams.value, dateRange.value));
   loading.value = false;
   userList.value = res.data?.rows;
   total.value = res.data?.total;
diff --git a/src/directive/common/copyText.ts b/src/directive/common/copyText.ts
index 0e605d31..54d3f546 100644
--- a/src/directive/common/copyText.ts
+++ b/src/directive/common/copyText.ts
@@ -2,7 +2,7 @@
  * v-copyText 复制文本内容
  * Copyright (c) 2022 ruoyi
  */
-import { DirectiveBinding } from 'vue';
+import type { DirectiveBinding } from 'vue';
 
 export default {
   beforeMount(el: any, { value, arg }: DirectiveBinding) {
diff --git a/src/directive/index.ts b/src/directive/index.ts
index ef25ee89..c0bed9ad 100644
--- a/src/directive/index.ts
+++ b/src/directive/index.ts
@@ -1,6 +1,6 @@
+import type { App } from 'vue';
 import copyText from './common/copyText';
 import { hasPermi, hasRoles } from './permission';
-import { App } from 'vue';
 
 export default (app: App) => {
   app.directive('copyText', copyText);
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index c66da22b..c06568c4 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,4 +1,4 @@
-import { Directive, DirectiveBinding } from 'vue';
+import type { Directive, DirectiveBinding } from 'vue';
 import { useUserStore } from '@/store/modules/user';
 /**
  * 操作权限处理
diff --git a/src/hooks/useDialog.ts b/src/hooks/useDialog.ts
index ba410518..87b2254e 100644
--- a/src/hooks/useDialog.ts
+++ b/src/hooks/useDialog.ts
@@ -1,4 +1,4 @@
-import { Ref } from 'vue';
+import type { Ref } from 'vue';
 
 interface Options {
   title?: string;
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 4f8e74c1..8c3aa191 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -1,9 +1,8 @@
 // 自定义国际化配置
 import { createI18n } from 'vue-i18n';
-
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import zh_CN from '@/lang/zh_CN';
 import en_US from '@/lang/en_US';
+import zh_CN from '@/lang/zh_CN';
 
 /**
  * 获取当前语言
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 6bfaffa8..6272f4f6 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -12,11 +12,11 @@
 </template>
 
 <script setup name="AppMain" lang="ts">
+import animateConfig from '@/animate';
 import { useSettingsStore } from '@/store/modules/settings';
 import { useTagsViewStore } from '@/store/modules/tagsView';
-
 import IframeToggle from './IframeToggle/index.vue';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
 const route = useRoute();
 const tagsViewStore = useTagsViewStore();
 
@@ -26,11 +26,9 @@ watch(
   () => useSettingsStore().animationEnable,
   (val: boolean) => {
     if (val) {
-      animate.value = proxy?.animate.animateList[
-        Math.floor(Math.random() * proxy?.animate.animateList.length)
-      ] as string;
+      animate.value = animateConfig.animateList[Math.floor(Math.random() * animateConfig.animateList.length)] as string;
     } else {
-      animate.value = proxy?.animate.defaultAnimate as string;
+      animate.value = animateConfig.defaultAnimate as string;
     }
   },
   { immediate: true }
diff --git a/src/layout/components/IframeToggle/index.vue b/src/layout/components/IframeToggle/index.vue
index 1095af7a..dee6db82 100644
--- a/src/layout/components/IframeToggle/index.vue
+++ b/src/layout/components/IframeToggle/index.vue
@@ -9,9 +9,8 @@
 </template>
 
 <script setup lang="ts">
-import InnerLink from '../InnerLink/index.vue';
-
 import { useTagsViewStore } from '@/store/modules/tagsView';
+import InnerLink from '../InnerLink/index.vue';
 
 const route = useRoute();
 const tagsViewStore = useTagsViewStore();
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 02c733ca..018d2d20 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -31,7 +31,7 @@
           </div>
         </el-tooltip>
         <!-- 消息 -->
-        <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('navbar.message')" effect="dark" placement="bottom">
           <div>
             <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
               <template #reference>
@@ -51,19 +51,19 @@
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('navbar.document')" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('navbar.full')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('navbar.language')" effect="dark" placement="bottom">
           <lang-select id="lang-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
       </template>
@@ -80,13 +80,13 @@
           <template #dropdown>
             <el-dropdown-menu>
               <router-link to="/user/profile">
-                <el-dropdown-item>{{ proxy.$t('navbar.personalCenter') }}</el-dropdown-item>
+                <el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item>
               </router-link>
               <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
-                <span>{{ proxy.$t('navbar.layoutSetting') }}</span>
+                <span>{{ $t('navbar.layoutSetting') }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided command="logout">
-                <span>{{ proxy.$t('navbar.logout') }}</span>
+                <span>{{ $t('navbar.logout') }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </template>
@@ -97,26 +97,25 @@
 </template>
 
 <script setup lang="ts">
-import SearchMenu from './TopBar/search.vue';
-import { useAppStore } from '@/store/modules/app';
-import { useUserStore } from '@/store/modules/user';
-import { useSettingsStore } from '@/store/modules/settings';
-import { useNoticeStore } from '@/store/modules/notice';
-import notice from './notice/index.vue';
-import router from '@/router';
 import type { ElMessageBoxOptions } from 'element-plus';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';
-import TopBar from './TopBar/index.vue';
 import { CaretBottom } from '@element-plus/icons-vue';
 import appLogo from '@/assets/logo/logo.png';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
+import tab from '@/plugins/tab';
+import router from '@/router';
+import { useAppStore } from '@/store/modules/app';
+import { useNoticeStore } from '@/store/modules/notice';
+import { useSettingsStore } from '@/store/modules/settings';
+import { useUserStore } from '@/store/modules/user';
+import notice from './notice/index.vue';
+import TopBar from './TopBar/index.vue';
+import SearchMenu from './TopBar/search.vue';
 
 const appStore = useAppStore();
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
 const noticeStore = storeToRefs(useNoticeStore());
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
 const navType = computed(() => settingsStore.navType);
 const showLogo = computed(() => settingsStore.sidebarLogo);
 const displayName = computed(() => userStore.nickname || '管理员');
@@ -145,7 +144,7 @@ const logout = async () => {
         redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
       }
     });
-    proxy?.$tab.closeAllPage();
+    tab.closeAllPage();
   });
 };
 
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index e573715a..56dd11bf 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -162,16 +162,16 @@
 </template>
 
 <script setup lang="ts">
-import { useDynamicTitle } from '@/utils/dynamicTitle';
-import { useAppStore } from '@/store/modules/app';
-import { useSettingsStore } from '@/store/modules/settings';
-import { usePermissionStore } from '@/store/modules/permission';
-import { handleThemeStyle } from '@/utils/theme';
-import { SideThemeEnum } from '@/enums/SideThemeEnum';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
+import { SideThemeEnum } from '@/enums/SideThemeEnum';
+import modal from '@/plugins/modal';
 import defaultSettings from '@/settings';
+import { useAppStore } from '@/store/modules/app';
+import { usePermissionStore } from '@/store/modules/permission';
+import { useSettingsStore } from '@/store/modules/settings';
+import { useDynamicTitle } from '@/utils/dynamicTitle';
+import { handleThemeStyle } from '@/utils/theme';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
@@ -245,7 +245,7 @@ const handleTheme = (val: string) => {
   settingsStore.sideTheme = val;
 };
 const saveSetting = () => {
-  proxy?.$modal.loading('正在保存到本地，请稍候...');
+  modal.loading('正在保存到本地，请稍候...');
   const settings = useStorage<LayoutSetting>('layout-setting', defaultSettings);
   if (!storeSettings.value.tagsViewPersist) {
     localStorage.removeItem('tags-view-visited');
@@ -261,11 +261,11 @@ const saveSetting = () => {
   settings.value.navType = storeSettings.value.navType;
   settings.value.radiusBase = storeSettings.value.radiusBase;
   setTimeout(() => {
-    proxy?.$modal.closeLoading();
+    modal.closeLoading();
   }, 1000);
 };
 const resetSetting = () => {
-  proxy?.$modal.loading('正在清除设置缓存并刷新，请稍候...');
+  modal.loading('正在清除设置缓存并刷新，请稍候...');
   localStorage.removeItem('tags-view-visited');
   useStorage<any>('layout-setting', null).value = null;
   setTimeout('window.location.reload()', 1000);
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 4b2efff7..3f9f3ad1 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="sidebar-logo-container" :class="{ collapse: collapse }">
-    <transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
+    <transition :enter-active-class="animateConfig.logoAnimate.enter" mode="out-in">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title">
@@ -18,10 +18,10 @@
 </template>
 
 <script setup lang="ts">
+import animateConfig from '@/animate';
 import logo from '@/assets/logo/logo.png';
-import { useSettingsStore } from '@/store/modules/settings';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
+import { useSettingsStore } from '@/store/modules/settings';
 
 defineProps({
   collapse: {
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 1da74946..3647e8df 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -44,10 +44,10 @@
 </template>
 
 <script setup lang="ts">
+import { RouteRecordRaw } from 'vue-router';
+import { getNormalPath } from '@/utils/ruoyi';
 import { isExternal } from '@/utils/validate';
 import AppLink from './Link.vue';
-import { getNormalPath } from '@/utils/ruoyi';
-import { RouteRecordRaw } from 'vue-router';
 
 const props = defineProps({
   item: {
@@ -105,7 +105,10 @@ const resolvePath = (routePath: string, routeQuery?: string): any => {
   }
   if (routeQuery) {
     const query = JSON.parse(routeQuery);
-    return { path: getNormalPath(props.basePath + '/' + routePath), query: query };
+    return {
+      path: getNormalPath(props.basePath + '/' + routePath),
+      query: query
+    };
   }
   return getNormalPath(props.basePath + '/' + routePath);
 };
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f062fd3e..6a23458c 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -2,7 +2,7 @@
   <div class="sidebar-shell" :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: bgColor }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
-      <transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
+      <transition :enter-active-class="animateConfig.menuSearchAnimate.enter" mode="out-in">
         <el-menu
           :default-active="activeMenu"
           :collapse="isCollapse"
@@ -22,14 +22,13 @@
 </template>
 
 <script setup lang="ts">
+import { RouteRecordRaw } from 'vue-router';
+import animateConfig from '@/animate';
+import { useAppStore } from '@/store/modules/app';
+import { usePermissionStore } from '@/store/modules/permission';
+import { useSettingsStore } from '@/store/modules/settings';
 import Logo from './Logo.vue';
 import SidebarItem from './SidebarItem.vue';
-import { useAppStore } from '@/store/modules/app';
-import { useSettingsStore } from '@/store/modules/settings';
-import { usePermissionStore } from '@/store/modules/permission';
-import { RouteRecordRaw } from 'vue-router';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const route = useRoute();
 const appStore = useAppStore();
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index 1c26bd5d..2d6653f9 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -4,8 +4,8 @@
 
 <script setup lang="ts">
 import { login, callback } from '@/api/login';
-import { setToken, getToken } from '@/utils/auth';
 import { LoginData } from '@/api/types';
+import { setToken, getToken } from '@/utils/auth';
 
 const route = useRoute();
 const loading = ref(true);
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index d334045f..7addec21 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -13,8 +13,7 @@ const emits = defineEmits(['scroll', 'updateArrows']);
 const scrollContainerRef = ref<ElScrollbarInstance>();
 
 const getScrollWrapper = (): HTMLElement | null => {
-  const scrollbar = scrollContainerRef.value as any;
-  return scrollbar?.wrapRef || scrollbar?.$refs?.wrapRef || null;
+  return scrollContainerRef.value?.wrapRef ?? null;
 };
 
 const emitScroll = () => {
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 251a6d3d..d687b0c6 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -88,6 +88,7 @@
 </template>
 
 <script setup lang="ts">
+import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router';
 import {
   ArrowDown,
   ArrowLeft,
@@ -100,12 +101,12 @@ import {
   RefreshRight,
   Right
 } from '@element-plus/icons-vue';
-import ScrollPane from './ScrollPane.vue';
-import { getNormalPath } from '@/utils/ruoyi';
-import { useSettingsStore } from '@/store/modules/settings';
+import tab from '@/plugins/tab';
 import { usePermissionStore } from '@/store/modules/permission';
+import { useSettingsStore } from '@/store/modules/settings';
 import { useTagsViewStore } from '@/store/modules/tagsView';
-import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router';
+import { getNormalPath } from '@/utils/ruoyi';
+import ScrollPane from './ScrollPane.vue';
 
 const visible = ref(false);
 const top = ref(0);
@@ -118,7 +119,6 @@ const isFullscreen = ref(false);
 const scrollPaneRef = ref<InstanceType<typeof ScrollPane>>();
 const fullscreenModeClass = 'tags-fullscreen-mode';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
 const settingsStore = useSettingsStore();
@@ -267,7 +267,7 @@ const refreshSelectedTag = (view?: RouteLocationNormalized) => {
   if (!view) {
     return;
   }
-  proxy?.$tab.refreshPage(view);
+  tab.refreshPage(view);
   if (route.meta.link) {
     tagsViewStore.delIframeView(route as RouteLocationNormalized);
   }
@@ -277,7 +277,7 @@ const closeSelectedTag = (view?: RouteLocationNormalized) => {
   if (!view) {
     return;
   }
-  proxy?.$tab.closePage(view).then(({ visitedViews }: { visitedViews: RouteLocationNormalized[] }) => {
+  tab.closePage(view).then(({ visitedViews }: { visitedViews: RouteLocationNormalized[] }) => {
     if (isActive(view)) {
       toLastView(visitedViews, view);
     }
@@ -289,7 +289,7 @@ const closeRightTags = () => {
   if (!tag) {
     return;
   }
-  proxy?.$tab.closeRightPage(tag).then((views: RouteLocationNormalized[]) => {
+  tab.closeRightPage(tag).then((views: RouteLocationNormalized[]) => {
     if (!views.find(item => item.fullPath === route.fullPath)) {
       toLastView(views);
     }
@@ -301,7 +301,7 @@ const closeLeftTags = () => {
   if (!tag) {
     return;
   }
-  proxy?.$tab.closeLeftPage(tag).then((views: RouteLocationNormalized[]) => {
+  tab.closeLeftPage(tag).then((views: RouteLocationNormalized[]) => {
     if (!views.find(item => item.fullPath === route.fullPath)) {
       toLastView(views);
     }
@@ -314,13 +314,13 @@ const closeOthersTags = () => {
     return;
   }
   router.push(tag.fullPath || tag.path || '/').catch(() => {});
-  proxy?.$tab.closeOtherPage(tag).then(() => {
+  tab.closeOtherPage(tag).then(() => {
     moveToCurrentTag();
   });
 };
 
 const closeAllTags = (view?: RouteLocationNormalized) => {
-  proxy?.$tab.closeAllPage().then(({ visitedViews: views }: { visitedViews: RouteLocationNormalized[] }) => {
+  tab.closeAllPage().then(({ visitedViews: views }: { visitedViews: RouteLocationNormalized[] }) => {
     if (affixTags.value.some(tag => tag.path === route.path)) {
       return;
     }
diff --git a/src/layout/components/TopBar/index.vue b/src/layout/components/TopBar/index.vue
index 45091e4c..df1565eb 100644
--- a/src/layout/components/TopBar/index.vue
+++ b/src/layout/components/TopBar/index.vue
@@ -7,10 +7,10 @@
     mode="horizontal"
   >
     <sidebar-item
-      :key="route.path + index"
-      v-for="(route, index) in topMenus"
-      :item="route"
-      :base-path="route.path"
+      :key="menuRoute.path + index"
+      v-for="(menuRoute, index) in topMenus"
+      :item="menuRoute"
+      :base-path="menuRoute.path"
       popper-class="topbar-menu-popper"
     />
 
@@ -24,10 +24,10 @@
         <span>更多菜单</span>
       </template>
       <sidebar-item
-        :key="route.path + index"
-        v-for="(route, index) in moreRoutes"
-        :item="route"
-        :base-path="route.path"
+        :key="menuRoute.path + index"
+        v-for="(menuRoute, index) in moreRoutes"
+        :item="menuRoute"
+        :base-path="menuRoute.path"
         popper-class="topbar-menu-popper"
       />
     </el-sub-menu>
@@ -35,9 +35,10 @@
 </template>
 
 <script setup lang="ts">
-import SidebarItem from '../Sidebar/SidebarItem';
-import { useSettingsStore } from '@/store/modules/settings';
+import type { RouteRecordRaw } from 'vue-router';
 import { usePermissionStore } from '@/store/modules/permission';
+import { useSettingsStore } from '@/store/modules/settings';
+import SidebarItem from '../Sidebar/SidebarItem.vue';
 
 const route = useRoute();
 const settingsStore = useSettingsStore();
@@ -53,11 +54,11 @@ const activeMenu = computed(() => {
 });
 
 const visibleNumber = ref(5);
-const topMenus = computed(() => {
-  return permissionStore.sidebarRouters.filter(f => !f.hidden).slice(0, visibleNumber.value);
+const topMenus = computed((): RouteRecordRaw[] => {
+  return permissionStore.sidebarRouters.filter(f => !f.hidden).slice(0, visibleNumber.value) as RouteRecordRaw[];
 });
-const moreRoutes = computed(() => {
-  return permissionStore.sidebarRouters.filter(f => !f.hidden).slice(visibleNumber.value);
+const moreRoutes = computed((): RouteRecordRaw[] => {
+  return permissionStore.sidebarRouters.filter(f => !f.hidden).slice(visibleNumber.value) as RouteRecordRaw[];
 });
 function setVisibleNumber() {
   let width = document.body.getBoundingClientRect().width;
diff --git a/src/layout/components/TopBar/search.vue b/src/layout/components/TopBar/search.vue
index 3d226106..2ddd71dd 100644
--- a/src/layout/components/TopBar/search.vue
+++ b/src/layout/components/TopBar/search.vue
@@ -88,12 +88,12 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbSearch">
+import type { RouteRecordRaw } from 'vue-router';
 import { Search } from '@element-plus/icons-vue';
-import { getNormalPath } from '@/utils/ruoyi';
-import { isHttp } from '@/utils/validate';
 import { usePermissionStore } from '@/store/modules/permission';
 import { useSettingsStore } from '@/store/modules/settings';
-import type { RouteRecordRaw } from 'vue-router';
+import { getNormalPath } from '@/utils/ruoyi';
+import { isHttp } from '@/utils/validate';
 
 type SearchMenuItem = {
   path: string;
diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue
index c4395483..50fd2626 100644
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -29,10 +29,10 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUserNews">
-import { useNoticeStore } from '@/store/modules/notice';
 import router from '@/router';
-import { markMessageRead, markMessageReadBatch } from '@/utils/message-read';
+import { useNoticeStore } from '@/store/modules/notice';
 import { useUserStore } from '@/store/modules/user';
+import { markMessageRead, markMessageReadBatch } from '@/utils/message-read';
 import { NOTICE_GROUP } from '@/utils/push-message';
 
 const noticeStore = useNoticeStore();
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 142ed67c..405e30f0 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -14,12 +14,12 @@
 </template>
 
 <script setup lang="ts">
-import SideBar from './components/Sidebar/index.vue';
-import { AppMain, Navbar, Settings, TagsView } from './components';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import { initMessageBox, initPush } from '@/utils/push';
+import { AppMain, Navbar, Settings, TagsView } from './components';
+import SideBar from './components/Sidebar/index.vue';
 
 const settingsStore = useSettingsStore();
 const theme = computed(() => settingsStore.theme);
@@ -45,14 +45,18 @@ const classObj = computed(() => ({
 const { width } = useWindowSize();
 const WIDTH = 992; // refer to Bootstrap's responsive design
 
-watch(width, (w) => {
-  if (w - 1 < WIDTH) {
-    useAppStore().toggleDevice('mobile');
-    useAppStore().closeSideBar({ withoutAnimation: true });
-  } else {
-    useAppStore().toggleDevice('desktop');
-  }
-}, { immediate: true });
+watch(
+  width,
+  w => {
+    if (w - 1 < WIDTH) {
+      useAppStore().toggleDevice('mobile');
+      useAppStore().closeSideBar({ withoutAnimation: true });
+    } else {
+      useAppStore().toggleDevice('desktop');
+    }
+  },
+  { immediate: true }
+);
 
 const settingRef = ref<InstanceType<typeof Settings>>();
 
diff --git a/src/main.ts b/src/main.ts
index 16ac6101..1e67d93a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,45 +1,27 @@
+import HighLight from '@highlightjs/vue-plugin';
+import { ElDialog } from 'element-plus';
 import { createApp } from 'vue';
-// global css
+import VXETable from 'vxe-table';
 import 'virtual:uno.css';
 import 'element-plus/theme-chalk/dark/css-vars.css';
 import '@/assets/styles/index.scss';
-
-// App、router、store
-import App from './App.vue';
-import store from './store';
-import router from './router';
-
-// 自定义指令
-import directive from './directive';
-
-// 注册插件
-import plugins from './plugins/index'; // plugins
-
-// 高亮组件
-// import 'highlight.js/styles/a11y-light.css';
 import 'highlight.js/styles/atom-one-dark.css';
 import 'highlight.js/lib/common';
-import HighLight from '@highlightjs/vue-plugin';
-
-// svg图标
 import 'virtual:svg-icons-register';
-import ElementIcons from '@/plugins/svgicon';
-
-// permission control
-import './permission';
-
-// 国际化
-import i18n from '@/lang/index';
-
-// vxeTable
-import VXETable from 'vxe-table';
 import 'vxe-table/lib/style.css';
+import i18n from '@/lang/index';
+import ElementIcons from '@/plugins/svgicon';
+import App from './App.vue';
+import directive from './directive';
+import plugins from './plugins/index';
+import './permission';
+import router from './router';
+import store from './store';
+
 VXETable.setConfig({
   zIndex: 999999
 });
 
-// 修改 el-dialog 默认点击遮照为不关闭
-import { ElDialog } from 'element-plus';
 ElDialog.props.closeOnClickModal.default = false;
 
 const app = createApp(App);
@@ -51,7 +33,6 @@ app.use(store);
 app.use(i18n);
 app.use(VXETable);
 app.use(plugins);
-// 自定义指令
 directive(app);
 
 app.mount('#app');
diff --git a/src/permission.ts b/src/permission.ts
index 7a693a52..092324aa 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -1,14 +1,14 @@
 import { to as tos } from 'await-to-js';
-import router from './router';
+import { ElMessage } from 'element-plus/es';
 import * as NProgressModule from 'nprogress';
 import 'nprogress/nprogress.css';
-import { getToken } from '@/utils/auth';
-import { isHttp, isPathMatch } from '@/utils/validate';
-import { isRelogin } from '@/utils/request';
-import { useUserStore } from '@/store/modules/user';
-import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
-import { ElMessage } from 'element-plus/es';
+import { useSettingsStore } from '@/store/modules/settings';
+import { useUserStore } from '@/store/modules/user';
+import { getToken } from '@/utils/auth';
+import { isRelogin } from '@/utils/request';
+import { isHttp, isPathMatch } from '@/utils/validate';
+import router from './router';
 
 const NProgress = ('default' in NProgressModule ? NProgressModule.default : NProgressModule) as typeof NProgressModule;
 
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 7171b7bc..099593ae 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -1,10 +1,11 @@
-import axios from 'axios';
-import errorCode from '@/utils/errorCode';
-import { blobValidate } from '@/utils/ruoyi';
-import { extractErrorMessage, globalHeaders } from '@/utils/request';
-import { saveBlob } from '@/utils/save';
 import type { LoadingInstance } from 'element-plus';
+import axiosModule from 'axios';
+import errorCode from '@/utils/errorCode';
+import { extractErrorMessage, globalHeaders } from '@/utils/request';
+import { blobValidate } from '@/utils/ruoyi';
+import { saveBlob } from '@/utils/save';
 
+const axios = axiosModule as any;
 const baseURL = import.meta.env.VITE_APP_BASE_API;
 let downloadLoadingInstance: LoadingInstance | undefined;
 export default {
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 6c5e0c37..cd61fb0e 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -1,43 +1,18 @@
+import type { App } from 'vue';
+import auth from './auth';
+import cache from './cache';
+import download from './download';
 import modal from './modal';
 import tab from './tab';
-import download from './download';
-import cache from './cache';
-import auth from './auth';
-// 预设动画
-import animate from '@/animate';
-
-import { download as dl } from '@/utils/request';
-import { useDict } from '@/utils/dict';
-import { getConfigKey, updateConfigByKey } from '@/api/system/config';
-import { parseTime, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi';
-
-import { App } from 'vue';
 
+/**
+ * 仅挂载无法在组合式中通过 import 替代的实例级能力（与业务模块解耦的壳层 API）。
+ * 字典、时间、树、请求下载等请在 setup 中从 @/utils、@/api 显式导入。
+ */
 export default function installPlugin(app: App) {
-  // 页签操作
   app.config.globalProperties.$tab = tab;
-
-  // 模态框对象
   app.config.globalProperties.$modal = modal;
-
-  // 缓存对象
   app.config.globalProperties.$cache = cache;
-
-  // 下载文件
   app.config.globalProperties.$download = download;
-
-  // 认证对象
   app.config.globalProperties.$auth = auth;
-
-  // 全局方法挂载
-  app.config.globalProperties.useDict = useDict;
-  app.config.globalProperties.getConfigKey = getConfigKey;
-  app.config.globalProperties.updateConfigByKey = updateConfigByKey;
-  app.config.globalProperties.download = dl;
-  app.config.globalProperties.parseTime = parseTime;
-  app.config.globalProperties.handleTree = handleTree;
-  app.config.globalProperties.addDateRange = addDateRange;
-  app.config.globalProperties.selectDictLabel = selectDictLabel;
-  app.config.globalProperties.selectDictLabels = selectDictLabels;
-  app.config.globalProperties.animate = animate;
 }
diff --git a/src/plugins/svgicon.ts b/src/plugins/svgicon.ts
index 8c686092..f2ce685a 100644
--- a/src/plugins/svgicon.ts
+++ b/src/plugins/svgicon.ts
@@ -1,5 +1,5 @@
+import type { App } from 'vue';
 import * as ElementPlusIconsVue from '@element-plus/icons-vue';
-import { App } from 'vue';
 
 export default {
   install: (app: App) => {
diff --git a/src/plugins/tab.ts b/src/plugins/tab.ts
index 9c08c7db..cf97272f 100644
--- a/src/plugins/tab.ts
+++ b/src/plugins/tab.ts
@@ -1,5 +1,5 @@
+import type { RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw } from 'vue-router';
 import router from '@/router';
-import { RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw } from 'vue-router';
 import { useTagsViewStore } from '@/store/modules/tagsView';
 
 export default {
@@ -57,7 +57,9 @@ export default {
   ): Promise<{ visitedViews: RouteLocationNormalized[]; cachedViews: string[] } | any> {
     if (obj === undefined) {
       // prettier-ignore
-      const { visitedViews } = await useTagsViewStore().delView(router.currentRoute.value)
+      const { visitedViews } = await useTagsViewStore().delView(
+				router.currentRoute.value,
+			);
       const latestView = visitedViews.slice(-1)[0];
       if (latestView) {
         return router.push(latestView.fullPath);
diff --git a/src/router/index.ts b/src/router/index.ts
index 4c43a496..6a6facb7 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
+import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router';
 /* Layout */
 import Layout from '@/layout/index.vue';
 
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 54edc367..1678bd87 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -1,8 +1,8 @@
-import zhCN from 'element-plus/es/locale/lang/zh-cn';
-import enUS from 'element-plus/es/locale/lang/en';
-import { defineStore } from 'pinia';
 import { useStorage } from '@vueuse/core';
-import { ref, reactive, computed } from 'vue';
+import enUS from 'element-plus/es/locale/lang/en';
+import zhCN from 'element-plus/es/locale/lang/zh-cn';
+import { defineStore } from 'pinia';
+import { computed, reactive, ref } from 'vue';
 
 export const useAppStore = defineStore('app', () => {
   const sidebarStatus = useStorage('sidebarStatus', '1');
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 01ec7968..11016f04 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,13 +1,13 @@
+import type { RouteRecordRaw } from 'vue-router';
 import { defineStore } from 'pinia';
-import router, { constantRoutes, dynamicRoutes } from '@/router';
-import store from '@/store';
+import { ref } from 'vue';
 import { getRouters } from '@/api/menu';
-import auth from '@/plugins/auth';
-import { RouteRecordRaw } from 'vue-router';
-import Layout from '@/layout/index.vue';
 import ParentView from '@/components/ParentView/index.vue';
 import InnerLink from '@/layout/components/InnerLink/index.vue';
-import { ref } from 'vue';
+import Layout from '@/layout/index.vue';
+import auth from '@/plugins/auth';
+import router, { constantRoutes, dynamicRoutes } from '@/router';
+import store from '@/store';
 import { createCustomNameComponent } from '@/utils/createCustomNameComponent';
 
 // 匹配views里面所有的.vue文件，预建查找表避免每次 O(n) 扫描
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 1869cb25..a90aa2af 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,9 +1,9 @@
-import { defineStore } from 'pinia';
-import defaultSettings from '@/settings';
-import { useDynamicTitle } from '@/utils/dynamicTitle';
 import { useStorage } from '@vueuse/core';
+import { defineStore } from 'pinia';
 import { ref } from 'vue';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
+import defaultSettings from '@/settings';
+import { useDynamicTitle } from '@/utils/dynamicTitle';
 
 export const useSettingsStore = defineStore('setting', () => {
   const storageSetting = useStorage<LayoutSetting>('layout-setting', {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 7c501d81..3167a7c4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,10 +1,12 @@
 import { to } from 'await-to-js';
-import { getToken, removeToken, setToken } from '@/utils/auth';
-import { login as loginApi, logout as logoutApi, getInfo as getUserInfo } from '@/api/login';
-import { LoginData } from '@/api/types';
-import defAva from '@/assets/images/profile.jpg';
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
+import type { UserInfo } from '@/api/system/user/types';
+import type { LoginData, LoginResult } from '@/api/types';
+import type { RuoYiAjaxResult } from '@/utils/api-types';
+import { getInfo as getUserInfo, login as loginApi, logout as logoutApi } from '@/api/login';
+import defAva from '@/assets/images/profile.jpg';
+import { getToken, removeToken, setToken } from '@/utils/auth';
 
 export const useUserStore = defineStore('user', () => {
   const token = ref(getToken());
@@ -23,7 +25,10 @@ export const useUserStore = defineStore('user', () => {
   const login = async (userInfo: LoginData): Promise<void> => {
     const [err, res] = await to(loginApi(userInfo));
     if (res) {
-      const data = res.data;
+      const data = (res as RuoYiAjaxResult<LoginResult>).data;
+      if (!data?.access_token) {
+        return Promise.reject(err);
+      }
       setToken(data.access_token);
       token.value = data.access_token;
       return Promise.resolve();
@@ -35,7 +40,10 @@ export const useUserStore = defineStore('user', () => {
   const getInfo = async (): Promise<void> => {
     const [err, res] = await to(getUserInfo());
     if (res) {
-      const data = res.data;
+      const data = (res as RuoYiAjaxResult<UserInfo>).data;
+      if (!data?.user) {
+        return Promise.reject(err);
+      }
       const user = data.user;
       const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
 
diff --git a/src/types/axios.d.ts b/src/types/axios.d.ts
index 9f2c6d2e..ab7f6f42 100644
--- a/src/types/axios.d.ts
+++ b/src/types/axios.d.ts
@@ -1,4 +1,3 @@
-export {};
 declare module 'axios' {
   interface AxiosResponse<T = any> {
     code: number;
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 4a3e99d2..65fa8ad2 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,4 +1,4 @@
-import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue';
+import type { ComponentInternalInstance as ComponentInstance } from 'vue';
 import { LanguageEnum } from '@/enums/LanguageEnum';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
@@ -172,4 +172,3 @@ declare global {
     dark: boolean;
   }
 }
-export {};
diff --git a/src/types/module.d.ts b/src/types/module.d.ts
index f8931268..7c88d726 100644
--- a/src/types/module.d.ts
+++ b/src/types/module.d.ts
@@ -1,39 +1,22 @@
-import modal from '@/plugins/modal';
-import tab from '@/plugins/tab';
-import download from '@/plugins/download';
+import type { LanguageType } from '@/lang';
 import auth from '@/plugins/auth';
 import cache from '@/plugins/cache';
-import animate from '@/animate';
-import { useDict } from '@/utils/dict';
-import { handleTree, addDateRange, selectDictLabel, selectDictLabels, parseTime } from '@/utils/ruoyi';
-import { getConfigKey, updateConfigByKey } from '@/api/system/config';
-import { download as rd } from '@/utils/request';
-import type { LanguageType } from '@/lang';
+import download from '@/plugins/download';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 
 declare module 'vue' {
   interface ComponentCustomProperties {
-    // 全局方法声明
     $modal: typeof modal;
     $tab: typeof tab;
     $download: typeof download;
     $auth: typeof auth;
     $cache: typeof cache;
-    animate: typeof animate;
     /**
      * i18n $t方法支持ts类型提示
      * @param key i18n key
      */
     $t(key: ObjKeysToUnion<LanguageType>): string;
-
-    useDict: typeof useDict;
-    addDateRange: typeof addDateRange;
-    download: typeof rd;
-    handleTree: typeof handleTree;
-    getConfigKey: typeof getConfigKey;
-    updateConfigByKey: typeof updateConfigByKey;
-    selectDictLabel: typeof selectDictLabel;
-    selectDictLabels: typeof selectDictLabels;
-    parseTime: typeof parseTime;
   }
 }
 
diff --git a/src/types/router.d.ts b/src/types/router.d.ts
index 11a60a05..d47a8ea7 100644
--- a/src/types/router.d.ts
+++ b/src/types/router.d.ts
@@ -34,5 +34,3 @@ declare module 'vue-router' {
     query?: LocationQuery;
   }
 }
-
-export {};
diff --git a/src/utils/api-types.ts b/src/utils/api-types.ts
new file mode 100644
index 00000000..c866339d
--- /dev/null
+++ b/src/utils/api-types.ts
@@ -0,0 +1,11 @@
+/**
+ * 与 `src/utils/request` 拦截器一致：resolve 的是若依风格 JSON `{ code, msg, data }`。
+ * axios 1.13 + TS6 下避免从 `axios` 拉已移除的 AxiosPromise。
+ */
+export interface RuoYiAjaxResult<T = unknown> {
+  code?: number;
+  msg?: string;
+  data?: T;
+}
+
+export type AxiosPromise<T = unknown> = Promise<RuoYiAjaxResult<T>>;
diff --git a/src/utils/jsencrypt.ts b/src/utils/jsencrypt.ts
index a1e92dbe..e833d3b9 100644
--- a/src/utils/jsencrypt.ts
+++ b/src/utils/jsencrypt.ts
@@ -1,4 +1,5 @@
 import { JSEncrypt } from 'jsencrypt';
+
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
 
 const publicKey = import.meta.env.VITE_APP_RSA_PUBLIC_KEY;
diff --git a/src/utils/ossContent.ts b/src/utils/ossContent.ts
index 8d4f1ac2..e8daa36d 100644
--- a/src/utils/ossContent.ts
+++ b/src/utils/ossContent.ts
@@ -16,7 +16,7 @@ export async function resolveOssContent(html: string): Promise<string> {
   const matches = [...html.matchAll(OSS_MARKER_RE)];
   if (matches.length === 0) return html;
 
-  const ossIds = [...new Set(matches.map((m) => m[1]))];
+  const ossIds = [...new Set(matches.map(m => m[1]))];
 
   try {
     const res = await listByIds(ossIds.join(','));
diff --git a/src/utils/propTypes.ts b/src/utils/propTypes.ts
index 24d861dc..4a8ca1a1 100644
--- a/src/utils/propTypes.ts
+++ b/src/utils/propTypes.ts
@@ -1,5 +1,5 @@
-import { CSSProperties } from 'vue';
-import VueTypes, { createTypes, toValidableType, VueTypeValidableDef, VueTypesInterface } from 'vue-types';
+import type { CSSProperties } from 'vue';
+import VueTypes, { createTypes, toValidableType, type VueTypesInterface, type VueTypeValidableDef } from 'vue-types';
 
 type PropTypes = VueTypesInterface & {
   readonly style: VueTypeValidableDef<CSSProperties>;
diff --git a/src/utils/push.ts b/src/utils/push.ts
index aac2e324..7ccae674 100644
--- a/src/utils/push.ts
+++ b/src/utils/push.ts
@@ -1,9 +1,9 @@
-import { getMessageBox } from '@/api/system/message';
+import { ElNotification } from 'element-plus';
 import type { MessageVO } from '@/api/system/message/types';
+import { getMessageBox } from '@/api/system/message';
+import { useNoticeStore } from '@/store/modules/notice';
 import { useUserStore } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
-import { ElNotification } from 'element-plus';
-import { useNoticeStore } from '@/store/modules/notice';
 import { isMessageRead } from '@/utils/message-read';
 import { parsePushMessage, resolveNoticeGroup, resolveNoticeTitle, shouldAppendNotice } from '@/utils/push-message';
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 548fd73b..1b7349cd 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,16 +1,19 @@
-import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import type { LoadingInstance } from 'element-plus';
+import axiosModule from 'axios';
+import { HttpStatus } from '@/enums/RespEnum';
+import { getLanguage } from '@/lang';
+import cache from '@/plugins/cache';
+import router from '@/router';
 import { useUserStore } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
-import { tansParams, blobValidate } from '@/utils/ruoyi';
-import cache from '@/plugins/cache';
-import { HttpStatus } from '@/enums/RespEnum';
+import { decryptBase64, decryptWithAes, encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto';
 import { errorCode } from '@/utils/errorCode';
-import { getLanguage } from '@/lang';
-import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto';
-import { encrypt, decrypt } from '@/utils/jsencrypt';
-import router from '@/router';
+import { decrypt, encrypt } from '@/utils/jsencrypt';
+import { blobValidate, tansParams } from '@/utils/ruoyi';
 import { saveBlob } from '@/utils/save';
-import type { LoadingInstance } from 'element-plus';
+
+/** axios 1.13 + TS6：默认导出在类型上会被解析为不可调用的 export= 形态 */
+const axios = axiosModule as any;
 
 const encryptHeader = 'encrypt-key';
 let downloadLoadingInstance: LoadingInstance | undefined;
@@ -95,7 +98,7 @@ const service = axios.create({
 
 // 请求拦截器
 service.interceptors.request.use(
-  (config: InternalAxiosRequestConfig) => {
+  (config: any) => {
     // 对应国际化资源文件后缀
     config.headers['Content-Language'] = getLanguage();
 
@@ -164,7 +167,7 @@ service.interceptors.request.use(
 
 // 响应拦截器
 service.interceptors.response.use(
-  (res: AxiosResponse) => {
+  (res: any) => {
     if (import.meta.env.VITE_APP_ENCRYPT === 'true') {
       // 加密后的 AES 秘钥
       const keyStr = res.headers[encryptHeader];
@@ -192,25 +195,35 @@ service.interceptors.response.use(
     if (code === 401) {
       // prettier-ignore
       if (!isRelogin.show) {
-        isRelogin.show = true;
-        ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          isRelogin.show = false;
-          useUserStore().logout().then(() => {
-            router.replace({
-              path: '/login',
-              query: {
-                redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
-              }
-            })
-          });
-        }).catch(() => {
-          isRelogin.show = false;
-        });
-      }
+				isRelogin.show = true;
+				ElMessageBox.confirm(
+					"登录状态已过期，您可以继续留在该页面，或者重新登录",
+					"系统提示",
+					{
+						confirmButtonText: "重新登录",
+						cancelButtonText: "取消",
+						type: "warning",
+					},
+				)
+					.then(() => {
+						isRelogin.show = false;
+						useUserStore()
+							.logout()
+							.then(() => {
+								router.replace({
+									path: "/login",
+									query: {
+										redirect: encodeURIComponent(
+											router.currentRoute.value.fullPath || "/",
+										),
+									},
+								});
+							});
+					})
+					.catch(() => {
+						isRelogin.show = false;
+					});
+			}
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。');
     } else if (code === HttpStatus.SERVER_ERROR) {
       ElMessage({ message: msg, type: 'error' });
@@ -238,31 +251,35 @@ export function download(url: string, params: any, fileName: string) {
     background: 'rgba(0, 0, 0, 0.7)'
   });
   // prettier-ignore
-  return service.post(url, params, {
-      transformRequest: [
-        (params: any) => {
-          return tansParams(params);
-        }
-      ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      responseType: 'blob'
-    }).then(async (resp: any) => {
-      const isLogin = blobValidate(resp);
-      if (isLogin) {
-        const blob = new Blob([resp]);
-        saveBlob(blob, fileName);
-      } else {
-        const blob = new Blob([resp]);
-        const resText = await blob.text();
-        const rspObj = JSON.parse(resText);
-        const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
-        ElMessage.error(errMsg);
-      }
-      downloadLoadingInstance?.close();
-    }).catch((r: any) => {
-      console.error(r);
-      downloadLoadingInstance?.close();
-    });
+  return service
+		.post(url, params, {
+			transformRequest: [
+				(params: any) => {
+					return tansParams(params);
+				},
+			],
+			headers: { "Content-Type": "application/x-www-form-urlencoded" },
+			responseType: "blob",
+		})
+		.then(async (resp: any) => {
+			const isLogin = blobValidate(resp);
+			if (isLogin) {
+				const blob = new Blob([resp]);
+				saveBlob(blob, fileName);
+			} else {
+				const blob = new Blob([resp]);
+				const resText = await blob.text();
+				const rspObj = JSON.parse(resText);
+				const errMsg =
+					errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+				ElMessage.error(errMsg);
+			}
+			downloadLoadingInstance?.close();
+		})
+		.catch((r: any) => {
+			console.error(r);
+			downloadLoadingInstance?.close();
+		});
 }
 // 导出 axios 实例
 export default service;
diff --git a/src/utils/scroll-to.ts b/src/utils/scroll-to.ts
index b638b9c5..f89af397 100644
--- a/src/utils/scroll-to.ts
+++ b/src/utils/scroll-to.ts
@@ -8,16 +8,13 @@ const easeInOutQuad = (t: number, b: number, c: number, d: number) => {
 };
 
 // requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
-const requestAnimFrame = (function () {
-  return (
-    window.requestAnimationFrame ||
-    (window as any).webkitRequestAnimationFrame ||
-    (window as any).mozRequestAnimationFrame ||
-    function (callback) {
-      window.setTimeout(callback, 1000 / 60);
-    }
-  );
-})();
+const requestAnimFrame = (() =>
+  window.requestAnimationFrame ||
+  (window as any).webkitRequestAnimationFrame ||
+  (window as any).mozRequestAnimationFrame ||
+  (callback => {
+    window.setTimeout(callback, 1000 / 60);
+  }))();
 
 /**
  * Because it's so fucking difficult to detect the scrolling element, just move them all
@@ -46,7 +43,7 @@ export const scrollTo = (to: number, duration: number, callback?: any) => {
   const increment = 20;
   let currentTime = 0;
   duration = typeof duration === 'undefined' ? 500 : duration;
-  const animateScroll = function () {
+  const animateScroll = () => {
     // increment the time
     currentTime += increment;
     // find the value with the quadratic in-out easing function
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 6563b184..b99dc7b2 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -138,8 +138,8 @@
 <script setup name="Demo" lang="ts">
 import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
 import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import modal from '@/plugins/modal';
+import { download as requestDownload } from '@/utils/request';
 
 const demoList = ref<DemoVO[]>([]);
 const buttonLoading = ref(false);
@@ -256,7 +256,7 @@ const submitForm = () => {
       } else {
         await addDemo(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('修改成功');
+      modal.msgSuccess('修改成功');
       dialog.visible = false;
       await getList();
     }
@@ -266,17 +266,15 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DemoVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal
-    .confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？')
-    .finally(() => (loading.value = false));
+  await modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delDemo(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   await getList();
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'demo/demo/export',
     {
       ...queryParams.value
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 0e3273bb..df65b0fc 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -116,6 +116,8 @@
 <script setup name="Tree" lang="ts">
 import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree';
 import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
+import modal from '@/plugins/modal';
+import { handleTree } from '@/utils/ruoyi';
 
 type TreeOption = {
   id: number;
@@ -123,8 +125,6 @@ type TreeOption = {
   children?: TreeOption[];
 };
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
 const treeList = ref<TreeVO[]>([]);
 const treeOptions = ref<TreeOption[]>([]);
 const buttonLoading = ref(false);
@@ -172,7 +172,7 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listTree(queryParams.value);
-  const data = proxy?.handleTree<TreeVO>(res.data, 'id', 'parentId');
+  const data = handleTree<TreeVO>(res.data, 'id', 'parentId');
   if (data) {
     treeList.value = data;
     loading.value = false;
@@ -184,7 +184,7 @@ const getTreeselect = async () => {
   const res = await listTree();
   treeOptions.value = [];
   const data: TreeOption = { id: 0, treeName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<TreeOption>(res.data, 'id', 'parentId');
+  data.children = handleTree<TreeOption>(res.data, 'id', 'parentId');
   treeOptions.value.push(data);
 };
 
@@ -261,7 +261,7 @@ const submitForm = () => {
       } else {
         await addTree(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -270,11 +270,11 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row: TreeVO) => {
-  await proxy?.$modal.confirm('是否确认删除测试树编号为"' + row.id + '"的数据项？');
+  await modal.confirm('是否确认删除测试树编号为"' + row.id + '"的数据项？');
   loading.value = true;
   await delTree(row.id).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index df8bb57c..64e79ac2 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -20,17 +20,19 @@
 </template>
 
 <script setup lang="ts">
+import { useRoute, useRouter } from 'vue-router';
 import errImage from '@/assets/401_images/401.gif';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const route = useRoute();
+const router = useRouter();
 
 const errGif = ref(errImage + '?' + +new Date());
 
 function back() {
-  if (proxy?.$route.query.noGoBack) {
-    proxy.$router.push({ path: '/' });
+  if (route.query.noGoBack) {
+    router.push({ path: '/' });
   } else {
-    proxy?.$router.go(-1);
+    router.go(-1);
   }
 }
 </script>
diff --git a/src/views/index.vue b/src/views/index.vue
index 1b38a553..09929a91 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -129,9 +129,7 @@ const goTarget = (url: string) => {
   grid-template-columns: minmax(0, 1.3fr) minmax(280px, 0.7fr);
   gap: 18px;
   padding: 30px;
-  background:
-    radial-gradient(circle at top left, rgba(53, 109, 255, 0.16), transparent 30%),
-    var(--app-surface-bg);
+  background: radial-gradient(circle at top left, rgba(53, 109, 255, 0.16), transparent 30%), var(--app-surface-bg);
 }
 
 .hero-copy {
@@ -366,9 +364,7 @@ const goTarget = (url: string) => {
 
 :global(html.dark) {
   .hero-panel {
-    background:
-      radial-gradient(circle at top left, rgba(53, 109, 255, 0.18), transparent 30%),
-      var(--app-surface-bg);
+    background: radial-gradient(circle at top left, rgba(53, 109, 255, 0.18), transparent 30%), var(--app-surface-bg);
   }
 }
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index b1002902..814f3c71 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -36,7 +36,7 @@
             type="text"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('login.username')"
+            :placeholder="$t('login.username')"
           >
             <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
           </el-input>
@@ -48,7 +48,7 @@
             type="password"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('login.password')"
+            :placeholder="$t('login.password')"
             @keyup.enter="handleLogin"
           >
             <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -60,7 +60,7 @@
             v-model="loginForm.code"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('login.code')"
+            :placeholder="$t('login.code')"
             @keyup.enter="handleLogin"
           >
             <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
@@ -71,28 +71,28 @@
         </el-form-item>
 
         <div class="form-meta">
-          <el-checkbox v-model="loginForm.rememberMe">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
+          <el-checkbox v-model="loginForm.rememberMe">{{ $t('login.rememberPassword') }}</el-checkbox>
           <router-link v-if="register" class="link-type" :to="'/register'">
-            {{ proxy.$t('login.switchRegisterPage') }}
+            {{ $t('login.switchRegisterPage') }}
           </router-link>
         </div>
 
         <div class="social-panel">
           <span class="social-label">第三方登录</span>
           <div class="social-actions">
-            <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">
+            <el-button circle :title="$t('login.social.wechat')" @click="doSocialLogin('wechat')">
               <svg-icon icon-class="wechat" />
             </el-button>
-            <el-button circle :title="proxy.$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">
+            <el-button circle :title="$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">
               <svg-icon icon-class="maxkey" />
             </el-button>
-            <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">
+            <el-button circle :title="$t('login.social.topiam')" @click="doSocialLogin('topiam')">
               <svg-icon icon-class="topiam" />
             </el-button>
-            <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">
+            <el-button circle :title="$t('login.social.gitee')" @click="doSocialLogin('gitee')">
               <svg-icon icon-class="gitee" />
             </el-button>
-            <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">
+            <el-button circle :title="$t('login.social.github')" @click="doSocialLogin('github')">
               <svg-icon icon-class="github" />
             </el-button>
           </div>
@@ -100,8 +100,8 @@
 
         <el-form-item class="submit-row">
           <el-button :loading="loading" size="large" type="primary" class="submit-button" @click.prevent="handleLogin">
-            <span v-if="!loading">{{ proxy.$t('login.login') }}</span>
-            <span v-else>{{ proxy.$t('login.logging') }}</span>
+            <span v-if="!loading">{{ $t('login.login') }}</span>
+            <span v-else>{{ $t('login.logging') }}</span>
           </el-button>
         </el-form-item>
       </el-form>
@@ -114,15 +114,13 @@
 </template>
 
 <script setup lang="ts">
+import { to } from 'await-to-js';
+import { useI18n } from 'vue-i18n';
 import { getCodeImg } from '@/api/login';
 import { authRouterUrl } from '@/api/system/social/auth';
-import { useUserStore } from '@/store/modules/user';
 import { LoginData } from '@/api/types';
-import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
-import { useI18n } from 'vue-i18n';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStore } from '@/store/modules/user';
 
 const title = import.meta.env.VITE_APP_TITLE;
 const currentYear = new Date().getFullYear();
@@ -145,9 +143,27 @@ const loginForm = ref<LoginData>({
 } as LoginData);
 
 const loginRules: ElFormRules = {
-  username: [{ required: true, trigger: 'blur', message: t('login.rule.username.required') }],
-  password: [{ required: true, trigger: 'blur', message: t('login.rule.password.required') }],
-  code: [{ required: true, trigger: 'change', message: t('login.rule.code.required') }]
+  username: [
+    {
+      required: true,
+      trigger: 'blur',
+      message: t('login.rule.username.required')
+    }
+  ],
+  password: [
+    {
+      required: true,
+      trigger: 'blur',
+      message: t('login.rule.password.required')
+    }
+  ],
+  code: [
+    {
+      required: true,
+      trigger: 'change',
+      message: t('login.rule.code.required')
+    }
+  ]
 };
 
 const codeUrl = ref('');
@@ -561,5 +577,4 @@ onMounted(() => {
     grid-template-columns: 1fr;
   }
 }
-
 </style>
diff --git a/src/views/monitor/cache/index.vue b/src/views/monitor/cache/index.vue
index 37a96100..e0dc4d19 100644
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@@ -143,19 +143,19 @@
 </template>
 
 <script setup name="Cache" lang="ts">
-import { getCache } from '@/api/monitor/cache';
 import * as echarts from 'echarts';
+import { getCache } from '@/api/monitor/cache';
 import { CacheVO } from '@/api/monitor/cache/types';
+import modal from '@/plugins/modal';
 
 const cache = ref<Partial<CacheVO>>({});
 const commandstats = ref();
 const usedmemory = ref();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const getList = async () => {
-  proxy?.$modal.loading('正在加载缓存监控数据，请稍候！');
+  modal.loading('正在加载缓存监控数据，请稍候！');
   const res = await getCache();
-  proxy?.$modal.closeLoading();
+  modal.closeLoading();
   cache.value = res.data;
   const commandstatsIntance = echarts.init(commandstats.value, 'macarons');
   commandstatsIntance.setOption({
diff --git a/src/views/monitor/logininfo/index.vue b/src/views/monitor/logininfo/index.vue
index 32a57e9d..9b1b24d5 100644
--- a/src/views/monitor/logininfo/index.vue
+++ b/src/views/monitor/logininfo/index.vue
@@ -137,7 +137,7 @@
           width="180"
         >
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
+            <span>{{ parseTime(scope.row.loginTime) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -156,10 +156,13 @@
 <script setup name="LoginInfo" lang="ts">
 import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from '@/api/monitor/logininfo';
 import { LoginInfoQuery, LoginInfoVO } from '@/api/monitor/logininfo/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime, addDateRange } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
-const { sys_common_status } = toRefs<any>(proxy?.useDict('sys_common_status'));
+const { sys_device_type } = toRefs<any>(useDict('sys_device_type'));
+const { sys_common_status } = toRefs<any>(useDict('sys_common_status'));
 
 const loginInfoList = ref<LoginInfoVO[]>([]);
 const loading = ref(true);
@@ -169,7 +172,7 @@ const single = ref(true);
 const multiple = ref(true);
 const selectName = ref<Array<string>>([]);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const defaultSort = ref<any>({ prop: 'loginTime', order: 'descending' });
 
 const queryFormRef = ref<ElFormInstance>();
@@ -188,7 +191,7 @@ const queryParams = ref<LoginInfoQuery>({
 /** 查询登录日志列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await list(addDateRange(queryParams.value, dateRange.value));
   loginInfoList.value = res.data?.rows;
   total.value = res.data?.total;
   loading.value = false;
@@ -221,28 +224,28 @@ const handleSortChange = (column: any) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: LoginInfoVO) => {
   const infoIds = row?.infoId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?');
+  await modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?');
   await delLoginInfo(infoIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 /** 清空按钮操作 */
 const handleClean = async () => {
-  await proxy?.$modal.confirm('是否确认清空所有登录日志数据项?');
+  await modal.confirm('是否确认清空所有登录日志数据项?');
   await cleanLoginInfo();
   await getList();
-  proxy?.$modal.msgSuccess('清空成功');
+  modal.msgSuccess('清空成功');
 };
 /** 解锁按钮操作 */
 const handleUnlock = async () => {
   const username = selectName.value;
-  await proxy?.$modal.confirm('是否确认解锁用户"' + username + '"数据项?');
+  await modal.confirm('是否确认解锁用户"' + username + '"数据项?');
   await unlockLoginInfo(username);
-  proxy?.$modal.msgSuccess('用户' + username + '解锁成功');
+  modal.msgSuccess('用户' + username + '解锁成功');
 };
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'monitor/loginInfo/export',
     {
       ...queryParams.value
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index b47ee22c..e6ad3ee9 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
         <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
+            <span>{{ parseTime(scope.row.loginTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -97,13 +97,14 @@
 </template>
 
 <script setup name="Online" lang="ts">
+import { to } from 'await-to-js';
 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';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
+const { sys_device_type } = toRefs<any>(useDict('sys_device_type'));
 
 const onlineList = ref<OnlineVO[]>([]);
 const loading = ref(true);
@@ -138,11 +139,11 @@ const resetQuery = () => {
 };
 /** 强退按钮操作 */
 const handleForceLogout = async (row: OnlineVO) => {
-  const [err] = await to(proxy?.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?') as any);
+  const [err] = await to(modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?') as any);
   if (!err) {
     await forceLogout(row.tokenId);
     await getList();
-    proxy?.$modal.msgSuccess('删除成功');
+    modal.msgSuccess('删除成功');
   }
 };
 
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 25417b0c..e8395329 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -161,7 +161,7 @@
           :sort-orders="['descending', 'ascending']"
         >
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.operTime) }}</span>
+            <span>{{ parseTime(scope.row.operTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -208,11 +208,14 @@
 <script setup name="Operlog" 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';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime, addDateRange, selectDictLabel } from '@/utils/ruoyi';
+import OperInfoDialog from './operInfoDialog.vue';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_oper_type, sys_common_status, sys_device_type } = toRefs<any>(
-  proxy?.useDict('sys_oper_type', 'sys_common_status', 'sys_device_type')
+  useDict('sys_oper_type', 'sys_common_status', 'sys_device_type')
 );
 
 const operlogList = ref<OperLogVO[]>([]);
@@ -221,7 +224,7 @@ const showSearch = ref(true);
 const ids = ref<Array<number | string>>([]);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const defaultSort = ref<any>({ prop: 'operTime', order: 'descending' });
 
 const operLogTableRef = ref<ElTableInstance>();
@@ -280,14 +283,14 @@ const { queryParams, form } = toRefs(data);
 /** 查询登录日志 */
 const getList = async () => {
   loading.value = true;
-  const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await list(addDateRange(queryParams.value, dateRange.value));
   operlogList.value = res.data?.rows;
   total.value = res.data?.total;
   loading.value = false;
 };
 /** 操作日志类型字典翻译 */
 const typeFormat = (row: OperLogForm) => {
-  return proxy?.selectDictLabel(sys_oper_type.value, row.businessType);
+  return selectDictLabel(sys_oper_type.value, row.businessType);
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -322,23 +325,23 @@ const handleView = (row: OperLogVO) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: OperLogVO) => {
   const operIds = row?.operId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?');
+  await modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?');
   await delOperlog(operIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 /** 清空按钮操作 */
 const handleClean = async () => {
-  await proxy?.$modal.confirm('是否确认清空所有操作日志数据项?');
+  await modal.confirm('是否确认清空所有操作日志数据项?');
   await cleanOperlog();
   await getList();
-  proxy?.$modal.msgSuccess('清空成功');
+  modal.msgSuccess('清空成功');
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'monitor/operlog/export',
     {
       ...queryParams.value
diff --git a/src/views/monitor/operlog/oper-info-dialog.vue b/src/views/monitor/operlog/operInfoDialog.vue
similarity index 89%
rename from src/views/monitor/operlog/oper-info-dialog.vue
rename to src/views/monitor/operlog/operInfoDialog.vue
index 02f8daf4..a37e9bf0 100644
--- a/src/views/monitor/operlog/oper-info-dialog.vue
+++ b/src/views/monitor/operlog/operInfoDialog.vue
@@ -52,7 +52,7 @@
         </template>
       </el-descriptions-item>
       <el-descriptions-item label="操作时间">
-        <template #default>{{ proxy.parseTime(info.operTime) }}</template>
+        <template #default>{{ parseTime(info.operTime) }}</template>
       </el-descriptions-item>
       <el-descriptions-item v-if="info.status === 1" label="异常信息">
         <template #default>
@@ -64,9 +64,11 @@
 </template>
 
 <script setup lang="ts">
-import type { OperLogForm } from '@/api/monitor/operlog/types';
 import VueJsonPretty from 'vue-json-pretty';
+import type { OperLogForm } from '@/api/monitor/operlog/types';
 import 'vue-json-pretty/lib/styles.css';
+import { useDict } from '@/utils/dict';
+import { parseTime, selectDictLabel } from '@/utils/ruoyi';
 
 const open = ref(false);
 const info = ref<OperLogForm | null>(null);
@@ -99,13 +101,12 @@ function formatToJsonObject(data: string) {
 /**
  * 字典信息
  */
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_oper_type, sys_device_type } = toRefs<any>(proxy?.useDict('sys_oper_type', 'sys_device_type'));
+const { sys_oper_type, sys_device_type } = toRefs<any>(useDict('sys_oper_type', 'sys_device_type'));
 const typeFormat = (row: OperLogForm) => {
-  return proxy?.selectDictLabel(sys_oper_type.value, row.businessType);
+  return selectDictLabel(sys_oper_type.value, row.businessType);
 };
 const deviceTypeFormat = (deviceType: string) => {
-  return proxy?.selectDictLabel(sys_device_type.value, deviceType);
+  return selectDictLabel(sys_device_type.value, deviceType);
 };
 </script>
 
diff --git a/src/views/register.vue b/src/views/register.vue
index 76f222d0..6a047f06 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -36,7 +36,7 @@
             type="text"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('register.username')"
+            :placeholder="$t('register.username')"
           >
             <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
           </el-input>
@@ -47,7 +47,7 @@
             type="password"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('register.password')"
+            :placeholder="$t('register.password')"
             @keyup.enter="handleRegister"
           >
             <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -59,7 +59,7 @@
             type="password"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('register.confirmPassword')"
+            :placeholder="$t('register.confirmPassword')"
             @keyup.enter="handleRegister"
           >
             <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -70,7 +70,7 @@
             v-model="registerForm.code"
             size="large"
             auto-complete="off"
-            :placeholder="proxy.$t('register.code')"
+            :placeholder="$t('register.code')"
             @keyup.enter="handleRegister"
           >
             <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
@@ -82,7 +82,7 @@
 
         <div class="form-meta">
           <span class="register-tip">注册后将返回登录页继续完成认证</span>
-          <router-link class="link-type" :to="'/login'">{{ proxy.$t('register.switchLoginPage') }}</router-link>
+          <router-link class="link-type" :to="'/login'">{{ $t('register.switchLoginPage') }}</router-link>
         </div>
 
         <el-form-item class="submit-row">
@@ -93,8 +93,8 @@
             class="submit-button"
             @click.prevent="handleRegister"
           >
-            <span v-if="!loading">{{ proxy.$t('register.register') }}</span>
-            <span v-else>{{ proxy.$t('register.registering') }}</span>
+            <span v-if="!loading">{{ $t('register.register') }}</span>
+            <span v-else>{{ $t('register.registering') }}</span>
           </el-button>
         </el-form-item>
       </el-form>
@@ -107,12 +107,10 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, register } from '@/api/login';
-import { RegisterForm } from '@/api/types';
 import { to } from 'await-to-js';
 import { useI18n } from 'vue-i18n';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { getCodeImg, register } from '@/api/login';
+import { RegisterForm } from '@/api/types';
 
 const title = import.meta.env.VITE_APP_TITLE;
 const currentYear = new Date().getFullYear();
@@ -145,7 +143,11 @@ const equalToPassword = (rule: any, value: string, callback: any) => {
 
 const registerRules: ElFormRules = {
   username: [
-    { required: true, trigger: 'blur', message: t('register.rule.username.required') },
+    {
+      required: true,
+      trigger: 'blur',
+      message: t('register.rule.username.required')
+    },
     {
       min: 2,
       max: 20,
@@ -154,7 +156,11 @@ const registerRules: ElFormRules = {
     }
   ],
   password: [
-    { required: true, trigger: 'blur', message: t('register.rule.password.required') },
+    {
+      required: true,
+      trigger: 'blur',
+      message: t('register.rule.password.required')
+    },
     {
       min: 5,
       max: 20,
@@ -163,15 +169,27 @@ const registerRules: ElFormRules = {
     },
     {
       pattern: /^[^<>"'|\\]+$/,
-      message: t('register.rule.password.pattern', { strings: '< > " \' \\ |' }),
+      message: t('register.rule.password.pattern', {
+        strings: '< > " \' \\ |'
+      }),
       trigger: 'blur'
     }
   ],
   confirmPassword: [
-    { required: true, trigger: 'blur', message: t('register.rule.confirmPassword.required') },
+    {
+      required: true,
+      trigger: 'blur',
+      message: t('register.rule.confirmPassword.required')
+    },
     { required: true, validator: equalToPassword, trigger: 'blur' }
   ],
-  code: [{ required: true, trigger: 'change', message: t('register.rule.code.required') }]
+  code: [
+    {
+      required: true,
+      trigger: 'change',
+      message: t('register.rule.code.required')
+    }
+  ]
 };
 const codeUrl = ref('');
 const loading = ref(false);
@@ -502,5 +520,4 @@ onMounted(() => {
     grid-template-columns: 1fr;
   }
 }
-
 </style>
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 3aa5df5a..2550f53f 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -213,11 +213,13 @@
 <script setup name="Client" lang="ts">
 import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
 import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
-const { sys_grant_type } = toRefs<any>(proxy?.useDict('sys_grant_type'));
-const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
+const { sys_grant_type } = toRefs<any>(useDict('sys_grant_type'));
+const { sys_device_type } = toRefs<any>(useDict('sys_device_type'));
 
 const clientList = ref<ClientVO[]>([]);
 const buttonLoading = ref(false);
@@ -340,7 +342,7 @@ const submitForm = () => {
       } else {
         await addClient(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('修改成功');
+      modal.msgSuccess('修改成功');
       dialog.visible = false;
       await getList();
     }
@@ -350,17 +352,15 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: ClientVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal
-    .confirm('是否确认删除客户端管理编号为"' + _ids + '"的数据项？')
-    .finally(() => (loading.value = false));
+  await modal.confirm('是否确认删除客户端管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delClient(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   await getList();
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/client/export',
     {
       ...queryParams.value
@@ -373,9 +373,9 @@ const handleExport = () => {
 const handleStatusChange = async (row: ClientVO) => {
   const text = row.status === '0' ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm('确认要"' + text + '"吗?');
+    await modal.confirm('确认要"' + text + '"吗?');
     await changeStatus(row.clientId, row.status);
-    proxy?.$modal.msgSuccess(text + '成功');
+    modal.msgSuccess(text + '成功');
   } catch (err) {
     row.status = row.status === '0' ? '1' : '0';
   }
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 56ea6e11..5871389f 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -120,7 +120,7 @@
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
@@ -189,9 +189,12 @@
 <script setup name="Config" lang="ts">
 import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from '@/api/system/config';
 import { ConfigForm, ConfigQuery, ConfigVO } from '@/api/system/config/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime, addDateRange } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
+const { sys_yes_no } = toRefs<any>(useDict('sys_yes_no'));
 
 const configList = ref<ConfigVO[]>([]);
 const loading = ref(true);
@@ -200,7 +203,7 @@ const ids = ref<Array<number | string>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 
 const queryFormRef = ref<ElFormInstance>();
 const configFormRef = ref<ElFormInstance>();
@@ -237,7 +240,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询参数列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listConfig(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await listConfig(addDateRange(queryParams.value, dateRange.value));
   configList.value = res.data?.rows;
   total.value = res.data?.total;
   loading.value = false;
@@ -289,7 +292,7 @@ const submitForm = () => {
   configFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.configId ? await updateConfig(form.value) : await addConfig(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -298,14 +301,14 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: ConfigVO) => {
   const configIds = row?.configId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？');
+  await modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？');
   await delConfig(configIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/config/export',
     {
       ...queryParams.value
@@ -316,7 +319,7 @@ const handleExport = () => {
 /** 刷新缓存按钮操作 */
 const handleRefreshCache = async () => {
   await refreshCache();
-  proxy?.$modal.msgSuccess('刷新缓存成功');
+  modal.msgSuccess('刷新缓存成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 7c33a043..5148d0c8 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -79,7 +79,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right" align="center" label="操作">
@@ -192,8 +192,11 @@
 <script setup name="Dept" 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';
+import { UserVO } from '@/api/system/user/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { handleTree, parseTime } from '@/utils/ruoyi';
 
 interface DeptOptionsType {
   deptId: number | string;
@@ -201,8 +204,7 @@ interface DeptOptionsType {
   children: DeptOptionsType[];
 }
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const deptList = ref<DeptVO[]>([]);
 const loading = ref(true);
@@ -244,8 +246,20 @@ const initData: PageData<DeptForm, DeptQuery> = {
     parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
     deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
     orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
-    email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
-    phone: [{ pattern: /^1[3456789][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }]
+    email: [
+      {
+        type: 'email',
+        message: '请输入正确的邮箱地址',
+        trigger: ['blur', 'change']
+      }
+    ],
+    phone: [
+      {
+        pattern: /^1[3456789][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur'
+      }
+    ]
   }
 };
 const data = reactive<PageData<DeptForm, DeptQuery>>(initData);
@@ -256,7 +270,7 @@ const { queryParams, form, rules } = toRefs<PageData<DeptForm, DeptQuery>>(data)
 const getList = async () => {
   loading.value = true;
   const res = await listDept(queryParams.value);
-  const data = proxy?.handleTree<DeptVO>(res.data, 'deptId');
+  const data = handleTree<DeptVO>(res.data, 'deptId');
   if (data) {
     deptList.value = data;
   }
@@ -309,7 +323,7 @@ const toggleExpandAll = (data: DeptVO[], status: boolean) => {
 const handleAdd = async (row?: DeptVO) => {
   reset();
   const res = await listDept();
-  const data = proxy?.handleTree<DeptOptionsType>(res.data, 'deptId');
+  const data = handleTree<DeptOptionsType>(res.data, 'deptId');
   if (data) {
     deptOptions.value = data;
     if (row && row.deptId) {
@@ -328,7 +342,7 @@ const handleUpdate = async (row: DeptVO) => {
   const res = await getDept(row.deptId);
   form.value = res.data;
   const response = await listDeptExcludeChild(row.deptId);
-  const data = proxy?.handleTree<DeptOptionsType>(response.data, 'deptId');
+  const data = handleTree<DeptOptionsType>(response.data, 'deptId');
   if (data) {
     deptOptions.value = data;
     if (data.length === 0) {
@@ -348,7 +362,7 @@ const submitForm = () => {
   deptFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.deptId ? await updateDept(form.value) : await addDept(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -356,10 +370,10 @@ const submitForm = () => {
 };
 /** 删除按钮操作 */
 const handleDelete = async (row: DeptVO) => {
-  await proxy?.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?');
+  await modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?');
   await delDept(row.deptId);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index de3613ee..43105507 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -113,7 +113,7 @@
               <el-table-column label="备注" align="center" prop="remark" width="160" />
               <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                 <template #default="scope">
-                  <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -280,7 +280,7 @@
               <el-table-column label="备注" align="center" prop="remark" width="100" />
               <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                 <template #default="scope">
-                  <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -397,13 +397,14 @@
 </template>
 
 <script setup name="Dict" lang="ts">
-import { useDictStore } from '@/store/modules/dict';
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
 import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data';
-import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
 import { DictDataForm, DictDataQuery, DictDataVO } from '@/api/system/dict/data/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
+import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
+import modal from '@/plugins/modal';
+import { useDictStore } from '@/store/modules/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime } from '@/utils/ruoyi';
 
 const typeList = ref<DictTypeVO[]>([]);
 const typeLoading = ref(true);
@@ -587,7 +588,7 @@ const submitTypeForm = () => {
   typeFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       typeForm.value.dictId ? await updateType(typeForm.value) : await addType(typeForm.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       typeDialog.visible = false;
       getTypeList();
     }
@@ -596,14 +597,14 @@ const submitTypeForm = () => {
 
 const handleTypeDelete = async (row?: DictTypeVO) => {
   const dictIds = row?.dictId || typeIds.value;
-  await proxy?.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？');
+  await modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？');
   await delType(dictIds);
   getTypeList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 const handleTypeExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/dict/type/export',
     {
       ...typeQueryParams.value
@@ -614,7 +615,7 @@ const handleTypeExport = () => {
 
 const handleRefreshCache = async () => {
   await refreshCache();
-  proxy?.$modal.msgSuccess('刷新成功');
+  modal.msgSuccess('刷新成功');
   useDictStore().cleanDict();
 };
 
@@ -656,7 +657,7 @@ const handleDataResetQuery = () => {
 
 const handleDataAdd = () => {
   if (!currentDict.value) {
-    proxy?.$modal.msgWarning('请先选择字典');
+    modal.msgWarning('请先选择字典');
     return;
   }
   resetDataForm();
@@ -673,7 +674,7 @@ const handleDataSelectionChange = (selection: DictDataVO[]) => {
 
 const handleDataUpdate = async (row?: DictDataVO) => {
   if (!currentDict.value) {
-    proxy?.$modal.msgWarning('请先选择字典');
+    modal.msgWarning('请先选择字典');
     return;
   }
   resetDataForm();
@@ -689,7 +690,7 @@ const submitDataForm = () => {
     if (valid) {
       dataForm.value.dictCode ? await updateData(dataForm.value) : await addData(dataForm.value);
       useDictStore().removeDict(dataQueryParams.value.dictType);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dataDialog.visible = false;
       await getDataList();
     }
@@ -698,23 +699,23 @@ const submitDataForm = () => {
 
 const handleDataDelete = async (row?: DictDataVO) => {
   if (!currentDict.value) {
-    proxy?.$modal.msgWarning('请先选择字典');
+    modal.msgWarning('请先选择字典');
     return;
   }
   const dictCodes = row?.dictCode || dataIds.value;
-  await proxy?.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？');
+  await modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？');
   await delData(dictCodes);
   await getDataList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   useDictStore().removeDict(dataQueryParams.value.dictType);
 };
 
 const handleDataExport = () => {
   if (!currentDict.value) {
-    proxy?.$modal.msgWarning('请先选择字典');
+    modal.msgWarning('请先选择字典');
     return;
   }
-  proxy?.download(
+  requestDownload(
     'system/dict/data/export',
     {
       ...dataQueryParams.value
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 36160172..47957c87 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -368,6 +368,9 @@
 import { addMenu, cascadeDelMenu, delMenu, getMenu, listMenu, updateMenu } from '@/api/system/menu';
 import { MenuForm, MenuQuery, MenuVO } from '@/api/system/menu/types';
 import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { handleTree } from '@/utils/ruoyi';
 
 interface MenuOptionsType {
   menuId: number;
@@ -375,8 +378,7 @@ interface MenuOptionsType {
   children: MenuOptionsType[] | undefined;
 }
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_show_hide, sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_show_hide', 'sys_normal_disable'));
+const { sys_show_hide, sys_normal_disable } = toRefs<any>(useDict('sys_show_hide', 'sys_normal_disable'));
 
 const menuList = ref<MenuVO[]>([]);
 const menuChildrenListMap = ref({});
@@ -512,7 +514,7 @@ const getTreeselect = async () => {
   menuOptions.value = [];
   const response = await listMenu();
   const menu: MenuOptionsType = { menuId: 0, menuName: '主类目', children: [] };
-  menu.children = proxy?.handleTree<MenuOptionsType>(response.data, 'menuId');
+  menu.children = handleTree<MenuOptionsType>(response.data, 'menuId');
   menuOptions.value.push(menu);
 };
 /** 取消按钮 */
@@ -559,7 +561,7 @@ const submitForm = () => {
   menuFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.menuId ? await updateMenu(form.value) : await addMenu(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -567,10 +569,10 @@ const submitForm = () => {
 };
 /** 删除按钮操作 */
 const handleDelete = async (row: MenuVO) => {
-  await proxy?.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?');
+  await modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?');
   await delMenu(row.menuId);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 const deleteLoading = ref<boolean>(false);
@@ -598,14 +600,14 @@ const cancelCascade = () => {
 const submitDeleteForm = async () => {
   const menuIds = menuTreeRef.value?.getCheckedKeys();
   if (menuIds.length < 0) {
-    proxy?.$modal.msgWarning('请选择要删除的菜单');
+    modal.msgWarning('请选择要删除的菜单');
     return;
   }
 
   deleteLoading.value = true;
   await cascadeDelMenu(menuIds).finally(() => (deleteLoading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   deleteDialog.visible = false;
 };
 
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 76457e5f..3ffaa5e7 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -100,7 +100,7 @@
         <el-table-column label="创建者" align="center" prop="createByName" width="100" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="100">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -215,7 +215,7 @@
             </div>
             <div class="notice-detail__meta-item">
               <span class="notice-detail__meta-label">创建时间：</span>
-              <span>{{ proxy.parseTime(detailForm.createTime, '{y}-{m}-{d} {h}:{i}:{s}') || '-' }}</span>
+              <span>{{ parseTime(detailForm.createTime, '{y}-{m}-{d} {h}:{i}:{s}') || '-' }}</span>
             </div>
           </div>
         </div>
@@ -227,13 +227,16 @@
 </template>
 
 <script setup name="Notice" lang="ts">
+import { useRoute, useRouter } from 'vue-router';
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/notice';
 import { NoticeForm, NoticeQuery, NoticeVO } from '@/api/system/notice/types';
-import { sanitizeHtml } from '@/utils/sanitize';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
 import { resolveOssContent } from '@/utils/ossContent';
+import { parseTime } from '@/utils/ruoyi';
+import { sanitizeHtml } from '@/utils/sanitize';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_status', 'sys_notice_type'));
+const { sys_notice_status, sys_notice_type } = toRefs<any>(useDict('sys_notice_status', 'sys_notice_type'));
 const route = useRoute();
 const router = useRouter();
 
@@ -370,7 +373,7 @@ const submitForm = () => {
   noticeFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.noticeId ? await updateNotice(form.value) : await addNotice(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -379,10 +382,10 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: NoticeVO) => {
   const noticeIds = row?.noticeId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？');
+  await modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？');
   await delNotice(noticeIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index c8966363..b90d9c81 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -208,10 +208,10 @@ import {
   changeOssConfigStatus
 } from '@/api/system/ossConfig';
 import { OssConfigForm, OssConfigQuery, OssConfigVO } from '@/api/system/ossConfig/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
-
+const { sys_yes_no } = toRefs<any>(useDict('sys_yes_no'));
 const ossConfigList = ref<OssConfigVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -372,7 +372,7 @@ const submitForm = () => {
       } else {
         await addOssConfig(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('新增成功');
+      modal.msgSuccess('新增成功');
       dialog.visible = false;
       await getList();
     }
@@ -382,10 +382,10 @@ const submitForm = () => {
 const handleStatusChange = async (row: OssConfigVO) => {
   const text = row.status === 'Y' ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm('确认要"' + text + '""' + row.configKey + '"配置吗?');
+    await modal.confirm('确认要"' + text + '""' + row.configKey + '"配置吗?');
     await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
     await getList();
-    proxy?.$modal.msgSuccess(text + '成功');
+    modal.msgSuccess(text + '成功');
   } catch {
     row.status = row.status === 'Y' ? 'N' : 'Y';
   }
@@ -393,11 +393,11 @@ const handleStatusChange = async (row: OssConfigVO) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: OssConfigVO) => {
   const ossConfigIds = row?.ossConfigId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除OSS配置编号为"' + ossConfigIds + '"的数据项?');
+  await modal.confirm('是否确认删除OSS配置编号为"' + ossConfigIds + '"的数据项?');
   loading.value = true;
   await delOssConfig(ossConfigIds).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index b93c58f1..4af39f1f 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -128,7 +128,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" sortable="custom">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="上传人" align="center" prop="createByName" />
@@ -184,12 +184,16 @@
 </template>
 
 <script setup name="Oss" lang="ts">
+import { useRouter } from 'vue-router';
+import { getConfigKey, updateConfigByKey } from '@/api/system/config';
 import { listOss, delOss } from '@/api/system/oss';
-import ImagePreview from '@/components/ImagePreview/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
+import ImagePreview from '@/components/ImagePreview/index.vue';
+import download from '@/plugins/download';
+import modal from '@/plugins/modal';
+import { parseTime, addDateRange } from '@/utils/ruoyi';
 
 const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const ossList = ref<OssVO[]>([]);
 const showTable = ref(true);
@@ -202,7 +206,7 @@ const multiple = ref(true);
 const total = ref(0);
 const type = ref(0);
 const previewListResource = ref(true);
-const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRangeCreateTime = ref<any>(['', '']);
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -242,9 +246,9 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询OSS对象存储列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await proxy?.getConfigKey('sys.oss.previewListResource');
+  const res = await getConfigKey('sys.oss.previewListResource');
   previewListResource.value = res?.data === undefined ? true : res.data === 'true';
-  const response = await listOss(proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime'));
+  const response = await listOss(addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime'));
   ossList.value = response.data?.rows;
   total.value = response.data?.total;
   loading.value = false;
@@ -355,14 +359,14 @@ const submitForm = () => {
 };
 /** 下载按钮操作 */
 const handleDownload = (row: OssVO) => {
-  proxy?.$download.oss(row.ossId);
+  download.oss(row.ossId);
 };
 /** 预览开关按钮  */
 const handlePreviewListResource = async (preview: boolean) => {
   try {
-    await proxy?.updateConfigByKey('sys.oss.previewListResource', preview);
+    await updateConfigByKey('sys.oss.previewListResource', preview);
     await getList();
-    proxy?.$modal.msgSuccess((preview ? '启用' : '停用') + '成功');
+    modal.msgSuccess((preview ? '启用' : '停用') + '成功');
   } catch {
     return;
   }
@@ -370,11 +374,11 @@ const handlePreviewListResource = async (preview: boolean) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: OssVO) => {
   const ossIds = row?.ossId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除OSS对象存储编号为"' + ossIds + '"的数据项?');
+  await modal.confirm('是否确认删除OSS对象存储编号为"' + ossIds + '"的数据项?');
   loading.value = true;
   await delOss(ossIds).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 98222379..fc97b416 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -146,7 +146,7 @@
             </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template #default="scope">
-                <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
@@ -231,13 +231,16 @@
 </template>
 
 <script setup name="Post" lang="ts">
-import TreePanel from '@/components/TreePanel/index.vue';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
 import { listPost, addPost, delPost, getPost, updatePost, deptTreeSelect } from '@/api/system/post';
 import { PostForm, PostQuery, PostVO } from '@/api/system/post/types';
-import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
+import TreePanel from '@/components/TreePanel/index.vue';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const postList = ref<PostVO[]>([]);
 const loading = ref(true);
@@ -373,7 +376,7 @@ const submitForm = () => {
   postFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.postId ? await updatePost(form.value) : await addPost(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -383,15 +386,15 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: PostVO) => {
   const postIds = row?.postId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？');
+  await modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？');
   await delPost(postIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/post/export',
     {
       ...queryParams.value
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index b5975b46..144c6e4b 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -106,15 +106,17 @@
 </template>
 
 <script setup name="AuthUser" lang="ts">
+import { RouteLocationNormalized } from 'vue-router';
 import { allocatedUserList, authUserCancel, authUserCancelAll } from '@/api/system/role';
 import { UserQuery } from '@/api/system/user/types';
 import { UserVO } from '@/api/system/user/types';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
+import { useDict } from '@/utils/dict';
 import SelectUser from './selectUser.vue';
-import { RouteLocationNormalized } from 'vue-router';
 
 const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const userList = ref<UserVO[]>([]);
 const loading = ref(true);
@@ -155,7 +157,7 @@ const handleClose = () => {
     query: undefined,
     redirectedFrom: undefined
   };
-  proxy?.$tab.closeOpenPage(obj);
+  tab.closeOpenPage(obj as any);
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -178,19 +180,19 @@ const openSelectUser = () => {
 };
 /** 取消授权按钮操作 */
 const cancelAuthUser = async (row: UserVO) => {
-  await proxy?.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？');
+  await modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？');
   await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
   await getList();
-  proxy?.$modal.msgSuccess('取消授权成功');
+  modal.msgSuccess('取消授权成功');
 };
 /** 批量取消授权按钮操作 */
 const cancelAuthUserAll = async () => {
   const roleId = queryParams.roleId;
   const uIds = userIds.value.join(',');
-  await proxy?.$modal.confirm('是否取消选中用户授权数据项?');
+  await modal.confirm('是否取消选中用户授权数据项?');
   await authUserCancelAll({ roleId: roleId, userIds: uIds });
   await getList();
-  proxy?.$modal.msgSuccess('取消授权成功');
+  modal.msgSuccess('取消授权成功');
 };
 
 onMounted(() => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3b2795d2..c9e7d042 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -112,7 +112,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
 
@@ -275,6 +275,9 @@
 </template>
 
 <script setup name="Role" lang="ts">
+import { useRouter } from 'vue-router';
+import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
+import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
 import {
   addRole,
   changeRoleStatus,
@@ -285,13 +288,14 @@ import {
   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';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime, addDateRange } from '@/utils/ruoyi';
 
 const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const roleList = ref<RoleVO[]>();
 const loading = ref(true);
@@ -300,7 +304,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const menuOptions = ref<MenuTreeOption[]>([]);
 const menuExpand = ref(false);
 const menuNodeAll = ref(false);
@@ -366,7 +370,7 @@ const dialog = reactive<DialogOption>({
  */
 const getList = () => {
   loading.value = true;
-  listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
+  listRole(addDateRange(queryParams.value, dateRange.value)).then(res => {
     roleList.value = res.data?.rows;
     total.value = res.data?.total;
     loading.value = false;
@@ -390,15 +394,15 @@ const resetQuery = () => {
 /**删除按钮操作 */
 const handleDelete = async (row?: RoleVO) => {
   const roleids = row?.roleId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除角色编号为' + roleids + '数据项目');
+  await modal.confirm('是否确认删除角色编号为' + roleids + '数据项目');
   await delRole(roleids);
   getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/role/export',
     {
       ...queryParams.value
@@ -417,9 +421,9 @@ const handleSelectionChange = (selection: RoleVO[]) => {
 const handleStatusChange = async (row: RoleVO) => {
   const text = row.status === '0' ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?');
+    await modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?');
     await changeRoleStatus(row.roleId, row.status);
-    proxy?.$modal.msgSuccess(text + '成功');
+    modal.msgSuccess(text + '成功');
   } catch {
     row.status = row.status === '0' ? '1' : '0';
   }
@@ -494,19 +498,20 @@ const getRoleDeptTreeSelect = async (roleId: string | number) => {
   return res.data;
 };
 /** 树权限（展开/折叠）*/
-const handleCheckedTreeExpand = (value: boolean, type: string) => {
+const handleCheckedTreeExpand = (value: unknown, type: string) => {
+  const expanded = Boolean(value);
   if (type == 'menu') {
     const treeList = menuOptions.value;
     for (let i = 0; i < treeList.length; i++) {
       if (menuRef.value) {
-        menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
+        menuRef.value.store.nodesMap[treeList[i].id].expanded = expanded;
       }
     }
   } else if (type == 'dept') {
     const treeList = deptOptions.value;
     for (let i = 0; i < treeList.length; i++) {
       if (deptRef.value) {
-        deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
+        deptRef.value.store.nodesMap[treeList[i].id].expanded = expanded;
       }
     }
   }
@@ -544,7 +549,7 @@ const submitForm = () => {
     if (valid) {
       form.value.menuIds = getMenuAllCheckedKeys();
       form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       getList();
     }
@@ -577,7 +582,7 @@ const submitDataScope = async () => {
   if (form.value.roleId) {
     form.value.deptIds = getDeptAllCheckedKeys();
     await dataScope(form.value);
-    proxy?.$modal.msgSuccess('修改成功');
+    modal.msgSuccess('修改成功');
     openDataScope.value = false;
     getList();
   }
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 8de4d717..47d3e3eb 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -49,7 +49,7 @@
             </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template #default="scope">
-                <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -76,6 +76,9 @@
 import { authUserSelectAll, unallocatedUserList } from '@/api/system/role';
 import { UserVO } from '@/api/system/user/types';
 import { UserQuery } from '@/api/system/user/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi';
 
 const props = defineProps({
   roleId: {
@@ -84,8 +87,7 @@ const props = defineProps({
   }
 });
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
 
 const userList = ref<UserVO[]>([]);
 const visible = ref(false);
@@ -144,11 +146,11 @@ const handleSelectUser = async () => {
   const roleId = queryParams.roleId;
   const ids = userIds.value.join(',');
   if (ids == '') {
-    proxy?.$modal.msgError('请选择要分配的用户');
+    modal.msgError('请选择要分配的用户');
     return;
   }
   await authUserSelectAll({ roleId, userIds: ids });
-  proxy?.$modal.msgSuccess('分配成功');
+  modal.msgSuccess('分配成功');
   emit('ok');
   visible.value = false;
 };
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 4fdd2cb9..1469c750 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -54,7 +54,7 @@
         <el-table-column label="权限字符" align="center" prop="roleKey" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -64,14 +64,15 @@
 </template>
 
 <script setup name="AuthRole" lang="ts">
+import { RouteLocationNormalized } from 'vue-router';
 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 modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 import { parseTime } from '@/utils/ruoyi';
 
 const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const loading = ref(true);
 const total = ref(0);
@@ -119,14 +120,14 @@ const close = () => {
     redirectedFrom: undefined,
     path: '/system/user'
   };
-  proxy?.$tab.closeOpenPage(obj);
+  tab.closeOpenPage(obj as any);
 };
 /** 提交按钮 */
 const submitForm = async () => {
   const userId = form.value.userId;
   const rIds = roleIds.value.join(',');
   await updateAuthRole({ userId: userId as string, roleIds: rIds });
-  proxy?.$modal.msgSuccess('授权成功');
+  modal.msgSuccess('授权成功');
   close();
 };
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d07ec9ec..f0790d46 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -451,22 +451,27 @@
 </template>
 
 <script setup name="User" lang="ts">
-import TreePanel from '@/components/TreePanel/index.vue';
+import { to } from 'await-to-js';
+import { useRouter } from 'vue-router';
+import { getConfigKey } from '@/api/system/config';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
+import { optionselect } from '@/api/system/post';
+import { PostVO } from '@/api/system/post/types';
+import { RoleVO } from '@/api/system/role/types';
 import api from '@/api/system/user';
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
-import { RoleVO } from '@/api/system/role/types';
-import { PostVO } from '@/api/system/post/types';
-import { globalHeaders } from '@/utils/request';
-import { to } from 'await-to-js';
-import { optionselect } from '@/api/system/post';
-import { checkPermi } from '@/utils/permission';
+import TreePanel from '@/components/TreePanel/index.vue';
+import modal from '@/plugins/modal';
 import { useUserStore } from '@/store/modules/user';
+import { useDict } from '@/utils/dict';
+import { checkPermi } from '@/utils/permission';
+import { globalHeaders } from '@/utils/request';
+import { download as requestDownload } from '@/utils/request';
+import { addDateRange } from '@/utils/ruoyi';
 import UserViewDrawer from './view.vue';
 
 const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable, sys_user_gender } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_gender'));
+const { sys_normal_disable, sys_user_gender } = toRefs<any>(useDict('sys_normal_disable', 'sys_user_gender'));
 const userList = ref<UserVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
@@ -474,7 +479,7 @@ const ids = ref<Array<number | string>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const treeCollapsed = ref(false);
 const deptOptions = ref<DeptTreeVO[]>([]);
 const enabledDeptOptions = ref<DeptTreeVO[]>([]);
@@ -564,7 +569,11 @@ const initData: PageData<UserForm, UserQuery> = {
         message: '用户密码长度必须介于 5 和 20 之间',
         trigger: 'blur'
       },
-      { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
+      {
+        pattern: /^[^<>"'|\\]+$/,
+        message: '不能包含非法字符：< > " \' \\ |',
+        trigger: 'blur'
+      }
     ],
     email: [
       {
@@ -590,7 +599,7 @@ const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
 /** 查询用户列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await api.listUser(addDateRange(queryParams.value, dateRange.value));
   loading.value = false;
   userList.value = res.data?.rows;
   total.value = res.data?.total;
@@ -640,21 +649,21 @@ const resetQuery = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: UserVO) => {
   const userIds = row?.userId || ids.value;
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？') as any);
+  const [err] = await to(modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？') as any);
   if (!err) {
     await api.delUser(userIds);
     await getList();
-    proxy?.$modal.msgSuccess('删除成功');
+    modal.msgSuccess('删除成功');
   }
 };
 
 /** 解锁按钮操作 */
 const handleUnlock = async () => {
   const userId = ids.value[0];
-  const [err] = await to(proxy?.$modal.confirm('是否确认解锁用户编号为"' + userId + '"的数据项?') as any);
+  const [err] = await to(modal.confirm('是否确认解锁用户编号为"' + userId + '"的数据项?') as any);
   if (!err) {
     await api.unlockUser(userId);
-    proxy?.$modal.msgSuccess('用户编号"' + userId + '"解锁成功');
+    modal.msgSuccess('用户编号"' + userId + '"解锁成功');
   }
 };
 
@@ -662,9 +671,9 @@ const handleUnlock = async () => {
 const handleStatusChange = async (row: UserVO) => {
   const text = row.status === '0' ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
+    await modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
     await api.changeUserStatus(row.userId, row.status);
-    proxy?.$modal.msgSuccess(text + '成功');
+    modal.msgSuccess(text + '成功');
   } catch (err) {
     row.status = row.status === '0' ? '1' : '0';
   }
@@ -693,7 +702,7 @@ const handleResetPwd = async (row: UserVO) => {
   );
   if (!err && res) {
     await api.resetUserPwd(row.userId, res.value);
-    proxy?.$modal.msgSuccess('修改成功，新密码是：' + res.value);
+    modal.msgSuccess('修改成功，新密码是：' + res.value);
   }
 };
 
@@ -716,7 +725,7 @@ const handleImport = () => {
 };
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'system/user/export',
     {
       ...queryParams.value
@@ -726,7 +735,7 @@ const handleExport = () => {
 };
 /** 下载模板操作 */
 const importTemplate = () => {
-  proxy?.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+  requestDownload('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
 };
 
 /**文件上传中处理 */
@@ -811,7 +820,7 @@ const submitForm = () => {
       } else {
         await api.addUser(form.value);
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -839,7 +848,7 @@ const resetForm = () => {
 onMounted(() => {
   getDeptTree(); // 初始化部门数据
   getList(); // 初始化列表数据
-  proxy?.getConfigKey('sys.user.initPassword').then(response => {
+  getConfigKey('sys.user.initPassword').then(response => {
     initPassword.value = response.data;
   });
 });
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 729001b7..1759771b 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -93,15 +93,15 @@
 </template>
 
 <script setup name="Profile" lang="ts">
-import UserAvatar from './userAvatar.vue';
-import UserInfo from './userInfo.vue';
-import ResetPwd from './resetPwd.vue';
-import ThirdParty from './thirdParty.vue';
-import OnlineDevice from './onlineDevice.vue';
+import { getOnline } from '@/api/monitor/online';
 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';
+import OnlineDevice from './onlineDevice.vue';
+import ResetPwd from './resetPwd.vue';
+import ThirdParty from './thirdParty.vue';
+import UserAvatar from './userAvatar.vue';
+import UserInfo from './userInfo.vue';
 
 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 653ddba4..90a8b987 100644
--- a/src/views/system/user/profile/onlineDevice.vue
+++ b/src/views/system/user/profile/onlineDevice.vue
@@ -12,7 +12,7 @@
       <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
       <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
         <template #default="scope">
-          <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -28,10 +28,13 @@
 
 <script setup name="Online" lang="ts">
 import { delOnline } from '@/api/monitor/online';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
+import { useDict } from '@/utils/dict';
 import { propTypes } from '@/utils/propTypes';
+import { parseTime } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
+const { sys_device_type } = toRefs<any>(useDict('sys_device_type'));
 
 const props = defineProps({
   devices: propTypes.any.isRequired
@@ -46,10 +49,10 @@ const handldDelOnline = (row: any) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        proxy?.$modal.msgSuccess('删除成功');
-        proxy?.$tab.refreshPage();
+        modal.msgSuccess('删除成功');
+        tab.refreshPage();
       } else {
-        proxy?.$modal.msgError(res.msg);
+        modal.msgError(res.msg);
       }
     })
     .catch(() => {});
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 11046b15..c2e14930 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -17,10 +17,11 @@
 </template>
 
 <script setup lang="ts">
-import { updateUserPwd } from '@/api/system/user';
 import type { ResetPwdForm } from '@/api/system/user/types';
+import { updateUserPwd } from '@/api/system/user';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const pwdRef = ref<ElFormInstance>();
 const user = ref<ResetPwdForm>({
   oldPassword: '',
@@ -45,7 +46,11 @@ const rules = ref({
       message: '长度在 6 到 20 个字符',
       trigger: 'blur'
     },
-    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
+    {
+      pattern: /^[^<>"'|\\]+$/,
+      message: '不能包含非法字符：< > " \' \\ |',
+      trigger: 'blur'
+    }
   ],
   confirmPassword: [
     { required: true, message: '确认密码不能为空', trigger: 'blur' },
@@ -62,13 +67,13 @@ const submit = () => {
   pwdRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       await updateUserPwd(user.value.oldPassword, user.value.newPassword);
-      proxy?.$modal.msgSuccess('修改成功');
+      modal.msgSuccess('修改成功');
     }
   });
 };
 /** 关闭按钮 */
 const close = () => {
-  proxy?.$tab.closePage();
+  tab.closePage();
 };
 </script>
 
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index 0b396d00..cade9ac3 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -62,10 +62,10 @@
 
 <script setup lang="ts">
 import { authUnlock, authRouterUrl } from '@/api/system/social/auth';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 import { propTypes } from '@/utils/propTypes';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
 const props = defineProps({
   auths: propTypes.any.isRequired
 });
@@ -78,10 +78,10 @@ const unlockAuth = (row: any) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        proxy?.$modal.msgSuccess('解绑成功');
-        proxy?.$tab.refreshPage();
+        modal.msgSuccess('解绑成功');
+        tab.refreshPage();
       } else {
-        proxy?.$modal.msgError(res.msg);
+        modal.msgError(res.msg);
       }
     })
     .catch(() => {});
@@ -92,7 +92,7 @@ const authUrl = (source: string) => {
     if (res.code === 200) {
       window.location.href = res.data;
     } else {
-      proxy?.$modal.msgError(res.msg);
+      modal.msgError(res.msg);
     }
   });
 };
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index ac24cd3e..61dec3e3 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -57,10 +57,11 @@
 
 <script setup lang="ts">
 import 'vue-cropper/dist/index.css';
+import { UploadRawFile } from 'element-plus';
 import { VueCropper } from 'vue-cropper';
 import { uploadAvatar } from '@/api/system/user';
+import modal from '@/plugins/modal';
 import { useUserStore } from '@/store/modules/user';
-import { UploadRawFile } from 'element-plus';
 
 interface Options {
   img: string | any; // 裁剪图片的地址
@@ -75,7 +76,6 @@ interface Options {
 }
 
 const userStore = useUserStore();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const open = ref(false);
 const visible = ref(false);
@@ -121,7 +121,7 @@ const changeScale = (num: number) => {
 /** 上传预处理 */
 const beforeUpload = (file: UploadRawFile): any => {
   if (file.type.indexOf('image/') == -1) {
-    proxy?.$modal.msgError('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。');
+    modal.msgError('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。');
   } else {
     const reader = new FileReader();
     reader.readAsDataURL(file);
@@ -140,7 +140,7 @@ const uploadImg = async () => {
     open.value = false;
     options.img = res.data.imgUrl;
     userStore.setAvatar(options.img);
-    proxy?.$modal.msgSuccess('修改成功');
+    modal.msgSuccess('修改成功');
     visible.value = false;
   });
 };
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index a3be4c31..31f128ec 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -24,13 +24,14 @@
 
 <script setup lang="ts">
 import { updateUserProfile } from '@/api/system/user';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 import { propTypes } from '@/utils/propTypes';
 
 const props = defineProps({
   user: propTypes.any.isRequired
 });
 const userForm = computed(() => props.user);
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userRef = ref<ElFormInstance>();
 const rule: ElFormRules = {
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -48,7 +49,11 @@ const rule: ElFormRules = {
       message: '手机号码不能为空',
       trigger: 'blur'
     },
-    { pattern: /^1[3456789][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+    {
+      pattern: /^1[3456789][0-9]\d{8}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
   ]
 };
 const rules = ref<ElFormRules>(rule);
@@ -58,13 +63,13 @@ const submit = () => {
   userRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       await updateUserProfile(props.user);
-      proxy?.$modal.msgSuccess('修改成功');
+      modal.msgSuccess('修改成功');
     }
   });
 };
 /** 关闭按钮 */
 const close = () => {
-  proxy?.$tab.closePage();
+  tab.closePage();
 };
 </script>
 
diff --git a/src/views/system/user/view.vue b/src/views/system/user/view.vue
index 39bd3147..2de9ed39 100644
--- a/src/views/system/user/view.vue
+++ b/src/views/system/user/view.vue
@@ -1,18 +1,29 @@
 <template>
-  <el-drawer v-model="visible" title="用户信息详情" :size="680" append-to-body :close-on-click-modal="true" @closed="info = null">
+  <el-drawer
+    v-model="visible"
+    title="用户信息详情"
+    :size="680"
+    append-to-body
+    :close-on-click-modal="true"
+    @closed="info = null"
+  >
     <el-descriptions v-if="info" v-loading="loading" :column="2" border>
       <el-descriptions-item label="用户名称">{{ info.nickName }}</el-descriptions-item>
-      <el-descriptions-item label="归属部门">{{ info.deptName || (info.dept && info.dept.deptName) || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="归属部门">
+        {{ info.deptName || (info.dept && info.dept.deptName) || '-' }}
+      </el-descriptions-item>
       <el-descriptions-item label="手机号码">{{ info.phoneNumber || '-' }}</el-descriptions-item>
       <el-descriptions-item label="邮箱">{{ info.email || '-' }}</el-descriptions-item>
       <el-descriptions-item label="登录账号">{{ info.userName }}</el-descriptions-item>
       <el-descriptions-item label="用户状态">
         <el-tag :type="info.status === '0' ? 'success' : 'danger'">
-          {{ proxy?.selectDictLabel(sys_normal_disable, info.status) }}
+          {{ selectDictLabel(sys_normal_disable, info.status) }}
         </el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="岗位">{{ postNames || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="用户性别">{{ proxy?.selectDictLabel(sys_user_gender, info.gender) || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="用户性别">
+        {{ selectDictLabel(sys_user_gender, info.gender) || '-' }}
+      </el-descriptions-item>
       <el-descriptions-item label="角色" :span="2">{{ roleNames || '-' }}</el-descriptions-item>
     </el-descriptions>
 
@@ -29,13 +40,14 @@
 </template>
 
 <script setup lang="ts">
-import api from '@/api/system/user';
-import type { UserVO } from '@/api/system/user/types';
 import type { PostVO } from '@/api/system/post/types';
 import type { RoleVO } from '@/api/system/role/types';
+import type { UserVO } from '@/api/system/user/types';
+import api from '@/api/system/user';
+import { useDict } from '@/utils/dict';
+import { selectDictLabel } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable, sys_user_gender } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_gender'));
+const { sys_normal_disable, sys_user_gender } = toRefs<any>(useDict('sys_normal_disable', 'sys_user_gender'));
 
 const visible = ref(false);
 const loading = ref(false);
@@ -48,16 +60,16 @@ const roleIds = ref<string[]>([]);
 const postNames = computed(() => {
   if (!postOptions.value.length || !postIds.value.length) return '';
   return postOptions.value
-    .filter((p) => postIds.value.includes(String(p.postId)))
-    .map((p) => p.postName)
+    .filter(p => postIds.value.includes(String(p.postId)))
+    .map(p => p.postName)
     .join('、');
 });
 
 const roleNames = computed(() => {
   if (!roleOptions.value.length || !roleIds.value.length) return '';
   return roleOptions.value
-    .filter((r) => roleIds.value.includes(String(r.roleId)))
-    .map((r) => r.roleName)
+    .filter(r => roleIds.value.includes(String(r.roleId)))
+    .map(r => r.roleName)
     .join('、');
 });
 
diff --git a/src/views/tool/gen/basicInfoForm.vue b/src/views/tool/gen/basicInfoForm.vue
index 54120887..aa6a9962 100644
--- a/src/views/tool/gen/basicInfoForm.vue
+++ b/src/views/tool/gen/basicInfoForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="basicInfoForm" :model="infoForm" :rules="rules" label-width="150px">
+  <el-form ref="formRef" :model="infoForm" :rules="rules" label-width="150px">
     <el-row>
       <el-col :span="12">
         <el-form-item label="表名称" prop="tableName">
@@ -31,6 +31,7 @@
 </template>
 
 <script setup lang="ts">
+import type { FormInstance } from 'element-plus';
 import { propTypes } from '@/utils/propTypes';
 
 const prop = defineProps({
@@ -38,6 +39,7 @@ const prop = defineProps({
 });
 
 const infoForm = computed(() => prop.info);
+const formRef = ref<FormInstance>();
 
 // 表单校验
 const rules = ref({
@@ -46,4 +48,17 @@ const rules = ref({
   className: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
   functionAuthor: [{ required: true, message: '请输入作者', trigger: 'blur' }]
 });
+
+/** Element Plus 推荐：通过 validate() 的 Promise 做校验 */
+async function validate(): Promise<boolean> {
+  if (!formRef.value) return false;
+  try {
+    await formRef.value.validate();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+defineExpose({ validate });
 </script>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 6838dfd3..3dfca9b7 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -118,17 +118,17 @@
 </template>
 
 <script setup name="GenEdit" lang="ts">
-import { getGenTable, updateGenTable } from '@/api/tool/gen';
-import { DbColumnVO, DbTableVO } from '@/api/tool/gen/types';
+import { useRoute } from 'vue-router';
 import { optionselect as getDictOptionselect } from '@/api/system/dict/type';
 import { DictTypeVO } from '@/api/system/dict/type/types';
+import { getGenTable, updateGenTable } from '@/api/tool/gen';
+import { DbColumnVO, DbTableVO } from '@/api/tool/gen/types';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
 import BasicInfoForm from './basicInfoForm.vue';
 import GenInfoForm from './genInfoForm.vue';
-import { RouteLocationNormalized } from 'vue-router';
 
 const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
 const activeName = ref('columnInfo');
 const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px');
 const tables = ref<DbTableVO[]>([]);
@@ -140,64 +140,45 @@ const basicInfo = ref<InstanceType<typeof BasicInfoForm>>();
 const genInfo = ref<InstanceType<typeof GenInfoForm>>();
 
 /** 提交按钮 */
-const submitForm = () => {
-  const basicForm = basicInfo.value?.$refs.basicInfoForm;
-  const genForm = genInfo.value?.$refs.genInfoForm;
-
-  Promise.all([basicForm, genForm].map(getFormPromise)).then(async res => {
-    const validateResult = res.every(item => !!item);
-    if (validateResult) {
-      const genTable: any = Object.assign({}, info.value);
-      genTable.columns = columns.value;
-      genTable.params = {
-        treeCode: info.value?.treeCode,
-        treeName: info.value.treeName,
-        treeParentCode: info.value.treeParentCode,
-        parentMenuId: info.value.parentMenuId
-      };
-      const response = await updateGenTable(genTable);
-      proxy?.$modal.msgSuccess(response.msg);
-      if (response.code === 200) {
-        close();
-      }
-    } else {
-      proxy?.$modal.msgError('表单校验未通过，请重新检查提交内容');
-    }
-  });
-};
-const getFormPromise = (form: any) => {
-  return new Promise(resolve => {
-    form.validate((res: any) => {
-      resolve(res);
-    });
-  });
-};
-const close = () => {
-  const obj: RouteLocationNormalized = {
-    path: '/tool/gen',
-    fullPath: '',
-    hash: '',
-    matched: [],
-    meta: undefined,
-    name: undefined,
-    params: undefined,
-    redirectedFrom: undefined,
-    query: { t: Date.now().toString(), pageNum: route.query.pageNum }
-  };
-  proxy?.$tab.closeOpenPage(obj);
-};
-
-(async () => {
-  const tableId = route.params && (route.params.tableId as string);
-  if (tableId) {
-    // 获取表详细信息
-    const res = await getGenTable(tableId);
-    columns.value = res.data.rows;
-    info.value = res.data.info;
-    tables.value = res.data.tables;
-    /** 查询字典下拉列表 */
-    const response = await getDictOptionselect();
-    dictOptions.value = response.data;
+const submitForm = async () => {
+  const basicOk = (await basicInfo.value?.validate()) ?? false;
+  const genOk = (await genInfo.value?.validate()) ?? false;
+  if (!basicOk || !genOk) {
+    modal.msgError('表单校验未通过，请重新检查提交内容');
+    return;
   }
-})();
+  const genTable: Record<string, unknown> = { ...info.value };
+  genTable.columns = columns.value;
+  genTable.params = {
+    treeCode: info.value?.treeCode,
+    treeName: info.value.treeName,
+    treeParentCode: info.value.treeParentCode,
+    parentMenuId: info.value.parentMenuId
+  };
+  const response = await updateGenTable(genTable as any);
+  modal.msgSuccess(response.msg ?? '');
+  if (response.code === 200) {
+    close();
+  }
+};
+
+const close = () => {
+  tab.closeOpenPage({
+    path: '/tool/gen',
+    query: { t: Date.now().toString(), pageNum: route.query.pageNum }
+  });
+};
+
+onMounted(async () => {
+  const tableId = route.params?.tableId as string | undefined;
+  if (!tableId) return;
+  const res = await getGenTable(tableId);
+  const detail = res.data;
+  if (!detail) return;
+  columns.value = detail.rows;
+  info.value = detail.info;
+  tables.value = detail.tables;
+  const response = await getDictOptionselect();
+  dictOptions.value = response.data;
+});
 </script>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index bc171016..7fd92935 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="genInfoForm" :model="infoForm" :rules="rules" label-width="150px">
+  <el-form ref="formRef" :model="infoForm" :rules="rules" label-width="150px">
     <el-row>
       <el-col :span="12">
         <el-form-item prop="tplCategory">
@@ -227,18 +227,20 @@
 </template>
 
 <script setup lang="ts">
+import type { FormInstance } from 'element-plus';
 import { listMenu } from '@/api/system/menu';
 import { propTypes } from '@/utils/propTypes';
+import { handleTree } from '@/utils/ruoyi';
 
 interface MenuOptionsType {
   menuId: number | string;
   menuName: string;
   children?: MenuOptionsType[];
 }
-const { proxy } = getCurrentInstance();
 
 const subColumns = ref<any>([]);
 const menuOptions = ref<Array<MenuOptionsType>>([]);
+const formRef = ref<FormInstance>();
 
 const props = defineProps({
   info: propTypes.any.isRequired,
@@ -279,7 +281,7 @@ const setSubTableColumns = (value: string) => {
 /** 查询菜单下拉树结构 */
 const getMenuTreeselect = async () => {
   const res = await listMenu();
-  const data = proxy?.handleTree<MenuOptionsType>(res.data, 'menuId');
+  const data = handleTree<MenuOptionsType>(res.data, 'menuId');
 
   if (data) {
     menuOptions.value = data;
@@ -293,6 +295,18 @@ watch(
   }
 );
 
+async function validate(): Promise<boolean> {
+  if (!formRef.value) return false;
+  try {
+    await formRef.value.validate();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+defineExpose({ validate });
+
 onMounted(() => {
   getMenuTreeselect();
 });
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 7d6ae2bd..30bade3d 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -53,12 +53,12 @@
 <script setup lang="ts">
 import { listDbTable, importTable, getDataNames } from '@/api/tool/gen';
 import { DbTableQuery, DbTableVO } from '@/api/tool/gen/types';
+import modal from '@/plugins/modal';
 
 const total = ref(0);
 const visible = ref(false);
 const tables = ref<Array<string>>([]);
 const dbTableList = ref<Array<DbTableVO>>([]);
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const tableRef = ref<ElTableInstance>();
 const queryFormRef = ref<ElFormInstance>();
@@ -118,11 +118,14 @@ const resetQuery = () => {
 const handleImportTable = async () => {
   const tableNames = tables.value.join(',');
   if (tableNames == '') {
-    proxy?.$modal.msgError('请选择要导入的表');
+    modal.msgError('请选择要导入的表');
     return;
   }
-  const res = await importTable({ tables: tableNames, dataName: queryParams.dataName });
-  proxy?.$modal.msgSuccess(res.msg);
+  const res = await importTable({
+    tables: tableNames,
+    dataName: queryParams.dataName
+  });
+  modal.msgSuccess(res.msg ?? '');
   if (res.code === 200) {
     visible.value = false;
     emit('ok');
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 92a62912..cf0158d3 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -191,13 +191,16 @@
 </template>
 
 <script setup name="Gen" lang="ts">
+import { useRoute } from 'vue-router';
 import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
 import { TableQuery, TableVO } from '@/api/tool/gen/types';
+import download from '@/plugins/download';
+import modal from '@/plugins/modal';
 import router from '@/router';
+import { addDateRange } from '@/utils/ruoyi';
 import ImportTable from './importTable.vue';
 
 const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const tableList = ref<TableVO[]>([]);
 const loading = ref(true);
@@ -206,7 +209,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRange = ref<any>(['', '']);
 const uniqueId = ref('');
 const dataNameList = ref<Array<string>>([]);
 
@@ -242,7 +245,7 @@ const getDataNameList = async () => {
 /** 查询表集合 */
 const getList = async () => {
   loading.value = true;
-  const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const res = await listTable(addDateRange(queryParams.value, dateRange.value));
   tableList.value = res.data?.rows;
   total.value = res.data?.total;
   loading.value = false;
@@ -256,22 +259,22 @@ const handleQuery = () => {
 const handleGenTable = async (row?: TableVO) => {
   const tbIds = row?.tableId || ids.value;
   if (tbIds == '') {
-    proxy?.$modal.msgError('请选择要生成的数据');
+    modal.msgError('请选择要生成的数据');
     return;
   }
   if (row?.genType === '1') {
     await genCode(row.tableId);
-    proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
+    modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
   } else {
-    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
+    download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
   }
 };
 /** 同步数据库操作 */
 const handleSynchDb = async (row: TableVO) => {
   const tableId = row.tableId;
-  await proxy?.$modal.confirm('确认要强制同步"' + row.tableName + '"表结构吗？');
+  await modal.confirm('确认要强制同步"' + row.tableName + '"表结构吗？');
   await synchDb(tableId);
-  proxy?.$modal.msgSuccess('同步成功');
+  modal.msgSuccess('同步成功');
 };
 /** 打开导入表弹窗 */
 const openImportTable = () => {
@@ -292,7 +295,7 @@ const handlePreview = async (row: TableVO) => {
 };
 /** 复制代码成功 */
 const copyTextSuccess = () => {
-  proxy?.$modal.msgSuccess('复制成功');
+  modal.msgSuccess('复制成功');
 };
 // 多选框选中数据
 const handleSelectionChange = (selection: TableVO[]) => {
@@ -311,10 +314,10 @@ const handleEditTable = (row?: TableVO) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: TableVO) => {
   const tableIds = row?.tableId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？');
+  await modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？');
   await delTable(tableIds);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index 35734e17..9797d4ab 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -123,6 +123,8 @@
 <script setup name="Category" lang="ts">
 import { listCategory, getCategory, delCategory, addCategory, updateCategory } from '@/api/workflow/category';
 import { CategoryVO, CategoryQuery, CategoryForm } from '@/api/workflow/category/types';
+import modal from '@/plugins/modal';
+import { handleTree } from '@/utils/ruoyi';
 
 type CategoryOption = {
   categoryId: number;
@@ -130,8 +132,6 @@ type CategoryOption = {
   children?: CategoryOption[];
 };
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
 const categoryList = ref<CategoryVO[]>([]);
 const categoryOptions = ref<CategoryOption[]>([]);
 const buttonLoading = ref(false);
@@ -173,7 +173,7 @@ 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 = handleTree<CategoryVO>(res.data, 'categoryId', 'parentId');
   if (data) {
     categoryList.value = data;
     loading.value = false;
@@ -185,7 +185,7 @@ const getTreeselect = async () => {
   const res = await listCategory();
   categoryOptions.value = [];
   // 处理树形数据
-  const data = proxy?.handleTree<CategoryOption>(res.data, 'categoryId', 'parentId');
+  const data = handleTree<CategoryOption>(res.data, 'categoryId', 'parentId');
   if (data) {
     categoryOptions.value = data; // 将处理后的树形数据赋值
   }
@@ -264,7 +264,7 @@ const submitForm = () => {
       } else {
         await addCategory(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       getList();
     }
@@ -273,11 +273,11 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row: CategoryVO) => {
-  await proxy?.$modal.confirm('是否确认删除"' + row.categoryName + '"的分类？');
+  await modal.confirm('是否确认删除"' + row.categoryName + '"的分类？');
   loading.value = true;
   await delCategory(row.categoryId).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 onMounted(() => {
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 0698f8c9..305b00bd 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -73,12 +73,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center" prop="startDate">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center" prop="endDate">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="请假天数" align="center" prop="leaveDays" />
@@ -151,12 +151,19 @@
 </template>
 
 <script setup name="Leave" lang="ts">
-import { delLeave, listLeave } from '@/api/workflow/leave';
+import { useRoute } from 'vue-router';
 import { cancelProcessApply } from '@/api/workflow/instance';
+import { delLeave, listLeave } from '@/api/workflow/leave';
 import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
+import router from '@/router';
+import { useDict } from '@/utils/dict';
+import { download as requestDownload } from '@/utils/request';
+import { parseTime } from '@/utils/ruoyi';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const route = useRoute();
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
 const leaveList = ref<LeaveVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -228,8 +235,8 @@ const handleSelectionChange = (selection: LeaveVO[]) => {
 
 /** 新增按钮操作 */
 const handleAdd = () => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+  tab.closePage(route);
+  router.push({
     path: `/workflow/leaveEdit/index`,
     query: {
       type: 'add'
@@ -239,8 +246,8 @@ const handleAdd = () => {
 
 /** 修改按钮操作 */
 const handleUpdate = (row?: LeaveVO) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+  tab.closePage(route);
+  router.push({
     path: `/workflow/leaveEdit/index`,
     query: {
       id: row.id,
@@ -251,8 +258,8 @@ const handleUpdate = (row?: LeaveVO) => {
 
 /** 查看按钮操作 */
 const handleView = (row?: LeaveVO) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+  tab.closePage(route);
+  router.push({
     path: `/workflow/leaveEdit/index`,
     query: {
       id: row.id,
@@ -264,15 +271,15 @@ const handleView = (row?: LeaveVO) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: LeaveVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除请假编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await modal.confirm('是否确认删除请假编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delLeave(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   await getList();
 };
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  requestDownload(
     'workflow/leave/export',
     {
       ...queryParams.value
@@ -283,7 +290,7 @@ const handleExport = () => {
 
 /** 撤销按钮操作 */
 const handleCancelProcessApply = async (id: string) => {
-  await proxy?.$modal.confirm('是否确认撤销当前单据？');
+  await modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   const data = {
     businessId: id,
@@ -291,7 +298,7 @@ const handleCancelProcessApply = async (id: string) => {
   };
   await cancelProcessApply(data).finally(() => (loading.value = false));
   await getList();
-  proxy?.$modal.msgSuccess('撤销成功');
+  modal.msgSuccess('撤销成功');
 };
 onMounted(() => {
   getList();
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index fb8e00dd..489925c9 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -61,15 +61,19 @@
 </template>
 
 <script setup name="Leave" lang="ts">
+import { useRoute } from 'vue-router';
 import { addLeave, getLeave, submitAndFlowStart, updateLeave } from '@/api/workflow/leave';
 import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
 import { startWorkFlow } from '@/api/workflow/task';
-import SubmitVerify from '@/components/Process/submitVerify.vue';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import ApprovalButton from '@/components/Process/approvalButton.vue';
-import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
+import router from '@/router';
+
+const route = useRoute();
 
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -197,7 +201,7 @@ const getInfo = () => {
 /** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
   if (leaveTime.value.length === 0) {
-    proxy?.$modal.msgError('请假时间不能为空');
+    modal.msgError('请假时间不能为空');
     return;
   }
   try {
@@ -211,9 +215,9 @@ const submitForm = (status: string, mode: boolean) => {
           const res = await submitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
           form.value = res.data;
           buttonLoading.value = false;
-          proxy?.$modal.msgSuccess('操作成功');
-          proxy.$tab.closePage(proxy.$route);
-          proxy.$router.go(-1);
+          modal.msgSuccess('操作成功');
+          tab.closePage(route);
+          router.go(-1);
         } else {
           let res;
           if (form.value.id) {
@@ -224,9 +228,9 @@ const submitForm = (status: string, mode: boolean) => {
           form.value = res.data;
           if (status === 'draft') {
             buttonLoading.value = false;
-            proxy?.$modal.msgSuccess('暂存成功');
-            proxy.$tab.closePage(proxy.$route);
-            proxy.$router.go(-1);
+            modal.msgSuccess('暂存成功');
+            tab.closePage(route);
+            router.go(-1);
           } else {
             await handleStartWorkFlow(res.data);
           }
@@ -272,8 +276,8 @@ const handleApprovalRecord = () => {
 };
 //提交回调
 const submitCallback = async () => {
-  await proxy.$tab.closePage(proxy.$route);
-  proxy.$router.go(-1);
+  await tab.closePage(route);
+  router.go(-1);
 };
 //审批
 const approvalVerifyOpen = async () => {
@@ -282,7 +286,7 @@ const approvalVerifyOpen = async () => {
 
 onMounted(() => {
   nextTick(async () => {
-    routeParams.value = proxy.$route.query;
+    routeParams.value = route.query;
     reset();
     loading.value = false;
     if (
diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 2dffa9c3..92de59f1 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -5,23 +5,21 @@
 </template>
 
 <script setup name="WarmFlow" lang="ts">
-const { proxy } = getCurrentInstance();
-import { onMounted } from 'vue';
+import { onBeforeUnmount, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import tab from '@/plugins/tab';
 import { getToken } from '@/utils/auth';
 
+const route = useRoute();
 // definitionId为需要查询的流程定义id，
 // disabled为是否可编辑, 例如：查看的时候不可编辑，不可保存
 const iframeUrl = ref('');
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const iframeLoaded = () => {
-  // iframe监听组件内设计器保存事件
-  window.onmessage = event => {
-    switch (event.data.method) {
-      case 'close':
-        close();
-        break;
-    }
-  };
+
+const onDesignerMessage = (event: MessageEvent) => {
+  if (event.data?.method === 'close') {
+    close();
+  }
 };
 const open = async (definitionId, disabled) => {
   const url = baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&onlyDesignShow=true`;
@@ -31,14 +29,18 @@ const open = async (definitionId, disabled) => {
 function close() {
   const obj = {
     path: '/workflow/processDefinition',
-    query: { activeName: proxy.$route.query.activeName }
+    query: { activeName: route.query.activeName }
   };
-  proxy.$tab.closeOpenPage(obj);
+  tab.closeOpenPage(obj);
 }
 
 onMounted(() => {
-  iframeLoaded();
-  open(proxy.$route.query.definitionId, proxy.$route.query.disabled);
+  window.addEventListener('message', onDesignerMessage);
+  open(route.query.definitionId, route.query.disabled);
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener('message', onDesignerMessage);
 });
 /**
  * 对外暴露子组件方法
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 822d9561..0e5921fc 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -324,7 +324,10 @@
 </template>
 
 <script setup name="processDefinition" lang="ts">
-import TreePanel from '@/components/TreePanel/index.vue';
+import type { ElMessageBoxOptions, TabsPaneContext, UploadRequestOptions } from 'element-plus';
+import { useRoute, useRouter } from 'vue-router';
+import { categoryTree } from '@/api/workflow/category';
+import { CategoryTreeVO } from '@/api/workflow/category/types';
 import {
   listDefinition,
   deleteDefinition,
@@ -337,12 +340,13 @@ import {
   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 type { ElMessageBoxOptions, TabsPaneContext, UploadRequestOptions } from 'element-plus';
+import TreePanel from '@/components/TreePanel/index.vue';
+import modal from '@/plugins/modal';
+import { download as requestDownload } from '@/utils/request';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const route = useRoute();
+const router = useRouter();
 
 const queryFormRef = ref<ElFormInstance>();
 const treePanelRef = ref<InstanceType<typeof TreePanel>>();
@@ -458,10 +462,11 @@ const handleSelectionChange = (selection: any) => {
 };
 //分页
 const getPageList = async () => {
-  const query = proxy.$route.query;
-  if (query.activeName) {
-    activeName.value = query.activeName;
-    proxy.$route.query.activeName = '';
+  if (route.query.activeName) {
+    activeName.value = route.query.activeName as string;
+    const q = { ...route.query };
+    delete q.activeName;
+    router.replace({ path: route.path, query: q });
   }
   if (activeName.value === '0') {
     getList();
@@ -490,16 +495,16 @@ const getUnPublishList = async () => {
 const handleDelete = async (row?: FlowDefinitionVo) => {
   const id = row?.id || ids.value;
   const defList = processDefinitionList.value.filter(x => id.indexOf(x.id) != -1).map(x => x.flowCode);
-  await proxy?.$modal.confirm('是否确认删除流程定义编码为【' + defList + '】的数据项？');
+  await modal.confirm('是否确认删除流程定义编码为【' + defList + '】的数据项？');
   loading.value = true;
   await deleteDefinition(id).finally(() => (loading.value = false));
   await handleQuery();
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 /** 发布流程定义 */
 const handlePublish = async (row?: FlowDefinitionVo) => {
-  await proxy?.$modal.confirm(
+  await modal.confirm(
     '是否确认发布流程定义编码为【' +
       row.flowCode +
       '】版本为【' +
@@ -510,7 +515,7 @@ const handlePublish = async (row?: FlowDefinitionVo) => {
   await publish(row.id).finally(() => (loading.value = false));
   activeName.value = '0';
   await handleQuery();
-  proxy?.$modal.msgSuccess('发布成功');
+  modal.msgSuccess('发布成功');
 };
 /** 挂起/激活 */
 const handleProcessDefState = async (row: FlowDefinitionVo, status: number | string | boolean) => {
@@ -522,10 +527,10 @@ const handleProcessDefState = async (row: FlowDefinitionVo, status: number | str
   }
   try {
     loading.value = true;
-    await proxy?.$modal.confirm(msg);
+    await modal.confirm(msg);
     await active(row.id, !!status);
     await handleQuery();
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } catch (error) {
     row.activityStatus = status === 0 ? 1 : 0;
     console.error(error);
@@ -537,11 +542,11 @@ const handleProcessDefState = async (row: FlowDefinitionVo, status: number | str
 //上传文件前的钩子
 const handlerBeforeUpload = () => {
   if (selectCategory.value === 'ALL') {
-    proxy?.$modal.msgError('顶级节点不可作为分类！');
+    modal.msgError('顶级节点不可作为分类！');
     return false;
   }
   if (!selectCategory.value) {
-    proxy?.$modal.msgError('请选择左侧要上传的分类！');
+    modal.msgError('请选择左侧要上传的分类！');
     return false;
   }
 };
@@ -554,7 +559,7 @@ const handlerImportDefinition = (data: UploadRequestOptions): XMLHttpRequest =>
   importDef(formData)
     .then(() => {
       uploadDialog.visible = false;
-      proxy?.$modal.msgSuccess('部署成功');
+      modal.msgSuccess('部署成功');
       activeName.value = '1';
       handleQuery();
     })
@@ -568,12 +573,12 @@ const handlerImportDefinition = (data: UploadRequestOptions): XMLHttpRequest =>
  * @param row
  */
 const design = async (row: FlowDefinitionVo) => {
-  proxy.$router.push({
+  router.push({
     path: `/workflow/design/index`,
     query: {
-      definitionId: row.id,
-      disabled: false,
-      activeName: activeName.value
+      definitionId: String(row.id),
+      disabled: 'false',
+      activeName: String(activeName.value)
     }
   });
 };
@@ -583,12 +588,12 @@ const design = async (row: FlowDefinitionVo) => {
  * @param row
  */
 const designView = async (row: FlowDefinitionVo) => {
-  proxy.$router.push({
+  router.push({
     path: `/workflow/design/index`,
     query: {
-      definitionId: row.id,
-      disabled: true,
-      activeName: activeName.value
+      definitionId: String(row.id),
+      disabled: 'true',
+      activeName: String(activeName.value)
     }
   });
 };
@@ -602,8 +607,8 @@ const reset = () => {
  */
 const handleAdd = async () => {
   reset();
-  if (queryParams.value.category != '') {
-    form.value.category = queryParams.value.category;
+  if (queryParams.value.category != null && queryParams.value.category !== '') {
+    form.value.category = String(queryParams.value.category);
   }
   form.value.modelValue = 'CLASSICS';
   form.value.formCustom = 'N';
@@ -631,8 +636,9 @@ const handleSubmit = async () => {
   defFormRef.value.validate(async (valid: boolean) => {
     if (valid) {
       loading.value = true;
-      const ext = {};
-      ext.autoPass = autoPass.value;
+      const ext: { autoPass: boolean } = {
+        autoPass: autoPass.value
+      };
       form.value.ext = JSON.stringify(ext);
       if (form.value.id) {
         await edit(form.value).finally(() => (loading.value = false));
@@ -640,7 +646,7 @@ const handleSubmit = async () => {
         await add(form.value).finally(() => (loading.value = false));
         activeName.value = '1';
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       modelDialog.visible = false;
       handleQuery();
     }
@@ -657,7 +663,7 @@ const handleCopyDef = async (row: FlowDefinitionVo) => {
     copy(row.id)
       .then(resp => {
         if (resp.code === 200) {
-          proxy?.$modal.msgSuccess('操作成功');
+          modal.msgSuccess('操作成功');
           activeName.value = '1';
           handleQuery();
         }
@@ -668,7 +674,7 @@ const handleCopyDef = async (row: FlowDefinitionVo) => {
 
 /** 导出按钮操作 */
 const handleExportDef = () => {
-  proxy?.download(`/workflow/definition/exportDef/${ids.value[0]}`, {}, `${flowCodeList.value[0]}.json`);
+  requestDownload(`/workflow/definition/exportDef/${ids.value[0]}`, {}, `${flowCodeList.value[0]}.json`);
 };
 </script>
 
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 63a51ddc..c18fb716 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -9,7 +9,7 @@
         placeholder="请输入流程分类名"
         :data="categoryOptions"
         :expanded-span="4"
-        filter-field="categoryName"
+        filter-field="label"
         @node-click="handleNodeClick"
       />
       <el-col
@@ -60,7 +60,7 @@
                   plain
                   icon="Delete"
                   :disabled="multiple"
-                  @click="handleDelete"
+                  @click="() => handleDelete()"
                 >
                   删除
                 </el-button>
@@ -143,7 +143,12 @@
                 <template #default="scope">
                   <el-row v-if="tab === 'running'" :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                      <el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300">
+                      <el-popover
+                        :ref="el => setPopoverRef(el, scope.$index)"
+                        trigger="click"
+                        placement="left"
+                        :width="300"
+                      >
                         <el-input
                           v-model="deleteReason"
                           resize="none"
@@ -295,7 +300,12 @@
 </template>
 
 <script setup lang="ts">
-import TreePanel from '@/components/TreePanel/index.vue';
+import { ElForm, FormInstance, type TabsPaneContext } from 'element-plus';
+import { ref } from 'vue';
+import VueJsonPretty from 'vue-json-pretty';
+import { UserVO } from '@/api/system/user/types';
+import { categoryTree } from '@/api/workflow/category';
+import { CategoryTreeVO } from '@/api/workflow/category/types';
 import {
   pageByRunning,
   pageByFinish,
@@ -305,22 +315,24 @@ import {
   invalid,
   updateVariable
 } from '@/api/workflow/instance';
-import { categoryTree } from '@/api/workflow/category';
-import { CategoryTreeVO } from '@/api/workflow/category/types';
 import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
+import 'vue-json-pretty/lib/styles.css';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-import VueJsonPretty from 'vue-json-pretty';
-import 'vue-json-pretty/lib/styles.css';
+import TreePanel from '@/components/TreePanel/index.vue';
 import UserSelect from '@/components/UserSelect/index.vue';
-import { ElForm, FormInstance } from 'element-plus';
-//审批记录组件
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
 const queryFormRef = ref<ElFormInstance>();
 const treePanelRef = ref<InstanceType<typeof TreePanel>>();
-import { ref } from 'vue';
-import { UserVO } from '@/api/system/user/types';
+const popoverRefs = ref<Record<number, { hide?: () => void } | null>>({});
+const setPopoverRef = (el: unknown, index: number) => {
+  if (el) {
+    popoverRefs.value[index] = el as { hide?: () => void };
+  }
+};
 const form = ref<Record<string, any>>({
   instanceId: undefined,
   key: undefined,
@@ -354,7 +366,7 @@ const processDefinitionName = ref();
 // 模型定义表格数据
 const processInstanceList = ref<FlowInstanceVO[]>([]);
 const processDefinitionHistoryList = ref<Array<any>>([]);
-const categoryOptions = ref<CategoryOption[]>([]);
+const categoryOptions = ref<CategoryTreeVO[]>([]);
 const treeCollapsed = ref(false);
 
 const processDefinitionDialog = reactive<DialogOption>({
@@ -362,12 +374,6 @@ const processDefinitionDialog = reactive<DialogOption>({
   title: '流程定义'
 });
 
-type CategoryOption = {
-  id: string;
-  categoryName: string;
-  children?: CategoryOption[];
-};
-
 const tab = ref('running');
 // 作废原因
 const deleteReason = ref('');
@@ -446,9 +452,9 @@ const getProcessInstanceFinishList = () => {
 };
 
 /** 删除按钮操作 */
-const handleDelete = async (row: FlowInstanceVO) => {
-  const instanceIdList = row.id || instanceIds.value;
-  await proxy?.$modal.confirm('是否确认删除？');
+const handleDelete = async (row?: FlowInstanceVO) => {
+  const instanceIdList = row?.id ?? instanceIds.value;
+  await modal.confirm('是否确认删除？');
   loading.value = true;
   if ('running' === tab.value) {
     await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
@@ -457,12 +463,12 @@ const handleDelete = async (row: FlowInstanceVO) => {
     await deleteHisByInstanceIds(instanceIdList).finally(() => (loading.value = false));
     getProcessInstanceFinishList();
   }
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
-const changeTab = async (data: string) => {
+const changeTab = async (pane: TabsPaneContext) => {
   processInstanceList.value = [];
   queryParams.value.pageNum = 1;
-  if ('running' === data.paneName) {
+  if ('running' === pane.paneName) {
     getProcessInstanceRunningList();
   } else {
     getProcessInstanceFinishList();
@@ -470,7 +476,7 @@ const changeTab = async (data: string) => {
 };
 /** 作废按钮操作 */
 const handleInvalid = async (row: FlowInstanceVO) => {
-  await proxy?.$modal.confirm('是否确认作废？');
+  await modal.confirm('是否确认作废？');
   loading.value = true;
   if ('running' === tab.value) {
     const param = {
@@ -479,11 +485,11 @@ const handleInvalid = async (row: FlowInstanceVO) => {
     };
     await invalid(param).finally(() => (loading.value = false));
     getProcessInstanceRunningList();
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   }
 };
-const cancelPopover = async (index: any) => {
-  (proxy?.$refs[`popoverRef${index}`] as any)?.hide(); //关闭弹窗
+const cancelPopover = async (index: number) => {
+  popoverRefs.value[index]?.hide?.();
 };
 /** 查看按钮操作 */
 const handleView = row => {
@@ -494,7 +500,7 @@ const handleView = row => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 
 //查询流程变量
@@ -560,9 +566,9 @@ const handleVariable = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       form.value.instanceId = instanceId.value;
-      await proxy?.$modal.confirm('是否确认提交？');
+      await modal.confirm('是否确认提交？');
       await updateVariable(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       const data = await instanceVariable(instanceId.value);
       variables.value = data.data.variable;
     }
diff --git a/src/views/workflow/spel/index.vue b/src/views/workflow/spel/index.vue
index d64bd205..9b23d550 100644
--- a/src/views/workflow/spel/index.vue
+++ b/src/views/workflow/spel/index.vue
@@ -210,9 +210,10 @@
 <script setup name="Spel" lang="ts">
 import { listSpel, getSpel, delSpel, addSpel, updateSpel } from '@/api/workflow/spel';
 import { SpelVO, SpelQuery, SpelForm } from '@/api/workflow/spel/types';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_show_hide, sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_show_hide', 'sys_normal_disable'));
+const { sys_show_hide, sys_normal_disable } = toRefs<any>(useDict('sys_show_hide', 'sys_normal_disable'));
 
 const spelList = ref<SpelVO[]>([]);
 const buttonLoading = ref(false);
@@ -326,7 +327,7 @@ const submitForm = () => {
       } else {
         await addSpel(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
@@ -336,11 +337,11 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: SpelVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal
+  await modal
     .confirm('是否确认删除流程spel表达式定义编号为"' + _ids + '"的数据项？')
     .finally(() => (loading.value = false));
   await delSpel(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
   await getList();
 };
 
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 56de61d7..93c995c0 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -176,15 +176,18 @@
 </template>
 
 <script setup lang="ts">
+import { TabsPaneContext } from 'element-plus';
+import { UserVO } from '@/api/system/user/types';
 import { pageByAllTaskWait, pageByAllTaskFinish, updateAssignee, urgeTask } from '@/api/workflow/task';
-import UserSelect from '@/components/UserSelect';
 import { TaskQuery } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-import processMeddle from '@/components/Process/processMeddle';
-import messageType from '@/components/Process/MessageType';
-import { UserVO } from '@/api/system/user/types';
-import { TabsPaneContext } from 'element-plus';
+import messageType from '@/components/Process/MessageType.vue';
+import processMeddle from '@/components/Process/processMeddle.vue';
+import UserSelect from '@/components/UserSelect/index.vue';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+
 //选人组件
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 //流程干预组件
@@ -194,9 +197,8 @@ const applyUserSelectRef = ref<InstanceType<typeof UserSelect>>();
 //消息组件
 const messageTypeRef = ref<InstanceType<typeof messageType>>();
 const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
-const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(useDict('wf_task_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组
@@ -289,23 +291,23 @@ const handleUserOpen = () => {
 
 //打开修改选人
 const handleUserTask = async data => {
-  await proxy?.$modal.confirm('是否确认提交？');
+  await modal.confirm('是否确认提交？');
   data.taskIdList = ids.value;
   await urgeTask(data);
   messageTypeRef.value.close();
-  proxy?.$modal.msgSuccess('操作成功');
+  modal.msgSuccess('操作成功');
   handleQuery();
 };
 //修改办理人
 const submitCallback = async data => {
   if (data && data.length > 0) {
-    await proxy?.$modal.confirm('是否确认提交？');
+    await modal.confirm('是否确认提交？');
     loading.value = true;
     await updateAssignee(ids.value, data[0].userId);
     handleQuery();
-    proxy?.$modal.msgSuccess('操作成功');
+    modal.msgSuccess('操作成功');
   } else {
-    proxy?.$modal.msgWarning('请选择用户！');
+    modal.msgWarning('请选择用户！');
   }
 };
 /** 查看按钮操作 */
@@ -317,7 +319,7 @@ const handleView = row => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 const handleMeddle = row => {
   processMeddleRef.value.open(row.id);
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index b8e9066c..f3079386 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -149,17 +149,18 @@
 </template>
 
 <script setup lang="ts">
-import TreePanel from '@/components/TreePanel/index.vue';
-import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } from '@/api/workflow/instance';
 import { categoryTree } from '@/api/workflow/category';
 import { CategoryTreeVO } from '@/api/workflow/category/types';
+import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } from '@/api/workflow/instance';
 import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+import TreePanel from '@/components/TreePanel/index.vue';
+import modal from '@/plugins/modal';
+import { useDict } from '@/utils/dict';
+
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
 const queryFormRef = ref<ElFormInstance>();
-const treePanelRef = ref<InstanceType<typeof TreePanel>>();
 
 // 遮罩层
 const loading = ref(true);
@@ -240,18 +241,18 @@ const getList = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row: FlowInstanceVO) => {
   const instanceIdList = row.id || instanceIds.value;
-  await proxy?.$modal.confirm('是否确认删除？');
+  await modal.confirm('是否确认删除？');
   loading.value = true;
   if ('running' === tab.value) {
     await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
     getList();
   }
-  proxy?.$modal.msgSuccess('删除成功');
+  modal.msgSuccess('删除成功');
 };
 
 /** 撤销按钮操作 */
 const handleCancelProcessApply = async (businessId: string) => {
-  await proxy?.$modal.confirm('是否确认撤销当前单据？');
+  await modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   if ('running' === tab.value) {
     const data = {
@@ -261,7 +262,7 @@ const handleCancelProcessApply = async (businessId: string) => {
     await cancelProcessApply(data).finally(() => (loading.value = false));
     getList();
   }
-  proxy?.$modal.msgSuccess('撤销成功');
+  modal.msgSuccess('撤销成功');
 };
 
 //办理
@@ -273,7 +274,7 @@ const handleOpen = async (row, type) => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 </script>
 
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 27baa97e..7f8ba2c2 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -92,14 +92,15 @@
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
 import { pageByTaskCopy } from '@/api/workflow/task';
 import { TaskQuery } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-//审批记录组件
+import { useDict } from '@/utils/dict';
+
 const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组
@@ -158,7 +159,7 @@ const handleView = row => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 
 onMounted(() => {
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index b84f154c..3441ffc4 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -129,18 +129,19 @@
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
 import { pageByTaskFinish } from '@/api/workflow/task';
 import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-//审批记录组件
+import UserSelect from '@/components/UserSelect/index.vue';
+import { useDict } from '@/utils/dict';
+
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(useDict('wf_task_status'));
+
 const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
-const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
-import UserSelect from '@/components/UserSelect';
-import { ref } from 'vue';
-import { UserVO } from '@/api/system/user/types';
 
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 // 遮罩层
@@ -207,7 +208,7 @@ const handleView = (row: FlowTaskVO) => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 //打开申请人选择
 const openUserSelect = () => {
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 10212b2b..c91fb1a3 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -115,16 +115,16 @@
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
 import { pageByTaskWait } from '@/api/workflow/task';
 import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+import UserSelect from '@/components/UserSelect/index.vue';
+import { useDict } from '@/utils/dict';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
-import UserSelect from '@/components/UserSelect';
-import { ref } from 'vue';
-import { UserVO } from '@/api/system/user/types';
+const { wf_business_status } = toRefs<any>(useDict('wf_business_status'));
 
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 //提交组件
@@ -198,7 +198,7 @@ const handleOpen = async (row: FlowTaskVO) => {
     formCustom: row.formCustom,
     formPath: row.formPath
   });
-  workflowCommon.routerJump(routerJumpVo, proxy);
+  workflowCommon.routerJump(routerJumpVo);
 };
 //打开申请人选择
 const openUserSelect = () => {