From 9ed3ae3fab3863ff15bcdae9adab94a8371991cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sun, 27 Oct 2024 23:29:36 +0800
Subject: [PATCH 01/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=86=85?=
 =?UTF-8?q?=E5=B5=8C=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=B8=8E=E5=A4=96=E9=83=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 86e0092..6c12791 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -103,7 +103,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole.vue'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user', icon: '' }
+        meta: { title: '分配角色', activeMenu: '/system/user', icon: '', noCache: true }
       }
     ]
   },
@@ -117,7 +117,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser.vue'),
         name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role', icon: '' }
+        meta: { title: '分配用户', activeMenu: '/system/role', icon: '', noCache: true }
       }
     ]
   },
@@ -131,7 +131,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data.vue'),
         name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict', icon: '' }
+        meta: { title: '字典数据', activeMenu: '/system/dict', icon: '', noCache: true }
       }
     ]
   },
@@ -145,7 +145,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'index',
         component: () => import('@/views/system/oss/config.vue'),
         name: 'OssConfig',
-        meta: { title: '配置管理', activeMenu: '/system/oss', icon: '' }
+        meta: { title: '配置管理', activeMenu: '/system/oss', icon: '', noCache: true }
       }
     ]
   },

From fdfb556c8e1eb40c61e8867297109b7afea5de71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 5 Nov 2024 14:29:13 +0800
Subject: [PATCH 02/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20getTenantLi?=
 =?UTF-8?q?st=20=E6=8E=A5=E5=8F=A3=E5=8A=A8=E6=80=81=E5=86=B3=E5=AE=9A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BC=A0token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts                 | 4 ++--
 src/layout/components/Navbar.vue | 2 +-
 src/views/login.vue              | 2 +-
 src/views/register.vue           | 2 +-
 src/views/system/user/index.vue  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index c7c291e..38b61a0 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -100,11 +100,11 @@ export function getInfo(): AxiosPromise<UserInfo> {
 }
 
 // 获取租户列表
-export function getTenantList(): AxiosPromise<TenantInfo> {
+export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
   return request({
     url: '/auth/tenant/list',
     headers: {
-      isToken: false
+      isToken: isToken
     },
     method: 'get'
   });
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c2ed0b6..617c5da 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -142,7 +142,7 @@ const dynamicClearEvent = async () => {
 
 /** 租户列表 */
 const initTenantList = async () => {
-  const { data } = await getTenantList();
+  const { data } = await getTenantList(true);
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
     tenantList.value = data.voList;
diff --git a/src/views/login.vue b/src/views/login.vue
index db1fca6..71d5dcd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -176,7 +176,7 @@ const getLoginData = () => {
  * 获取租户列表
  */
 const initTenantList = async () => {
-  const { data } = await getTenantList();
+  const { data } = await getTenantList(false);
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
     tenantList.value = data.voList;
diff --git a/src/views/register.vue b/src/views/register.vue
index c3d1930..4e67a67 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -140,7 +140,7 @@ const getCode = async () => {
 };
 
 const initTenantList = async () => {
-  const { data } = await getTenantList();
+  const { data } = await getTenantList(false);
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
     tenantList.value = data.voList;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 46bffd2..c53d41b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -81,7 +81,7 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
-                      <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
+                      <el-dropdown-item icon="Top" @click="handleImport">导入数据</el-dropdown-item>
                       <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>

From b19c2805e100c0a7bbb5abb6b30f6f97f13fd98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 5 Nov 2024 16:47:51 +0800
Subject: [PATCH 03/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=A0=A1?=
 =?UTF-8?q?=E6=A3=80=E6=96=87=E4=BB=B6=E5=90=8D=E6=98=AF=E5=90=A6=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue  | 5 +++++
 src/components/ImageUpload/index.vue | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index aaaa45c..b22d09a 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -121,6 +121,11 @@ const handleBeforeUpload = (file: any) => {
       return false;
     }
   }
+  // 校检文件名是否包含特殊字符
+  if (file.name.includes(',')) {
+    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
+    return false;
+  }
   // 校检文件大小
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 1c6dcd1..0778121 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -139,6 +139,10 @@ const handleBeforeUpload = (file: any) => {
     proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}图片格式文件!`);
     return false;
   }
+  if (file.name.includes(',')) {
+    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
+    return false;
+  }
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {

From 4310e5e049ceff181d7728d8223d14b356ebea61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 8 Nov 2024 00:33:23 +0800
Subject: [PATCH 04/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/sse.ts       | 2 +-
 src/utils/websocket.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/sse.ts b/src/utils/sse.ts
index 9174f0d..5234648 100644
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@@ -8,7 +8,7 @@ export const initSSE = (url: any) => {
     return;
   }
 
-  url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID
+  url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID;
   const {
     data,
     error
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index ade13ef..c9b394c 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -7,7 +7,7 @@ export const initWebSocket = (url: any) => {
   if (import.meta.env.VITE_APP_WEBSOCKET === 'false') {
     return;
   }
-  url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID
+  url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID;
   useWebSocket(url, {
     autoReconnect: {
       // 重连最大次数
@@ -16,14 +16,14 @@ export const initWebSocket = (url: any) => {
       delay: 1000,
       onFailed() {
         console.log('websocket重连失败');
-      },
+      }
     },
     heartbeat: {
-      message: JSON.stringify({type: 'ping'}),
+      message: JSON.stringify({ type: 'ping' }),
       // 发送心跳的间隔
       interval: 10000,
       // 接收到心跳response的超时时间
-      pongTimeout: 2000,
+      pongTimeout: 2000
     },
     onConnected() {
       console.log('websocket已经连接');

From 9836d6d9bde266c1e79333d505e1f218567e7ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=88=E5=A4=9C?= <768242801@qq.com>
Date: Mon, 11 Nov 2024 15:10:24 +0800
Subject: [PATCH 05/73] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=BC=93=E5=AD=98=E4=BD=BF=E7=94=A8Map=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BFArray=EF=BC=8C=E6=9B=B4=E9=AB=98=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/dict.ts | 55 +++++++++++++++------------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 2f937b9..cd1a41d 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,29 +1,15 @@
 export const useDictStore = defineStore('dict', () => {
-  const dict = ref<
-    Array<{
-      key: string;
-      value: DictDataOption[];
-    }>
-  >([]);
+  const dict = ref<Map<string, DictDataOption[]>>(new Map());
 
   /**
    * 获取字典
    * @param _key 字典key
    */
   const getDict = (_key: string): DictDataOption[] | null => {
-    if (_key == null && _key == '') {
+    if (!_key) {
       return null;
     }
-    try {
-      for (let i = 0; i < dict.value.length; i++) {
-        if (dict.value[i].key == _key) {
-          return dict.value[i].value;
-        }
-      }
-    } catch (e) {
-      return null;
-    }
-    return null;
+    return dict.value.get(_key) || null;
   };
 
   /**
@@ -32,11 +18,15 @@ export const useDictStore = defineStore('dict', () => {
    * @param _value 字典value
    */
   const setDict = (_key: string, _value: DictDataOption[]) => {
-    if (_key !== null && _key !== '') {
-      dict.value.push({
-        key: _key,
-        value: _value
-      });
+    if (!_key) {
+      return false;
+    }
+    try {
+      dict.value.set(_key, _value);
+      return true;
+    } catch (e) {
+      console.error('Error in setDict:', e);
+      return false;
     }
   };
 
@@ -45,25 +35,22 @@ export const useDictStore = defineStore('dict', () => {
    * @param _key
    */
   const removeDict = (_key: string): boolean => {
-    let bln = false;
-    try {
-      for (let i = 0; i < dict.value.length; i++) {
-        if (dict.value[i].key == _key) {
-          dict.value.splice(i, 1);
-          return true;
-        }
-      }
-    } catch (e) {
-      bln = false;
+    if (!_key) {
+      return false;
+    }
+    try {
+      return dict.value.delete(_key);
+    } catch (e) {
+      console.error('Error in removeDict:', e);
+      return false;
     }
-    return bln;
   };
 
   /**
    * 清空字典
    */
   const cleanDict = (): void => {
-    dict.value = [];
+    dict.value.clear();
   };
 
   return {

From 72ac227ecf97aa0921e9deafb8f6f5b1493e1548 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 14 Nov 2024 16:20:34 +0800
Subject: [PATCH 06/73] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   5 +-
 src/views/monitor/operlog/index.vue           |  57 +--------
 .../monitor/operlog/oper-info-dialog.vue      | 111 ++++++++++++++++++
 3 files changed, 120 insertions(+), 53 deletions(-)
 create mode 100644 src/views/monitor/operlog/oper-info-dialog.vue

diff --git a/package.json b/package.json
index e67d60f..40478ad 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "vue": "3.4.34",
     "vue-cropper": "1.1.1",
     "vue-i18n": "9.10.2",
+    "vue-json-pretty": "^2.4.0",
     "vue-router": "4.3.2",
     "vue-types": "5.1.1",
     "vxe-table": "4.5.22"
@@ -66,10 +67,10 @@
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-define-config": "2.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-vue": "9.23.0",
     "fast-glob": "3.3.2",
     "postcss": "8.4.36",
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index ed0d755..fcecab7 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -123,56 +123,14 @@
       <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
     </el-card>
     <!-- 操作日志详细 -->
-    <el-dialog v-model="dialog.visible" title="操作日志详细" width="700px" append-to-body>
-      <el-form :model="form" label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="登录信息：">{{ form.operName }} / {{ form.deptName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="请求信息：">{{ form.requestMethod }} {{ form.operUrl }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="操作状态：">
-              <div v-if="form.status === 0">正常</div>
-              <div v-else-if="form.status === 1">失败</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item v-if="form.status === 1" label="异常信息：">{{ form.errorMsg }}</el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="dialog.visible = false">关 闭</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <OperInfoDialog ref="operInfoDialogRef" />
   </div>
 </template>
 
 <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';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_oper_type, sys_common_status } = toRefs<any>(proxy?.useDict('sys_oper_type', 'sys_common_status'));
@@ -189,11 +147,6 @@ const defaultSort = ref<any>({ prop: 'operTime', order: 'descending' });
 const operLogTableRef = ref<ElTableInstance>();
 const queryFormRef = ref<ElFormInstance>();
 
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
 const data = reactive<PageData<OperLogForm, OperLogQuery>>({
   form: {
     operId: undefined,
@@ -267,11 +220,13 @@ const handleSortChange = (column: any) => {
   queryParams.value.isAsc = column.order;
   getList();
 };
+
+const operInfoDialogRef = ref<InstanceType<typeof OperInfoDialog>>();
 /** 详细按钮操作 */
 const handleView = (row: OperLogVO) => {
-  dialog.visible = true;
-  form.value = row;
+  operInfoDialogRef.value.openDialog(row);
 };
+
 /** 删除按钮操作 */
 const handleDelete = async (row?: OperLogVO) => {
   const operIds = row?.operId || ids.value;
diff --git a/src/views/monitor/operlog/oper-info-dialog.vue b/src/views/monitor/operlog/oper-info-dialog.vue
new file mode 100644
index 0000000..fd620ae
--- /dev/null
+++ b/src/views/monitor/operlog/oper-info-dialog.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-dialog v-model="open" title="操作日志详细" width="700px" append-to-body close-on-click-modal @closed="info = null">
+    <el-descriptions v-if="info" :column="1" border>
+      <el-descriptions-item label="操作状态">
+        <template #default>
+          <el-tag v-if="info.status === 0" type="success">正常</el-tag>
+          <el-tag v-else-if="info.status === 1" type="danger">失败</el-tag>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="登录信息">
+        <template #default> {{ info.operName }} / {{ info.deptName }} / {{ info.operIp }} / {{ info.operLocation }} </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="请求信息">
+        <template #default> {{ info.requestMethod }} {{ info.operUrl }} </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="操作模块">
+        <template #default> {{ info.title }} / {{ typeFormat(info) }} </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="操作方法">
+        <template #default>
+          {{ info.method }}
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="请求参数">
+        <template #default>
+          <div class="max-h-300px overflow-y-auto">
+            <VueJsonPretty :data="formatToJsonObject(info.operParam)" />
+          </div>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="返回参数">
+        <template #default>
+          <div class="max-h-300px overflow-y-auto">
+            <VueJsonPretty :data="formatToJsonObject(info.jsonResult)" />
+          </div>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="消耗时间">
+        <template #default>
+          <span> {{ info.costTime }}ms </span>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="操作时间">
+        <template #default> {{ parseTime(info.operTime) }}</template>
+      </el-descriptions-item>
+      <el-descriptions-item v-if="info.status === 1" label="异常信息">
+        <template #default>
+          <span class="text-danger"> {{ info.errorMsg }}</span>
+        </template>
+      </el-descriptions-item>
+    </el-descriptions>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import type { OperLogForm } from '@/api/monitor/operlog/types';
+import VueJsonPretty from 'vue-json-pretty';
+import 'vue-json-pretty/lib/styles.css';
+
+const open = ref(false);
+const info = ref<OperLogForm | null>(null);
+function openDialog(row: OperLogForm) {
+  info.value = row;
+  open.value = true;
+}
+
+function closeDialog() {
+  open.value = false;
+}
+
+defineExpose({
+  openDialog,
+  closeDialog
+});
+
+/**
+ * json转为对象
+ * @param data 原始数据
+ */
+function formatToJsonObject(data: string) {
+  try {
+    return JSON.parse(data);
+  } catch (error) {
+    return data;
+  }
+}
+
+/**
+ * 字典信息
+ */
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_oper_type } = toRefs<any>(proxy?.useDict('sys_oper_type'));
+const typeFormat = (row: OperLogForm) => {
+  return proxy?.selectDictLabel(sys_oper_type.value, row.businessType);
+};
+</script>
+
+<style scoped>
+/**
+label宽度固定
+*/
+:deep(.el-descriptions__label) {
+  min-width: 100px;
+}
+/**
+文字超过 换行显示
+*/
+:deep(.el-descriptions__content) {
+  max-width: 300px;
+}
+</style>

From cdbbca43c4466d36e9cef08b81cb0fe689c6da25 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 14 Nov 2024 16:23:16 +0800
Subject: [PATCH 07/73] =?UTF-8?q?chore:=20=E9=94=81=E5=AE=9Avue-json-prett?=
 =?UTF-8?q?y=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 40478ad..9eaf743 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "vue": "3.4.34",
     "vue-cropper": "1.1.1",
     "vue-i18n": "9.10.2",
-    "vue-json-pretty": "^2.4.0",
+    "vue-json-pretty": "2.4.0",
     "vue-router": "4.3.2",
     "vue-types": "5.1.1",
     "vxe-table": "4.5.22"

From 5f582c09bab4565eea1d07bf63ab038d5f685fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 15 Nov 2024 09:56:27 +0800
Subject: [PATCH 08/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=85=B3?=
 =?UTF-8?q?=E9=97=ADsse=E5=8A=9F=E8=83=BD=20=E7=99=BB=E5=87=BA=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E4=BC=9A=E5=8F=91=E9=80=81sse=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 38b61a0..35e6a4e 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -51,10 +51,12 @@ export function register(data: any) {
  * 注销
  */
 export function logout() {
-  request({
-    url: '/resource/sse/close',
-    method: 'get'
-  });
+  if (import.meta.env.VITE_APP_SSE === 'true') {
+    request({
+      url: '/resource/sse/close',
+      method: 'get'
+    });
+  }
   return request({
     url: '/auth/logout',
     method: 'post'

From ec0e6a167eaff834fdb54c3d042b93766d8d9cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 15 Nov 2024 16:28:00 +0800
Subject: [PATCH 09/73] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 010adb9..531f64b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 - 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。
 - 成员项目: 基于 vben(ant-design-vue) 的前端项目 [ruoyi-plus-vben](https://gitee.com/dapppp/ruoyi-plus-vben)
+- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
 - 配套后端代码仓库地址
 - [RuoYi-Vue-Plus 5.X(注意版本号)](https://gitee.com/dromara/RuoYi-Vue-Plus)
 - [RuoYi-Cloud-Plus 2.X(注意版本号)](https://gitee.com/dromara/RuoYi-Cloud-Plus)

From 22e8a57b31acfcc8aa84b96b797a055a0445af41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 18 Nov 2024 23:47:14 +0800
Subject: [PATCH 10/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B0=86?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AD=97=E5=85=B8=E5=8A=9F=E8=83=BD=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E7=A7=9F=E6=88=B7=E7=AE=A1=E7=90=86=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue   | 14 +-------------
 src/views/system/tenant/index.vue | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 4ad70d0..9eead48 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -49,9 +49,6 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -112,15 +109,11 @@
 
 <script setup name="Dict" lang="ts">
 import useDictStore from '@/store/modules/dict';
-import useUserStore from "@/store/modules/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
-import { syncTenantDict } from "@/api/system/tenant";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const userStore = useUserStore();
-const userId = ref(userStore.userId);
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -246,12 +239,7 @@ const handleRefreshCache = async () => {
   proxy?.$modal.msgSuccess('刷新成功');
   useDictStore().cleanDict();
 };
-/**同步租户字典*/
-const handleSyncTenantDict = async () => {
-  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
-  let res = await syncTenantDict();
-  proxy?.$modal.msgSuccess(res.msg);
-};
+
 
 onMounted(() => {
   getList();
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index fabe18d..e2cec99 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -44,6 +44,9 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -141,13 +144,16 @@
 </template>
 
 <script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage } from '@/api/system/tenant';
+import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage, syncTenantDict } from '@/api/system/tenant';
 import { selectTenantPackage } from '@/api/system/tenantPackage';
+import useUserStore from '@/store/modules/user';
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
 import { TenantPkgVO } from '@/api/system/tenantPackage/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
 const tenantList = ref<TenantVO[]>([]);
 const packageList = ref<TenantPkgVO[]>([]);
 const buttonLoading = ref(false);
@@ -343,6 +349,13 @@ const handleExport = () => {
   );
 };
 
+/**同步租户字典*/
+const handleSyncTenantDict = async () => {
+  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
+  let res = await syncTenantDict();
+  proxy?.$modal.msgSuccess(res.msg);
+};
+
 onMounted(() => {
   getList();
 });

From 24f1e8b4b1a54191973eca060bc40c4a1a6d8ea6 Mon Sep 17 00:00:00 2001
From: QianRj <923207736@qq.com>
Date: Tue, 19 Nov 2024 14:40:36 +0800
Subject: [PATCH 11/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=BB=8E@/lang/*.ts=E5=90=8E=E7=BC=80=E7=9A=84i18n?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E8=AF=BB=E5=8F=96=E5=90=84=E5=9B=BD?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en_US.json | 25 -------------------------
 src/lang/index.ts   | 11 ++++++++++-
 src/lang/zh_CN.json | 25 -------------------------
 3 files changed, 10 insertions(+), 51 deletions(-)
 delete mode 100644 src/lang/en_US.json
 delete mode 100644 src/lang/zh_CN.json

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
deleted file mode 100644
index 17b472e..0000000
--- a/src/lang/en_US.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "route": {
-    "dashboard": "Dashboard",
-    "document": "Document"
-  },
-  "login": {
-    "username": "Username",
-    "password": "Password",
-    "login": "Login",
-    "code": "Verification Code",
-    "copyright": ""
-  },
-  "navbar": {
-    "full": "Full Screen",
-    "language": "Language",
-    "dashboard": "Dashboard",
-    "document": "Document",
-    "message": "Message",
-    "layoutSize": "Layout Size",
-    "selectTenant": "Select Tenant",
-    "layoutSetting": "Layout Setting",
-    "personalCenter": "Personal Center",
-    "logout": "Logout"
-  }
-}
diff --git a/src/lang/index.ts b/src/lang/index.ts
index e4e1d25..737beb2 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,7 +2,16 @@
 import { createI18n } from 'vue-i18n';
 
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import messages from '@intlify/unplugin-vue-i18n/messages';
+import en_US from '@/lang/en_US';
+import zh_CN from '@/lang/zh_CN';
+
+/**
+ * 组合导入的语言包
+ */
+const messages = {
+  en_US,
+  zh_CN
+};
 
 /**
  * 获取当前语言
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
deleted file mode 100644
index 071598d..0000000
--- a/src/lang/zh_CN.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "route": {
-    "dashboard": "首页",
-    "document": "项目文档"
-  },
-  "login": {
-    "username": "用户名",
-    "password": "密码",
-    "login": "登 录",
-    "code": "请输入验证码",
-    "copyright": ""
-  },
-  "navbar": {
-    "full": "全屏",
-    "language": "语言",
-    "dashboard": "首页",
-    "document": "项目文档",
-    "message": "消息",
-    "layoutSize": "布局大小",
-    "selectTenant": "选择租户",
-    "layoutSetting": "布局设置",
-    "personalCenter": "个人中心",
-    "logout": "退出登录"
-  }
-}

From 9dd7bf89909a0473ed02a7f1df7442973dd96c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 20 Nov 2024 11:25:51 +0800
Subject: [PATCH 12/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E7=99=BB=E5=87=BA=E4=B8=8Etoken=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=99=BB=E5=87=BA=E8=B7=B3=E8=BD=AC=E8=A1=8C=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 617c5da..bfe339e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -98,6 +98,7 @@ import { getTenantList } from '@/api/login';
 import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
+import router from "@/router";
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -163,8 +164,14 @@ const logout = async () => {
     cancelButtonText: '取消',
     type: 'warning'
   });
-  await userStore.logout();
-  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  userStore.logout().then(() => {
+    router.replace({
+      path: '/login',
+      query: {
+        redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+      }
+    })
+  });
 };
 
 const emits = defineEmits(['setLayout']);

From a150c8c9a7b324dfd3caa53d523396aed19e2a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 22 Nov 2024 16:00:10 +0800
Subject: [PATCH 13/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=BC=BA=E9=80=80=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/monitor/online/index.ts b/src/api/monitor/online/index.ts
index 7484702..5b3221c 100644
--- a/src/api/monitor/online/index.ts
+++ b/src/api/monitor/online/index.ts
@@ -30,7 +30,7 @@ export function getOnline() {
 // 删除当前在线设备
 export function delOnline(tokenId: string) {
   return request({
-    url: '/monitor/online/' + tokenId,
-    method: 'post'
+    url: '/monitor/online/myself/' + tokenId,
+    method: 'delete'
   });
 }

From 51e4c44fd0e475608728e5bbf1b3b3d6bb7f55bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 22 Nov 2024 17:54:31 +0800
Subject: [PATCH 14/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20monitor=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20context-path=20=E5=AF=BC=E8=87=B4=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95404=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 14e1335..c9b42a2 100644
--- a/.env.development
+++ b/.env.development
@@ -11,12 +11,12 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_CONTEXT_PATH = '/'
 
 # 监控地址
-VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications'
+VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/applications'
 
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
 
-VITE_APP_PORT = 80
+VITE_APP_PORT = 81
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT = true

From a5931a78f6fcf1da2dc5a3bfa243397d01acb6a6 Mon Sep 17 00:00:00 2001
From: admin_lijinfu <lijinfu@outlook.com>
Date: Sun, 24 Nov 2024 21:49:13 +0800
Subject: [PATCH 15/73] =?UTF-8?q?perf:=20permission=20loadView=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E6=95=B4=E4=B8=AAmodules=E5=BE=AA=E7=8E=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8view=E4=B8=AD=E9=97=B4=E6=9C=89views=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index e90df4c..43fcef8 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -158,9 +158,12 @@ export const filterDynamicRoutes = (routes: RouteRecordRaw[]) => {
 export const loadView = (view: any, name: string) => {
   let res;
   for (const path in modules) {
-    const dir = path.split('views/')[1].split('.vue')[0];
+    const viewsIndex = path.indexOf('/views/');
+    let dir = path.substring(viewsIndex + 7);
+    dir = dir.substring(0, dir.lastIndexOf('.vue'));
     if (dir === view) {
       res = createCustomNameComponent(modules[path], { name });
+      return res;
     }
   }
   return res;

From 6eeb711d2fb25e864b764e6433deac69e8cea3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 25 Nov 2024 10:33:47 +0800
Subject: [PATCH 16/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=20"=E9=83=A8=E9=97=A8=E5=8F=8A=E4=BB=A5=E4=B8=8B=E6=88=96?=
 =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90"=20?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f2299d7..f67a527 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -223,7 +223,8 @@ const dataScopeOptions = ref([
   { value: '2', label: '自定数据权限' },
   { value: '3', label: '本部门数据权限' },
   { value: '4', label: '本部门及以下数据权限' },
-  { value: '5', label: '仅本人数据权限' }
+  { value: '5', label: '仅本人数据权限' },
+  { value: '6', label: '部门及以下或本人数据权限' }
 ]);
 
 const queryFormRef = ref<ElFormInstance>();

From 247bf826d8a03e88d7b0bfeb2f81840189709e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 25 Nov 2024 10:37:30 +0800
Subject: [PATCH 17/73] =?UTF-8?q?Revert=20"update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E@/lang/*.ts=E5=90=8E=E7=BC=80?=
 =?UTF-8?q?=E7=9A=84i18n=E6=96=87=E4=BB=B6=E4=B8=AD=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=90=84=E5=9B=BD=E8=AF=AD=E8=A8=80=E5=8C=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 24f1e8b4b1a54191973eca060bc40c4a1a6d8ea6.
---
 src/lang/en_US.json | 25 +++++++++++++++++++++++++
 src/lang/index.ts   | 11 +----------
 src/lang/zh_CN.json | 25 +++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 src/lang/en_US.json
 create mode 100644 src/lang/zh_CN.json

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
new file mode 100644
index 0000000..17b472e
--- /dev/null
+++ b/src/lang/en_US.json
@@ -0,0 +1,25 @@
+{
+  "route": {
+    "dashboard": "Dashboard",
+    "document": "Document"
+  },
+  "login": {
+    "username": "Username",
+    "password": "Password",
+    "login": "Login",
+    "code": "Verification Code",
+    "copyright": ""
+  },
+  "navbar": {
+    "full": "Full Screen",
+    "language": "Language",
+    "dashboard": "Dashboard",
+    "document": "Document",
+    "message": "Message",
+    "layoutSize": "Layout Size",
+    "selectTenant": "Select Tenant",
+    "layoutSetting": "Layout Setting",
+    "personalCenter": "Personal Center",
+    "logout": "Logout"
+  }
+}
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 737beb2..e4e1d25 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,16 +2,7 @@
 import { createI18n } from 'vue-i18n';
 
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import en_US from '@/lang/en_US';
-import zh_CN from '@/lang/zh_CN';
-
-/**
- * 组合导入的语言包
- */
-const messages = {
-  en_US,
-  zh_CN
-};
+import messages from '@intlify/unplugin-vue-i18n/messages';
 
 /**
  * 获取当前语言
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
new file mode 100644
index 0000000..071598d
--- /dev/null
+++ b/src/lang/zh_CN.json
@@ -0,0 +1,25 @@
+{
+  "route": {
+    "dashboard": "首页",
+    "document": "项目文档"
+  },
+  "login": {
+    "username": "用户名",
+    "password": "密码",
+    "login": "登 录",
+    "code": "请输入验证码",
+    "copyright": ""
+  },
+  "navbar": {
+    "full": "全屏",
+    "language": "语言",
+    "dashboard": "首页",
+    "document": "项目文档",
+    "message": "消息",
+    "layoutSize": "布局大小",
+    "selectTenant": "选择租户",
+    "layoutSetting": "布局设置",
+    "personalCenter": "个人中心",
+    "logout": "退出登录"
+  }
+}

From a06db1a6f9bde222358da9eb2e5b3611f738bae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 25 Nov 2024 13:54:27 +0800
Subject: [PATCH 18/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=94=AE=E5=80=BC=E6=9B=B4=E6=8D=A2=E4=B8=BA=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 1b67d48..dcd41ea 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -101,7 +101,7 @@
           <el-input v-model="form.configKey" placeholder="请输入参数键名" />
         </el-form-item>
         <el-form-item label="参数键值" prop="configValue">
-          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
+          <el-input v-model="form.configValue" type="textarea" placeholder="请输入参数键值" />
         </el-form-item>
         <el-form-item label="系统内置" prop="configType">
           <el-radio-group v-model="form.configType">

From e3b5d7ca543cbb4e268d70a44bc78269d54547fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 26 Nov 2024 13:25:37 +0800
Subject: [PATCH 19/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=9D=A2=E5=8C=85=E5=B1=91=E5=AF=BC=E8=88=AA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E5=B1=82=E7=BA=A7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Breadcrumb/index.vue | 44 +++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 9502e60..184f41c 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -11,20 +11,52 @@
 
 <script setup lang="ts">
 import { RouteLocationMatched } from 'vue-router';
+import usePermissionStore from '@/store/modules/permission';
 
 const route = useRoute();
 const router = useRouter();
+const permissionStore = usePermissionStore();
 const levelList = ref<RouteLocationMatched[]>([]);
 
 const getBreadcrumb = () => {
   // only show routes with meta.title
-  let matched = route.matched.filter((item) => item.meta && item.meta.title);
-  const first = matched[0];
-  // 判断是否为首页
-  if (!isDashboard(first)) {
-    matched = ([{ path: '/index', meta: { title: '首页' } }] as any).concat(matched);
+  let matched = [];
+  const pathNum = findPathNum(route.path);
+  // multi-level menu
+  if (pathNum > 2) {
+    const reg = /\/\w+/gi;
+    const pathList = route.path.match(reg).map((item, index) => {
+      if (index !== 0) item = item.slice(1);
+      return item;
+    })
+    getMatched(pathList, permissionStore.defaultRoutes, matched);
+  } else {
+    matched = route.matched.filter(item => item.meta && item.meta.title);
+  }
+  // 判断是否为首页
+  if (!isDashboard(matched[0])) {
+    matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched);
+  }
+  levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
+};
+const findPathNum = (str, char = '/') => {
+  let index = str.indexOf(char);
+  let num = 0;
+  while (index !== -1) {
+    num++;
+    index = str.indexOf(char, index + 1);
+  }
+  return num;
+};
+const getMatched = (pathList, routeList, matched) => {
+  let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]);
+  if (data) {
+    matched.push(data);
+    if (data.children && pathList.length) {
+      pathList.shift();
+      getMatched(pathList, data.children, matched);
+    }
   }
-  levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false);
 };
 const isDashboard = (route: RouteLocationMatched) => {
   const name = route && (route.name as string);

From 3960c319752d62fc9897b3c4fc3c77c6d307d2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 26 Nov 2024 13:25:44 +0800
Subject: [PATCH 20/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/SidebarItem.vue | 6 ++----
 src/plugins/cache.ts                          | 2 ++
 src/router/index.ts                           | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 3720062..5e82ea3 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -59,11 +59,9 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[])
   const showingChildren = children.filter((item) => {
     if (item.hidden) {
       return false;
-    } else {
-      // Temp set(will be used if only has one showing child)
-      onlyOneChild.value = item;
-      return true;
     }
+    onlyOneChild.value = item;
+    return true;
   });
 
   // When there is only one child router, the child router is displayed by default
diff --git a/src/plugins/cache.ts b/src/plugins/cache.ts
index cf43680..e5ceead 100644
--- a/src/plugins/cache.ts
+++ b/src/plugins/cache.ts
@@ -26,6 +26,7 @@ const sessionCache = {
     if (value != null) {
       return JSON.parse(value);
     }
+    return null;
   },
   remove(key: string) {
     sessionStorage.removeItem(key);
@@ -59,6 +60,7 @@ const localCache = {
     if (value != null) {
       return JSON.parse(value);
     }
+    return null;
   },
   remove(key: string) {
     localStorage.removeItem(key);
diff --git a/src/router/index.ts b/src/router/index.ts
index 6c12791..c5b472f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -189,9 +189,8 @@ const router = createRouter({
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
       return savedPosition;
-    } else {
-      return { top: 0 };
     }
+    return { top: 0 };
   }
 });
 

From 3b710d9e99871509b679461f51ec1e7e239d06b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 26 Nov 2024 15:28:24 +0800
Subject: [PATCH 21/73] =?UTF-8?q?update=20typescript=205.4.5=20=3D>=205.7.?=
 =?UTF-8?q?2=20update=20vite=205.2.12=20=3D>=205.4.11=20update=20vue=203.4?=
 =?UTF-8?q?.34=20=3D>=203.5.13=20update=20element-plus=202.7.8=20=3D>=202.?=
 =?UTF-8?q?8.8=20update=20....=20=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 9eaf743..9726ee5 100644
--- a/package.json
+++ b/package.json
@@ -21,16 +21,16 @@
     "@element-plus/icons-vue": "2.3.1",
     "@highlightjs/vue-plugin": "2.1.0",
     "@vueup/vue-quill": "1.2.0",
-    "@vueuse/core": "10.9.0",
+    "@vueuse/core": "11.3.0",
     "animate.css": "4.1.1",
     "await-to-js": "3.0.0",
-    "axios": "1.6.8",
+    "axios": "1.7.8",
     "bpmn-js": "16.4.0",
     "crypto-js": "4.2.0",
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
     "echarts": "5.5.0",
-    "element-plus": "2.7.8",
+    "element-plus": "2.8.8",
     "file-saver": "2.0.5",
     "fuse.js": "7.0.0",
     "highlight.js": "11.9.0",
@@ -38,51 +38,51 @@
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",
     "nprogress": "0.2.0",
-    "pinia": "2.1.7",
+    "pinia": "2.2.6",
     "screenfull": "6.0.2",
-    "vue": "3.4.34",
+    "vue": "3.5.13",
     "vue-cropper": "1.1.1",
     "vue-i18n": "9.10.2",
     "vue-json-pretty": "2.4.0",
-    "vue-router": "4.3.2",
-    "vue-types": "5.1.1",
+    "vue-router": "4.4.5",
+    "vue-types": "5.1.3",
     "vxe-table": "4.5.22"
   },
   "devDependencies": {
-    "@iconify/json": "2.2.201",
+    "@iconify/json": "2.2.276",
     "@intlify/unplugin-vue-i18n": "3.0.1",
     "@types/crypto-js": "4.2.2",
     "@types/file-saver": "2.0.7",
     "@types/js-cookie": "3.0.6",
     "@types/node": "18.18.2",
     "@types/nprogress": "0.2.3",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
-    "@typescript-eslint/parser": "7.3.1",
-    "@unocss/preset-attributify": "0.58.6",
-    "@unocss/preset-icons": "0.58.6",
-    "@unocss/preset-uno": "0.58.6",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
+    "@unocss/preset-attributify": "0.64.1",
+    "@unocss/preset-icons": "0.64.1",
+    "@unocss/preset-uno": "0.64.1",
     "@vitejs/plugin-vue": "5.0.4",
     "@vue/compiler-sfc": "3.4.23",
     "autoprefixer": "10.4.18",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-define-config": "2.1.0",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-vue": "9.23.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-promise": "7.2.0",
+    "eslint-plugin-vue": "9.31.0",
     "fast-glob": "3.3.2",
     "postcss": "8.4.36",
     "prettier": "3.2.5",
     "sass": "1.72.0",
-    "typescript": "5.4.5",
-    "unocss": "0.58.6",
+    "typescript": "5.7.2",
+    "unocss": "0.64.1",
     "unplugin-auto-import": "0.17.5",
     "unplugin-icons": "0.18.5",
     "unplugin-vue-components": "0.26.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
-    "vite": "5.2.12",
+    "vite": "5.4.11",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1",
     "vitest": "1.5.0",

From f203716f3152a777c303031b74ee0368d7466434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 26 Nov 2024 15:29:06 +0800
Subject: [PATCH 22/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=AF=BC=E5=85=A5=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/importTable.vue | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 50ec0ee..e0f524e 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -63,14 +63,18 @@ const emit = defineEmits(['ok']);
 
 /** 查询参数列表 */
 const show = (dataName: string) => {
-  getDataNameList();
-  if (dataName) {
-    queryParams.dataName = dataName;
-  } else {
-    queryParams.dataName = 'master';
-  }
-  getList();
-  visible.value = true;
+  getDataNames().then(res => {
+    if (res.code == 200) {
+      dataNameList.value = res.data;
+      if (dataName) {
+        queryParams.dataName = dataName;
+      } else {
+        queryParams.dataName = dataNameList.value[0];
+      }
+      getList();
+      visible.value = true;
+    }
+  });
 };
 /** 单击选择行 */
 const clickRow = (row: DbTableVO) => {
@@ -111,11 +115,6 @@ const handleImportTable = async () => {
     emit('ok');
   }
 };
-/** 查询多数据源名称 */
-const getDataNameList = async () => {
-  const res = await getDataNames();
-  dataNameList.value = res.data;
-};
 
 defineExpose({
   show

From f3425493ed4e77ea683930e314e46cb51f5151a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 26 Nov 2024 15:29:22 +0800
Subject: [PATCH 23/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=85=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts                |  2 +-
 src/assets/styles/element-ui.scss             |  1 -
 src/assets/styles/variables.module.scss       | 24 +++++++++----------
 src/components/Breadcrumb/index.vue           |  8 +++----
 src/components/Process/multiInstanceUser.vue  |  2 +-
 src/layout/components/Navbar.vue              |  4 ++--
 src/layout/index.vue                          |  2 +-
 src/plugins/tab.ts                            |  2 +-
 src/store/modules/tagsView.ts                 | 18 +++++++-------
 src/utils/request.ts                          |  2 +-
 src/utils/sse.ts                              |  5 +---
 src/views/demo/demo/index.vue                 |  2 +-
 src/views/demo/tree/index.vue                 |  2 +-
 src/views/monitor/logininfor/index.vue        |  2 +-
 src/views/monitor/operlog/index.vue           |  2 +-
 src/views/system/client/index.vue             |  2 +-
 src/views/system/config/index.vue             |  2 +-
 src/views/system/dept/index.vue               |  2 +-
 src/views/system/dict/data.vue                |  2 +-
 src/views/system/dict/index.vue               |  3 +--
 src/views/system/menu/index.vue               |  2 +-
 src/views/system/notice/index.vue             |  2 +-
 src/views/system/oss/config.vue               |  2 +-
 src/views/system/oss/index.vue                |  2 +-
 src/views/system/post/index.vue               |  2 +-
 src/views/system/role/authUser.vue            |  2 +-
 src/views/system/role/index.vue               |  2 +-
 src/views/system/tenant/index.vue             | 13 ++++++++--
 src/views/system/tenantPackage/index.vue      |  2 +-
 src/views/system/user/authRole.vue            |  2 +-
 src/views/system/user/index.vue               |  2 +-
 src/views/tool/gen/index.vue                  |  2 +-
 src/views/workflow/category/index.vue         |  2 +-
 src/views/workflow/formManage/index.vue       |  2 +-
 src/views/workflow/leave/index.vue            |  2 +-
 src/views/workflow/leave/leaveEdit.vue        |  4 ++--
 src/views/workflow/model/index.vue            |  2 +-
 .../workflow/processDefinition/index.vue      |  2 +-
 src/views/workflow/processInstance/index.vue  |  2 +-
 src/views/workflow/task/allTaskWaiting.vue    |  2 +-
 src/views/workflow/task/myDocument.vue        |  2 +-
 src/views/workflow/task/taskCopyList.vue      |  2 +-
 src/views/workflow/task/taskFinish.vue        |  2 +-
 src/views/workflow/task/taskWaiting.vue       |  2 +-
 tsconfig.json                                 |  2 +-
 45 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 7b7b93f..d1d8ff8 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -96,6 +96,6 @@ export function syncTenantPackage(tenantId: string | number, packageId: string |
 export function syncTenantDict() {
   return request({
     url: '/system/tenant/syncTenantDict',
-    method: 'get',
+    method: 'get'
   });
 }
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 220e4ac..5dd573d 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -1,4 +1,3 @@
-
 .el-collapse {
   .collapse__title {
     font-weight: 600;
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 92fc34d..36a8df6 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -20,7 +20,7 @@
   --bpmn-panel-bar-background-color: #f5f7fa;
 
   // ele
-  --brder-color: #e8e8e8
+  --brder-color: #e8e8e8;
 }
 html.dark {
   --menuBg: #1d1e1f;
@@ -42,25 +42,25 @@ html.dark {
     --el-color-primary-light-9: #262727;
   }
   // vxe-table 主题
-  --vxe-font-color: #98989E;
-  --vxe-primary-color: #2C7ECF;
-  --vxe-icon-background-color: #98989E;
-  --vxe-table-font-color: #98989E;
+  --vxe-font-color: #98989e;
+  --vxe-primary-color: #2c7ecf;
+  --vxe-icon-background-color: #98989e;
+  --vxe-table-font-color: #98989e;
   --vxe-table-resizable-color: #95969a;
-  --vxe-table-header-background-color: #28282A;
+  --vxe-table-header-background-color: #28282a;
   --vxe-table-body-background-color: #151518;
   --vxe-table-background-color: #4a5663;
   --vxe-table-border-width: 1px;
-  --vxe-table-border-color: #37373A;
-  --vxe-toolbar-background-color: #37373A;
+  --vxe-table-border-color: #37373a;
+  --vxe-toolbar-background-color: #37373a;
 
   // 工作流
-  --bpmn-panel-border: #37373A;
-  --bpmn-panel-box-shadow: #37373A;
-  --bpmn-panel-bar-background-color: #37373A;
+  --bpmn-panel-border: #37373a;
+  --bpmn-panel-box-shadow: #37373a;
+  --bpmn-panel-bar-background-color: #37373a;
 
   // ele
-  --brder-color: #37373A
+  --brder-color: #37373a;
 }
 
 // base color
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 184f41c..a8b2f68 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -28,16 +28,16 @@ const getBreadcrumb = () => {
     const pathList = route.path.match(reg).map((item, index) => {
       if (index !== 0) item = item.slice(1);
       return item;
-    })
+    });
     getMatched(pathList, permissionStore.defaultRoutes, matched);
   } else {
-    matched = route.matched.filter(item => item.meta && item.meta.title);
+    matched = route.matched.filter((item) => item.meta && item.meta.title);
   }
   // 判断是否为首页
   if (!isDashboard(matched[0])) {
     matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched);
   }
-  levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
+  levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false);
 };
 const findPathNum = (str, char = '/') => {
   let index = str.indexOf(char);
@@ -49,7 +49,7 @@ const findPathNum = (str, char = '/') => {
   return num;
 };
 const getMatched = (pathList, routeList, matched) => {
-  let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]);
+  let data = routeList.find((item) => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]);
   if (data) {
     matched.push(data);
     if (data.children && pathList.length) {
diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue
index d19fb5f..e366ea0 100644
--- a/src/components/Process/multiInstanceUser.vue
+++ b/src/components/Process/multiInstanceUser.vue
@@ -41,7 +41,7 @@
           <el-card shadow="hover">
             <template #header>
               <el-row :gutter="10">
-                <right-toolbar v-model:showSearch="showSearch" :search="true" @query-table="handleQuery"></right-toolbar>
+                <right-toolbar v-model:show-search="showSearch" :search="true" @query-table="handleQuery"></right-toolbar>
               </el-row>
             </template>
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index bfe339e..6ac2f14 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -98,7 +98,7 @@ import { getTenantList } from '@/api/login';
 import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
-import router from "@/router";
+import router from '@/router';
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -170,7 +170,7 @@ const logout = async () => {
       query: {
         redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
       }
-    })
+    });
   });
 };
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ce47a30..207a470 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -27,7 +27,7 @@ import { AppMain, Navbar, Settings, TagsView } from './components';
 import useAppStore from '@/store/modules/app';
 import useSettingsStore from '@/store/modules/settings';
 import { initWebSocket } from '@/utils/websocket';
-import { initSSE } from "@/utils/sse";
+import { initSSE } from '@/utils/sse';
 
 const settingsStore = useSettingsStore();
 const theme = computed(() => settingsStore.theme);
diff --git a/src/plugins/tab.ts b/src/plugins/tab.ts
index 86421a8..4b44dc6 100644
--- a/src/plugins/tab.ts
+++ b/src/plugins/tab.ts
@@ -1,5 +1,5 @@
 import router from '@/router';
-import {RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw} from 'vue-router';
+import { RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw } from 'vue-router';
 import useTagsViewStore from '@/store/modules/tagsView';
 
 export default {
diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts
index 9756ac2..b6cf434 100644
--- a/src/store/modules/tagsView.ts
+++ b/src/store/modules/tagsView.ts
@@ -31,7 +31,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
   const delIframeView = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
     return new Promise((resolve) => {
       iframeViews.value = iframeViews.value.filter((item: RouteLocationNormalized) => item.path !== view.path);
-      resolve([...iframeViews.value as RouteLocationNormalized[]]);
+      resolve([...(iframeViews.value as RouteLocationNormalized[])]);
     });
   };
   const addVisitedView = (view: RouteLocationNormalized): void => {
@@ -54,7 +54,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
         delCachedView(view);
       }
       resolve({
-        visitedViews: [...visitedViews.value as RouteLocationNormalized[]],
+        visitedViews: [...(visitedViews.value as RouteLocationNormalized[])],
         cachedViews: [...cachedViews.value]
       });
     });
@@ -68,7 +68,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
           break;
         }
       }
-      resolve([...visitedViews.value as RouteLocationNormalized[]]);
+      resolve([...(visitedViews.value as RouteLocationNormalized[])]);
     });
   };
   const delCachedView = (view?: RouteLocationNormalized): Promise<string[]> => {
@@ -92,7 +92,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
       delOthersVisitedViews(view);
       delOthersCachedViews(view);
       resolve({
-        visitedViews: [...visitedViews.value as RouteLocationNormalized[]],
+        visitedViews: [...(visitedViews.value as RouteLocationNormalized[])],
         cachedViews: [...cachedViews.value]
       });
     });
@@ -103,7 +103,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
       visitedViews.value = visitedViews.value.filter((v: RouteLocationNormalized) => {
         return v.meta?.affix || v.path === view.path;
       });
-      resolve([...visitedViews.value as RouteLocationNormalized[]]);
+      resolve([...(visitedViews.value as RouteLocationNormalized[])]);
     });
   };
   const delOthersCachedViews = (view: RouteLocationNormalized): Promise<string[]> => {
@@ -124,7 +124,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
       delAllVisitedViews();
       delAllCachedViews();
       resolve({
-        visitedViews: [...visitedViews.value as RouteLocationNormalized[]],
+        visitedViews: [...(visitedViews.value as RouteLocationNormalized[])],
         cachedViews: [...cachedViews.value]
       });
     });
@@ -132,7 +132,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
   const delAllVisitedViews = (): Promise<RouteLocationNormalized[]> => {
     return new Promise((resolve) => {
       visitedViews.value = visitedViews.value.filter((tag: RouteLocationNormalized) => tag.meta?.affix);
-      resolve([...visitedViews.value as RouteLocationNormalized[]]);
+      resolve([...(visitedViews.value as RouteLocationNormalized[])]);
     });
   };
 
@@ -167,7 +167,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
         }
         return false;
       });
-      resolve([...visitedViews.value as RouteLocationNormalized[]]);
+      resolve([...(visitedViews.value as RouteLocationNormalized[])]);
     });
   };
   const delLeftTags = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
@@ -186,7 +186,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
         }
         return false;
       });
-      resolve([...visitedViews.value as RouteLocationNormalized[]]);
+      resolve([...(visitedViews.value as RouteLocationNormalized[])]);
     });
   };
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f8f1f53..9682b81 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -10,7 +10,7 @@ import FileSaver from 'file-saver';
 import { getLanguage } from '@/lang';
 import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
-import router from "@/router";
+import router from '@/router';
 
 const encryptHeader = 'encrypt-key';
 let downloadLoadingInstance: LoadingInstance;
diff --git a/src/utils/sse.ts b/src/utils/sse.ts
index 5234648..69447ad 100644
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@@ -9,10 +9,7 @@ export const initSSE = (url: any) => {
   }
 
   url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID;
-  const {
-    data,
-    error
-  } = useEventSource(url, [], {
+  const { data, error } = useEventSource(url, [], {
     autoReconnect: {
       retries: 10,
       delay: 3000,
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 523deff..da1bc16 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -45,7 +45,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 921ddd9..566d071 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -25,7 +25,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
       <el-table
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 4cc890d..ec4b8fe 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -54,7 +54,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['monitor:logininfor:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index fcecab7..5bf8430 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -57,7 +57,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['monitor:operlog:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index c05dcdc..37e8609 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -41,7 +41,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:client:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index dcd41ea..64a0d4c 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -56,7 +56,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 199a997..15dfaa2 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -33,7 +33,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 33c7fc8..0faf1fa 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -40,7 +40,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 9eead48..adb0b27 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -49,7 +49,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
@@ -240,7 +240,6 @@ const handleRefreshCache = async () => {
   useDictStore().cleanDict();
 };
 
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index cf5f0fc..05630f4 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -30,7 +30,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7d4bbe0..d99b42c 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -40,7 +40,7 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 41766f6..07bfd36 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -41,7 +41,7 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index d057c23..37b2e91 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -62,7 +62,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:ossConfig:list']" type="info" plain icon="Operation" @click="handleOssConfig">配置管理</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 49b735b..95ad1ec 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -81,7 +81,7 @@
               <el-col :span="1.5">
                 <el-button v-hasPermi="['system:post:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
           <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 6394804..0af7b6d 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -30,7 +30,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :search="true" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" :search="true" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f67a527..b86a8ec 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -51,7 +51,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index e2cec99..c6f011e 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -47,7 +47,7 @@
           <el-col :span="1.5">
             <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
@@ -144,7 +144,16 @@
 </template>
 
 <script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage, syncTenantDict } from '@/api/system/tenant';
+import {
+  listTenant,
+  getTenant,
+  delTenant,
+  addTenant,
+  updateTenant,
+  changeTenantStatus,
+  syncTenantPackage,
+  syncTenantDict
+} from '@/api/system/tenant';
 import { selectTenantPackage } from '@/api/system/tenantPackage';
 import useUserStore from '@/store/modules/user';
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 05a0b41..f97bb35 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -35,7 +35,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出 </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index fe119ae..070221a 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -80,7 +80,7 @@ const tableRef = ref<ElTableInstance>();
 
 /** 单击选中行数据 */
 const clickRow = (row: RoleVO) => {
-  row.flag = !row.flag
+  row.flag = !row.flag;
   tableRef.value?.toggleRowSelection(row, row.flag);
 };
 /** 多选框选中数据 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index c53d41b..d75e760 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -87,7 +87,7 @@
                   </template>
                 </el-dropdown>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
 
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 2618a20..57b4282 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -52,7 +52,7 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index fd3bfc5..401edcf 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -26,7 +26,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
       <el-table
diff --git a/src/views/workflow/formManage/index.vue b/src/views/workflow/formManage/index.vue
index 9b9cfe2..e77fd75 100644
--- a/src/views/workflow/formManage/index.vue
+++ b/src/views/workflow/formManage/index.vue
@@ -33,7 +33,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['workflow:formManage:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index f413136..1708b64 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -27,7 +27,7 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 55556fd..418f272 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -192,8 +192,8 @@ const handleStartWorkFlow = async (data: LeaveVO) => {
     taskVariables.value = {
       entity: data,
       leaveDays: data.leaveDays,
-      userList: ["1", "3"],
-      userList2: ["1", "3"]
+      userList: ['1', '3'],
+      userList2: ['1', '3']
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);
diff --git a/src/views/workflow/model/index.vue b/src/views/workflow/model/index.vue
index e83cd94..86249bb 100644
--- a/src/views/workflow/model/index.vue
+++ b/src/views/workflow/model/index.vue
@@ -53,7 +53,7 @@
               <el-col :span="1.5">
                 <el-button type="primary" plain :disabled="multiple" icon="Download" @click="clickExportZip()">导出</el-button>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
 
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 1dacb80..6c686bf 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -47,7 +47,7 @@
               <el-col :span="1.5">
                 <el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
 
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 7c60880..084cf13 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -52,7 +52,7 @@
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
 
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index fe530b8..0bcfd31 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -35,7 +35,7 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">修改办理人</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 1bf5bbf..0a2ef19 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -38,7 +38,7 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
 
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 7784a08..c978cbd 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -24,7 +24,7 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 155bd4f..dadef15 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -24,7 +24,7 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index dc6546a..6d54829 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -24,7 +24,7 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
 
diff --git a/tsconfig.json b/tsconfig.json
index bb287e9..6315891 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-//    "useDefineForClassFields": true,
+    //    "useDefineForClassFields": true,
     "moduleResolution": "bundler",
     "strict": true,
     "jsx": "preserve",

From 845b848b60cd2356d9cf3b9d13c51595babaf72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=B2=E5=A8=9C=E8=B4=9Der?= <15891557205@163.com>
Date: Wed, 27 Nov 2024 07:39:34 +0000
Subject: [PATCH 24/73] =?UTF-8?q?!159=20eslint=E5=8D=87=E7=BA=A7v9?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20*=20update:=20eslint=E5=8D=87=E7=BA=A7v9?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20&=20=E6=9B=B4=E6=96=B0=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                              | 17 -----
 eslint.config.js                           | 86 ++++++++++++++++++++++
 package.json                               | 21 +++---
 src/layout/components/TopBar/search.vue    |  2 +-
 src/permission.ts                          |  2 +-
 src/views/register.vue                     |  2 +-
 src/views/system/user/index.vue            |  4 +-
 src/views/system/user/profile/resetPwd.vue |  2 +-
 src/views/tool/gen/importTable.vue         |  2 +-
 9 files changed, 102 insertions(+), 36 deletions(-)
 delete mode 100644 .eslintignore
 create mode 100644 eslint.config.js

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e74db40..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.sh
-node_modules
-*.md
-*.woff
-*.ttf
-.vscode
-.idea
-dist
-/public
-/docs
-.husky
-.local
-/bin
-.eslintrc.cjs
-prettier.config.js
-src/assets
-tailwind.config.js
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 0000000..8b67e9e
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,86 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import pluginVue from 'eslint-plugin-vue';
+import { readFile } from 'node:fs/promises';
+import prettier from 'eslint-plugin-prettier';
+
+/**
+ * https://blog.csdn.net/sayUonly/article/details/123482912
+ * 自动导入的配置
+ */
+const autoImportFile = new URL('./.eslintrc-auto-import.json', import.meta.url);
+const autoImportGlobals = JSON.parse(await readFile(autoImportFile, 'utf8'));
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  {
+    /**
+     * 不需要.eslintignore文件 而是在这里配置
+     */
+    ignores: [
+      '*.sh',
+      'node_modules',
+      '*.md',
+      '*.woff',
+      '*.ttf',
+      '.vscode',
+      '.idea',
+      'dist',
+      '/public',
+      '/docs',
+      '.husky',
+      '.local',
+      '/bin',
+      '.eslintrc.cjs',
+      'prettier.config.js',
+      'src/assets',
+      'tailwind.config.js'
+    ]
+  },
+  { files: ['**/*.{js,mjs,cjs,ts,vue}'] },
+  {
+    languageOptions: {
+      globals: globals.browser
+    }
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  ...pluginVue.configs['flat/essential'],
+  {
+    files: ['**/*.vue'],
+    languageOptions: {
+      parserOptions: {
+        parser: tseslint.parser
+      }
+    }
+  },
+  {
+    languageOptions: {
+      globals: {
+        // 自动导入的配置 undef
+        ...autoImportGlobals.globals,
+        DialogOption: 'readonly',
+        LayoutSetting: 'readonly'
+      }
+    },
+    plugins: { prettier },
+    rules: {
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/no-this-alias': 'off',
+
+      // vue
+      'vue/multi-word-component-names': 'off',
+      'vue/valid-define-props': 'off',
+      'vue/no-v-model-argument': 'off',
+      'prefer-rest-params': 'off',
+      // prettier
+      'prettier/prettier': 'error',
+      // 允许使用空Object类型 {}
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-unused-expressions': 'off'
+    }
+  }
+];
diff --git a/package.json b/package.json
index 9726ee5..04ca0b3 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/tsconfig",
   "name": "ruoyi-vue-plus",
   "version": "5.2.3",
   "description": "RuoYi-Vue-Plus多租户管理系统",
@@ -10,7 +11,8 @@
     "build:prod": "vite build --mode production",
     "build:dev": "vite build --mode development",
     "preview": "vite preview",
-    "lint:eslint": "eslint  --fix --ext .ts,.js,.vue ./src ",
+    "lint:eslint": "eslint",
+    "lint:eslint:fix": "eslint --fix",
     "prettier": "prettier --write ."
   },
   "repository": {
@@ -34,7 +36,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "7.0.0",
     "highlight.js": "11.9.0",
-    "image-conversion": "^2.1.1",
+    "image-conversion": "2.1.1",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",
     "nprogress": "0.2.0",
@@ -49,6 +51,7 @@
     "vxe-table": "4.5.22"
   },
   "devDependencies": {
+    "@eslint/js": "9.15.0",
     "@iconify/json": "2.2.276",
     "@intlify/unplugin-vue-i18n": "3.0.1",
     "@types/crypto-js": "4.2.2",
@@ -56,27 +59,22 @@
     "@types/js-cookie": "3.0.6",
     "@types/node": "18.18.2",
     "@types/nprogress": "0.2.3",
-    "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "7.18.0",
     "@unocss/preset-attributify": "0.64.1",
     "@unocss/preset-icons": "0.64.1",
     "@unocss/preset-uno": "0.64.1",
     "@vitejs/plugin-vue": "5.0.4",
     "@vue/compiler-sfc": "3.4.23",
     "autoprefixer": "10.4.18",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-define-config": "2.1.0",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-promise": "7.2.0",
+    "eslint": "9.15.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-vue": "9.31.0",
     "fast-glob": "3.3.2",
+    "globals": "15.12.0",
     "postcss": "8.4.36",
     "prettier": "3.2.5",
     "sass": "1.72.0",
     "typescript": "5.7.2",
+    "typescript-eslint": "8.16.0",
     "unocss": "0.64.1",
     "unplugin-auto-import": "0.17.5",
     "unplugin-icons": "0.18.5",
@@ -86,7 +84,6 @@
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1",
     "vitest": "1.5.0",
-    "vue-eslint-parser": "9.4.2",
     "vue-tsc": "2.0.13"
   }
 }
diff --git a/src/layout/components/TopBar/search.vue b/src/layout/components/TopBar/search.vue
index cf4b024..182e84a 100644
--- a/src/layout/components/TopBar/search.vue
+++ b/src/layout/components/TopBar/search.vue
@@ -66,7 +66,7 @@ const closeSearch = () => {
   state.isShowSearch = false;
 };
 // 菜单搜索数据过滤
-const menuSearch = (queryString: string, cb: Function) => {
+const menuSearch = (queryString: string, cb: (options: any[]) => void) => {
   let options = state.menuList.filter((item) => {
     return item.title.indexOf(queryString) > -1;
   });
diff --git a/src/permission.ts b/src/permission.ts
index 125438b..51a928a 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -40,7 +40,7 @@ router.beforeEach(async (to, from, next) => {
               router.addRoute(route); // 动态添加可访问路由表
             }
           });
-          // @ts-ignore
+          // @ts-expect-error hack方法 确保addRoutes已完成
           next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
         }
       } else {
diff --git a/src/views/register.vue b/src/views/register.vue
index 4e67a67..83f7a27 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -92,7 +92,7 @@ const registerRules: ElFormRules = {
   password: [
     { required: true, trigger: 'blur', message: '请输入您的密码' },
     { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur' }
+    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
   ],
   confirmPassword: [
     { required: true, trigger: 'blur', message: '请再次输入您的密码' },
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d75e760..9597ca1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -393,7 +393,7 @@ const initData: PageData<UserForm, UserQuery> = {
         message: '用户密码长度必须介于 5 和 20 之间',
         trigger: 'blur'
       },
-      { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur' }
+      { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
     ],
     email: [
       {
@@ -506,7 +506,7 @@ const handleResetPwd = async (row: UserVO) => {
       inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
       inputValidator: (value) => {
         if (/<|>|"|'|\||\\/.test(value)) {
-          return '不能包含非法字符：< > " \' \\\ |';
+          return '不能包含非法字符：< > " \' \\ |';
         }
       }
     })
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index aae5ef8..3ca5ee9 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -45,7 +45,7 @@ const rules = ref({
       message: '长度在 6 到 20 个字符',
       trigger: 'blur'
     },
-    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur' }
+    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
   ],
   confirmPassword: [
     { required: true, message: '确认密码不能为空', trigger: 'blur' },
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index e0f524e..f6e75cc 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -63,7 +63,7 @@ const emit = defineEmits(['ok']);
 
 /** 查询参数列表 */
 const show = (dataName: string) => {
-  getDataNames().then(res => {
+  getDataNames().then((res) => {
     if (res.code == 200) {
       dataNameList.value = res.data;
       if (dataName) {

From eb406fbb2614ebb893f3aafe49d58a19da39b395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 27 Nov 2024 15:51:38 +0800
Subject: [PATCH 25/73] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.cjs | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 .eslintrc.cjs

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
deleted file mode 100644
index 6042c39..0000000
--- a/.eslintrc.cjs
+++ /dev/null
@@ -1,51 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    node: true,
-    es6: true
-  },
-  parser: 'vue-eslint-parser',
-  extends: [
-    'plugin:vue/vue3-recommended',
-    './.eslintrc-auto-import.json',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'plugin:prettier/recommended'
-  ],
-  parserOptions: {
-    ecmaVersion: '2020',
-    sourceType: 'module',
-    project: './tsconfig.*?.json',
-    parser: '@typescript-eslint/parser'
-  },
-  plugins: ['vue', '@typescript-eslint', 'import', 'promise', 'node', 'prettier'],
-  rules: {
-    '@typescript-eslint/no-empty-function': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-unused-vars': 'off',
-    '@typescript-eslint/no-this-alias': 'off',
-
-    // vue
-    'vue/multi-word-component-names': 'off',
-    'vue/valid-define-props': 'off',
-    'vue/no-v-model-argument': 'off',
-    'prefer-rest-params': 'off',
-    // prettier
-    'prettier/prettier': 'error',
-    '@typescript-eslint/ban-types': [
-      'error',
-      {
-        // 关闭空类型检查 {}
-        extendDefaults: true,
-        types: {
-          '{}': false,
-          Function: false
-        }
-      }
-    ]
-  },
-  globals: {
-    DialogOption: 'readonly',
-    OptionType: 'readonly'
-  }
-};

From 7c1525fd21783509bce3bf5c71ff400b0e89f68c Mon Sep 17 00:00:00 2001
From: QianRj <14974713+qianrj@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 17:25:09 +0800
Subject: [PATCH 26/73] =?UTF-8?q?refactor:=20=E8=A1=A5=E5=85=85=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E4=B8=8E=E6=B3=A8=E5=86=8C=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en_US.json    | 58 ++++++++++++++++++++++++++++++-
 src/lang/en_US.ts      | 59 ++++++++++++++++++++++++++++++-
 src/lang/zh_CN.json    | 60 ++++++++++++++++++++++++++++++--
 src/lang/zh_CN.ts      | 62 +++++++++++++++++++++++++++++++--
 src/views/login.vue    | 76 ++++++++++++++++++++++++++++------------
 src/views/register.vue | 79 ++++++++++++++++++++++++++++++------------
 6 files changed, 343 insertions(+), 51 deletions(-)

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
index 17b472e..f465aa6 100644
--- a/src/lang/en_US.json
+++ b/src/lang/en_US.json
@@ -4,11 +4,67 @@
     "document": "Document"
   },
   "login": {
+    "selectPlaceholder": "Please select/enter a company name",
     "username": "Username",
     "password": "Password",
     "login": "Login",
+    "logging": "Logging...",
     "code": "Verification Code",
-    "copyright": ""
+    "rememberPassword": "Remember me",
+    "switchRegisterPage": "Sign up now",
+    "rule": {
+      "tenantId": {
+        "required": "Please enter your tenant id"
+      },
+      "username": {
+        "required": "Please enter your account"
+      },
+      "password": {
+        "required": "Please enter your password"
+      },
+      "code": {
+        "required": "Please enter a verification code"
+      }
+    },
+    "social": {
+      "wechat": "Wechat Login",
+      "maxkey": "MaxKey Login",
+      "topiam": "TopIam Login",
+      "gitee": "Gitee Login",
+      "github": "Github Login"
+    }
+  },
+  "register": {
+    "selectPlaceholder": "Please select/enter a company name",
+    "username": "Username",
+    "password": "Password",
+    "confirmPassword": "Confirm Password",
+    "register": "Register",
+    "registering": "Registering...",
+    "registerSuccess": "Congratulations, your {username} account has been registered!",
+    "code": "Verification Code",
+    "switchLoginPage": "Log in with an existing account",
+    "rule": {
+      "tenantId": {
+        "required": "Please enter your tenant id"
+      },
+      "username": {
+        "required": "Please enter your account",
+        "length": "The length of the user account must be between {min} and {max}"
+      },
+      "password": {
+        "required": "Please enter your password",
+        "length": "The user password must be between {min} and {max} in length",
+        "pattern": "Can't contain illegal characters: {strings}"
+      },
+      "code": {
+        "required": "Please enter a verification code"
+      },
+      "confirmPassword": {
+        "required": "Please enter your password again",
+        "equalToPassword": "The password entered twice is inconsistent"
+      }
+    }
   },
   "navbar": {
     "full": "Full Screen",
diff --git a/src/lang/en_US.ts b/src/lang/en_US.ts
index 034ea91..b090d3e 100644
--- a/src/lang/en_US.ts
+++ b/src/lang/en_US.ts
@@ -6,11 +6,68 @@ export default {
   },
   // 登录页面国际化
   login: {
+    selectPlaceholder: 'Please select/enter a company name',
     username: 'Username',
     password: 'Password',
     login: 'Login',
+    logging: 'Logging...',
     code: 'Verification Code',
-    copyright: ''
+    rememberPassword: 'Remember me',
+    switchRegisterPage: 'Sign up now',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account'
+      },
+      password: {
+        required: 'Please enter your password'
+      },
+      code: {
+        required: 'Please enter a verification code'
+      }
+    },
+    social: {
+      wechat: 'Wechat Login',
+      maxkey: 'MaxKey Login',
+      topiam: 'TopIam Login',
+      gitee: 'Gitee Login',
+      github: 'Github Login'
+    }
+  },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: 'Please select/enter a company name',
+    username: 'Username',
+    password: 'Password',
+    confirmPassword: 'Confirm Password',
+    register: 'Register',
+    registering: 'Registering...',
+    registerSuccess: 'Congratulations, your {username} account has been registered!',
+    code: 'Verification Code',
+    switchLoginPage: 'Log in with an existing account',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account',
+        length: 'The length of the user account must be between {min} and {max}'
+      },
+      password: {
+        required: 'Please enter your password',
+        length: 'The user password must be between {min} and {max} in length',
+        pattern: "Can't contain illegal characters: {strings}"
+      },
+      code: {
+        required: 'Please enter a verification code'
+      },
+      confirmPassword: {
+        required: 'Please enter your password again',
+        equalToPassword: 'The password entered twice is inconsistent'
+      }
+    }
   },
   // 导航栏国际化
   navbar: {
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
index 071598d..14138b5 100644
--- a/src/lang/zh_CN.json
+++ b/src/lang/zh_CN.json
@@ -4,11 +4,67 @@
     "document": "项目文档"
   },
   "login": {
+    "selectPlaceholder": "请选择/输入公司名称",
     "username": "用户名",
     "password": "密码",
     "login": "登 录",
-    "code": "请输入验证码",
-    "copyright": ""
+    "logging": "登 录 中...",
+    "code": "验证码",
+    "rememberPassword": "记住我",
+    "switchRegisterPage": "立即注册",
+    "rule": {
+      "tenantId": {
+        "required": "请输入您的租户编号"
+      },
+      "username": {
+        "required": "请输入您的账号"
+      },
+      "password": {
+        "required": "请输入您的密码"
+      },
+      "code": {
+        "required": "请输入验证码"
+      }
+    },
+    "social": {
+      "wechat": "微信登录",
+      "maxkey": "MaxKey登录",
+      "topiam": "TopIam登录",
+      "gitee": "Gitee登录",
+      "github": "Github登录"
+    }
+  },
+  "register": {
+    "selectPlaceholder": "请选择/输入公司名称",
+    "username": "用户名",
+    "password": "密码",
+    "confirmPassword": "确认密码",
+    "register": "注 册",
+    "registering": "注 册 中...",
+    "registerSuccess": "恭喜你，您的账号 {username} 注册成功！",
+    "code": "验证码",
+    "switchLoginPage": "使用已有账户登录",
+    "rule": {
+      "tenantId": {
+        "required": "请输入您的租户编号"
+      },
+      "username": {
+        "required": "请输入您的账号",
+        "length": "用户账号长度必须介于 {min} 和 {max} 之间"
+      },
+      "password": {
+        "required": "请输入您的密码",
+        "length": "用户密码长度必须介于 {min} 和 {max} 之间",
+        "pattern": "不能包含非法字符：{strings}"
+      },
+      "code": {
+        "required": "请输入验证码"
+      },
+      "confirmPassword": {
+        "required": "请再次输入您的密码",
+        "equalToPassword": "两次输入的密码不一致"
+      }
+    }
   },
   "navbar": {
     "full": "全屏",
diff --git a/src/lang/zh_CN.ts b/src/lang/zh_CN.ts
index 666a400..3cc9872 100644
--- a/src/lang/zh_CN.ts
+++ b/src/lang/zh_CN.ts
@@ -6,12 +6,70 @@ export default {
   },
   // 登录页面国际化
   login: {
+    selectPlaceholder: '请选择/输入公司名称',
     username: '用户名',
     password: '密码',
     login: '登 录',
-    code: '请输入验证码',
-    copyright: ''
+    logging: '登 录 中...',
+    code: '验证码',
+    rememberPassword: '记住我',
+    switchRegisterPage: '立即注册',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号'
+      },
+      password: {
+        required: '请输入您的密码'
+      },
+      code: {
+        required: '请输入验证码'
+      }
+    },
+    social: {
+      wechat: '微信登录',
+      maxkey: 'MaxKey登录',
+      topiam: 'TopIam登录',
+      gitee: 'Gitee登录',
+      github: 'Github登录'
+    }
   },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: '请选择/输入公司名称',
+    username: '用户名',
+    password: '密码',
+    confirmPassword: '确认密码',
+    register: '注 册',
+    registering: '注 册 中...',
+    registerSuccess: '恭喜你，您的账号 {username} 注册成功！',
+    code: '验证码',
+    switchLoginPage: '使用已有账户登录',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号',
+        length: '用户账号长度必须介于 {min} 和 {max} 之间'
+      },
+      password: {
+        required: '请输入您的密码',
+        length: '用户密码长度必须介于 {min} 和 {max} 之间',
+        pattern: '不能包含非法字符：{strings}'
+      },
+      code: {
+        required: '请输入验证码'
+      },
+      confirmPassword: {
+        required: '请再次输入您的密码',
+        equalToPassword: '两次输入的密码不一致'
+      }
+    }
+  },
+  // 导航栏国际化
   navbar: {
     full: '全屏',
     language: '语言',
diff --git a/src/views/login.vue b/src/views/login.vue
index 71d5dcd..7f7ae6b 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,56 +1,73 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+      <div class="title-box">
+        <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+        <lang-select class="lang-select hover-effect" />
+      </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
+        <el-select v-model="loginForm.tenantId" filterable :placeholder="$t('tenant.selectPlaceholder')" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+        <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('login.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码" @keyup.enter="handleLogin">
+        <el-input
+          v-model="loginForm.password"
+          type="password"
+          size="large"
+          auto-complete="off"
+          :placeholder="$t('login.password')"
+          @keyup.enter="handleLogin"
+        >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item v-if="captchaEnabled" prop="code">
-        <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleLogin">
+        <el-input
+          v-model="loginForm.code"
+          size="large"
+          auto-complete="off"
+          :placeholder="$t('login.code')"
+          style="width: 63%"
+          @keyup.enter="handleLogin"
+        >
           <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" class="login-code-img" @click="getCode" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">记住密码</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ $t('login.rememberPassword') }}</el-checkbox>
       <el-form-item style="float: right">
-        <el-button circle title="微信登录" @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="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="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="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="Github登录" @click="doSocialLogin('github')">
+        <el-button circle :title="$t('login.social.github')" @click="doSocialLogin('github')">
           <svg-icon icon-class="github" />
         </el-button>
       </el-form-item>
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
+          <span v-if="!loading">{{ $t('login.login') }}</span>
+          <span v-else>{{ $t('login.logging') }}</span>
         </el-button>
         <div v-if="register" style="float: right">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          <router-link class="link-type" :to="'/register'">{{ $t('login.switchRegisterPage') }}</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -68,9 +85,11 @@ import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
+import { useI18n } from 'vue-i18n';
 
 const userStore = useUserStore();
 const router = useRouter();
+const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
@@ -82,10 +101,10 @@ const loginForm = ref<LoginData>({
 } as LoginData);
 
 const loginRules: ElFormRules = {
-  tenantId: [{ required: true, trigger: 'blur', message: '请输入您的租户编号' }],
-  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-  code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
+  tenantId: [{ required: true, trigger: 'blur', message: t('login.rule.tenantId.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('');
@@ -218,10 +237,23 @@ onMounted(() => {
   background-size: cover;
 }
 
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+.title-box {
+  display: flex;
+
+  .title {
+    margin: 0px auto 30px auto;
+    text-align: center;
+    color: #707070;
+  }
+
+  .lang-select {
+    line-height: 30px;
+    color: #7483a3;
+
+    &.hover-effect {
+      cursor: pointer;
+    }
+  }
 }
 
 .login-form {
diff --git a/src/views/register.vue b/src/views/register.vue
index 83f7a27..e6b6ca8 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,20 +1,30 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+      <div class="title-box">
+        <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+        <lang-select class="lang-select hover-effect" />
+      </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
+        <el-select v-model="registerForm.tenantId" filterable :placeholder="$t('register.selectPlaceholder')" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+        <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('register.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
+        <el-input
+          v-model="registerForm.password"
+          type="password"
+          size="large"
+          auto-complete="off"
+          :placeholder="$t('register.password')"
+          @keyup.enter="handleRegister"
+        >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
@@ -24,14 +34,21 @@
           type="password"
           size="large"
           auto-complete="off"
-          placeholder="确认密码"
+          :placeholder="$t('register.confirmPassword')"
           @keyup.enter="handleRegister"
         >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item v-if="captchaEnabled" prop="code">
-        <el-input v-model="registerForm.code" size="large" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
+        <el-input
+          v-model="registerForm.code"
+          size="large"
+          auto-complete="off"
+          :placeholder="$t('register.code')"
+          style="width: 63%"
+          @keyup.enter="handleRegister"
+        >
           <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
         </el-input>
         <div class="register-code">
@@ -40,11 +57,11 @@
       </el-form-item>
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleRegister">
-          <span v-if="!loading">注 册</span>
-          <span v-else>注 册 中...</span>
+          <span v-if="!loading">{{ $t('register.register') }}</span>
+          <span v-else>{{ $t('register.registering') }}</span>
         </el-button>
         <div style="float: right">
-          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+          <router-link class="link-type" :to="'/login'">{{ $t('register.switchLoginPage') }}</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -59,9 +76,12 @@
 import { getCodeImg, register, getTenantList } from '@/api/login';
 import { RegisterForm, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
+import { useI18n } from 'vue-i18n';
 
 const router = useRouter();
 
+const { t } = useI18n();
+
 const registerForm = ref<RegisterForm>({
   tenantId: '',
   username: '',
@@ -77,28 +97,28 @@ const tenantEnabled = ref(true);
 
 const equalToPassword = (rule: any, value: string, callback: any) => {
   if (registerForm.value.password !== value) {
-    callback(new Error('两次输入的密码不一致'));
+    callback(new Error(t('register.rule.confirmPassword.equalToPassword')));
   } else {
     callback();
   }
 };
 
 const registerRules: ElFormRules = {
-  tenantId: [{ required: true, trigger: 'blur', message: '请输入您的租户编号' }],
+  tenantId: [{ required: true, trigger: 'blur', message: t('register.rule.tenantId.required') }],
   username: [
-    { required: true, trigger: 'blur', message: '请输入您的账号' },
-    { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+    { required: true, trigger: 'blur', message: t('register.rule.username.required') },
+    { min: 2, max: 20, message: t('register.rule.username.length', { min: 2, max: 20 }), trigger: 'blur' }
   ],
   password: [
-    { required: true, trigger: 'blur', message: '请输入您的密码' },
-    { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-    { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
+    { required: true, trigger: 'blur', message: t('register.rule.password.required') },
+    { min: 5, max: 20, message: t('register.rule.password.length', { min: 5, max: 20 }), trigger: 'blur' },
+    { pattern: /^[^<>"'|\\]+$/, message: t('register.rule.password.pattern', { strings: '< > " \' \\ |' }), trigger: 'blur' }
   ],
   confirmPassword: [
-    { required: true, trigger: 'blur', message: '请再次输入您的密码' },
+    { required: true, trigger: 'blur', message: t('register.rule.confirmPassword.required') },
     { required: true, validator: equalToPassword, trigger: 'blur' }
   ],
-  code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
+  code: [{ required: true, trigger: 'change', message: t('register.rule.code.required') }]
 };
 const codeUrl = ref('');
 const loading = ref(false);
@@ -114,7 +134,7 @@ const handleRegister = () => {
       const [err] = await to(register(registerForm.value));
       if (!err) {
         const username = registerForm.value.username;
-        await ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + ' 注册成功！</font>', '系统提示', {
+        await ElMessageBox.alert("<font color='red'>" + t('register.registerSuccess', { username }) + '</font>', '系统提示', {
           dangerouslyUseHTMLString: true,
           type: 'success'
         });
@@ -166,10 +186,23 @@ onMounted(() => {
   background-size: cover;
 }
 
-.title {
-  margin: 0 auto 30px auto;
-  text-align: center;
-  color: #707070;
+.title-box {
+  display: flex;
+
+  .title {
+    margin: 0px auto 30px auto;
+    text-align: center;
+    color: #707070;
+  }
+
+  .lang-select {
+    line-height: 30px;
+    color: #7483a3;
+
+    &.hover-effect {
+      cursor: pointer;
+    }
+  }
 }
 
 .register-form {

From 6ef9b9a7414988568931e28e3971dacb0961e7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 27 Nov 2024 17:43:17 +0800
Subject: [PATCH 27/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/module.d.ts  | 2 +-
 src/views/register.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/types/module.d.ts b/src/types/module.d.ts
index 984df9f..bc2f16b 100644
--- a/src/types/module.d.ts
+++ b/src/types/module.d.ts
@@ -11,7 +11,7 @@ import { download as rd } from '@/utils/request';
 
 export {};
 
-declare module 'vue' {
+declare module '@vue/runtime-core' {
   interface ComponentCustomProperties {
     // 全局方法声明
     $modal: typeof modal;
diff --git a/src/views/register.vue b/src/views/register.vue
index e6b6ca8..5d3edaa 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -134,7 +134,8 @@ const handleRegister = () => {
       const [err] = await to(register(registerForm.value));
       if (!err) {
         const username = registerForm.value.username;
-        await ElMessageBox.alert("<font color='red'>" + t('register.registerSuccess', { username }) + '</font>', '系统提示', {
+        await ElMessageBox.alert('<span style="color: red; ">' + t('register.registerSuccess', { username }) + '</font>', '系统提示', {
+          app: undefined,
           dangerouslyUseHTMLString: true,
           type: 'success'
         });

From 42b6668fd042f2d0ecdbcc4b401b4a05055b53c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 28 Nov 2024 11:16:00 +0800
Subject: [PATCH 28/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=8F=98?=
 =?UTF-8?q?=E9=87=8Fcode=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 7f7ae6b..4c89c14 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
         <lang-select class="lang-select hover-effect" />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="loginForm.tenantId" filterable :placeholder="$t('tenant.selectPlaceholder')" style="width: 100%">
+        <el-select v-model="loginForm.tenantId" filterable :placeholder="$t('login.selectPlaceholder')" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>

From 06a8d871f7741c82612e21ea8f85081b361d841d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 28 Nov 2024 11:42:08 +0800
Subject: [PATCH 29/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E9=87=8D=E5=A4=8D=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        |  1 -
 src/lang/en_US.json | 81 ---------------------------------------------
 src/lang/index.ts   |  8 +++--
 src/lang/zh_CN.json | 81 ---------------------------------------------
 4 files changed, 6 insertions(+), 165 deletions(-)
 delete mode 100644 src/lang/en_US.json
 delete mode 100644 src/lang/zh_CN.json

diff --git a/package.json b/package.json
index 04ca0b3..b911cd6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
   "devDependencies": {
     "@eslint/js": "9.15.0",
     "@iconify/json": "2.2.276",
-    "@intlify/unplugin-vue-i18n": "3.0.1",
     "@types/crypto-js": "4.2.2",
     "@types/file-saver": "2.0.7",
     "@types/js-cookie": "3.0.6",
diff --git a/src/lang/en_US.json b/src/lang/en_US.json
deleted file mode 100644
index f465aa6..0000000
--- a/src/lang/en_US.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "Dashboard",
-    "document": "Document"
-  },
-  "login": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "login": "Login",
-    "logging": "Logging...",
-    "code": "Verification Code",
-    "rememberPassword": "Remember me",
-    "switchRegisterPage": "Sign up now",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account"
-      },
-      "password": {
-        "required": "Please enter your password"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      }
-    },
-    "social": {
-      "wechat": "Wechat Login",
-      "maxkey": "MaxKey Login",
-      "topiam": "TopIam Login",
-      "gitee": "Gitee Login",
-      "github": "Github Login"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "register": "Register",
-    "registering": "Registering...",
-    "registerSuccess": "Congratulations, your {username} account has been registered!",
-    "code": "Verification Code",
-    "switchLoginPage": "Log in with an existing account",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account",
-        "length": "The length of the user account must be between {min} and {max}"
-      },
-      "password": {
-        "required": "Please enter your password",
-        "length": "The user password must be between {min} and {max} in length",
-        "pattern": "Can't contain illegal characters: {strings}"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      },
-      "confirmPassword": {
-        "required": "Please enter your password again",
-        "equalToPassword": "The password entered twice is inconsistent"
-      }
-    }
-  },
-  "navbar": {
-    "full": "Full Screen",
-    "language": "Language",
-    "dashboard": "Dashboard",
-    "document": "Document",
-    "message": "Message",
-    "layoutSize": "Layout Size",
-    "selectTenant": "Select Tenant",
-    "layoutSetting": "Layout Setting",
-    "personalCenter": "Personal Center",
-    "logout": "Logout"
-  }
-}
diff --git a/src/lang/index.ts b/src/lang/index.ts
index e4e1d25..3e69cee 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,7 +2,8 @@
 import { createI18n } from 'vue-i18n';
 
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import messages from '@intlify/unplugin-vue-i18n/messages';
+import zh_CN from "@/lang/zh_CN";
+import en_US from "@/lang/en_US";
 
 /**
  * 获取当前语言
@@ -21,7 +22,10 @@ const i18n = createI18n({
   allowComposition: true,
   legacy: false,
   locale: getLanguage(),
-  messages
+  messages: {
+    zh_CN: zh_CN,
+    en_US: en_US
+  }
 });
 
 export default i18n;
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
deleted file mode 100644
index 14138b5..0000000
--- a/src/lang/zh_CN.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "首页",
-    "document": "项目文档"
-  },
-  "login": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "login": "登 录",
-    "logging": "登 录 中...",
-    "code": "验证码",
-    "rememberPassword": "记住我",
-    "switchRegisterPage": "立即注册",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号"
-      },
-      "password": {
-        "required": "请输入您的密码"
-      },
-      "code": {
-        "required": "请输入验证码"
-      }
-    },
-    "social": {
-      "wechat": "微信登录",
-      "maxkey": "MaxKey登录",
-      "topiam": "TopIam登录",
-      "gitee": "Gitee登录",
-      "github": "Github登录"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "confirmPassword": "确认密码",
-    "register": "注 册",
-    "registering": "注 册 中...",
-    "registerSuccess": "恭喜你，您的账号 {username} 注册成功！",
-    "code": "验证码",
-    "switchLoginPage": "使用已有账户登录",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号",
-        "length": "用户账号长度必须介于 {min} 和 {max} 之间"
-      },
-      "password": {
-        "required": "请输入您的密码",
-        "length": "用户密码长度必须介于 {min} 和 {max} 之间",
-        "pattern": "不能包含非法字符：{strings}"
-      },
-      "code": {
-        "required": "请输入验证码"
-      },
-      "confirmPassword": {
-        "required": "请再次输入您的密码",
-        "equalToPassword": "两次输入的密码不一致"
-      }
-    }
-  },
-  "navbar": {
-    "full": "全屏",
-    "language": "语言",
-    "dashboard": "首页",
-    "document": "项目文档",
-    "message": "消息",
-    "layoutSize": "布局大小",
-    "selectTenant": "选择租户",
-    "layoutSetting": "布局设置",
-    "personalCenter": "个人中心",
-    "logout": "退出登录"
-  }
-}

From 786f25bfd48ff001ff93dce49b4434d67f583b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 28 Nov 2024 12:43:32 +0800
Subject: [PATCH 30/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue    | 10 +++-------
 src/views/register.vue | 11 ++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 4c89c14..aabf2aa 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -3,7 +3,7 @@
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
       <div class="title-box">
         <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
-        <lang-select class="lang-select hover-effect" />
+        <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
         <el-select v-model="loginForm.tenantId" filterable :placeholder="$t('login.selectPlaceholder')" style="width: 100%">
@@ -246,13 +246,9 @@ onMounted(() => {
     color: #707070;
   }
 
-  .lang-select {
-    line-height: 30px;
+  :deep(.lang-select--style) {
+    line-height: 0;
     color: #7483a3;
-
-    &.hover-effect {
-      cursor: pointer;
-    }
   }
 }
 
diff --git a/src/views/register.vue b/src/views/register.vue
index 5d3edaa..9f76c70 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -3,7 +3,7 @@
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
       <div class="title-box">
         <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
-        <lang-select class="lang-select hover-effect" />
+        <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
         <el-select v-model="registerForm.tenantId" filterable :placeholder="$t('register.selectPlaceholder')" style="width: 100%">
@@ -196,14 +196,11 @@ onMounted(() => {
     color: #707070;
   }
 
-  .lang-select {
-    line-height: 30px;
+  :deep(.lang-select--style) {
+    line-height: 0;
     color: #7483a3;
-
-    &.hover-effect {
-      cursor: pointer;
-    }
   }
+
 }
 
 .register-form {

From 5ca894369a833330d79cf7948b3f0b0776c3d286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E8=BE=9E=E6=9C=AA=E5=AF=92?= <545073804@qq.com>
Date: Thu, 28 Nov 2024 14:15:10 +0800
Subject: [PATCH 31/73] =?UTF-8?q?remove=20=E7=A7=BB=E9=99=A4=20=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E4=B8=8D=E5=86=8D=E4=BE=9D=E8=B5=96=E7=9A=84=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite/plugins/i18n.ts  | 6 ------
 vite/plugins/index.ts | 2 --
 2 files changed, 8 deletions(-)
 delete mode 100644 vite/plugins/i18n.ts

diff --git a/vite/plugins/i18n.ts b/vite/plugins/i18n.ts
deleted file mode 100644
index 8777d1a..0000000
--- a/vite/plugins/i18n.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-export default (path: any) => {
-  return VueI18nPlugin({
-    include: [path.resolve(__dirname, '../../src/lang/**.json')]
-  });
-};
diff --git a/vite/plugins/index.ts b/vite/plugins/index.ts
index 0ec5b8d..30b2835 100644
--- a/vite/plugins/index.ts
+++ b/vite/plugins/index.ts
@@ -6,7 +6,6 @@ import createIcons from './icons';
 import createSvgIconsPlugin from './svg-icon';
 import createCompression from './compression';
 import createSetupExtend from './setup-extend';
-import createI18n from './i18n';
 import path from 'path';
 
 export default (viteEnv: any, isBuild = false): [] => {
@@ -19,6 +18,5 @@ export default (viteEnv: any, isBuild = false): [] => {
   vitePlugins.push(createIcons());
   vitePlugins.push(createSvgIconsPlugin(path, isBuild));
   vitePlugins.push(createSetupExtend());
-  vitePlugins.push(createI18n(path));
   return vitePlugins;
 };

From 23f372dad7d83b65f7c1f3673aa43484b92057dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 28 Nov 2024 14:17:59 +0800
Subject: [PATCH 32/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=A0redirect=E5=8F=82=E6=95=B0404=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index aabf2aa..ae70f75 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -124,7 +124,7 @@ const tenantList = ref<TenantVO[]>([]);
 watch(
   () => router.currentRoute.value,
   (newRoute: any) => {
-    redirect.value = newRoute.query && decodeURIComponent(newRoute.query.redirect);
+    redirect.value = newRoute.query && newRoute.query.redirect && decodeURIComponent(newRoute.query.redirect);
   },
   { immediate: true }
 );

From bf43f8aa3cde0f53e21fe252ea162b316cea7c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 28 Nov 2024 16:31:12 +0800
Subject: [PATCH 33/73] =?UTF-8?q?reset=20=E5=9B=9E=E6=BB=9A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index c9b42a2..fa845e7 100644
--- a/.env.development
+++ b/.env.development
@@ -16,7 +16,7 @@ VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/applications'
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
 
-VITE_APP_PORT = 81
+VITE_APP_PORT = 80
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT = true

From 76f4824d2b447cbb80e5476289448898a2b55b0d Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 28 Nov 2024 21:07:23 +0800
Subject: [PATCH 34/73] =?UTF-8?q?feat:=20i18n=20$t=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81ts=E7=B1=BB=E5=9E=8B=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/index.ts     |  6 ++++--
 src/types/module.d.ts | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/lang/index.ts b/src/lang/index.ts
index 3e69cee..4f8e74c 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,8 +2,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';
+import en_US from '@/lang/en_US';
 
 /**
  * 获取当前语言
@@ -29,3 +29,5 @@ const i18n = createI18n({
 });
 
 export default i18n;
+
+export type LanguageType = typeof zh_CN;
diff --git a/src/types/module.d.ts b/src/types/module.d.ts
index bc2f16b..9942657 100644
--- a/src/types/module.d.ts
+++ b/src/types/module.d.ts
@@ -8,6 +8,7 @@ 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';
 
 export {};
 
@@ -20,6 +21,11 @@ declare module '@vue/runtime-core' {
     $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;
@@ -33,6 +39,16 @@ declare module '@vue/runtime-core' {
   }
 }
 
+/**
+ * { a: 1, b: { ba: { baa: 1, bab: 2 }, bb: 2} } ---> a | b.ba.baa | b.ba.bab | b.bb
+ * https://juejin.cn/post/7280062870670606397
+ */
+export type ObjKeysToUnion<T, P extends string = ''> = T extends object
+  ? {
+      [K in keyof T]: ObjKeysToUnion<T[K], P extends '' ? `${K & string}` : `${P}.${K & string}`>;
+    }[keyof T]
+  : P;
+
 declare module 'vform3-builds' {
   const content: any;
   export = content;

From 150f1d793c8f471f68aa5c7f6dc5867d4afd7d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Nov 2024 09:50:16 +0800
Subject: [PATCH 35/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue    | 2 --
 src/views/register.vue | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index ae70f75..c3d1690 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -85,11 +85,9 @@ import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
-import { useI18n } from 'vue-i18n';
 
 const userStore = useUserStore();
 const router = useRouter();
-const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
diff --git a/src/views/register.vue b/src/views/register.vue
index 9f76c70..1d9c394 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -76,12 +76,9 @@
 import { getCodeImg, register, getTenantList } from '@/api/login';
 import { RegisterForm, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
-import { useI18n } from 'vue-i18n';
 
 const router = useRouter();
 
-const { t } = useI18n();
-
 const registerForm = ref<RegisterForm>({
   tenantId: '',
   username: '',

From 484db3c09ec004d0ec9fb4a59aae170eabd07be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Nov 2024 10:02:03 +0800
Subject: [PATCH 36/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/module.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/types/module.d.ts b/src/types/module.d.ts
index 9942657..2fc273a 100644
--- a/src/types/module.d.ts
+++ b/src/types/module.d.ts
@@ -49,7 +49,3 @@ export type ObjKeysToUnion<T, P extends string = ''> = T extends object
     }[keyof T]
   : P;
 
-declare module 'vform3-builds' {
-  const content: any;
-  export = content;
-}

From 116a214ce641ed3846c13972aa6184ca22581812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Nov 2024 10:06:25 +0800
Subject: [PATCH 37/73] =?UTF-8?q?Revert=20"update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=98=E9=87=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 150f1d793c8f471f68aa5c7f6dc5867d4afd7d81.
---
 src/views/login.vue    | 2 ++
 src/views/register.vue | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/views/login.vue b/src/views/login.vue
index c3d1690..ae70f75 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -85,9 +85,11 @@ import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
+import { useI18n } from 'vue-i18n';
 
 const userStore = useUserStore();
 const router = useRouter();
+const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
diff --git a/src/views/register.vue b/src/views/register.vue
index 1d9c394..9f76c70 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -76,9 +76,12 @@
 import { getCodeImg, register, getTenantList } from '@/api/login';
 import { RegisterForm, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
+import { useI18n } from 'vue-i18n';
 
 const router = useRouter();
 
+const { t } = useI18n();
+
 const registerForm = ref<RegisterForm>({
   tenantId: '',
   username: '',

From 4075b838fc2acb29dd715ad9a05d80db930e468e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Nov 2024 10:15:09 +0800
Subject: [PATCH 38/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=20=E7=BC=96=E8=BE=91=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=9F=A5=E4=B8=A4=E9=81=8D=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/index.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 57b4282..0d8055b 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -113,8 +113,8 @@
 </template>
 
 <script setup name="Gen" lang="ts">
-import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen';
-import { TableQuery, TableVO } from '@/api/tool/gen/types';
+import {delTable, genCode, getDataNames, listTable, previewTable, synchDb} from '@/api/tool/gen';
+import {TableQuery, TableVO} from '@/api/tool/gen/types';
 import router from '@/router';
 import ImportTable from './importTable.vue';
 
@@ -155,17 +155,6 @@ const dialog = reactive<DialogOption>({
   title: '代码预览'
 });
 
-onActivated(() => {
-  const time = route.query.t;
-  if (time != null && time != uniqueId.value) {
-    uniqueId.value = time as string;
-    queryParams.value.pageNum = Number(route.query.pageNum);
-    dateRange.value = ['', ''];
-    queryFormRef.value?.resetFields();
-    getList();
-  }
-});
-
 /** 查询多数据源名称 */
 const getDataNameList = async () => {
   const res = await getDataNames();
@@ -248,7 +237,14 @@ const handleDelete = async (row?: TableVO) => {
 };
 
 onMounted(() => {
-  getList();
+  const time = route.query.t;
+  if (time != null && time != uniqueId.value) {
+    uniqueId.value = time as string;
+    queryParams.value.pageNum = Number(route.query.pageNum);
+    dateRange.value = ['', ''];
+    queryFormRef.value?.resetFields();
+    getList();
+  }
   getDataNameList();
 });
 </script>

From b61865f45fe8ec9f22edc18e2ae51052562a671b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 29 Nov 2024 18:30:19 +0800
Subject: [PATCH 39/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=20id=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserSelect/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index e9865e5..4b93bb3 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -166,7 +166,7 @@ const confirm = () => {
 
 const computedIds = (data) => {
   if (data instanceof Array) {
-    return [...data];
+    return data.map(item => String(item));
   } else if (typeof data === 'string') {
     return data.split(',');
   } else if (typeof data === 'number') {

From 00f7ab34efc17bf383eecf7bf81844b874ac1a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 3 Dec 2024 11:15:09 +0800
Subject: [PATCH 40/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=ADTags-Views?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=86=85=E9=93=BE=E9=A1=B5=E9=9D=A2=E6=89=93?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue        | 15 +++++++++++++++
 src/layout/components/TagsView/index.vue |  4 ----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 7f86ef4..9f8d706 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -20,6 +20,7 @@ import useTagsViewStore from '@/store/modules/tagsView';
 
 import IframeToggle from './IframeToggle/index.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const route = useRoute();
 const tagsViewStore = useTagsViewStore();
 
 // 随机动画集合
@@ -37,6 +38,20 @@ watch(
   },
   { immediate: true }
 );
+
+onMounted(() => {
+  addIframe()
+})
+
+watch((route) => {
+  addIframe()
+})
+
+function addIframe() {
+  if (route.meta.link) {
+    useTagsViewStore().addIframeView(route)
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1e12ca4..0812feb 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -135,11 +135,7 @@ const addTags = () => {
   }
   if (name) {
     useTagsViewStore().addView(route as any);
-    if (route.meta.link) {
-      useTagsViewStore().addIframeView(route as any);
-    }
   }
-  return false;
 };
 const moveToCurrentTag = () => {
   nextTick(() => {

From fd01b5a61f1a92db90c00e7bb1b4162a2b61bfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 4 Dec 2024 11:42:07 +0800
Subject: [PATCH 41/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=94=AF=E6=8C=81=E5=AF=B9=E9=80=9A=E9=85=8D?=
 =?UTF-8?q?=E7=AC=A6=E8=B7=AF=E5=BE=84=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.ts     | 10 +++++++---
 src/utils/validate.ts | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/permission.ts b/src/permission.ts
index 51a928a..86dd6c3 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -3,7 +3,7 @@ import router from './router';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { getToken } from '@/utils/auth';
-import { isHttp } from '@/utils/validate';
+import { isHttp, isPathMatch } from '@/utils/validate';
 import { isRelogin } from '@/utils/request';
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
@@ -12,6 +12,10 @@ import usePermissionStore from '@/store/modules/permission';
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback'];
 
+const isWhiteList = (path: string) => {
+  return whiteList.some(pattern => isPathMatch(pattern, path))
+}
+
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
   if (getToken()) {
@@ -20,7 +24,7 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === '/login') {
       next({ path: '/' });
       NProgress.done();
-    } else if (whiteList.indexOf(to.path as string) !== -1) {
+    } else if (isWhiteList(to.path)) {
       next();
     } else {
       if (useUserStore().roles.length === 0) {
@@ -49,7 +53,7 @@ router.beforeEach(async (to, from, next) => {
     }
   } else {
     // 没有token
-    if (whiteList.indexOf(to.path as string) !== -1) {
+    if (isWhiteList(to.path)) {
       // 在免登录白名单，直接进入
       next();
     } else {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 4d57894..788095c 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -1,3 +1,15 @@
+/**
+ * 路径匹配器
+ * @param {string} pattern
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isPathMatch(pattern: string, path: string) {
+  const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
+  const regex = new RegExp(`^${regexPattern}$`)
+  return regex.test(path)
+}
+
 /**
  * 判断url是否是http或https
  * @returns {Boolean}

From cc4186b578c158984842c50349fc043a4d0d478d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 4 Dec 2024 11:43:18 +0800
Subject: [PATCH 42/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=88=99=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/permission.ts b/src/permission.ts
index 86dd6c3..b05f8c3 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -10,7 +10,7 @@ import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 
 NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register', '/social-callback'];
+const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*'];
 
 const isWhiteList = (path: string) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))

From 84888c3c287ba418c1dca23fc081da8b979519c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sun, 8 Dec 2024 21:03:44 +0800
Subject: [PATCH 43/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BD=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 0d8055b..b4df31b 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -243,8 +243,8 @@ onMounted(() => {
     queryParams.value.pageNum = Number(route.query.pageNum);
     dateRange.value = ['', ''];
     queryFormRef.value?.resetFields();
-    getList();
   }
+  getList();
   getDataNameList();
 });
 </script>

From 7a9ccedadcd7f6a27d6c2a40b2083a899dae4732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 11 Dec 2024 15:30:44 +0800
Subject: [PATCH 44/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=A6=81=E7=94=A8=E7=9A=84=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept/types.ts    | 12 +++++++++++
 src/api/system/user/index.ts    |  4 ++--
 src/views/system/user/index.vue | 35 +++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/api/system/dept/types.ts b/src/api/system/dept/types.ts
index 494745c..adaefd2 100644
--- a/src/api/system/dept/types.ts
+++ b/src/api/system/dept/types.ts
@@ -28,6 +28,18 @@ export interface DeptVO extends BaseEntity {
   menuId: string | number;
 }
 
+/**
+ * 部门类型
+ */
+export interface DeptTreeVO extends BaseEntity {
+  id: number | string;
+  label: string;
+  parentId: number | string;
+  weight: number;
+  children: DeptTreeVO[];
+  disabled: boolean;
+}
+
 /**
  * 部门表单类型
  */
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 25c7884..0867c48 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -1,4 +1,4 @@
-import { DeptVO } from './../dept/types';
+import {DeptTreeVO, DeptVO} from './../dept/types';
 import { RoleVO } from '@/api/system/role/types';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
@@ -202,7 +202,7 @@ export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]
 /**
  * 查询部门下拉树结构
  */
-export const deptTreeSelect = (): AxiosPromise<DeptVO[]> => {
+export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
   return request({
     url: '/system/user/deptTree',
     method: 'get'
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9597ca1..572f50c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -154,7 +154,7 @@
             <el-form-item label="归属部门" prop="deptId">
               <el-tree-select
                 v-model="form.deptId"
-                :data="deptOptions"
+                :data="enabledDeptOptions"
                 :props="{ value: 'id', label: 'label', children: 'children' }"
                 value-key="id"
                 placeholder="请选择归属部门"
@@ -287,7 +287,7 @@
 <script setup name="User" lang="ts">
 import api from '@/api/system/user';
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { DeptVO } from '@/api/system/dept/types';
+import {DeptTreeVO, DeptVO} from '@/api/system/dept/types';
 import { RoleVO } from '@/api/system/role/types';
 import { PostQuery, PostVO } from '@/api/system/post/types';
 import { treeselect } from '@/api/system/dept';
@@ -307,7 +307,8 @@ const multiple = ref(true);
 const total = ref(0);
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
+const deptOptions = ref<DeptTreeVO[]>([]);
+const enabledDeptOptions = ref<DeptTreeVO[]>([]);
 const initPassword = ref<string>('');
 const postOptions = ref<PostVO[]>([]);
 const roleOptions = ref<RoleVO[]>([]);
@@ -431,12 +432,6 @@ watchEffect(
   }
 );
 
-/** 查询部门下拉树结构 */
-const getTreeSelect = async () => {
-  const res = await api.deptTreeSelect();
-  deptOptions.value = res.data;
-};
-
 /** 查询用户列表 */
 const getList = async () => {
   loading.value = true;
@@ -446,6 +441,26 @@ const getList = async () => {
   total.value = res.total;
 };
 
+/** 查询部门下拉树结构 */
+const getDeptTree = async () => {
+  const res = await api.deptTreeSelect();
+  deptOptions.value = res.data;
+  enabledDeptOptions.value = filterDisabledDept(res.data);
+};
+
+/** 过滤禁用的部门 */
+const filterDisabledDept = (deptList: DeptTreeVO[]) => {
+  return deptList.filter(dept => {
+    if (dept.disabled) {
+      return false;
+    }
+    if (dept.children && dept.children.length) {
+      dept.children = filterDisabledDept(dept.children);
+    }
+    return true;
+  });
+};
+
 /** 节点单击事件 */
 const handleNodeClick = (data: DeptVO) => {
   queryParams.value.deptId = data.id;
@@ -643,7 +658,7 @@ const resetForm = () => {
   form.value.status = '1';
 };
 onMounted(() => {
-  getTreeSelect(); // 初始化部门数据
+  getDeptTree(); // 初始化部门数据
   getList(); // 初始化列表数据
   proxy?.getConfigKey('sys.user.initPassword').then((response) => {
     initPassword.value = response.data;

From 8a034662c7cfca4b6d4b96ef207f1a6396239bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 13 Dec 2024 11:45:25 +0800
Subject: [PATCH 45/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2api=E8=BF=87=E6=9C=9F=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 9f8d706..0d402f2 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -43,7 +43,7 @@ onMounted(() => {
   addIframe()
 })
 
-watch((route) => {
+watchEffect((route) => {
   addIframe()
 })
 

From 1f93137b80b24e411ccdbd1279fee1e8fee8b8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 13 Dec 2024 14:49:24 +0800
Subject: [PATCH 46/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20oss=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=20=E5=B1=95=E7=A4=BA=E9=85=8D=E7=BD=AEkey=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=BB=E9=94=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oss/config.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 07bfd36..0563a02 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -159,8 +159,8 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `主建`, visible: true },
-  { key: 1, label: `配置key`, visible: false },
+  { key: 0, label: `主建`, visible: false },
+  { key: 1, label: `配置key`, visible: true },
   { key: 2, label: `访问站点`, visible: true },
   { key: 3, label: `自定义域名`, visible: true },
   { key: 4, label: `桶名称`, visible: true },

From f5410dfff4f4f8737a649047858be477d6e7c2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 17 Dec 2024 09:41:11 +0800
Subject: [PATCH 47/73] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 572f50c..0a35a1b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -579,15 +579,6 @@ function submitFileForm() {
   uploadRef.value?.submit();
 }
 
-/** 初始化部门数据 */
-const initTreeData = async () => {
-  // 判断部门的数据是否存在，存在不获取，不存在则获取
-  if (deptOptions.value === undefined) {
-    const { data } = await treeselect();
-    deptOptions.value = data;
-  }
-};
-
 /** 重置操作表单 */
 const reset = () => {
   form.value = { ...initFormData };
@@ -605,7 +596,6 @@ const handleAdd = async () => {
   const { data } = await api.getUser();
   dialog.visible = true;
   dialog.title = '新增用户';
-  await initTreeData();
   postOptions.value = data.posts;
   roleOptions.value = data.roles;
   form.value.password = initPassword.value.toString();
@@ -618,7 +608,6 @@ const handleUpdate = async (row?: UserForm) => {
   const { data } = await api.getUser(userId);
   dialog.visible = true;
   dialog.title = '修改用户';
-  await initTreeData();
   Object.assign(form.value, data.user);
   postOptions.value = data.posts;
   roleOptions.value = data.roles;

From 1c280581414cb56c1d32978c4e8b9d1a8afa5745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 18 Dec 2024 13:22:47 +0800
Subject: [PATCH 48/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20TopNav?=
 =?UTF-8?q?=E5=86=85=E9=93=BE=E8=8F=9C=E5=8D=95=E7=82=B9=E5=87=BB=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopNav/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index e93e005..cfe2cd7 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -91,8 +91,8 @@ const activeMenu = computed(() => {
   let activePath = path;
   if (path !== undefined && path.lastIndexOf('/') > 0 && hideList.indexOf(path) === -1) {
     const tmpPath = path.substring(1, path.length);
-    activePath = '/' + tmpPath.substring(0, tmpPath.indexOf('/'));
     if (!route.meta.link) {
+      activePath = '/' + tmpPath.substring(0, tmpPath.indexOf('/'));
       appStore.toggleSideBarHide(false);
     }
   } else if (!route.children) {

From ed82954643b065728293990518345fc32193df0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 24 Dec 2024 09:22:48 +0000
Subject: [PATCH 49/73] update src/views/system/user/index.vue.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 疯狂的狮子Li <15040126243@163.com>
---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0a35a1b..43cee7c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -68,7 +68,7 @@
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
+                <el-button v-has-permi="['system:user:remove']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
                   删除
                 </el-button>
               </el-col>

From 7772c7c7d646452ac9a50cb76b1f2be10e7a1d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 24 Dec 2024 21:58:26 +0800
Subject: [PATCH 50/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=20=E5=A2=9E=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0=E5=A4=84=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 43cee7c..4eddc50 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -81,8 +81,8 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
-                      <el-dropdown-item icon="Top" @click="handleImport">导入数据</el-dropdown-item>
-                      <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
+                      <el-dropdown-item v-has-permi="['system:user:import']" icon="Top" @click="handleImport">导入数据</el-dropdown-item>
+                      <el-dropdown-item v-has-permi="['system:user:export']" icon="Download" @click="handleExport">导出数据</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

From e29beed8bd5c7f7fa61efb62236d6bcd65d05b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 24 Dec 2024 21:58:48 +0800
Subject: [PATCH 51/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20hasRoles=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0=E8=B6=85=E7=AE=A1=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directive/permission/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index afde332..eb2dccc 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -31,7 +31,7 @@ export const hasRoles: Directive = {
     const { roles } = useUserStore();
     if (value && value instanceof Array && value.length > 0) {
       const hasRole = roles.some((role: string) => {
-        return role === 'admin' || value.includes(role);
+        return role === 'superadmin' || role === 'admin' || value.includes(role);
       });
       if (!hasRole) {
         el.parentNode && el.parentNode.removeChild(el);

From b600fb34b56888e6cd4807047ec7bb3cb6b193aa Mon Sep 17 00:00:00 2001
From: QianRj <14974713+qianrj@user.noreply.gitee.com>
Date: Wed, 25 Dec 2024 22:27:32 +0800
Subject: [PATCH 52/73] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4eddc50..430c55a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -63,7 +63,7 @@
                 <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
+                <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
                   修改
                 </el-button>
               </el-col>

From 2b1f5f2c7033eebee97de472b5f6195d95516b80 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Fri, 27 Dec 2024 11:45:33 +0800
Subject: [PATCH 53/73] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E5=9C=A8=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=AE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/variables.module.scss  | 19 +++++++++++++++++++
 src/layout/components/TagsView/index.vue |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 36a8df6..4405b97 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -21,7 +21,12 @@
 
   // ele
   --brder-color: #e8e8e8;
+
+  // 添加 tag 相关变量
+  --tags-view-active-bg: var(--el-color-primary);
+  --tags-view-active-border-color: var(--el-color-primary);
 }
+
 html.dark {
   --menuBg: #1d1e1f;
   --menuColor: #bfcbd9;
@@ -41,6 +46,20 @@ html.dark {
   .el-tree-node__content {
     --el-color-primary-light-9: #262727;
   }
+
+  .el-button--primary {
+    --el-button-bg-color: var(--el-color-primary-dark-6);
+    --el-button-border-color: var(--el-color-primary-light-2);
+  }
+
+  .el-switch {
+    --el-switch-on-color: var(--el-color-primary-dark-6);
+    --el-switch-border-color: var(--el-color-primary-light-2);
+  }
+
+  // 在深色模式下使用更深的颜色
+  --tags-view-active-bg: var(--el-color-primary-dark-6);
+  --tags-view-active-border-color: var(--el-color-primary-light-2);
   // vxe-table 主题
   --vxe-font-color: #98989e;
   --vxe-primary-color: #2c7ecf;
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 0812feb..9bcf285 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -70,8 +70,8 @@ const isActive = (r: RouteLocationNormalized): boolean => {
 const activeStyle = (tag: RouteLocationNormalized) => {
   if (!isActive(tag)) return {};
   return {
-    'background-color': theme.value,
-    'border-color': theme.value
+    'background-color': 'var(--tags-view-active-bg)',
+    'border-color': 'var(--tags-view-active-border-color)'
   };
 };
 const isAffix = (tag: RouteLocationNormalized) => {

From b39e0ad6db13cb6c737cd4ef5dd867a44c928de3 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Fri, 27 Dec 2024 12:55:27 +0800
Subject: [PATCH 54/73] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E5=9C=A8=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=AE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/variables.module.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 4405b97..e5cd95d 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -57,6 +57,11 @@ html.dark {
     --el-switch-border-color: var(--el-color-primary-light-2);
   }
 
+  .el-tag--primary {
+    --el-tag-bg-color: var(--el-color-primary-dark-6);
+    --el-tag-border-color: var(--el-color-primary-light-2);
+  }
+
   // 在深色模式下使用更深的颜色
   --tags-view-active-bg: var(--el-color-primary-dark-6);
   --tags-view-active-border-color: var(--el-color-primary-light-2);
@@ -137,4 +142,4 @@ $base-sidebar-width: 200px;
   dangerColor: $--color-danger;
   infoColor: $--color-info;
   warningColor: $--color-warning;
-}
+}
\ No newline at end of file

From 100f44e197dd99ff63220e2fa05d5c564f278aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sun, 12 Jan 2025 20:54:58 +0800
Subject: [PATCH 55/73] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=A7=9F=E6=88=B7=20tabs=E8=BF=87=E5=A4=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=8D=A1=E4=BD=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6ac2f14..f821448 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -127,18 +127,18 @@ const dynamicTenantEvent = async (tenantId: string) => {
   if (companyName.value != null && companyName.value !== '') {
     await dynamicTenant(tenantId);
     dynamic.value = true;
-    proxy?.$tab.closeAllPage();
-    proxy?.$router.push('/');
-    proxy?.$tab.refreshPage();
+    await proxy?.$router.push('/');
+    await proxy?.$tab.closeAllPage();
+    await proxy?.$tab.refreshPage();
   }
 };
 
 const dynamicClearEvent = async () => {
   await dynamicClear();
   dynamic.value = false;
-  proxy?.$tab.closeAllPage();
-  proxy?.$router.push('/');
-  proxy?.$tab.refreshPage();
+  await proxy?.$router.push('/');
+  await proxy?.$tab.closeAllPage();
+  await proxy?.$tab.refreshPage();
 };
 
 /** 租户列表 */

From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 13 Jan 2025 06:11:00 +0000
Subject: [PATCH 56/73] =?UTF-8?q?!172=20=E5=90=88=E5=B9=B6=20warmflow=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=86=E6=94=AF=20*=20update=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E7=82=B9=E5=87=BB=E5=A4=8D=E5=88=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=9C=AA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BDloading=E5=B1=82=20*=20fix:?=
 =?UTF-8?q?=20v-model=E5=A4=84=E7=90=86=E6=9C=89=E5=BB=B6=E8=BF=9F=20?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E5=A4=84=E7=90=86=20*=20up?=
 =?UTF-8?q?date=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20*=20Merge=20remote-tracking=20branch=20'or?=
 =?UTF-8?q?igin/dev'=20into=20warm-flw-future=20*=20update=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8F=AF=E9=A9=B3=E5=9B=9E=E7=9A=84=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=20*=20update:=20=E8=B0=83=E6=95=B4=E6=96=87=E6=A1=88=20*=20upd?=
 =?UTF-8?q?ate:=20=E6=BF=80=E6=B4=BB/=E6=8C=82=E8=B5=B7=E6=94=B9=E4=B8=BAs?=
 =?UTF-8?q?witch=E6=93=8D=E4=BD=9C=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=20*=20update=20=E7=BB=9F=E4=B8=80=E6=8A=84=E9=80=81?=
 =?UTF-8?q?=E4=BA=BA=E4=BD=BF=E7=94=A8=E6=98=B5=E7=A7=B0=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=20*=20update=20=E8=B0=83=E6=95=B4=E5=88=86=E7=B1=BB=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20*=20update=20=E7=BB=9F=E4=B8=80=E4=B8=9A=E5=8A=A1id?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20*=20update=20=E5=88=A0=E9=99=A4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=A1=B6=E8=8A=82=E7=82=B9=20*=20!168=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB=20*=20update=20?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=AF=AF=E5=88=A0=E9=99=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20*=20update=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=20*=20update=20=E4=BF=AE=E5=A4=8D=20=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC=E6=9C=AA=E6=94=B9=E5=85=A8=20*=20[u?=
 =?UTF-8?q?pdate]=20*=20fix=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20*=20update=20=E9=87=8D=E6=9E=84=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=88=86=E7=B1=BB=E8=A1=A8=20*=20update=20=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8E=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=85=B6=E4=BB=96bug=20?=
 =?UTF-8?q?*=20fix=20=E4=BF=AE=E5=A4=8D=20=E4=B8=80=E4=BA=9B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20*=20update=20=E5=8F=98=E9=87=8F=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=20*=20add=20=E5=A2=9E=E5=8A=A0=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=20*=20Merge=20branch=20'warm-flw-future'=20of=20https?=
 =?UTF-8?q?://gitee.com/JavaLionLi/plus-ui=E2=80=A6=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=9E=E7=90=86=E4=BA=BA=20*=20Merge=20rem?=
 =?UTF-8?q?ote-tracking=20branch=20'origin/dev'=20into=20warm-flw-future?=
 =?UTF-8?q?=20*=20add=20=E5=A2=9E=E5=8A=A0=E7=A4=BA=E4=BE=8B=20*=20update?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=87=BA=20*=20re?=
 =?UTF-8?q?move=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20*=20remove=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20*=20[update]=20*=20[fix]=20*=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=B9=B2=E9=A2=84=E5=88=A0=E9=99=A4=E5=A7=94=E6=89=98=20*=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6=20*=20=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20*=20=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9=20*=201.=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20*=20!167=20fix=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20import=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=20*=20fix=20=E4=BF=AE=E5=A4=8D=20im?=
 =?UTF-8?q?port=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20*=20!166=20update=20=E6=B8=85=E9=99=A4=20P?=
 =?UTF-8?q?rocessPreview=20=E5=BC=95=E7=94=A8=20*=20update=20=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=20ProcessPreview=20=E5=BC=95=E7=94=A8=20*=20remove=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20bpmn.js=20=E8=AE=BE=E8=AE=A1=E5=99=A8=20*?=
 =?UTF-8?q?=20remove=20=E5=88=A0=E9=99=A4=20bpmn.js=20=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=20*=20remove=20=E5=88=A0=E9=99=A4=20bpmn.js=20?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=20*=20remove=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=20bpmn.js=20=E8=AE=BE=E8=AE=A1=E5=99=A8=20*=20fix=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E5=89=8D=E7=AB=AF=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98=20*=20update=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=20*=20add=20=E6=B7=BB=E5=8A=A0=E4=BD=9C=E5=BA=9F=20*?=
 =?UTF-8?q?=20add=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=B9=B2=E9=A2=84?=
 =?UTF-8?q?=20*=20update=20=E8=B0=83=E6=95=B4=E5=8A=A0=E7=AD=BE=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E7=AD=BE=20*=20update=20=E8=B0=83=E6=95=B4=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E5=87=8F=E7=AD=BE=20*=20add=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=9F=A5=E7=9C=8B=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A7=94=E6=89=98=EF=BC=8C=E8=BD=AC=E5=8A=9E?=
 =?UTF-8?q?=20*=20update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=20*=20update=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86=E4=BA=BA=E4=BF=AE=E6=94=B9=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=A1=B5=E9=9D=A2=20*=20update=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E9=A1=B5=E9=9D=A2=20*=20add=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=92=A4=E9=94=80=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=20=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E9=A1=B5=E9=9D=A2=20*=20Merge=20branch=20'dev'=20into?=
 =?UTF-8?q?=20warm-flw-future=20*=20update=20=E8=B0=83=E6=95=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2=20*=20add=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=20*=20update=20=E8=B0=83=E6=95=B4=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=9E=E7=90=86=E4=BA=BA=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E8=AE=A1=E5=99=A8uri=20*=20update?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82uri=20=E8=B0=83=E6=95=B4=E5=BE=85=E5=8A=9E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=20*=20update=20=E8=B0=83=E6=95=B4=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=20=E9=A9=B3=E5=9B=9E=20=E7=BB=88=E6=AD=A2=E7=AD=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=20*=20add=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20*=20add=20=E6=B7=BB=E5=8A=A0warm-ui?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8,=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=20*=20Merge=20remote-tracking=20bra?=
 =?UTF-8?q?nch=20'origin/dev'=20into=20warm-flw-future=20*=20add=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1=20*=20up?=
 =?UTF-8?q?date=20=E8=B0=83=E6=95=B4=E9=A9=B3=E5=9B=9E=20*=20update=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=86=E5=9B=BE=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20*=20Merge=20branch=20'warm-flw-future'=20of=20https?=
 =?UTF-8?q?://gitee.com/JavaLionLi/plus-ui=E2=80=A6=20*=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E5=8A=9E=EF=BC=8C=E6=9C=AA=E5=8A=9E=20*=20Me?=
 =?UTF-8?q?rge=20remote-tracking=20branch=20'origin/dev'=20into=20warm-flw?=
 =?UTF-8?q?-future=20*=20update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=EF=BC=8C=E5=BE=85=E5=8A=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20*=20add=20=E6=B7=BB=E5=8A=A0=E4=BB=A3=E5=8A=9E=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20*=20update=20=E8=B0=83=E6=95=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2=20*=20add?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=20=E6=8C=82=E8=B5=B7=20*=20add=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=87=E4=BB=B6=E9=83=A8=E7=BD=B2=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83=20*=20up?=
 =?UTF-8?q?date=20=E4=BC=98=E5=8C=96=20=E6=97=B6=E9=97=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=84=E4=BB=B6=E7=BB=9F=E4=B8=80=20*=20Merge=20rem?=
 =?UTF-8?q?ote-tracking=20branch=20'origin/dev'=20into=20warm-flw-future?=
 =?UTF-8?q?=20*=20fix=20=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91=E5=AE=89=E5=85=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20*=20Merge=20remote-track?=
 =?UTF-8?q?ing=20branch=20'origin/dev'=20into=20warm-flw-future=20*=20upda?=
 =?UTF-8?q?te=20=E4=BC=98=E5=8C=96=20=E7=B1=BB=E5=9E=8B=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=A7=9F=E6=88=B7=E5=90=8E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=A1=A8=E6=A0=BC=E8=A1=8C=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20vueuse=20=E9=87=8D=E6=9E=84=20websocket=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=20*=20update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20vueuse=20=E9=87=8D=E6=9E=84=20websocket=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=20*=20fix=20=E4=BF=AE=E5=A4=8D=20=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA=E5=90=8E=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=20sse?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20*=20re?=
 =?UTF-8?q?set=20=E5=9B=9E=E6=BB=9A=20=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E9=87=87=E7=94=A8=E5=85=B6=E4=BB=96=E6=96=B9=E6=A1=88=20*?=
 =?UTF-8?q?=20fix=20=E4=BF=AE=E5=A4=8D=20=E7=99=BB=E5=87=BA=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=20sse=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20*=20update=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20*=20update=20element-plus=202.7.5=20=3D>=202.7.8=20?=
 =?UTF-8?q?*=20reset=20=E5=9B=9E=E6=BB=9A=20=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20*=20update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=BC=93=E5=AD=98=20=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=90=8E=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=20*=20fix=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=90=8C=E6=AD=A5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=8F=96=E6=B6=88=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20*=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0warm-flow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    1 -
 src/api/system/dept/index.ts                  |   15 +-
 src/api/workflow/category/index.ts            |   27 +-
 src/api/workflow/category/types.ts            |   71 +-
 src/api/workflow/definition/index.ts          |  170 +++
 src/api/workflow/definition/types.ts          |   31 +
 src/api/workflow/definitionConfig/index.ts    |   49 -
 src/api/workflow/definitionConfig/types.ts    |  102 --
 src/api/workflow/formManage/index.ts          |   76 -
 src/api/workflow/formManage/types.ts          |   69 -
 src/api/workflow/instance/index.ts            |  101 ++
 src/api/workflow/instance/types.ts            |   26 +
 src/api/workflow/model/index.ts               |  104 --
 src/api/workflow/model/types.ts               |   66 -
 src/api/workflow/nodeConfig/types.ts          |   38 -
 src/api/workflow/processDefinition/index.ts   |  114 --
 src/api/workflow/processDefinition/types.ts   |   24 -
 src/api/workflow/processInstance/index.ts     |  136 --
 src/api/workflow/processInstance/types.ts     |   27 -
 src/api/workflow/task/index.ts                |  140 +-
 src/api/workflow/task/types.ts                |   67 +-
 src/api/workflow/workflowCommon/index.ts      |   32 +-
 src/api/workflow/workflowCommon/types.ts      |   15 +-
 src/assets/styles/variables.module.scss       |   10 -
 src/bpmn/assets/defaultXML.ts                 |   23 -
 src/bpmn/assets/lang/zh.ts                    |  126 --
 src/bpmn/assets/moddle/flowable.ts            | 1250 -----------------
 .../ContextPad/CustomContextPadProvider.ts    |  138 --
 .../module/Palette/CustomPaletteProvider.ts   |  109 --
 .../assets/module/Renderer/CustomRenderer.ts  |   56 -
 src/bpmn/assets/module/Translate/index.ts     |   15 -
 src/bpmn/assets/module/index.ts               |   17 -
 src/bpmn/assets/showConfig.ts                 |   50 -
 src/bpmn/assets/style/index.scss              |  284 ----
 src/bpmn/hooks/usePanel.ts                    |  145 --
 src/bpmn/hooks/useParseElement.ts             |   34 -
 src/bpmn/index.vue                            |  496 -------
 src/bpmn/panel/GatewayPanel.vue               |   68 -
 src/bpmn/panel/ParticipantPanel.vue           |   68 -
 src/bpmn/panel/ProcessPanel.vue               |   71 -
 src/bpmn/panel/SequenceFlowPanel.vue          |   95 --
 src/bpmn/panel/StartEndPanel.vue              |   67 -
 src/bpmn/panel/SubProcessPanel.vue            |  193 ---
 src/bpmn/panel/TaskPanel.vue                  |  491 -------
 src/bpmn/panel/index.vue                      |  110 --
 src/bpmn/panel/property/DueDate.vue           |  252 ----
 src/bpmn/panel/property/ExecutionListener.vue |  308 ----
 src/bpmn/panel/property/ListenerParam.vue     |  121 --
 src/bpmn/panel/property/TaskListener.vue      |  310 ----
 src/components/BpmnDesign/index.vue           |   71 -
 src/components/BpmnView/index.vue             |  411 ------
 src/components/Process/approvalRecord.vue     |   80 +-
 src/components/Process/multiInstanceUser.vue  |  378 -----
 src/components/Process/processMeddle.vue      |  207 +++
 src/components/Process/submitVerify.vue       |  226 +--
 src/components/UserSelect/index.vue           |    8 +-
 src/enums/bpmn/IndexEnums.ts                  |   17 -
 src/router/index.ts                           |   14 +
 src/store/modules/modeler.ts                  |   76 -
 src/types/bpmn/editor/global.d.ts             |   13 -
 src/types/bpmn/index.d.ts                     |   15 -
 src/types/bpmn/moddle.d.ts                    |   37 -
 src/types/bpmn/panel.d.ts                     |   92 --
 src/views/workflow/category/index.vue         |  194 ++-
 src/views/workflow/formManage/index.vue       |  243 ----
 src/views/workflow/leave/index.vue            |   62 +-
 src/views/workflow/leave/leaveEdit.vue        |   70 +-
 src/views/workflow/model/index.vue            |  383 -----
 .../components/processPreview.vue             |   45 -
 .../workflow/processDefinition/design.vue     |   52 +
 .../workflow/processDefinition/index.vue      |  590 ++++----
 src/views/workflow/processInstance/index.vue  |  357 +++--
 src/views/workflow/task/allTaskWaiting.vue    |  271 ++--
 src/views/workflow/task/myDocument.vue        |  138 +-
 src/views/workflow/task/taskCopyList.vue      |   57 +-
 src/views/workflow/task/taskFinish.vue        |   97 +-
 src/views/workflow/task/taskWaiting.vue       |   95 +-
 vite.config.ts                                |   10 -
 78 files changed, 1955 insertions(+), 8762 deletions(-)
 create mode 100644 src/api/workflow/definition/index.ts
 create mode 100644 src/api/workflow/definition/types.ts
 delete mode 100644 src/api/workflow/definitionConfig/index.ts
 delete mode 100644 src/api/workflow/definitionConfig/types.ts
 delete mode 100644 src/api/workflow/formManage/index.ts
 delete mode 100644 src/api/workflow/formManage/types.ts
 create mode 100644 src/api/workflow/instance/index.ts
 create mode 100644 src/api/workflow/instance/types.ts
 delete mode 100644 src/api/workflow/model/index.ts
 delete mode 100644 src/api/workflow/model/types.ts
 delete mode 100644 src/api/workflow/nodeConfig/types.ts
 delete mode 100644 src/api/workflow/processDefinition/index.ts
 delete mode 100644 src/api/workflow/processDefinition/types.ts
 delete mode 100644 src/api/workflow/processInstance/index.ts
 delete mode 100644 src/api/workflow/processInstance/types.ts
 delete mode 100644 src/bpmn/assets/defaultXML.ts
 delete mode 100644 src/bpmn/assets/lang/zh.ts
 delete mode 100644 src/bpmn/assets/moddle/flowable.ts
 delete mode 100644 src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts
 delete mode 100644 src/bpmn/assets/module/Palette/CustomPaletteProvider.ts
 delete mode 100644 src/bpmn/assets/module/Renderer/CustomRenderer.ts
 delete mode 100644 src/bpmn/assets/module/Translate/index.ts
 delete mode 100644 src/bpmn/assets/module/index.ts
 delete mode 100644 src/bpmn/assets/showConfig.ts
 delete mode 100644 src/bpmn/assets/style/index.scss
 delete mode 100644 src/bpmn/hooks/usePanel.ts
 delete mode 100644 src/bpmn/hooks/useParseElement.ts
 delete mode 100644 src/bpmn/index.vue
 delete mode 100644 src/bpmn/panel/GatewayPanel.vue
 delete mode 100644 src/bpmn/panel/ParticipantPanel.vue
 delete mode 100644 src/bpmn/panel/ProcessPanel.vue
 delete mode 100644 src/bpmn/panel/SequenceFlowPanel.vue
 delete mode 100644 src/bpmn/panel/StartEndPanel.vue
 delete mode 100644 src/bpmn/panel/SubProcessPanel.vue
 delete mode 100644 src/bpmn/panel/TaskPanel.vue
 delete mode 100644 src/bpmn/panel/index.vue
 delete mode 100644 src/bpmn/panel/property/DueDate.vue
 delete mode 100644 src/bpmn/panel/property/ExecutionListener.vue
 delete mode 100644 src/bpmn/panel/property/ListenerParam.vue
 delete mode 100644 src/bpmn/panel/property/TaskListener.vue
 delete mode 100644 src/components/BpmnDesign/index.vue
 delete mode 100644 src/components/BpmnView/index.vue
 delete mode 100644 src/components/Process/multiInstanceUser.vue
 create mode 100644 src/components/Process/processMeddle.vue
 delete mode 100644 src/enums/bpmn/IndexEnums.ts
 delete mode 100644 src/store/modules/modeler.ts
 delete mode 100644 src/types/bpmn/editor/global.d.ts
 delete mode 100644 src/types/bpmn/index.d.ts
 delete mode 100644 src/types/bpmn/moddle.d.ts
 delete mode 100644 src/types/bpmn/panel.d.ts
 delete mode 100644 src/views/workflow/formManage/index.vue
 delete mode 100644 src/views/workflow/model/index.vue
 delete mode 100644 src/views/workflow/processDefinition/components/processPreview.vue
 create mode 100644 src/views/workflow/processDefinition/design.vue

diff --git a/package.json b/package.json
index b911cd6..223af4f 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "animate.css": "4.1.1",
     "await-to-js": "3.0.0",
     "axios": "1.7.8",
-    "bpmn-js": "16.4.0",
     "crypto-js": "4.2.0",
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts
index 7e097fd..f16cb2c 100644
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DeptForm, DeptQuery, DeptVO } from './types';
+import {DeptForm, DeptQuery, DeptTreeVO, DeptVO} from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {
@@ -11,6 +11,17 @@ export const listDept = (query?: DeptQuery) => {
   });
 };
 
+/**
+ * 通过deptIds查询部门
+ * @param deptIds
+ */
+export const optionSelect = (deptIds: (number | string)[]): AxiosPromise<DeptVO[]> => {
+  return request({
+    url: '/system/dept/optionselect?deptIds=' + deptIds,
+    method: 'get'
+  });
+};
+
 // 查询部门列表（排除节点）
 export const listDeptExcludeChild = (deptId: string | number): AxiosPromise<DeptVO[]> => {
   return request({
@@ -28,7 +39,7 @@ export const getDept = (deptId: string | number): AxiosPromise<DeptVO> => {
 };
 
 // 查询部门下拉树结构
-export const treeselect = (): AxiosPromise<DeptVO[]> => {
+export const treeselect = (): AxiosPromise<DeptTreeVO[]> => {
   return request({
     url: '/system/dept/treeselect',
     method: 'get'
diff --git a/src/api/workflow/category/index.ts b/src/api/workflow/category/index.ts
index e9723b0..b6a83ea 100644
--- a/src/api/workflow/category/index.ts
+++ b/src/api/workflow/category/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { CategoryVO, CategoryForm, CategoryQuery } from '@/api/workflow/category/types';
+import { CategoryVO, CategoryForm, CategoryQuery, CategoryTreeVO } from '@/api/workflow/category/types';
 
 /**
  * 查询流程分类列表
@@ -18,11 +18,11 @@ export const listCategory = (query?: CategoryQuery): AxiosPromise<CategoryVO[]>
 
 /**
  * 查询流程分类详细
- * @param id
+ * @param categoryId
  */
-export const getCategory = (id: string | number): AxiosPromise<CategoryVO> => {
+export const getCategory = (categoryId: string | number): AxiosPromise<CategoryVO> => {
   return request({
-    url: '/workflow/category/' + id,
+    url: '/workflow/category/' + categoryId,
     method: 'get'
   });
 };
@@ -53,11 +53,24 @@ export const updateCategory = (data: CategoryForm) => {
 
 /**
  * 删除流程分类
- * @param id
+ * @param categoryId
  */
-export const delCategory = (id: string | number | Array<string | number>) => {
+export const delCategory = (categoryId: string | number | Array<string | number>) => {
   return request({
-    url: '/workflow/category/' + id,
+    url: '/workflow/category/' + categoryId,
     method: 'delete'
   });
 };
+
+/**
+ * 获取流程分类树列表
+ * @param query 流程实例id
+ * @returns
+ */
+export const categoryTree = (query?: CategoryForm): AxiosPromise<CategoryTreeVO[]> => {
+  return request({
+    url: `/workflow/category/categoryTree`,
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/workflow/category/types.ts b/src/api/workflow/category/types.ts
index 414fa55..a093073 100644
--- a/src/api/workflow/category/types.ts
+++ b/src/api/workflow/category/types.ts
@@ -1,18 +1,16 @@
+export interface CategoryTreeVO {
+  id: number | string;
+  label: string;
+  parentId: number | string;
+  weight: number;
+  children: CategoryTreeVO[];
+}
 export interface CategoryVO {
-  /**
-   * 主键
-   */
-  id: string;
 
   /**
-   * 分类名称
+   * 流程分类ID
    */
-  categoryName: string;
-
-  /**
-   * 分类编码
-   */
-  categoryCode: string;
+  categoryId: string | number;
 
   /**
    * 父级id
@@ -20,48 +18,55 @@ export interface CategoryVO {
   parentId: string | number;
 
   /**
-   * 排序
+   * 流程分类名称
    */
-  sortNum: number;
+  categoryName: string;
 
-  children?: CategoryVO[];
+  /**
+   * 显示顺序
+   */
+  orderNum: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 子对象
+   */
+  children: CategoryVO[];
 }
 
 export interface CategoryForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: string | number;
 
   /**
-   * 分类名称
+   * 流程分类ID
+   */
+  categoryId?: string | number;
+
+  /**
+   * 流程分类名称
    */
   categoryName?: string;
 
   /**
-   * 分类编码
-   */
-  categoryCode?: string;
-
-  /**
-   * 父级id
+   * 父流程分类id
    */
   parentId?: string | number;
 
   /**
-   * 排序
+   * 显示顺序
    */
-  sortNum?: number;
+  orderNum?: number;
+
 }
 
-export interface CategoryQuery extends PageQuery {
+export interface CategoryQuery {
+
   /**
-   * 分类名称
+   * 流程分类名称
    */
   categoryName?: string;
 
-  /**
-   * 分类编码
-   */
-  categoryCode?: string;
 }
diff --git a/src/api/workflow/definition/index.ts b/src/api/workflow/definition/index.ts
new file mode 100644
index 0000000..49e6ee8
--- /dev/null
+++ b/src/api/workflow/definition/index.ts
@@ -0,0 +1,170 @@
+import request from '@/utils/request';
+import { FlowDefinitionQuery, definitionXmlVO, FlowDefinitionForm, FlowDefinitionVo } from '@/api/workflow/definition/types';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取流程定义列表
+ * @param query 流程实例id
+ * @returns
+ */
+export const listDefinition = (query: FlowDefinitionQuery): AxiosPromise<FlowDefinitionVo[]> => {
+  return request({
+    url: `/workflow/definition/list`,
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询未发布的流程定义列表
+ * @param query 流程实例id
+ * @returns
+ */
+export const unPublishList = (query: FlowDefinitionQuery): AxiosPromise<FlowDefinitionVo[]> => {
+  return request({
+    url: `/workflow/definition/unPublishList`,
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 通过流程定义id获取xml
+ * @param definitionId 流程定义id
+ * @returns
+ */
+export const definitionXml = (definitionId: string): AxiosPromise<definitionXmlVO> => {
+  return request({
+    url: `/workflow/definition/definitionXml/${definitionId}`,
+    method: 'get'
+  });
+};
+
+/**
+ * 删除流程定义
+ * @param id 流程定义id
+ * @returns
+ */
+export const deleteDefinition = (id: string | string[]) => {
+  return request({
+    url: `/workflow/definition/${id}`,
+    method: 'delete'
+  });
+};
+
+/**
+ * 挂起/激活
+ * @param definitionId 流程定义id
+ * @param activityStatus 状态
+ * @returns
+ */
+export const active = (definitionId: string, activityStatus: boolean) => {
+  return request({
+    url: `/workflow/definition/active/${definitionId}`,
+    method: 'put',
+    params: {
+      active: activityStatus
+    }
+  });
+};
+
+/**
+ * 通过zip或xml部署流程定义
+ * @returns
+ */
+export function importDef(data: any) {
+  return request({
+    url: '/workflow/definition/importDef',
+    method: 'post',
+    data: data,
+    headers: {
+      repeatSubmit: false
+    }
+  });
+}
+
+/**
+ * 发布流程定义
+ * @param id 流程定义id
+ * @returns
+ */
+export const publish = (id: string) => {
+  return request({
+    url: `/workflow/definition/publish/${id}`,
+    method: 'put'
+  });
+};
+
+/**
+ * 取消发布流程定义
+ * @param id 流程定义id
+ * @returns
+ */
+export const unPublish = (id: string) => {
+  return request({
+    url: `/workflow/definition/unPublish/${id}`,
+    method: 'put'
+  });
+};
+
+/**
+ * 获取流程定义xml字符串
+ * @param id 流程定义id
+ * @returns
+ */
+export const xmlString = (id: string) => {
+  return request({
+    url: `/workflow/definition/xmlString/${id}`,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增
+ * @param data 参数
+ * @returns
+ */
+export const add = (data: FlowDefinitionForm) => {
+  return request({
+    url: `/workflow/definition`,
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改
+ * @param data 参数
+ * @returns
+ */
+export const edit = (data: FlowDefinitionForm) => {
+  return request({
+    url: `/workflow/definition`,
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 查询详情
+ * @param id 参数
+ * @returns
+ */
+export const getInfo = (id: number | string) => {
+  return request({
+    url: `/workflow/definition/${id}`,
+    method: 'get'
+  });
+};
+
+/**
+ * 复制流程定义
+ * @param id 流程定义id
+ * @returns
+ */
+export const copy = (id: string) => {
+  return request({
+    url: `/workflow/definition/copy/${id}`,
+    method: 'post'
+  });
+};
diff --git a/src/api/workflow/definition/types.ts b/src/api/workflow/definition/types.ts
new file mode 100644
index 0000000..5de7f77
--- /dev/null
+++ b/src/api/workflow/definition/types.ts
@@ -0,0 +1,31 @@
+export interface FlowDefinitionQuery extends PageQuery {
+  flowCode?: string;
+  flowName?: string;
+  category: string | number;
+  isPublish?: number;
+}
+
+export interface FlowDefinitionVo {
+  id: string;
+  flowName: string;
+  flowCode: string;
+  formPath: string;
+  version: string;
+  isPublish: number;
+  activityStatus: number;
+  createTime: Date;
+  updateTime: Date;
+}
+
+export interface FlowDefinitionForm {
+  id: string;
+  flowName: string;
+  flowCode: string;
+  category: string;
+  formPath: string;
+}
+
+export interface definitionXmlVO {
+  xml: string[];
+  xmlStr: string;
+}
diff --git a/src/api/workflow/definitionConfig/index.ts b/src/api/workflow/definitionConfig/index.ts
deleted file mode 100644
index d34bf05..0000000
--- a/src/api/workflow/definitionConfig/index.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { DefinitionConfigVO, DefinitionConfigForm } from '@/api/workflow/definitionConfig/types';
-
-/**
- * 查询表单配置详细
- * @param definitionId
- */
-export const getByDefId = (definitionId: string | number): AxiosPromise<DefinitionConfigVO> => {
-  return request({
-    url: '/workflow/definitionConfig/getByDefId/' + definitionId,
-    method: 'get'
-  });
-};
-
-/**
- * 新增表单配置
- * @param data
- */
-export const saveOrUpdate = (data: DefinitionConfigForm) => {
-  return request({
-    url: '/workflow/definitionConfig/saveOrUpdate',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 删除表单配置
- * @param id
- */
-export const deldefinitionConfig = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/workflow/definitionConfig/' + id,
-    method: 'delete'
-  });
-};
-
-/**
- * 查询流程定义配置排除当前查询的流程定义
- * @param tableName
- * @param definitionId
- */
-export const getByTableNameNotDefId = (tableName: string, definitionId: string | number) => {
-  return request({
-    url: `/workflow/definitionConfig/getByTableNameNotDefId/${tableName}/${definitionId}`,
-    method: 'get'
-  });
-};
diff --git a/src/api/workflow/definitionConfig/types.ts b/src/api/workflow/definitionConfig/types.ts
deleted file mode 100644
index 7627403..0000000
--- a/src/api/workflow/definitionConfig/types.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { FormManageVO } from '@/api/workflow/formManage/types';
-
-export interface DefinitionConfigVO {
-  /**
-   * 主键
-   */
-  id: string | number;
-
-  /**
-   * 表名
-   */
-  tableName?: string;
-
-  /**
-   * 流程定义ID
-   */
-  definitionId: string | number;
-
-  /**
-   * 流程KEY
-   */
-  processKey: string;
-
-  /**
-   * 流程版本
-   */
-  version?: string | number;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-  /**
-   * 表单管理
-   */
-  wfFormManageVo: FormManageVO;
-}
-
-export interface DefinitionConfigForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: string | number;
-
-  /**
-   * 表名
-   */
-  tableName?: string;
-
-  /**
-   * 流程定义ID
-   */
-  definitionId?: string | number;
-
-  /**
-   * 流程KEY
-   */
-  processKey?: string;
-
-  /**
-   * 流程版本
-   */
-  version?: string | number;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-  /**
-   * 表单管理
-   */
-  wfFormManageVo?: FormManageVO;
-}
-
-export interface DefinitionConfigQuery extends PageQuery {
-  /**
-   * 表名
-   */
-  tableName?: string;
-
-  /**
-   * 流程定义ID
-   */
-  definitionId?: string | number;
-
-  /**
-   * 流程KEY
-   */
-  processKey?: string;
-
-  /**
-   * 流程版本
-   */
-  version?: string | number;
-
-  /**
-   * 表单管理
-   */
-  wfFormManageVo: FormManageVO;
-}
diff --git a/src/api/workflow/formManage/index.ts b/src/api/workflow/formManage/index.ts
deleted file mode 100644
index 6c5ec60..0000000
--- a/src/api/workflow/formManage/index.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { FormManageVO, FormManageForm, FormManageQuery } from '@/api/workflow/formManage/types';
-
-/**
- * 查询表单管理列表
- * @param query
- * @returns {*}
- */
-
-export const listFormManage = (query?: FormManageQuery): AxiosPromise<FormManageVO[]> => {
-  return request({
-    url: '/workflow/formManage/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询表单管理列表
- * @param query
- * @returns {*}
- */
-
-export const selectListFormManage = (): AxiosPromise<FormManageVO[]> => {
-  return request({
-    url: '/workflow/formManage/list/selectList',
-    method: 'get'
-  });
-};
-
-/**
- * 查询表单管理详细
- * @param id
- */
-export const getFormManage = (id: string | number): AxiosPromise<FormManageVO> => {
-  return request({
-    url: '/workflow/formManage/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增表单管理
- * @param data
- */
-export const addFormManage = (data: FormManageForm) => {
-  return request({
-    url: '/workflow/formManage',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改表单管理
- * @param data
- */
-export const updateFormManage = (data: FormManageForm) => {
-  return request({
-    url: '/workflow/formManage',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除表单管理
- * @param id
- */
-export const delFormManage = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/workflow/formManage/' + id,
-    method: 'delete'
-  });
-};
diff --git a/src/api/workflow/formManage/types.ts b/src/api/workflow/formManage/types.ts
deleted file mode 100644
index b9dc1d8..0000000
--- a/src/api/workflow/formManage/types.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-export interface FormManageVO {
-  /**
-   * 主键
-   */
-  id: string | number;
-
-  /**
-   * 表单名称
-   */
-  formName: string;
-
-  /**
-   * 表单类型
-   */
-  formType: string;
-  /**
-   * 表单类型名称
-   */
-  formTypeName: string;
-
-  /**
-   * 路由地址/表单ID
-   */
-  router: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface FormManageForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: string | number;
-
-  /**
-   * 表单名称
-   */
-  formName?: string;
-
-  /**
-   * 表单类型
-   */
-  formType?: string;
-
-  /**
-   * 路由地址/表单ID
-   */
-  router?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface FormManageQuery extends PageQuery {
-  /**
-   * 表单名称
-   */
-  formName?: string;
-
-  /**
-   * 表单类型
-   */
-  formType?: string;
-}
diff --git a/src/api/workflow/instance/index.ts b/src/api/workflow/instance/index.ts
new file mode 100644
index 0000000..42d748d
--- /dev/null
+++ b/src/api/workflow/instance/index.ts
@@ -0,0 +1,101 @@
+import request from '@/utils/request';
+import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询运行中实例列表
+ * @param query
+ * @returns {*}
+ */
+export const pageByRunning = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+  return request({
+    url: '/workflow/instance/pageByRunning',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询已完成实例列表
+ * @param query
+ * @returns {*}
+ */
+export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+  return request({
+    url: '/workflow/instance/pageByFinish',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 通过业务id获取历史流程图
+ */
+export const flowImage = (businessId: string | number) => {
+  return request({
+    url: `/workflow/instance/flowImage/${businessId}` + '?t' + Math.random(),
+    method: 'get'
+  });
+};
+
+/**
+ * 分页查询当前登录人单据
+ * @param query
+ * @returns {*}
+ */
+export const pageByCurrent = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+  return request({
+    url: '/workflow/instance/pageByCurrent',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 撤销流程
+ * @param data 参数
+ * @returns
+ */
+export const cancelProcessApply = (data: any) => {
+  return request({
+    url: `/workflow/instance/cancelProcessApply`,
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 获取流程变量
+ * @param instanceId 实例id
+ * @returns
+ */
+export const instanceVariable = (instanceId: string | number) => {
+  return request({
+    url: `/workflow/instance/instanceVariable/${instanceId}`,
+    method: 'get'
+  });
+};
+
+/**
+ * 删除
+ * @param instanceIds 流程实例id
+ * @returns
+ */
+export const deleteByInstanceIds = (instanceIds: Array<string | number> | string | number) => {
+  return request({
+    url: `/workflow/instance/deleteByInstanceIds/${instanceIds}`,
+    method: 'delete'
+  });
+};
+/**
+ * 作废流程
+ * @param data 参数
+ * @returns
+ */
+export const invalid = (data: any) => {
+  return request({
+    url: `/workflow/instance/invalid`,
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/api/workflow/instance/types.ts b/src/api/workflow/instance/types.ts
new file mode 100644
index 0000000..a12dab3
--- /dev/null
+++ b/src/api/workflow/instance/types.ts
@@ -0,0 +1,26 @@
+import { FlowTaskVO } from '@/api/workflow/task/types';
+
+export interface FlowInstanceQuery extends PageQuery {
+  category?: string | number;
+  nodeName?: string;
+  flowCode?: string;
+  flowName?: string;
+  createByIds?: string[] | number[];
+  businessId?: string;
+}
+
+export interface FlowInstanceVO extends BaseEntity {
+  id: string | number;
+  definitionId: string;
+  flowName: string;
+  flowCode: string;
+  version: string;
+  businessId: string;
+  activityStatus: number;
+  tenantId: string;
+  createTime: string;
+  createBy: string;
+  flowStatus: string;
+  flowStatusName: string;
+  flowTaskList: FlowTaskVO[];
+}
diff --git a/src/api/workflow/model/index.ts b/src/api/workflow/model/index.ts
deleted file mode 100644
index 1ca8b19..0000000
--- a/src/api/workflow/model/index.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ModelForm, ModelQuery, ModelVO } from '@/api/workflow/model/types';
-
-/**
- * 查询模型列表
- * @param query
- * @returns {*}
- */
-export const listModel = (query: ModelQuery): AxiosPromise<ModelVO[]> => {
-  return request({
-    url: '/workflow/model/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询模型信息
- * @param query
- * @returns {*}
- */
-export const getInfo = (id: string): AxiosPromise<ModelForm> => {
-  return request({
-    url: '/workflow/model/getInfo/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增模型
- * @param data
- * @returns {*}
- */
-export const addModel = (data: ModelForm): AxiosPromise<void> => {
-  return request({
-    url: '/workflow/model/save',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改模型信息
- * @param data
- * @returns {*}
- */
-export function update(data: ModelForm): AxiosPromise<void> {
-  return request({
-    url: '/workflow/model/update',
-    method: 'put',
-    data: data
-  });
-}
-
-/**
- * 修改模型信息
- * @param data
- * @returns {*}
- */
-export function editModelXml(data: ModelForm): AxiosPromise<void> {
-  return request({
-    url: '/workflow/model/editModelXml',
-    method: 'put',
-    data: data
-  });
-}
-
-/**
- * 按id删除模型
- * @returns {*}
- * @param id 模型id
- */
-export function delModel(id: string | string[]): AxiosPromise<void> {
-  return request({
-    url: '/workflow/model/' + id,
-    method: 'delete'
-  });
-}
-
-/**
- * 模型部署
- * @returns {*}
- * @param id 模型id
- */
-export const modelDeploy = (id: string): AxiosPromise<void> => {
-  return request({
-    url: `/workflow/model/modelDeploy/${id}`,
-    method: 'post'
-  });
-};
-
-/**
- * 复制模型
- * @param data
- * @returns {*}
- */
-export const copyModel = (data: ModelForm): AxiosPromise<void> => {
-  return request({
-    url: '/workflow/model/copyModel',
-    method: 'post',
-    data: data
-  });
-};
diff --git a/src/api/workflow/model/types.ts b/src/api/workflow/model/types.ts
deleted file mode 100644
index 77f947d..0000000
--- a/src/api/workflow/model/types.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-export interface ModelForm {
-  id: string;
-  name: string;
-  key: string;
-  categoryCode: string;
-  xml: string;
-  svg: string;
-  description: string;
-}
-
-export interface ModelQuery extends PageQuery {
-  name?: string;
-  key?: string;
-  categoryCode?: string;
-}
-
-export interface OriginalPersistentState {
-  metaInfo: string;
-  editorSourceValueId: string;
-  createTime: string;
-  deploymentId?: string;
-  name: string;
-  tenantId: string;
-  category?: string;
-  version: number;
-  editorSourceExtraValueId?: string;
-  key: string;
-  lastUpdateTime: string;
-}
-
-export interface PersistentState {
-  metaInfo: string;
-  editorSourceValueId: string;
-  createTime: string;
-  deploymentId?: string;
-  name: string;
-  tenantId: string;
-  category?: string;
-  version: number;
-  editorSourceExtraValueId?: string;
-  key: string;
-  lastUpdateTime: string;
-}
-
-export interface ModelVO {
-  id: string;
-  revision: number;
-  originalPersistentState: OriginalPersistentState;
-  name: string;
-  key: string;
-  category?: string;
-  createTime: string;
-  lastUpdateTime: string;
-  version: number;
-  metaInfo: string;
-  deploymentId?: string;
-  editorSourceValueId: string;
-  editorSourceExtraValueId?: string;
-  tenantId: string;
-  persistentState: PersistentState;
-  revisionNext: number;
-  idPrefix: string;
-  inserted: boolean;
-  updated: boolean;
-  deleted: boolean;
-}
diff --git a/src/api/workflow/nodeConfig/types.ts b/src/api/workflow/nodeConfig/types.ts
deleted file mode 100644
index a55fc91..0000000
--- a/src/api/workflow/nodeConfig/types.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { FormManageVO } from '@/api/workflow/formManage/types';
-
-export interface NodeConfigVO {
-  /**
-   * 主键
-   */
-  id: string | number;
-
-  /**
-   * 表单id
-   */
-  formId: string | number;
-
-  /**
-   * 表单类型
-   */
-  formType: string;
-
-  /**
-   * 节点名称
-   */
-  nodeName: string;
-
-  /**
-   * 节点id
-   */
-  nodeId: string | number;
-
-  /**
-   * 流程定义id
-   */
-  definitionId: string | number;
-
-  /**
-   * 表单管理
-   */
-  wfFormManageVo: FormManageVO;
-}
diff --git a/src/api/workflow/processDefinition/index.ts b/src/api/workflow/processDefinition/index.ts
deleted file mode 100644
index c063120..0000000
--- a/src/api/workflow/processDefinition/index.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import request from '@/utils/request';
-import { ProcessDefinitionQuery, ProcessDefinitionVO, definitionXmlVO } from '@/api/workflow/processDefinition/types';
-import { AxiosPromise } from 'axios';
-
-/**
- * 获取流程定义列表
- * @param query 流程实例id
- * @returns
- */
-export const listProcessDefinition = (query: ProcessDefinitionQuery): AxiosPromise<ProcessDefinitionVO[]> => {
-  return request({
-    url: `/workflow/processDefinition/list`,
-    method: 'get',
-    params: query
-  });
-};
-/**
- * 按照流程定义key获取流程定义
- * @param processInstanceId 流程实例id
- * @returns
- */
-export const getListByKey = (key: string) => {
-  return request({
-    url: `/workflow/processDefinition/getListByKey/${key}`,
-    method: 'get'
-  });
-};
-
-/**
- * 通过流程定义id获取流程图
- */
-export const definitionImage = (processDefinitionId: string): AxiosPromise<any> => {
-  return request({
-    url: `/workflow/processDefinition/definitionImage/${processDefinitionId}` + '?t' + Math.random(),
-    method: 'get'
-  });
-};
-
-/**
- * 通过流程定义id获取xml
- * @param processDefinitionId 流程定义id
- * @returns
- */
-export const definitionXml = (processDefinitionId: string): AxiosPromise<definitionXmlVO> => {
-  return request({
-    url: `/workflow/processDefinition/definitionXml/${processDefinitionId}`,
-    method: 'get'
-  });
-};
-
-/**
- * 删除流程定义
- * @param deploymentId 部署id
- * @param processDefinitionId 流程定义id
- * @returns
- */
-export const deleteProcessDefinition = (deploymentId: string | string[], processDefinitionId: string | string[]) => {
-  return request({
-    url: `/workflow/processDefinition/${deploymentId}/${processDefinitionId}`,
-    method: 'delete'
-  });
-};
-
-/**
- * 挂起/激活
- * @param processDefinitionId 流程定义id
- * @returns
- */
-export const updateDefinitionState = (processDefinitionId: string) => {
-  return request({
-    url: `/workflow/processDefinition/updateDefinitionState/${processDefinitionId}`,
-    method: 'put'
-  });
-};
-
-/**
- * 流程定义转换为模型
- * @param processDefinitionId 流程定义id
- * @returns
- */
-export const convertToModel = (processDefinitionId: string) => {
-  return request({
-    url: `/workflow/processDefinition/convertToModel/${processDefinitionId}`,
-    method: 'put'
-  });
-};
-
-/**
- * 通过zip或xml部署流程定义
- * @returns
- */
-export function deployProcessFile(data: any) {
-  return request({
-    url: '/workflow/processDefinition/deployByFile',
-    method: 'post',
-    data: data,
-    headers: {
-      repeatSubmit: false
-    }
-  });
-}
-
-/**
- * 迁移流程
- * @param currentProcessDefinitionId
- * @param fromProcessDefinitionId
- * @returns
- */
-export const migrationDefinition = (currentProcessDefinitionId: string, fromProcessDefinitionId: string) => {
-  return request({
-    url: `/workflow/processDefinition/migrationDefinition/${currentProcessDefinitionId}/${fromProcessDefinitionId}`,
-    method: 'put'
-  });
-};
diff --git a/src/api/workflow/processDefinition/types.ts b/src/api/workflow/processDefinition/types.ts
deleted file mode 100644
index 979ec25..0000000
--- a/src/api/workflow/processDefinition/types.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types';
-export interface ProcessDefinitionQuery extends PageQuery {
-  key?: string;
-  name?: string;
-  categoryCode?: string;
-}
-
-export interface ProcessDefinitionVO extends BaseEntity {
-  id: string;
-  name: string;
-  key: string;
-  version: number;
-  suspensionState: number;
-  resourceName: string;
-  diagramResourceName: string;
-  deploymentId: string;
-  deploymentTime: string;
-  wfDefinitionConfigVo: DefinitionConfigVO;
-}
-
-export interface definitionXmlVO {
-  xml: string[];
-  xmlStr: string;
-}
diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
deleted file mode 100644
index 6d5e53b..0000000
--- a/src/api/workflow/processInstance/index.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import request from '@/utils/request';
-import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
-import { AxiosPromise } from 'axios';
-
-/**
- * 查询运行中实例列表
- * @param query
- * @returns {*}
- */
-export const getPageByRunning = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
-  return request({
-    url: '/workflow/processInstance/getPageByRunning',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询已完成实例列表
- * @param query
- * @returns {*}
- */
-export const getPageByFinish = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
-  return request({
-    url: '/workflow/processInstance/getPageByFinish',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 通过业务id获取历史流程图
- */
-export const getHistoryImage = (businessKey: string) => {
-  return request({
-    url: `/workflow/processInstance/getHistoryImage/${businessKey}` + '?t' + Math.random(),
-    method: 'get'
-  });
-};
-
-/**
- * 通过业务id获取历史流程图运行中，历史等节点
- */
-export const getHistoryList = (businessKey: string): AxiosPromise<Record<string, any>> => {
-  return request({
-    url: `/workflow/processInstance/getHistoryList/${businessKey}` + '?t' + Math.random(),
-    method: 'get'
-  });
-};
-
-/**
- * 获取审批记录
- * @param businessKey 业务id
- * @returns
- */
-export const getHistoryRecord = (businessKey: string | number) => {
-  return request({
-    url: `/workflow/processInstance/getHistoryRecord/${businessKey}`,
-    method: 'get'
-  });
-};
-
-/**
- * 作废
- * @param data 参数
- * @returns
- */
-export const deleteRunInstance = (data: object) => {
-  return request({
-    url: `/workflow/processInstance/deleteRunInstance`,
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- * @param businessKey 业务id
- * @returns
- */
-export const deleteRunAndHisInstance = (businessKey: string | string[]) => {
-  return request({
-    url: `/workflow/processInstance/deleteRunAndHisInstance/${businessKey}`,
-    method: 'delete'
-  });
-};
-
-/**
- * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- * @param businessKey 业务id
- * @returns
- */
-export const deleteFinishAndHisInstance = (businessKey: string | string[]) => {
-  return request({
-    url: `/workflow/processInstance/deleteFinishAndHisInstance/${businessKey}`,
-    method: 'delete'
-  });
-};
-
-/**
- * 分页查询当前登录人单据
- * @param query
- * @returns {*}
- */
-export const getPageByCurrent = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
-  return request({
-    url: '/workflow/processInstance/getPageByCurrent',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 撤销流程
- * @param businessKey 业务id
- * @returns
- */
-export const cancelProcessApply = (businessKey: string) => {
-  return request({
-    url: `/workflow/processInstance/cancelProcessApply/${businessKey}`,
-    method: 'post'
-  });
-};
-
-export default {
-  getPageByRunning,
-  getPageByFinish,
-  getHistoryImage,
-  getHistoryList,
-  getHistoryRecord,
-  deleteRunInstance,
-  deleteRunAndHisInstance,
-  deleteFinishAndHisInstance,
-  getPageByCurrent,
-  cancelProcessApply
-};
diff --git a/src/api/workflow/processInstance/types.ts b/src/api/workflow/processInstance/types.ts
deleted file mode 100644
index 99d0511..0000000
--- a/src/api/workflow/processInstance/types.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { TaskVO } from '@/api/workflow/task/types';
-
-export interface ProcessInstanceQuery extends PageQuery {
-  categoryCode?: string;
-  name?: string;
-  key?: string;
-  startUserId?: string;
-  businessKey?: string;
-}
-
-export interface ProcessInstanceVO extends BaseEntity {
-  id: string;
-  processDefinitionId: string;
-  processDefinitionName: string;
-  processDefinitionKey: string;
-  processDefinitionVersion: string;
-  deploymentId: string;
-  businessKey: string;
-  isSuspended?: any;
-  tenantId: string;
-  startTime: string;
-  endTime?: string;
-  startUserId: string;
-  businessStatus: string;
-  businessStatusName: string;
-  taskVoList: TaskVO[];
-}
diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index d29de30..55ede45 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -1,15 +1,15 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import { TaskQuery, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
 
 /**
  * 查询待办列表
  * @param query
  * @returns {*}
  */
-export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
   return request({
-    url: '/workflow/task/getPageByTaskWait',
+    url: '/workflow/task/pageByTaskWait',
     method: 'get',
     params: query
   });
@@ -20,9 +20,9 @@ export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  * @param query
  * @returns {*}
  */
-export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
   return request({
-    url: '/workflow/task/getPageByTaskFinish',
+    url: '/workflow/task/pageByTaskFinish',
     method: 'get',
     params: query
   });
@@ -33,9 +33,9 @@ export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> =>
  * @param query
  * @returns {*}
  */
-export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
   return request({
-    url: '/workflow/task/getPageByTaskCopy',
+    url: '/workflow/task/pageByTaskCopy',
     method: 'get',
     params: query
   });
@@ -46,9 +46,9 @@ export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  * @param query
  * @returns {*}
  */
-export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
   return request({
-    url: '/workflow/task/getPageByAllTaskWait',
+    url: '/workflow/task/pageByAllTaskWait',
     method: 'get',
     params: query
   });
@@ -59,9 +59,9 @@ export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> =
  * @param query
  * @returns {*}
  */
-export const getPageByAllTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByAllTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
   return request({
-    url: '/workflow/task/getPageByAllTaskFinish',
+    url: '/workflow/task/pageByAllTaskFinish',
     method: 'get',
     params: query
   });
@@ -93,30 +93,6 @@ export const completeTask = (data: object) => {
   });
 };
 
-/**
- * 认领任务
- * @param taskId
- * @returns {*}
- */
-export const claim = (taskId: string): any => {
-  return request({
-    url: '/workflow/task/claim/' + taskId,
-    method: 'post'
-  });
-};
-
-/**
- * 归还任务
- * @param taskId
- * @returns {*}
- */
-export const returnTask = (taskId: string): any => {
-  return request({
-    url: '/workflow/task/returnTask/' + taskId,
-    method: 'post'
-  });
-};
-
 /**
  * 任务驳回
  * @param data
@@ -135,61 +111,24 @@ export const backProcess = (data: any): any => {
  * @param taskId
  * @returns
  */
-export const getTaskById = (taskId: string) => {
+export const getTask = (taskId: string) => {
   return request({
-    url: '/workflow/task/getTaskById/' + taskId,
+    url: '/workflow/task/getTask/' + taskId,
     method: 'get'
   });
 };
 
-/**
- * 加签
- * @param data
- * @returns
- */
-export const addMultiInstanceExecution = (data: any) => {
-  return request({
-    url: '/workflow/task/addMultiInstanceExecution',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 减签
- * @param data
- * @returns
- */
-export const deleteMultiInstanceExecution = (data: any) => {
-  return request({
-    url: '/workflow/task/deleteMultiInstanceExecution',
-    method: 'post',
-    data: data
-  });
-};
-
 /**
  * 修改任务办理人
- * @param taskIds
+ * @param taskIdList
  * @param userId
  * @returns
  */
-export const updateAssignee = (taskIds: Array<string>, userId: string) => {
+export const updateAssignee = (taskIdList: Array<string>, userId: string) => {
   return request({
-    url: `/workflow/task/updateAssignee/${taskIds}/${userId}`,
-    method: 'put'
-  });
-};
-
-/**
- * 转办任务
- * @returns
- */
-export const transferTask = (data: any) => {
-  return request({
-    url: `/workflow/task/transferTask`,
-    method: 'post',
-    data: data
+    url: `/workflow/task/updateAssignee/${userId}`,
+    method: 'put',
+    data: taskIdList
   });
 };
 
@@ -205,60 +144,37 @@ export const terminationTask = (data: any) => {
   });
 };
 
-/**
- * 查询流程变量
- * @returns
- */
-export const getInstanceVariable = (taskId: string) => {
-  return request({
-    url: `/workflow/task/getInstanceVariable/${taskId}`,
-    method: 'get'
-  });
-};
-
 /**
  * 获取可驳回得任务节点
  * @returns
  */
-export const getTaskNodeList = (processInstanceId: string) => {
+export const getBackTaskNode = (definitionId: string, nodeCode: string) => {
   return request({
-    url: `/workflow/task/getTaskNodeList/${processInstanceId}`,
+    url: `/workflow/task/getBackTaskNode/${definitionId}/${nodeCode}`,
     method: 'get'
   });
 };
 
 /**
- * 委托任务
+ * 任务操作 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
  * @returns
  */
-export const delegateTask = (data: any) => {
+export const taskOperation = (data: TaskOperationBo, operation: string) => {
   return request({
-    url: `/workflow/task/delegateTask`,
+    url: `/workflow/task/taskOperation/${operation}`,
     method: 'post',
     data: data
   });
 };
 
 /**
- * 查询工作流任务用户选择加签人员
- * @param taskId
- * @returns {*}
+ * 获取当前任务办理人
+ * @param taskId 任务id
+ * @returns
  */
-export const getTaskUserIdsByAddMultiInstance = (taskId: string) => {
+export const currentTaskAllUser = (taskId: string | number) => {
   return request({
-    url: '/workflow/task/getTaskUserIdsByAddMultiInstance/' + taskId,
-    method: 'get'
-  });
-};
-
-/**
- * 查询工作流选择减签人员
- * @param taskId
- * @returns {*}
- */
-export const getListByDeleteMultiInstance = (taskId: string) => {
-  return request({
-    url: '/workflow/task/getListByDeleteMultiInstance/' + taskId,
+    url: `/workflow/task/currentTaskAllUser/${taskId}`,
     method: 'get'
   });
 };
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index 0425a1a..8ea803b 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -1,9 +1,8 @@
-import { NodeConfigVO } from '@/api/workflow/nodeConfig/types';
-import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types';
 export interface TaskQuery extends PageQuery {
-  name?: string;
-  processDefinitionKey?: string;
-  processDefinitionName?: string;
+  nodeName?: string;
+  flowCode?: string;
+  flowName?: string;
+  createByIds?: string[] | number[];
 }
 
 export interface ParticipantVo {
@@ -12,38 +11,38 @@ export interface ParticipantVo {
   candidateName: string[];
   claim: boolean;
 }
-
-export interface TaskVO extends BaseEntity {
-  id: string;
-  name: string;
-  description?: string;
-  priority: number;
-  owner?: string;
-  assignee?: string | number;
-  assigneeName?: string;
-  processInstanceId: string;
-  executionId: string;
-  taskDefinitionId?: any;
-  processDefinitionId: string;
-  endTime?: string;
-  taskDefinitionKey: string;
-  dueDate?: string;
-  category?: any;
-  parentTaskId?: any;
-  tenantId: string;
-  claimTime?: string;
-  businessStatus?: string;
-  businessStatusName?: string;
-  processDefinitionName?: string;
-  processDefinitionKey?: string;
-  participantVo?: ParticipantVo;
-  multiInstance?: boolean;
-  businessKey?: string;
-  wfNodeConfigVo?: NodeConfigVO;
-  wfDefinitionConfigVo?: DefinitionConfigVO;
+export interface FlowTaskVO {
+  id: string | number;
+  createTime?: Date;
+  updateTime?: Date;
+  tenantId?: string;
+  definitionId?: string;
+  instanceId: string;
+  flowName: string;
+  businessId: string;
+  nodeCode: string;
+  nodeName: string;
+  flowCode: string;
+  flowStatus: string;
+  formCustom: string;
+  formPath: string;
+  nodeType: number;
+  nodeRatio: string | number;
+  version?: string;
 }
 
 export interface VariableVo {
   key: string;
   value: string;
 }
+
+export interface TaskOperationBo {
+  //委派/转办人的用户ID（必填，准对委派/转办人操作）
+  userId?: string;
+  //加签/减签人的用户ID列表（必填，针对加签/减签操作）
+  userIds?: string[];
+  //任务ID（必填）
+  taskId: string | number;
+  //意见或备注信息（可选）
+  message?: string;
+}
diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts
index 63ce318..0f5ce1b 100644
--- a/src/api/workflow/workflowCommon/index.ts
+++ b/src/api/workflow/workflowCommon/index.ts
@@ -2,28 +2,14 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 
 export default {
   routerJump(routerJumpVo: RouterJumpVo, proxy) {
-    if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
-      proxy.$tab.closePage(proxy.$route);
-      proxy.$router.push({
-        path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
-        query: {
-          id: routerJumpVo.businessKey,
-          type: routerJumpVo.type,
-          taskId: routerJumpVo.taskId
-        }
-      });
-    } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
-      proxy.$tab.closePage(proxy.$route);
-      proxy.$router.push({
-        path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
-        query: {
-          id: routerJumpVo.businessKey,
-          type: routerJumpVo.type,
-          taskId: routerJumpVo.taskId
-        }
-      });
-    } else {
-      proxy?.$modal.msgError('请到模型配置菜单！');
-    }
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+      path: routerJumpVo.formPath,
+      query: {
+        id: routerJumpVo.businessId,
+        type: routerJumpVo.type,
+        taskId: routerJumpVo.taskId
+      }
+    });
   }
 };
diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts
index 0f1ef1f..3e7a71d 100644
--- a/src/api/workflow/workflowCommon/types.ts
+++ b/src/api/workflow/workflowCommon/types.ts
@@ -1,16 +1,13 @@
-import { NodeConfigVO } from '@/api/workflow/nodeConfig/types';
-import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types';
-
 export interface RouterJumpVo {
-  wfNodeConfigVo: NodeConfigVO;
-  wfDefinitionConfigVo: DefinitionConfigVO;
-  businessKey: string;
-  taskId: string;
+  businessId: string;
+  taskId: string | number;
   type: string;
+  formCustom: string;
+  formPath: string;
 }
 
 export interface StartProcessBo {
-  businessKey: string | number;
-  tableName: string;
+  businessId: string | number;
+  flowCode: string;
   variables: any;
 }
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index e5cd95d..3aa871b 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -14,11 +14,6 @@
   --tableHeaderBg: #f8f8f9;
   --tableHeaderTextColor: #515a6e;
 
-  // 工作流
-  --bpmn-panel-border: #eeeeee;
-  --bpmn-panel-box-shadow: #cccccc;
-  --bpmn-panel-bar-background-color: #f5f7fa;
-
   // ele
   --brder-color: #e8e8e8;
 
@@ -78,11 +73,6 @@ html.dark {
   --vxe-table-border-color: #37373a;
   --vxe-toolbar-background-color: #37373a;
 
-  // 工作流
-  --bpmn-panel-border: #37373a;
-  --bpmn-panel-box-shadow: #37373a;
-  --bpmn-panel-bar-background-color: #37373a;
-
   // ele
   --brder-color: #37373a;
 }
diff --git a/src/bpmn/assets/defaultXML.ts b/src/bpmn/assets/defaultXML.ts
deleted file mode 100644
index dff0349..0000000
--- a/src/bpmn/assets/defaultXML.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-function generateRandomValue() {
-  // 生成一个随机数
-  const randomValue = Math.random().toString(36).slice(2, 12);
-  return `Process_${randomValue}`;
-}
-
-const cartage: string = 'default';
-export default `<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" targetNamespace="http://www.flowable.org/processdef">
-  <process id="process_${generateRandomValue()}" name="name_${generateRandomValue()}">
-    <startEvent id="startNode1" name="开始" />
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_flow">
-    <bpmndi:BPMNPlane id="BPMNPlane_flow" bpmnElement="T-2d89e7a3-ba79-4abd-9f64-ea59621c258c">
-      <bpmndi:BPMNShape id="BPMNShape_startNode1" bpmnElement="startNode1" bioc:stroke="">
-        <omgdc:Bounds x="240" y="200" width="30" height="30" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="242" y="237" width="23" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>`;
diff --git a/src/bpmn/assets/lang/zh.ts b/src/bpmn/assets/lang/zh.ts
deleted file mode 100644
index ee0c5de..0000000
--- a/src/bpmn/assets/lang/zh.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-export const NodeName = {
-  'bpmn:Process': '流程',
-  'bpmn:StartEvent': '开始事件',
-  'bpmn:IntermediateThrowEvent': '中间事件',
-  'bpmn:Task': '任务',
-  'bpmn:SendTask': '发送任务',
-  'bpmn:ReceiveTask': '接收任务',
-  'bpmn:UserTask': '用户任务',
-  'bpmn:ManualTask': '手工任务',
-  'bpmn:BusinessRuleTask': '业务规则任务',
-  'bpmn:ServiceTask': '服务任务',
-  'bpmn:ScriptTask': '脚本任务',
-  'bpmn:EndEvent': '结束事件',
-  'bpmn:SequenceFlow': '流程线',
-  'bpmn:ExclusiveGateway': '互斥网关',
-  'bpmn:ParallelGateway': '并行网关',
-  'bpmn:InclusiveGateway': '相容网关',
-  'bpmn:ComplexGateway': '复杂网关',
-  'bpmn:EventBasedGateway': '事件网关',
-  'bpmn:Participant': '池/参与者',
-  'bpmn:SubProcess': '子流程',
-  'bpmn:DataObjectReference': '数据对象引用',
-  'bpmn:DataStoreReference': '数据存储引用',
-  'bpmn:Group': '组'
-};
-
-export default {
-  'Activate hand tool': '启动手动工具',
-  'Activate lasso tool': '启动 Lasso 工具',
-  'Activate create/remove space tool': '启动创建/删除空间工具',
-  'Activate global connect tool': '启动全局连接工具',
-  'Ad-hoc': 'Ad-hoc',
-  'Add lane above': '在上方添加泳道',
-  'Add lane below': '在下方添加泳道',
-  'Business rule task': '规则任务',
-  'Call activity': '引用流程',
-  'Compensation end event': '结束补偿事件',
-  'Compensation intermediate throw event': '中间补偿抛出事件',
-  'Complex gateway': '复杂网关',
-  'Conditional intermediate catch event': '中间条件捕获事件',
-  'Conditional start event (non-interrupting)': '条件启动事件 (非中断)',
-  'Conditional start event': '条件启动事件',
-  'Connect using association': '文本关联',
-  'Connect using sequence/message flow or association': '消息关联',
-  'Change element': '更改元素',
-  'Change type': '更改类型',
-  'Create data object reference': '创建数据对象引用',
-  'Create data store reference': '创建数据存储引用',
-  'Create expanded sub-process': '创建可折叠子流程',
-  'Create pool/participant': '创建池/参与者',
-  'Collection': '集合',
-  'Connect using data input association': '数据输入关联',
-  'Data store reference': '数据存储引用',
-  'Data object reference': '数据对象引用',
-  'Divide into two lanes': '分成两个泳道',
-  'Divide into three lanes': '分成三个泳道',
-  'End event': '结束事件',
-  'Error end event': '结束错误事件',
-  'Escalation end event': '结束升级事件',
-  'Escalation intermediate throw event': '中间升级抛出事件',
-  'Event sub-process': '事件子流程',
-  'Event-based gateway': '事件网关',
-  'Exclusive gateway': '互斥网关',
-  'Empty pool/participant (removes content)': '清空池/参与者 (删除内容)',
-  'Empty pool/participant': '清空池/参与者',
-  'Expanded pool/participant': '展开池/参与者',
-  'Inclusive gateway': '相容网关',
-  'Intermediate throw event': '中间抛出事件',
-  'Loop': '循环',
-  'Link intermediate catch event': '中间链接捕获事件',
-  'Link intermediate throw event': '中间链接抛出事件',
-  'Manual task': '手动任务',
-  'Message end event': '结束消息事件',
-  'Message intermediate catch event': '中间消息捕获事件',
-  'Message intermediate throw event': '中间消息抛出事件',
-  'Message start event': '消息启动事件',
-  'Parallel gateway': '并行网关',
-  'Parallel multi-instance': '并行多实例',
-  'Participant multiplicity': '参与者多重性',
-  'Receive task': '接受任务',
-  'Remove': '移除',
-  'Script task': '脚本任务',
-  'Send task': '发送任务',
-  'Sequential multi-instance': '串行多实例',
-  'Service task': '服务任务',
-  'Signal end event': '结束信号事件',
-  'Signal intermediate catch event': '中间信号捕获事件',
-  'Signal intermediate throw event': '中间信号抛出事件',
-  'Signal start event (non-interrupting)': '信号启动事件 (非中断)',
-  'Signal start event': '信号启动事件',
-  'Start event': '开始事件',
-  'Sub-process (collapsed)': '可折叠子流程',
-  'Sub-process (expanded)': '可展开子流程',
-  'Sub rocess': '子流程',
-  'Task': '任务',
-  'Transaction': '事务',
-  'Terminate end event': '终止边界事件',
-  'Timer intermediate catch event': '中间定时捕获事件',
-  'Timer start event (non-interrupting)': '定时启动事件 (非中断)',
-  'Timer start event': '定时启动事件',
-  'User task': '用户任务',
-  'Create start event': '创建开始事件',
-  'Create gateway': '创建网关',
-  'Create intermediate/boundary event': '创建中间/边界事件',
-  'Create end event': '创建结束事件',
-  'Create group': '创建组',
-  'Create startEvent': '开始节点',
-  'Create endEvent': '结束节点',
-  'Create exclusiveGateway': '互斥网关',
-  'Create parallelGateway': '并行网关',
-  'Create task': '任务节点',
-  'Create userTask': '用户任务节点',
-  'Condition type': '条件类型',
-  'Append end event': '追加结束事件节点',
-  'Append gateway': '追加网关节点',
-  'Append task': '追加任务',
-  'Append user task': '追加用户任务节点',
-  'Append text annotation': '追加文本注释',
-  'Append intermediate/boundary event': '追加中间或边界事件',
-  'Append receive task': '追加接收任务节点',
-  'Append message intermediate catch event': '追加中间消息捕获事件',
-  'Append timer intermediate catch event': '追加中间定时捕获事件',
-  'Append conditional intermediate catch event': '追加中间条件捕获事件',
-  'Append signal intermediate catch event': '追加中间信号捕获事件',
-  'flow elements must be children of pools/participants': '流程元素必须是池/参与者的子元素'
-};
diff --git a/src/bpmn/assets/moddle/flowable.ts b/src/bpmn/assets/moddle/flowable.ts
deleted file mode 100644
index de959a6..0000000
--- a/src/bpmn/assets/moddle/flowable.ts
+++ /dev/null
@@ -1,1250 +0,0 @@
-export default {
-  'name': 'Flowable',
-  'uri': 'http://flowable.org/bpmn',
-  'prefix': 'flowable',
-  'xml': {
-    'tagAlias': 'lowerCase'
-  },
-  'associations': [],
-  'types': [
-    {
-      'name': 'flowable:extCandidateUsers',
-      'isAbstract': true,
-      'extends': [],
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['*']
-      },
-      'properties': [
-        {
-          'name': 'body',
-          'type': 'String',
-          'isBody': true
-        }
-      ]
-    },
-    {
-      'name': 'flowable:extAssignee',
-      'isAbstract': true,
-      'extends': [],
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['*']
-      },
-      'properties': [
-        {
-          'name': 'body',
-          'type': 'String',
-          'isBody': true
-        }
-      ]
-    },
-    {
-      'name': 'flowable:property',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'id',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'name',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'value',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'flowable:properties',
-      'isAbstract': true,
-      'extends': [],
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['*']
-      },
-      'properties': [
-        {
-          'name': 'values',
-          'type': 'flowable:property',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'InOutBinding',
-      'superClass': ['Element'],
-      'isAbstract': true,
-      'properties': [
-        {
-          'name': 'source',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'sourceExpression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'target',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'businessKey',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'local',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': false
-        },
-        {
-          'name': 'variables',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'In',
-      'superClass': ['InOutBinding'],
-      'meta': {
-        'allowedIn': ['bpmn:CallActivity']
-      }
-    },
-    {
-      'name': 'Out',
-      'superClass': ['InOutBinding'],
-      'meta': {
-        'allowedIn': ['bpmn:CallActivity']
-      }
-    },
-    {
-      'name': 'AsyncCapable',
-      'isAbstract': true,
-      'extends': ['bpmn:Activity', 'bpmn:Gateway', 'bpmn:Event'],
-      'properties': [
-        {
-          'name': 'async',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': false
-        },
-        {
-          'name': 'asyncBefore',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': false
-        },
-        {
-          'name': 'asyncAfter',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': false
-        },
-        {
-          'name': 'exclusive',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': true
-        }
-      ]
-    },
-    {
-      'name': 'flowable:in',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'source',
-          'type': 'string',
-          'isAttr': true
-        },
-        {
-          'name': 'target',
-          'type': 'string',
-          'isAttr': true
-        }
-      ]
-    },
-    {
-      'name': 'flowable:out',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'source',
-          'type': 'string',
-          'isAttr': true
-        },
-        {
-          'name': 'target',
-          'type': 'string',
-          'isAttr': true
-        }
-      ]
-    },
-    {
-      'name': 'BoundaryEvent',
-      'superClass': ['CatchEvent'],
-      'properties': [
-        {
-          'name': 'cancelActivity',
-          'default': true,
-          'isAttr': true,
-          'type': 'Boolean'
-        },
-        {
-          'name': 'attachedToRef',
-          'type': 'Activity',
-          'isAttr': true,
-          'isReference': true
-        }
-      ]
-    },
-    {
-      'name': 'JobPriorized',
-      'isAbstract': true,
-      'extends': ['bpmn:Process', 'flowable:AsyncCapable'],
-      'properties': [
-        {
-          'name': 'jobPriority',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'SignalEventDefinition',
-      'isAbstract': true,
-      'extends': ['bpmn:SignalEventDefinition'],
-      'properties': [
-        {
-          'name': 'async',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': false
-        }
-      ]
-    },
-    {
-      'name': 'ErrorEventDefinition',
-      'isAbstract': true,
-      'extends': ['bpmn:ErrorEventDefinition'],
-      'properties': [
-        {
-          'name': 'errorCodeVariable',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'errorMessageVariable',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Error',
-      'isAbstract': true,
-      'extends': ['bpmn:Error'],
-      'properties': [
-        {
-          'name': 'flowable:errorMessage',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'PotentialStarter',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'resourceAssignmentExpression',
-          'type': 'bpmn:ResourceAssignmentExpression'
-        }
-      ]
-    },
-    {
-      'name': 'UserTask',
-      'isAbstract': true,
-      'extends': ['bpmn:UserTask'],
-      'properties': [
-        {
-          'name': 'timerEventDefinition',
-          'type': 'Expression'
-        },
-        {
-          'name': 'multiInstanceLoopCharacteristics',
-          'type': 'MultiInstanceLoopCharacteristics'
-        }
-      ]
-    },
-    {
-      'name': 'StartEvent',
-      'isAbstract': true,
-      'extends': ['bpmn:StartEvent'],
-      'properties': [
-        {
-          'name': 'timerEventDefinition',
-          'type': 'Expression'
-        }
-      ]
-    },
-    {
-      'name': 'FormSupported',
-      'isAbstract': true,
-      'extends': ['bpmn:StartEvent', 'bpmn:UserTask'],
-      'properties': [
-        {
-          'name': 'formHandlerClass',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'formKey',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'TemplateSupported',
-      'isAbstract': true,
-      'extends': ['bpmn:Process', 'bpmn:FlowElement'],
-      'properties': [
-        {
-          'name': 'modelerTemplate',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Initiator',
-      'isAbstract': true,
-      'extends': ['bpmn:StartEvent'],
-      'properties': [
-        {
-          'name': 'initiator',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'ScriptTask',
-      'isAbstract': true,
-      'extends': ['bpmn:ScriptTask'],
-      'properties': [
-        {
-          'name': 'resultVariable',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'resource',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Process',
-      'isAbstract': true,
-      'extends': ['bpmn:Process'],
-      'properties': [
-        {
-          'name': 'candidateStarterGroups',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'candidateStarterUsers',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'versionTag',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'historyTimeToLive',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'isStartableInTasklist',
-          'isAttr': true,
-          'type': 'Boolean',
-          'default': true
-        }
-      ]
-    },
-    {
-      'name': 'EscalationEventDefinition',
-      'isAbstract': true,
-      'extends': ['bpmn:EscalationEventDefinition'],
-      'properties': [
-        {
-          'name': 'escalationCodeVariable',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'FormalExpression',
-      'isAbstract': true,
-      'extends': ['bpmn:FormalExpression'],
-      'properties': [
-        {
-          'name': 'resource',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Assignable',
-      'extends': ['bpmn:UserTask'],
-      'properties': [
-        {
-          'name': 'candidateGroups',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'dueDate',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'followUpDate',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'priority',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'CallActivity',
-      'extends': ['bpmn:CallActivity'],
-      'properties': [
-        {
-          'name': 'calledElementBinding',
-          'isAttr': true,
-          'type': 'String',
-          'default': 'latest'
-        },
-        {
-          'name': 'calledElementVersion',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'calledElementVersionTag',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'calledElementTenantId',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'caseRef',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'caseBinding',
-          'isAttr': true,
-          'type': 'String',
-          'default': 'latest'
-        },
-        {
-          'name': 'caseVersion',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'caseTenantId',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'variableMappingClass',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'variableMappingDelegateExpression',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'ServiceTaskLike',
-      'extends': ['bpmn:ServiceTask', 'bpmn:BusinessRuleTask', 'bpmn:SendTask', 'bpmn:MessageEventDefinition'],
-      'properties': [
-        {
-          'name': 'expression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'class',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'delegateExpression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'resultVariable',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'ExclusiveGateway',
-      'isAbstract': true,
-      'extends': ['bpmn:ExclusiveGateway'],
-      'properties': [
-        {
-          'name': 'serviceClass',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'DmnCapable',
-      'extends': ['bpmn:BusinessRuleTask'],
-      'properties': [
-        {
-          'name': 'decisionRef',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'decisionRefBinding',
-          'isAttr': true,
-          'type': 'String',
-          'default': 'latest'
-        },
-        {
-          'name': 'decisionRefVersion',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'mapDecisionResult',
-          'isAttr': true,
-          'type': 'String',
-          'default': 'resultList'
-        },
-        {
-          'name': 'decisionRefTenantId',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'ExternalCapable',
-      'extends': ['flowable:ServiceTaskLike'],
-      'properties': [
-        {
-          'name': 'type',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'topic',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'TaskPriorized',
-      'extends': ['bpmn:Process', 'flowable:ExternalCapable'],
-      'properties': [
-        {
-          'name': 'taskPriority',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Properties',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['*']
-      },
-      'properties': [
-        {
-          'name': 'values',
-          'type': 'Property',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'Property',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'id',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'name',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'value',
-          'type': 'String',
-          'isAttr': true
-        }
-      ]
-    },
-    {
-      'name': 'Connector',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['flowable:ServiceTaskLike']
-      },
-      'properties': [
-        {
-          'name': 'inputOutput',
-          'type': 'InputOutput'
-        },
-        {
-          'name': 'connectorId',
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'InputOutput',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['bpmn:FlowNode', 'flowable:Connector']
-      },
-      'properties': [
-        {
-          'name': 'inputOutput',
-          'type': 'InputOutput'
-        },
-        {
-          'name': 'connectorId',
-          'type': 'String'
-        },
-        {
-          'name': 'inputParameters',
-          'isMany': true,
-          'type': 'InputParameter'
-        },
-        {
-          'name': 'outputParameters',
-          'isMany': true,
-          'type': 'OutputParameter'
-        }
-      ]
-    },
-    {
-      'name': 'InputOutputParameter',
-      'properties': [
-        {
-          'name': 'name',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'value',
-          'isBody': true,
-          'type': 'String'
-        },
-        {
-          'name': 'definition',
-          'type': 'InputOutputParameterDefinition'
-        }
-      ]
-    },
-    {
-      'name': 'InputOutputParameterDefinition',
-      'isAbstract': true
-    },
-    {
-      'name': 'List',
-      'superClass': ['InputOutputParameterDefinition'],
-      'properties': [
-        {
-          'name': 'items',
-          'isMany': true,
-          'type': 'InputOutputParameterDefinition'
-        }
-      ]
-    },
-    {
-      'name': 'Map',
-      'superClass': ['InputOutputParameterDefinition'],
-      'properties': [
-        {
-          'name': 'entries',
-          'isMany': true,
-          'type': 'Entry'
-        }
-      ]
-    },
-    {
-      'name': 'Entry',
-      'properties': [
-        {
-          'name': 'key',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'value',
-          'isBody': true,
-          'type': 'String'
-        },
-        {
-          'name': 'definition',
-          'type': 'InputOutputParameterDefinition'
-        }
-      ]
-    },
-    {
-      'name': 'Value',
-      'superClass': ['InputOutputParameterDefinition'],
-      'properties': [
-        {
-          'name': 'id',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'name',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'value',
-          'isBody': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Script',
-      'superClass': ['InputOutputParameterDefinition'],
-      'properties': [
-        {
-          'name': 'scriptFormat',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'resource',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'value',
-          'isBody': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'Field',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['flowable:ServiceTaskLike', 'flowable:ExecutionListener', 'flowable:TaskListener']
-      },
-      'properties': [
-        {
-          'name': 'name',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'expression',
-          'isAttr': true,
-          'type': 'expression'
-        },
-        {
-          'name': 'string',
-          'type': 'string'
-        },
-        {
-          'name': 'stringValue',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'string',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['flowable:Field']
-      },
-      'properties': [
-        {
-          'name': 'body',
-          'isBody': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'expression',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['flowable:Field']
-      },
-      'properties': [
-        {
-          'name': 'body',
-          'isBody': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'InputParameter',
-      'superClass': ['InputOutputParameter']
-    },
-    {
-      'name': 'OutputParameter',
-      'superClass': ['InputOutputParameter']
-    },
-    {
-      'name': 'Collectable',
-      'isAbstract': true,
-      'extends': ['bpmn:MultiInstanceLoopCharacteristics'],
-      'superClass': ['flowable:AsyncCapable'],
-      'properties': [
-        {
-          'name': 'collection',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'elementVariable',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'SequenceFlow',
-      'superClass': ['FlowElement'],
-      'properties': [
-        {
-          'name': 'isImmediate',
-          'isAttr': true,
-          'type': 'Boolean'
-        },
-        {
-          'name': 'conditionExpression',
-          'type': 'Expression'
-        },
-        {
-          'name': 'sourceRef',
-          'type': 'FlowNode',
-          'isAttr': true,
-          'isReference': true
-        },
-        {
-          'name': 'targetRef',
-          'type': 'FlowNode',
-          'isAttr': true,
-          'isReference': true
-        }
-      ]
-    },
-    {
-      'name': 'MultiInstanceLoopCharacteristics',
-      'superClass': ['LoopCharacteristics'],
-      'properties': [
-        {
-          'name': 'isSequential',
-          'default': false,
-          'isAttr': true,
-          'type': 'Boolean'
-        },
-        {
-          'name': 'behavior',
-          'type': 'MultiInstanceBehavior',
-          'default': 'All',
-          'isAttr': true
-        },
-        {
-          'name': 'loopCardinality',
-          'type': 'Expression',
-          'xml': {
-            'serialize': 'xsi:type'
-          }
-        },
-        {
-          'name': 'loopDataInputRef',
-          'type': 'ItemAwareElement',
-          'isReference': true
-        },
-        {
-          'name': 'loopDataOutputRef',
-          'type': 'ItemAwareElement',
-          'isReference': true
-        },
-        {
-          'name': 'inputDataItem',
-          'type': 'DataInput',
-          'xml': {
-            'serialize': 'property'
-          }
-        },
-        {
-          'name': 'outputDataItem',
-          'type': 'DataOutput',
-          'xml': {
-            'serialize': 'property'
-          }
-        },
-        {
-          'name': 'complexBehaviorDefinition',
-          'type': 'ComplexBehaviorDefinition',
-          'isMany': true
-        },
-        {
-          'name': 'completionCondition',
-          'type': 'Expression',
-          'xml': {
-            'serialize': 'xsi:type'
-          }
-        },
-        {
-          'name': 'oneBehaviorEventRef',
-          'type': 'EventDefinition',
-          'isAttr': true,
-          'isReference': true
-        },
-        {
-          'name': 'noneBehaviorEventRef',
-          'type': 'EventDefinition',
-          'isAttr': true,
-          'isReference': true
-        }
-      ]
-    },
-    {
-      'name': 'FailedJobRetryTimeCycle',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['flowable:AsyncCapable', 'bpmn:MultiInstanceLoopCharacteristics']
-      },
-      'properties': [
-        {
-          'name': 'body',
-          'isBody': true,
-          'type': 'String'
-        }
-      ]
-    },
-    {
-      'name': 'ExecutionListener',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': [
-          'bpmn:Task',
-          'bpmn:ServiceTask',
-          'bpmn:UserTask',
-          'bpmn:BusinessRuleTask',
-          'bpmn:ScriptTask',
-          'bpmn:ReceiveTask',
-          'bpmn:ManualTask',
-          'bpmn:ExclusiveGateway',
-          'bpmn:SequenceFlow',
-          'bpmn:ParallelGateway',
-          'bpmn:InclusiveGateway',
-          'bpmn:EventBasedGateway',
-          'bpmn:StartEvent',
-          'bpmn:IntermediateCatchEvent',
-          'bpmn:IntermediateThrowEvent',
-          'bpmn:EndEvent',
-          'bpmn:BoundaryEvent',
-          'bpmn:CallActivity',
-          'bpmn:SubProcess',
-          'bpmn:Process'
-        ]
-      },
-      'properties': [
-        {
-          'name': 'expression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'class',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'delegateExpression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'event',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'script',
-          'type': 'Script'
-        },
-        {
-          'name': 'fields',
-          'type': 'Field',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'TaskListener',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['bpmn:UserTask']
-      },
-      'properties': [
-        {
-          'name': 'expression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'class',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'delegateExpression',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'event',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'script',
-          'type': 'Script'
-        },
-        {
-          'name': 'fields',
-          'type': 'Field',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'FormProperty',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['bpmn:StartEvent', 'bpmn:UserTask']
-      },
-      'properties': [
-        {
-          'name': 'id',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'name',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'type',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'required',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'readable',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'writable',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'variable',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'expression',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'datePattern',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'default',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'values',
-          'type': 'Value',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'FormData',
-      'superClass': ['Element'],
-      'meta': {
-        'allowedIn': ['bpmn:StartEvent', 'bpmn:UserTask']
-      },
-      'properties': [
-        {
-          'name': 'fields',
-          'type': 'FormField',
-          'isMany': true
-        },
-        {
-          'name': 'businessKey',
-          'type': 'String',
-          'isAttr': true
-        }
-      ]
-    },
-    {
-      'name': 'FormField',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'id',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'label',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'type',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'datePattern',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'defaultValue',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'properties',
-          'type': 'Properties'
-        },
-        {
-          'name': 'validation',
-          'type': 'Validation'
-        },
-        {
-          'name': 'values',
-          'type': 'Value',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'Validation',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'constraints',
-          'type': 'Constraint',
-          'isMany': true
-        }
-      ]
-    },
-    {
-      'name': 'Constraint',
-      'superClass': ['Element'],
-      'properties': [
-        {
-          'name': 'name',
-          'type': 'String',
-          'isAttr': true
-        },
-        {
-          'name': 'config',
-          'type': 'String',
-          'isAttr': true
-        }
-      ]
-    },
-    {
-      'name': 'ConditionalEventDefinition',
-      'isAbstract': true,
-      'extends': ['bpmn:ConditionalEventDefinition'],
-      'properties': [
-        {
-          'name': 'variableName',
-          'isAttr': true,
-          'type': 'String'
-        },
-        {
-          'name': 'variableEvent',
-          'isAttr': true,
-          'type': 'String'
-        }
-      ]
-    }
-  ],
-  'emumerations': []
-};
diff --git a/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts b/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts
deleted file mode 100644
index 13ccf50..0000000
--- a/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import ContextPadProvider from 'bpmn-js/lib/features/context-pad/ContextPadProvider';
-import { Injector } from 'didi';
-import EventBus from 'diagram-js/lib/core/EventBus';
-import ContextPad from 'diagram-js/lib/features/context-pad/ContextPad';
-import Modeling from 'bpmn-js/lib/features/modeling/Modeling.js';
-import ElementFactory from 'bpmn-js/lib/features/modeling/ElementFactory';
-import Connect from 'diagram-js/lib/features/connect/Connect';
-import Create from 'diagram-js/lib/features/create/Create';
-import PopupMenu from 'diagram-js/lib/features/popup-menu/PopupMenu';
-import Canvas from 'diagram-js/lib/core/Canvas';
-import Rules from 'diagram-js/lib/features/rules/Rules';
-import { Element, Shape } from 'diagram-js/lib/model/Types';
-import BpmnFactory from 'bpmn-js/lib/features/modeling/BpmnFactory';
-import modeler from '@/store/modules/modeler';
-
-// @Description: 增强元素连线事件
-
-class CustomContextPadProvider extends ContextPadProvider {
-  private _contextPad: ContextPad;
-  private _modeling: Modeling;
-  private _elementFactory: ElementFactory;
-  private _autoPlace: any;
-  private _connect: Connect;
-  private _create: Create;
-  private _popupMenu: PopupMenu;
-  private _canvas: Canvas;
-  private _rules: Rules;
-
-  constructor(
-    config: any,
-    injector: Injector,
-    eventBus: EventBus,
-    contextPad: ContextPad,
-    modeling: Modeling,
-    elementFactory: ElementFactory,
-    connect: Connect,
-    create: Create,
-    popupMenu: PopupMenu,
-    canvas: Canvas,
-    rules: Rules,
-    translate
-  ) {
-    // @ts-expect-error 忽略异常
-    super(config, injector, eventBus, contextPad, modeling, elementFactory, connect, create, popupMenu, canvas, rules, translate);
-
-    this._contextPad = contextPad;
-    this._modeling = modeling;
-    this._elementFactory = elementFactory;
-    this._connect = connect;
-    this._create = create;
-    this._popupMenu = popupMenu;
-    this._canvas = canvas;
-    this._rules = rules;
-
-    this._autoPlace = injector.get('autoPlace', false);
-  }
-
-  getContextPadEntries(element: Element) {
-    const actions: Record<string, any> = {};
-
-    const appendUserTask = (event: Event, element: Shape) => {
-      const shape = this._elementFactory.createShape({ type: 'bpmn:UserTask' });
-      this._create.start(event, shape, {
-        source: element
-      });
-    };
-
-    const appendMultiInstanceUserTask = (event: Event, element: Shape) => {
-      const store = modeler();
-      const bpmnFactory = store.getModeler().get('bpmnFactory') as BpmnFactory;
-      const businessObject = bpmnFactory.create('bpmn:UserTask', {
-        // name: '多实例用户任务',
-        isForCompensation: false
-      });
-      businessObject.loopCharacteristics = bpmnFactory.create('bpmn:MultiInstanceLoopCharacteristics');
-      // 创建 Shape
-      const shape = this._elementFactory.createShape({
-        type: 'bpmn:UserTask',
-        businessObject: businessObject
-      });
-      this._create.start(event, shape, { source: element });
-    };
-
-    const appendTask = this._autoPlace
-      ? (event, element) => {
-          const bpmnFactory: BpmnFactory | undefined = modeler().getModeler().get('bpmnFactory');
-          const businessObject = bpmnFactory.create('bpmn:UserTask', {
-            // name: '多实例用户任务',// 右键创建显示
-            isForCompensation: false
-          });
-
-          // 创建多实例属性并分配给用户任务的 loopCharacteristics
-          businessObject.loopCharacteristics = bpmnFactory.create('bpmn:MultiInstanceLoopCharacteristics');
-
-          // 创建 Shape
-          const shape = this._elementFactory.createShape({
-            type: 'bpmn:UserTask',
-            businessObject: businessObject
-          });
-
-          this._autoPlace.append(element, shape);
-        }
-      : appendMultiInstanceUserTask;
-
-    const append = this._autoPlace
-      ? (event: Event, element: Shape) => {
-          const shape = this._elementFactory.createShape({ type: 'bpmn:UserTask' });
-          this._autoPlace.append(element, shape);
-        }
-      : appendUserTask;
-
-    // // 添加创建用户任务按钮
-    actions['append.append-user-task'] = {
-      group: 'model',
-      className: 'bpmn-icon-user-task',
-      title: '用户任务',
-      action: {
-        dragstart: appendUserTask,
-        click: append
-      }
-    };
-
-    // 添加创建多实例用户任务按钮
-    actions['append.append-multi-instance-user-task'] = {
-      group: 'model',
-      className: 'bpmn-icon-user', // 你可以使用多实例用户任务的图标  bpmn-icon-user   bpmn-icon-user-task
-      title: '多实例用户任务',
-      action: {
-        dragstart: appendMultiInstanceUserTask,
-        click: appendTask
-      }
-    };
-
-    return actions;
-  }
-}
-
-export default CustomContextPadProvider;
diff --git a/src/bpmn/assets/module/Palette/CustomPaletteProvider.ts b/src/bpmn/assets/module/Palette/CustomPaletteProvider.ts
deleted file mode 100644
index 8556d9b..0000000
--- a/src/bpmn/assets/module/Palette/CustomPaletteProvider.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { assign } from 'min-dash';
-import PaletteProvider from 'bpmn-js/lib/features/palette/PaletteProvider';
-import ElementFactory from 'bpmn-js/lib/features/modeling/ElementFactory';
-import Create from 'diagram-js/lib/features/create/Create';
-import SpaceTool from 'diagram-js/lib/features/space-tool/SpaceTool';
-import LassoTool from 'diagram-js/lib/features/lasso-tool/LassoTool';
-import HandTool from 'diagram-js/lib/features/hand-tool/HandTool';
-import GlobalConnect from 'diagram-js/lib/features/global-connect/GlobalConnect';
-import Palette from 'diagram-js/lib/features/palette/Palette';
-import modeler from '@/store/modules/modeler';
-import BpmnFactory from 'bpmn-js/lib/features/modeling/BpmnFactory';
-
-// @Description: 增强左侧面板
-class CustomPaletteProvider extends PaletteProvider {
-  private readonly _palette: Palette;
-  private readonly _create: Create;
-  private readonly _elementFactory: ElementFactory;
-  private readonly _spaceTool: SpaceTool;
-  private readonly _lassoTool: LassoTool;
-  private readonly _handTool: HandTool;
-  private readonly _globalConnect: GlobalConnect;
-  private readonly _translate: any;
-
-  constructor(palette, create, elementFactory, spaceTool, lassoTool, handTool, globalConnect, translate) {
-    super(palette, create, elementFactory, spaceTool, lassoTool, handTool, globalConnect, translate);
-    this._palette = palette;
-    this._create = create;
-    this._elementFactory = elementFactory;
-    this._spaceTool = spaceTool;
-    this._lassoTool = lassoTool;
-    this._handTool = handTool;
-    this._globalConnect = globalConnect;
-    this._translate = translate;
-  }
-
-  getPaletteEntries() {
-    const actions = {},
-      create = this._create,
-      elementFactory = this._elementFactory,
-      translate = this._translate;
-
-    function createAction(type: string, group: string, className: string, title: string, options?: object) {
-      function createListener(event) {
-        const shape = elementFactory.createShape(assign({ type: type }, options));
-        if (options) {
-          !shape.businessObject.di && (shape.businessObject.di = {});
-          shape.businessObject.di.isExpanded = (options as { [key: string]: any }).isExpanded;
-        }
-        create.start(event, shape, null);
-      }
-      const shortType = type.replace(/^bpmn:/, '');
-      return {
-        group: group,
-        className: className,
-        title: title || translate('Create {type}', { type: shortType }),
-        action: {
-          dragstart: createListener,
-          click: createListener
-        }
-      };
-    }
-
-    function createMultiInstanceUserTask(event) {
-      const bpmnFactory: BpmnFactory | undefined = modeler().getBpmnFactory();
-      // 创建一个 bpmn:UserTask
-      const userTask = bpmnFactory.create('bpmn:UserTask', {
-        // name: '多实例用户任务', // 在画板中显示字段
-        isForCompensation: false
-      });
-      // 将多实例属性分配给 bpmn:UserTask 的 loopCharacteristics
-      userTask.loopCharacteristics = bpmnFactory.create('bpmn:MultiInstanceLoopCharacteristics');
-      const customUserTask = elementFactory.createShape({
-        type: 'bpmn:UserTask',
-        businessObject: userTask // 分配创建的 userTask 到 businessObject
-      });
-      create.start(event, customUserTask, {});
-    }
-
-    assign(actions, {
-      'create.parallel-gateway': createAction('bpmn:ParallelGateway', 'gateway', 'bpmn-icon-gateway-parallel', '并行网关'),
-      'create.event-base-gateway': createAction('bpmn:EventBasedGateway', 'gateway', 'bpmn-icon-gateway-eventbased', '事件网关'),
-      // 分组线
-      'gateway-separator': {
-        group: 'gateway',
-        separator: true
-      },
-      'create.user-task': createAction('bpmn:UserTask', 'activity', 'bpmn-icon-user-task', '创建用户任务'),
-      'create.multi-instance-user-task': {
-        group: 'activity',
-        type: 'bpmn:UserTask',
-        className: 'bpmn-icon-user task-multi-instance',
-        title: '创建多实例用户任务',
-        action: {
-          click: createMultiInstanceUserTask,
-          dragstart: createMultiInstanceUserTask
-        }
-      },
-      'task-separator': {
-        group: 'activity',
-        separator: true
-      }
-    });
-    return actions;
-  }
-}
-
-CustomPaletteProvider['$inject'] = ['palette', 'create', 'elementFactory', 'spaceTool', 'lassoTool', 'handTool', 'globalConnect', 'translate'];
-
-export default CustomPaletteProvider;
diff --git a/src/bpmn/assets/module/Renderer/CustomRenderer.ts b/src/bpmn/assets/module/Renderer/CustomRenderer.ts
deleted file mode 100644
index 6a4eb1a..0000000
--- a/src/bpmn/assets/module/Renderer/CustomRenderer.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import BaseRenderer from 'diagram-js/lib/draw/BaseRenderer';
-import {
-  append as svgAppend,
-  attr as svgAttr,
-  create as svgCreate,
-  select as svgSelect,
-  selectAll as svgSelectAll,
-  clone as svgClone,
-  clear as svgClear,
-  remove as svgRemove
-} from 'tiny-svg';
-
-const HIGH_PRIORITY = 1500;
-export default class CustomRenderer extends BaseRenderer {
-  bpmnRenderer: BaseRenderer;
-  modeling: any;
-  constructor(eventBus, bpmnRenderer, modeling) {
-    super(eventBus, HIGH_PRIORITY);
-    this.bpmnRenderer = bpmnRenderer;
-    this.modeling = modeling;
-  }
-  canRender(element) {
-    // ignore labels
-    return !element.labelTarget;
-  }
-
-  /**
-   * 自定义节点图形
-   * @param {*} parentNode 当前元素的svgNode
-   * @param {*} element
-   * @returns
-   */
-  drawShape(parentNode, element) {
-    const shape = this.bpmnRenderer.drawShape(parentNode, element);
-    const { type, width, height } = element;
-    // 开始 填充绿色
-    if (type === 'bpmn:StartEvent') {
-      svgAttr(shape, { fill: '#77DF6D' });
-      return shape;
-    }
-    if (type === 'bpmn:EndEvent') {
-      svgAttr(shape, { fill: '#EE7B77' });
-      return shape;
-    }
-    if (type === 'bpmn:UserTask') {
-      svgAttr(shape, { fill: '#A9C4F8' });
-      return shape;
-    }
-    return shape;
-  }
-
-  getShapePath(shape) {
-    return this.bpmnRenderer.getShapePath(shape);
-  }
-}
-CustomRenderer['$inject'] = ['eventBus', 'bpmnRenderer'];
diff --git a/src/bpmn/assets/module/Translate/index.ts b/src/bpmn/assets/module/Translate/index.ts
deleted file mode 100644
index 6b52dae..0000000
--- a/src/bpmn/assets/module/Translate/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import zh from '../../lang/zh';
-
-const customTranslate = (template: any, replacements: any) => {
-  replacements = replacements || {};
-  template = zh[template] || template;
-  return template.replace(/{([^}]+)}/g, function (_: any, key: any) {
-    return replacements[key] || '{' + key + '}';
-  });
-};
-
-export const translateModule = {
-  translate: ['value', customTranslate]
-};
-
-export default translateModule;
diff --git a/src/bpmn/assets/module/index.ts b/src/bpmn/assets/module/index.ts
deleted file mode 100644
index 55f6b9f..0000000
--- a/src/bpmn/assets/module/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// 翻译模块
-import TranslationModule from './Translate';
-import { ModuleDeclaration } from 'didi';
-import CustomPaletteProvider from './Palette/CustomPaletteProvider';
-import CustomRenderer from './Renderer/CustomRenderer';
-import CustomContextPadProvider from './ContextPad/CustomContextPadProvider';
-
-const Module: ModuleDeclaration[] = [
-  {
-    __init__: ['customPaletteProvider', 'customContextPadProvider', 'customRenderer'],
-    customPaletteProvider: ['type', CustomPaletteProvider],
-    customRenderer: ['type', CustomRenderer],
-    customContextPadProvider: ['type', CustomContextPadProvider]
-  },
-  TranslationModule
-];
-export default Module;
diff --git a/src/bpmn/assets/showConfig.ts b/src/bpmn/assets/showConfig.ts
deleted file mode 100644
index 853eb35..0000000
--- a/src/bpmn/assets/showConfig.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-export default {
-  'bpmn:EndEvent': {},
-  'bpmn:StartEvent': {
-    initiator: true,
-    formKey: true
-  },
-  'bpmn:UserTask': {
-    allocationType: true,
-    specifyDesc: true,
-    multipleUserAuditType: true,
-    async: true,
-    priority: true,
-    skipExpression: true,
-    dueDate: true,
-    taskListener: true,
-    executionListener: true
-  },
-  'bpmn:ServiceTask': {
-    async: true,
-    skipExpression: true,
-    isForCompensation: true,
-    triggerable: true,
-    class: true
-  },
-  'bpmn:ScriptTask': {
-    async: true,
-    isForCompensation: true,
-    autoStoreVariables: true
-  },
-  'bpmn:ManualTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:ReceiveTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:SendTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:BusinessRuleTask': {
-    async: true,
-    isForCompensation: true,
-    ruleVariablesInput: true,
-    rules: true,
-    resultVariable: true,
-    exclude: true
-  }
-};
diff --git a/src/bpmn/assets/style/index.scss b/src/bpmn/assets/style/index.scss
deleted file mode 100644
index 3c92792..0000000
--- a/src/bpmn/assets/style/index.scss
+++ /dev/null
@@ -1,284 +0,0 @@
-.djs-palette {
-  width: 300px;
-
-  .bpmn-icon-hand-tool:hover {
-    &:after {
-      content: '启动手动工具';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-lasso-tool:hover {
-    &:after {
-      content: '启动套索工具';
-      position: absolute;
-      left: 100px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-space-tool:hover {
-    &:after {
-      content: '启动创建/删除空间工具';
-      position: absolute;
-      left: 45px;
-      width: 170px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-connection-multi:hover {
-    &:after {
-      content: '启动全局连接工具';
-      position: absolute;
-      left: 100px;
-      width: 140px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-start-event-none:hover {
-    &:after {
-      content: '创建开始事件';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-intermediate-event-none:hover {
-    &:after {
-      content: '创建中间/边界事件';
-      position: absolute;
-      left: 100px;
-      width: 140px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-end-event-none:hover {
-    &:after {
-      content: '创建结束事件';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-gateway-none:hover {
-    &:after {
-      content: '创建网关';
-      position: absolute;
-      left: 100px;
-      width: 90px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-gateway-parallel:hover {
-    &:after {
-      content: '创建并行网关';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-gateway-eventbased:hover {
-    &:after {
-      content: '创建事件网关';
-      position: absolute;
-      left: 100px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-task:hover {
-    &:after {
-      content: '创建任务';
-      position: absolute;
-      left: 45px;
-      width: 80px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-subprocess-expanded:hover {
-    &:after {
-      content: '创建可折叠子流程';
-      position: absolute;
-      left: 100px;
-      width: 140px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-user-task:hover {
-    &:after {
-      content: '创建用户任务';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-
-  .task-multi-instance:hover {
-    &:after {
-      content: '创建多实例用户任务';
-      position: absolute;
-      left: 100px;
-      width: 160px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-participant:hover {
-    &:after {
-      content: '创建泳池/泳道';
-      position: absolute;
-      left: 45px;
-      width: 120px;
-      font-size: 15px;
-      font-weight: bold;
-      color: #3a84de;
-      border-radius: 2px;
-      border: 1px solid #cccccc;
-      background-color: #fafafa;
-      opacity: 0.8;
-    }
-  }
-  .bpmn-icon-data-object {
-    display: none;
-    &:hover {
-      &:after {
-        content: '创建数据对象';
-        position: absolute;
-        left: 45px;
-        width: 120px;
-        font-size: 15px;
-        font-weight: bold;
-        color: #3a84de;
-        border-radius: 2px;
-        border: 1px solid #cccccc;
-        background-color: #fafafa;
-        opacity: 0.8;
-      }
-    }
-  }
-  .bpmn-icon-data-store {
-    display: none;
-    &:hover {
-      &:after {
-        content: '创建数据存储';
-        position: absolute;
-        left: 100px;
-        width: 120px;
-        font-size: 15px;
-        font-weight: bold;
-        color: #3a84de;
-        border-radius: 2px;
-        border: 1px solid #cccccc;
-        background-color: #fafafa;
-        opacity: 0.8;
-      }
-    }
-  }
-  .bpmn-icon-group {
-    display: none;
-    &:hover {
-      &:after {
-        content: '创建分组';
-        position: absolute;
-        left: 100px;
-        width: 100px;
-        font-size: 15px;
-        font-weight: bold;
-        color: #3a84de;
-        border-radius: 2px;
-        border: 1px solid #cccccc;
-        background-color: #fafafa;
-        opacity: 0.8;
-      }
-    }
-  }
-}
diff --git a/src/bpmn/hooks/usePanel.ts b/src/bpmn/hooks/usePanel.ts
deleted file mode 100644
index ace579b..0000000
--- a/src/bpmn/hooks/usePanel.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import showConfig from '../assets/showConfig';
-import type { ModdleElement } from 'bpmn';
-import useModelerStore from '@/store/modules/modeler';
-import { MultiInstanceTypeEnum } from '@/enums/bpmn/IndexEnums';
-interface Options {
-  element: ModdleElement;
-}
-
-export default (ops: Options) => {
-  const { element } = ops;
-  const { getModeling, getModdle } = useModelerStore();
-  const modeling = getModeling();
-  const moddle = getModdle();
-
-  /**
-   * 当前节点类型
-   */
-  const elementType = computed(() => {
-    const bizObj = element.businessObject;
-    return bizObj.eventDefinitions ? bizObj.eventDefinitions[0].$type : bizObj.$type;
-  });
-
-  /**
-   * 用于控制面板字段显示与隐藏的配置
-   */
-  const config = computed(() => showConfig[elementType.value] || {});
-
-  /**
-   * 创建一个节点
-   * @param elementType 节点类型
-   * @param properties 属性
-   * @param parent 父节点
-   */
-  const createModdleElement = (elementType: string, properties: any, parent: ModdleElement) => {
-    const element = moddle.create(elementType, properties);
-    parent && (element.$parent = parent);
-    return element;
-  };
-
-  /**
-   * 获取扩展属性，如果不存在会自动创建
-   */
-  const getExtensionElements = (create = true) => {
-    let extensionElements = element.businessObject.get<ModdleElement>('extensionElements');
-    if (!extensionElements && create) {
-      extensionElements = createModdleElement('bpmn:ExtensionElements', { values: [] }, element.businessObject);
-      modeling.updateModdleProperties(element, element.businessObject, { extensionElements });
-    }
-    return extensionElements;
-  };
-
-  /**
-   * 获取extensionElements下的properties
-   * @param extensionElements 可选参数，默认获取当前Element下的extensionElements下的Properties
-   */
-  const getPropertiesElements = (extensionElements?: ModdleElement) => {
-    if (!extensionElements) {
-      extensionElements = getExtensionElements();
-    }
-    let propertiesElements = extensionElements.values.find((item) => item.$type === 'flowable:properties');
-    if (!propertiesElements) {
-      propertiesElements = createModdleElement('flowable:properties', { values: [] }, extensionElements);
-      modeling.updateModdleProperties(element, extensionElements, {
-        values: [...extensionElements.get<[]>('values'), propertiesElements]
-      });
-    }
-    return propertiesElements;
-  };
-
-  /**
-   * 更新节点属性
-   * @param properties 属性值
-   */
-  const updateProperties = (properties: any) => {
-    modeling.updateProperties(element, properties);
-  };
-
-  /**
-   * 更新节点信息
-   * @param updateElement 需要更新的节点
-   * @param properties 属性
-   */
-  const updateModdleProperties = (updateElement, properties: any) => {
-    modeling.updateModdleProperties(element, updateElement, properties);
-  };
-
-  /**
-   * 更新Property属性
-   * @param name key值
-   * @param value 值
-   */
-  const updateProperty = (name: string, value: string) => {
-    const propertiesElements = getPropertiesElements();
-
-    let propertyElements = propertiesElements.values.find((item) => item.name === name);
-    if (!propertyElements) {
-      propertyElements = createModdleElement('flowable:property', { name: name, value: value }, propertiesElements);
-      modeling.updateModdleProperties(element, propertiesElements, {
-        values: [...propertiesElements.get('values'), propertyElements]
-      });
-    } else {
-      propertyElements.name = name;
-      propertyElements.value = value;
-    }
-    return propertyElements;
-  };
-
-  const idChange = (newVal: string) => {
-    if (newVal) {
-      updateProperties({ id: newVal });
-    }
-  };
-  const nameChange = (newVal: string) => {
-    if (newVal) {
-      updateProperties({ name: newVal });
-    }
-  };
-  const formKeyChange = (newVal: string) => {
-    updateProperties({ formKey: newVal });
-  };
-  const constant = {
-    MultiInstanceType: [
-      { id: '373d4b81-a0d1-4eb8-8685-0d2fb1b468e2', label: '无', value: MultiInstanceTypeEnum.NONE },
-      { id: 'b5acea7c-b7e5-46b0-8778-390db091bdab', label: '串行', value: MultiInstanceTypeEnum.SERIAL },
-      { id: 'b4f0c683-1ccc-43c4-8380-e1b998986caf', label: '并行', value: MultiInstanceTypeEnum.PARALLEL }
-    ]
-  };
-
-  return {
-    elementType,
-    constant,
-    showConfig: config,
-
-    updateProperties,
-    updateProperty,
-    updateModdleProperties,
-
-    createModdleElement,
-    idChange,
-    nameChange,
-    formKeyChange,
-    getExtensionElements,
-    getPropertiesElements
-  };
-};
diff --git a/src/bpmn/hooks/useParseElement.ts b/src/bpmn/hooks/useParseElement.ts
deleted file mode 100644
index e1a6054..0000000
--- a/src/bpmn/hooks/useParseElement.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { ModdleElement } from 'bpmn';
-
-interface Options {
-  element: ModdleElement;
-}
-
-interface Data {
-  id: string;
-}
-
-export default (ops: Options) => {
-  const { element } = ops;
-
-  const parseData = <T>(): T => {
-    const result = {
-      ...element.businessObject,
-      ...element.businessObject.$attrs
-    };
-
-    // 移除flowable前缀，格式化数组
-    for (const key in result) {
-      if (key.indexOf('flowable:') === 0) {
-        const newKey = key.replace('flowable:', '');
-        result[newKey] = result[key];
-        delete result[key];
-      }
-    }
-    return { ...result } as T;
-  };
-
-  return {
-    parseData
-  };
-};
diff --git a/src/bpmn/index.vue b/src/bpmn/index.vue
deleted file mode 100644
index 15437c8..0000000
--- a/src/bpmn/index.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-<template>
-  <div class="containers-bpmn">
-    <!-- dark模式下 连接线的箭头样式 -->
-    <svg width="0" height="0" style="position: absolute">
-      <defs>
-        <marker id="markerArrow-dark-mode" viewBox="0 0 20 20" refX="11" refY="10" markerWidth="10" markerHeight="10" orient="auto">
-          <path d="M 1 5 L 11 10 L 1 15 Z" class="arrow-dark" />
-        </marker>
-      </defs>
-    </svg>
-    <div v-loading="loading" class="app-containers-bpmn">
-      <el-container class="h-full">
-        <el-container style="align-items: stretch">
-          <el-header>
-            <div class="process-toolbar">
-              <el-space wrap :size="10">
-                <el-tooltip effect="dark" content="自适应屏幕" placement="bottom">
-                  <el-button size="small" icon="Rank" @click="fitViewport" />
-                </el-tooltip>
-                <el-tooltip effect="dark" content="放大" placement="bottom">
-                  <el-button size="small" icon="ZoomIn" @click="zoomViewport(true)" />
-                </el-tooltip>
-                <el-tooltip effect="dark" content="缩小" placement="bottom">
-                  <el-button size="small" icon="ZoomOut" @click="zoomViewport(false)" />
-                </el-tooltip>
-                <el-tooltip effect="dark" content="后退" placement="bottom">
-                  <el-button size="small" icon="Back" @click="bpmnModeler.get('commandStack').undo()" />
-                </el-tooltip>
-                <el-tooltip effect="dark" content="前进" placement="bottom">
-                  <el-button size="small" icon="Right" @click="bpmnModeler.get('commandStack').redo()" />
-                </el-tooltip>
-              </el-space>
-              <el-space wrap :size="10" style="float: right; padding-right: 10px">
-                <el-button size="small" type="primary" @click="saveXml">保 存</el-button>
-                <el-dropdown size="small">
-                  <el-button size="small" type="primary"> 预 览 </el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item icon="Document" @click="previewXML">XML预览</el-dropdown-item>
-                      <el-dropdown-item icon="View" @click="previewSVG"> SVG预览</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-                <el-dropdown size="small">
-                  <el-button size="small" type="primary"> 下 载 </el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item icon="Download" @click="downloadXML">下载XML</el-dropdown-item>
-                      <el-dropdown-item icon="Download" @click="downloadSVG"> 下载SVG</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </el-space>
-            </div>
-          </el-header>
-          <div ref="canvas" class="canvas" />
-        </el-container>
-        <div :class="{ 'process-panel': true, 'hide': panelFlag }">
-          <div class="process-panel-bar" @click="panelBarClick">
-            <div class="open-bar">
-              <el-link type="default" :underline="false">
-                <svg-icon class-name="open-bar" :icon-class="panelFlag ? 'caret-back' : 'caret-forward'"></svg-icon>
-              </el-link>
-            </div>
-          </div>
-          <transition enter-active-class="animate__animated animate__fadeIn">
-            <div v-show="showPanel" v-if="bpmnModeler" class="panel-content">
-              <PropertyPanel :modeler="bpmnModeler" />
-            </div>
-          </transition>
-        </div>
-      </el-container>
-    </div>
-  </div>
-  <div>
-    <el-dialog v-model="perviewXMLShow" title="XML预览" width="80%" append-to-body>
-      <highlightjs :code="xmlStr" language="XML" />
-    </el-dialog>
-  </div>
-  <div>
-    <el-dialog v-model="perviewSVGShow" title="SVG预览" width="80%" append-to-body>
-      <div style="text-align: center" v-html="svgData" />
-    </el-dialog>
-  </div>
-</template>
-
-<script lang="ts" setup name="BpmnDesign">
-import 'bpmn-js/dist/assets/diagram-js.css';
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
-import './assets/style/index.scss';
-import type { Canvas, Modeler } from 'bpmn';
-import PropertyPanel from './panel/index.vue';
-import BpmnModeler from 'bpmn-js/lib/Modeler.js';
-import defaultXML from './assets/defaultXML';
-import flowableModdle from './assets/moddle/flowable';
-import Modules from './assets/module/index';
-import useModelerStore from '@/store/modules/modeler';
-import useDialog from '@/hooks/useDialog';
-
-const emit = defineEmits(['closeCallBack', 'saveCallBack']);
-
-const { visible, title, openDialog, closeDialog } = useDialog({
-  title: '编辑流程'
-});
-const modelerStore = useModelerStore();
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const panelFlag = ref(false);
-const showPanel = ref(true);
-const canvas = ref<HTMLDivElement>();
-const panel = ref<HTMLDivElement>();
-const bpmnModeler = ref<Modeler>();
-const zoom = ref(1);
-const perviewXMLShow = ref(false);
-const perviewSVGShow = ref(false);
-const xmlStr = ref('');
-const svgData = ref('');
-const loading = ref(false);
-
-const panelBarClick = () => {
-  // 延迟执行，否则会导致面板收起时，属性面板不显示
-  panelFlag.value = !panelFlag.value;
-  setTimeout(() => {
-    showPanel.value = !panelFlag.value;
-  }, 100);
-};
-
-/**
- * 初始化Canvas
- */
-const initCanvas = () => {
-  bpmnModeler.value = new BpmnModeler({
-    container: canvas.value,
-    // 键盘
-    keyboard: {
-      bindTo: window // 或者window，注意与外部表单的键盘监听事件是否冲突
-    },
-    propertiesPanel: {
-      parent: panel.value
-    },
-    additionalModules: Modules,
-    moddleExtensions: {
-      flowable: flowableModdle
-    }
-  });
-};
-
-/**
- * 初始化Model
- */
-const initModel = () => {
-  if (modelerStore.getModeler()) {
-    modelerStore.getModeler().destroy();
-    modelerStore.setModeler(undefined);
-  }
-  modelerStore.setModeler(bpmnModeler.value);
-};
-
-/**
- * 新建
- */
-const newDiagram = async () => {
-  await proxy?.$modal.confirm('是否确认新建');
-  initDiagram();
-};
-
-/**
- * 初始化
- */
-const initDiagram = (xml?: string) => {
-  if (!xml) xml = defaultXML;
-  bpmnModeler.value.importXML(xml);
-};
-
-/**
- * 自适应屏幕
- */
-const fitViewport = () => {
-  zoom.value = bpmnModeler.value.get<Canvas>('canvas').zoom('fit-viewport');
-  const bbox = document.querySelector<SVGGElement>('.app-containers-bpmn .viewport').getBBox();
-  const currentViewBox = bpmnModeler.value.get<Canvas>('canvas').viewbox();
-  const elementMid = {
-    x: bbox.x + bbox.width / 2 - 65,
-    y: bbox.y + bbox.height / 2
-  };
-  bpmnModeler.value.get<Canvas>('canvas').viewbox({
-    x: elementMid.x - currentViewBox.width / 2,
-    y: elementMid.y - currentViewBox.height / 2,
-    width: currentViewBox.width,
-    height: currentViewBox.height
-  });
-  zoom.value = (bbox.width / currentViewBox.width) * 1.8;
-};
-/**
- * 放大或者缩小
- * @param zoomIn true 放大 | false 缩小
- */
-const zoomViewport = (zoomIn = true) => {
-  zoom.value = bpmnModeler.value.get<Canvas>('canvas').zoom();
-  zoom.value += zoomIn ? 0.1 : -0.1;
-  bpmnModeler.value.get<Canvas>('canvas').zoom(zoom.value);
-};
-
-/**
- * 下载XML
- */
-const downloadXML = async () => {
-  try {
-    const { xml } = await bpmnModeler.value.saveXML({ format: true });
-    downloadFile(`${getProcessElement().name}.bpmn20.xml`, xml, 'application/xml');
-  } catch (e) {
-    proxy?.$modal.msgError(e);
-  }
-};
-
-/**
- * 下载SVG
- */
-const downloadSVG = async () => {
-  try {
-    const { svg } = await bpmnModeler.value.saveSVG();
-    downloadFile(getProcessElement().name, svg, 'image/svg+xml');
-  } catch (e) {
-    proxy?.$modal.msgError(e);
-  }
-};
-
-/**
- * XML预览
- */
-const previewXML = async () => {
-  try {
-    const { xml } = await bpmnModeler.value.saveXML({ format: true });
-    xmlStr.value = xml;
-    perviewXMLShow.value = true;
-  } catch (e) {
-    proxy?.$modal.msgError(e);
-  }
-};
-
-/**
- * SVG预览
- */
-const previewSVG = async () => {
-  try {
-    const { svg } = await bpmnModeler.value.saveSVG();
-    svgData.value = svg;
-    perviewSVGShow.value = true;
-  } catch (e) {
-    proxy?.$modal.msgError(e);
-  }
-};
-
-const curNodeInfo = reactive({
-  curType: '', // 任务类型 用户任务
-  curNode: '',
-  expValue: '' //多用户和部门角色实现
-});
-
-const downloadFile = (fileName: string, data: any, type: string) => {
-  const a = document.createElement('a');
-  const url = window.URL.createObjectURL(new Blob([data], { type: type }));
-  a.href = url;
-  a.download = fileName;
-  a.click();
-  window.URL.revokeObjectURL(url);
-};
-
-const getProcessElement = () => {
-  const rootElements = bpmnModeler.value?.getDefinitions().rootElements;
-  for (let i = 0; i < rootElements.length; i++) {
-    if (rootElements[i].$type === 'bpmn:Process') return rootElements[i];
-  }
-};
-
-const getProcess = () => {
-  const element = getProcessElement();
-  return {
-    id: element.id,
-    name: element.name
-  };
-};
-
-const saveXml = async () => {
-  const { xml } = await bpmnModeler.value.saveXML({ format: true });
-  const { svg } = await bpmnModeler.value.saveSVG();
-  const process = getProcess();
-  let data = {
-    xml: xml,
-    svg: svg,
-    key: process.id,
-    name: process.name,
-    loading: loading
-  };
-  emit('saveCallBack', data);
-};
-
-const open = (xml?: string) => {
-  openDialog();
-  nextTick(() => {
-    initDiagram(xml);
-  });
-};
-const close = () => {
-  closeDialog();
-};
-
-onMounted(() => {
-  nextTick(() => {
-    initCanvas();
-    initModel();
-  });
-});
-
-/**
- * 对外暴露子组件方法
- */
-defineExpose({
-  initDiagram,
-  saveXml,
-  open,
-  close
-});
-</script>
-
-<style lang="scss">
-/** 夜间模式 线条的颜色 */
-$stroke-color-dark: white;
-$bpmn-font-size: 12px;
-/** 日间模式 字体颜色 */
-$bpmn-font-color-dark: white;
-/** 夜间模式 字体颜色 */
-$bpmn-font-color-light: #222;
-
-/* 背景网格 */
-@mixin djs-container {
-  background-image: linear-gradient(90deg, hsl(0deg 0% 78.4% / 15%) 10%, transparent 0), linear-gradient(hsl(0deg 0% 78.4% / 15%) 10%, transparent 0) !important;
-  background-size: 10px 10px !important;
-}
-
-html[class='light'] {
-  /** 从左侧拖动时的背景图 */
-  svg.new-parent {
-    @include djs-container;
-  }
-
-  /** 双击编辑元素时样式保持一致 */
-  div.djs-direct-editing-parent {
-    border-radius: 10px;
-    background-color: transparent !important;
-    color: $bpmn-font-color-light;
-  }
-
-  g.djs-visual {
-    .djs-label {
-      fill: $bpmn-font-color-light !important;
-      font-size: $bpmn-font-size !important;
-    }
-  }
-}
-
-html[class='dark'] {
-  /** dark模式下 连接线的箭头样式 */
-  .arrow-dark {
-    stroke-width: 1px;
-    stroke-linecap: round;
-    stroke: $stroke-color-dark;
-    fill: $stroke-color-dark;
-    stroke-linejoin: round;
-  }
-
-  /** 从左侧拖动时的背景图 */
-  svg.new-parent {
-    background-color: black !important;
-    @include djs-container;
-  }
-
-  /** 双击编辑元素时样式保持一致 */
-  div.djs-direct-editing-parent {
-    border-radius: 10px;
-    background-color: transparent !important;
-    color: $bpmn-font-color-dark;
-  }
-
-  /** 元素相关设置 */
-  g.djs-visual {
-    /** 元素边框 需要去除文字(.djs-label) */
-    & > *:first-child:not(.djs-label) {
-      stroke: $stroke-color-dark !important;
-    }
-
-    /** 字体颜色 */
-    .djs-label {
-      fill: $bpmn-font-color-dark !important;
-      font-size: $bpmn-font-size !important;
-    }
-
-    /* 连接线样式 */
-    path[data-corner-radius] {
-      stroke: $stroke-color-dark !important;
-      marker-end: url('#markerArrow-dark-mode') !important;
-    }
-  }
-}
-
-.containers-bpmn {
-  height: 100%;
-  .app-containers-bpmn {
-    width: 100%;
-    height: 100%;
-    .canvas {
-      width: 100%;
-      height: 100%;
-      @include djs-container;
-    }
-    .el-header {
-      height: 35px;
-      padding: 0;
-    }
-
-    .process-panel {
-      transition: width 0.25s ease-in;
-      .process-panel-bar {
-        width: 34px;
-        height: 40px;
-        .open-bar {
-          width: 34px;
-          line-height: 40px;
-        }
-      }
-      // 收起面板样式
-      &.hide {
-        width: 34px;
-        overflow: hidden;
-        padding: 0;
-        .process-panel-bar {
-          width: 34px;
-          height: 100%;
-          box-sizing: border-box;
-          display: block;
-          text-align: left;
-          line-height: 34px;
-        }
-        .process-panel-bar:hover {
-          background-color: var(--bpmn-panel-bar-background-color);
-        }
-      }
-    }
-  }
-}
-pre {
-  margin: 0;
-  height: 100%;
-  max-height: calc(80vh - 32px);
-  overflow-x: hidden;
-  overflow-y: auto;
-  .hljs {
-    word-break: break-word;
-    white-space: pre-wrap;
-    padding: 0.5em;
-  }
-}
-
-.open-bar {
-  font-size: 20px;
-  cursor: pointer;
-  text-align: center;
-}
-.process-panel {
-  box-sizing: border-box;
-  padding: 0 8px 0 8px;
-  border-left: 1px solid var(--bpmn-panel-border);
-  box-shadow: var(--bpmn-panel-box-shadow) 0 0 8px;
-  max-height: 100%;
-  width: 25%;
-  height: calc(100vh - 100px);
-  .el-collapse {
-    height: calc(100vh - 182px);
-    overflow: auto;
-  }
-}
-
-// 任务栏 透明度
-//:deep(.djs-palette) {
-//  opacity: 0.3;
-//  transition: all 1s;
-//}
-//
-//:deep(.djs-palette:hover) {
-//  opacity: 1;
-//  transition: all 1s;
-//}
-</style>
diff --git a/src/bpmn/panel/GatewayPanel.vue b/src/bpmn/panel/GatewayPanel.vue
deleted file mode 100644
index 20cc134..0000000
--- a/src/bpmn/panel/GatewayPanel.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div>
-    <el-collapse v-model="currentCollapseItem">
-      <el-collapse-item name="1">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <InfoFilled />
-            </el-icon>
-            常规
-          </div>
-        </template>
-        <div>
-          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"> </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-collapse-item>
-
-      <el-collapse-item name="2">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <BellFilled />
-            </el-icon>
-            执行监听器
-          </div>
-        </template>
-        <div>
-          <ExecutionListener :element="element"></ExecutionListener>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-<script setup lang="ts">
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import type { Modeler, ModdleElement } from 'bpmn';
-import type { GatewayPanel } from 'bpmnDesign';
-import ExecutionListener from './property/ExecutionListener.vue';
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-const { nameChange, idChange } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-const currentCollapseItem = ref(['1', '2']);
-const formData = ref(parseData<GatewayPanel>());
-
-const formRules = ref<ElFormRules>({
-  processCategory: [{ required: true, message: '请选择', trigger: 'blur' }],
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/ParticipantPanel.vue b/src/bpmn/panel/ParticipantPanel.vue
deleted file mode 100644
index b1d42e6..0000000
--- a/src/bpmn/panel/ParticipantPanel.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div>
-    <el-collapse v-model="currentCollapseItem">
-      <el-collapse-item name="1">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <InfoFilled />
-            </el-icon>
-            常规
-          </div>
-        </template>
-        <div>
-          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"></el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-collapse-item>
-
-      <el-collapse-item name="2">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <BellFilled />
-            </el-icon>
-            执行监听器
-          </div>
-        </template>
-        <div>
-          <ExecutionListener :element="element"></ExecutionListener>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-<script setup lang="ts">
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import ExecutionListener from './property/ExecutionListener.vue';
-import type { ModdleElement } from 'bpmn';
-import type { ParticipantPanel } from 'bpmnDesign';
-
-interface PropType {
-  element: ModdleElement;
-}
-
-const props = withDefaults(defineProps<PropType>(), {});
-const { nameChange, idChange } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-
-const formData = ref(parseData<ParticipantPanel>());
-const currentCollapseItem = ref(['1', '2']);
-const formRules = ref<ElFormRules>({
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/ProcessPanel.vue b/src/bpmn/panel/ProcessPanel.vue
deleted file mode 100644
index 9e118e2..0000000
--- a/src/bpmn/panel/ProcessPanel.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <el-collapse v-model="currentCollapseItem">
-      <el-collapse-item name="1">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <InfoFilled />
-            </el-icon>
-            常规
-          </div>
-        </template>
-        <div>
-          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
-            <el-form-item label="流程标识" prop="id">
-              <el-input v-model="formData.id" @change="idChange"></el-input>
-            </el-form-item>
-            <el-form-item label="流程名称" prop="name">
-              <el-input v-model="formData.name" @change="nameChange"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-collapse-item>
-
-      <el-collapse-item name="2">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <BellFilled />
-            </el-icon>
-            执行监听器
-          </div>
-        </template>
-        <div>
-          <ExecutionListener :element="element"></ExecutionListener>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-
-<script setup lang="ts">
-import ExecutionListener from './property/ExecutionListener.vue';
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import type { Modeler, ModdleElement } from 'bpmn';
-import type { ProcessPanel } from 'bpmnDesign';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-const { idChange, nameChange } = usePanel({
-  element: toRaw(props.element)
-});
-const currentCollapseItem = ref(['1', '2']);
-const formData = ref<ProcessPanel>(parseData<ProcessPanel>());
-
-const formRules = ref<ElFormRules>({
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/src/bpmn/panel/SequenceFlowPanel.vue b/src/bpmn/panel/SequenceFlowPanel.vue
deleted file mode 100644
index eac8227..0000000
--- a/src/bpmn/panel/SequenceFlowPanel.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div>
-    <el-collapse v-model="currentCollapseItem">
-      <el-collapse-item name="1">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <InfoFilled />
-            </el-icon>
-            常规
-          </div>
-        </template>
-        <div>
-          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="conditionExpression" label="跳转条件">
-              <el-input v-model="formData.conditionExpressionValue" @change="conditionExpressionChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="skipExpression" label="跳过表达式">
-              <el-input v-model="formData.skipExpression" @change="skipExpressionChange"> </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-collapse-item>
-
-      <el-collapse-item name="2">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <BellFilled />
-            </el-icon>
-            执行监听器
-          </div>
-        </template>
-        <div>
-          <ExecutionListener :element="element"></ExecutionListener>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-<script setup lang="ts">
-import useParseElement from '../hooks/useParseElement';
-import useModelerStore from '@/store/modules/modeler';
-import usePanel from '../hooks/usePanel';
-import ExecutionListener from './property/ExecutionListener.vue';
-import type { Modeler, ModdleElement } from 'bpmn';
-import type { SequenceFlowPanel } from 'bpmnDesign';
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-const { nameChange, idChange, updateProperties } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-const moddle = useModelerStore().getModdle();
-const currentCollapseItem = ref(['1', '2']);
-const formData = ref(parseData<SequenceFlowPanel>());
-
-const formRules = ref<ElFormRules>({
-  processCategory: [{ required: true, message: '请选择', trigger: 'blur' }],
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-
-const conditionExpressionChange = (val: string) => {
-  if (val) {
-    const newCondition = moddle.create('bpmn:FormalExpression', { body: val });
-    updateProperties({ conditionExpression: newCondition });
-  } else {
-    updateProperties({ conditionExpression: null });
-  }
-};
-
-const skipExpressionChange = (val: string) => {
-  updateProperties({ 'flowable:skipExpression': val });
-};
-
-onBeforeMount(() => {
-  if (formData.value.conditionExpression) {
-    formData.value.conditionExpressionValue = formData.value.conditionExpression.body;
-  }
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/StartEndPanel.vue b/src/bpmn/panel/StartEndPanel.vue
deleted file mode 100644
index bde1212..0000000
--- a/src/bpmn/panel/StartEndPanel.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div>
-    <el-collapse v-model="currentCollapseItem">
-      <el-collapse-item name="1">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <InfoFilled />
-            </el-icon>
-            常规
-          </div>
-        </template>
-        <div>
-          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"> </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-collapse-item>
-
-      <el-collapse-item name="2">
-        <template #title>
-          <div class="collapse__title">
-            <el-icon>
-              <BellFilled />
-            </el-icon>
-            执行监听器
-          </div>
-        </template>
-        <div>
-          <ExecutionListener :element="element"></ExecutionListener>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-<script setup lang="ts">
-import ExecutionListener from './property/ExecutionListener.vue';
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import type { Modeler, ModdleElement } from 'bpmn';
-import type { StartEndPanel } from 'bpmnDesign';
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-const { nameChange, idChange } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-
-const formData = ref(parseData<StartEndPanel>());
-const currentCollapseItem = ref(['1', '2']);
-const formRules = ref<ElFormRules>({
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/SubProcessPanel.vue b/src/bpmn/panel/SubProcessPanel.vue
deleted file mode 100644
index 3490fff..0000000
--- a/src/bpmn/panel/SubProcessPanel.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div>
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
-      <el-collapse v-model="currentCollapseItem">
-        <el-collapse-item name="1">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-              常规
-            </div>
-          </template>
-          <div>
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"> </el-input>
-            </el-form-item>
-          </div>
-        </el-collapse-item>
-
-        <el-collapse-item name="2">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <BellFilled />
-              </el-icon>
-              执行监听器
-            </div>
-          </template>
-          <div>
-            <ExecutionListener :element="element"></ExecutionListener>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item name="3">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <HelpFilled />
-              </el-icon>
-              多实例
-            </div>
-          </template>
-          <div>
-            <el-form-item label="多实例类型">
-              <el-select v-model="formData.multiInstanceType" @change="multiInstanceTypeChange">
-                <el-option v-for="item in constant.MultiInstanceType" :key="item.id" :value="item.value" :label="item.label"> </el-option>
-              </el-select>
-            </el-form-item>
-
-            <div v-if="formData.multiInstanceType !== MultiInstanceTypeEnum.NONE">
-              <el-form-item label="集合">
-                <template #label>
-                  <span>
-                    集合
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        属性会作为表达式进行解析。如果表达式解析为字符串而不是一个集合，<br />
-                        不论是因为本身配置的就是静态字符串值，还是表达式计算结果为字符串，<br />
-                        这个字符串都会被当做变量名，并从流程变量中用于获取实际的集合。
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.collection" @change="collectionChange"></el-input>
-              </el-form-item>
-              <el-form-item label="元素变量">
-                <template #label>
-                  <span>
-                    元素变量
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        每创建一个用户任务前，先以该元素变量为label，集合中的一项为value，<br />
-                        创建（局部）流程变量，该局部流程变量被用于指派用户任务。<br />
-                        一般来说，该字符串应与指定人员变量相同。
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.elementVariable" @change="elementVariableChange"> </el-input>
-              </el-form-item>
-              <el-form-item label="完成条件">
-                <template #label>
-                  <span>
-                    完成条件
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        多实例活动在所有实例都完成时结束，然而也可以指定一个表达式，在每个实例<br />
-                        结束时进行计算。当表达式计算为true时，将销毁所有剩余的实例，并结束多实例<br />
-                        活动，继续执行流程。例如 ${nrOfCompletedInstances/nrOfInstances >= 0.6 }，<br />
-                        表示当任务完成60%时，该节点就算完成
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.completionCondition" @change="completionConditionChange"> </el-input>
-              </el-form-item>
-            </div>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </el-form>
-  </div>
-</template>
-<script setup lang="ts">
-import ExecutionListener from './property/ExecutionListener.vue';
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import type { ModdleElement } from 'bpmn';
-import type { SubProcessPanel } from 'bpmnDesign';
-import { MultiInstanceTypeEnum } from '@/enums/bpmn/IndexEnums';
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-const { nameChange, idChange, updateProperties, createModdleElement, constant } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-
-const formData = ref(parseData<SubProcessPanel>());
-const currentCollapseItem = ref(['1', '2', '3']);
-
-const multiInstanceTypeChange = (newVal) => {
-  if (newVal !== MultiInstanceTypeEnum.NONE) {
-    let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-    if (!loopCharacteristics) {
-      loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-    }
-    loopCharacteristics.isSequential = newVal === MultiInstanceTypeEnum.SERIAL;
-    updateProperties({ loopCharacteristics: loopCharacteristics });
-  } else {
-    updateProperties({ loopCharacteristics: undefined });
-  }
-};
-const collectionChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  loopCharacteristics.collection = newVal && newVal.length > 0 ? newVal : undefined;
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-const elementVariableChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  loopCharacteristics.elementVariable = newVal && newVal.length > 0 ? newVal : undefined;
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-const completionConditionChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get<ModdleElement>('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  if (newVal && newVal.length > 0) {
-    if (!loopCharacteristics.completionCondition) {
-      loopCharacteristics.completionCondition = createModdleElement('bpmn:Expression', { body: newVal }, loopCharacteristics);
-    } else {
-      loopCharacteristics.completionCondition.body = newVal;
-    }
-  } else {
-    loopCharacteristics.completionCondition = undefined;
-  }
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-
-onBeforeMount(() => {
-  if (formData.value.loopCharacteristics) {
-    const loopCharacteristics = formData.value.loopCharacteristics;
-    formData.value.collection = loopCharacteristics.collection || '';
-    formData.value.elementVariable = loopCharacteristics.elementVariable || '';
-    formData.value.completionCondition = loopCharacteristics.completionCondition?.body || '';
-    formData.value.multiInstanceType = loopCharacteristics.isSequential ? MultiInstanceTypeEnum.SERIAL : MultiInstanceTypeEnum.PARALLEL;
-  }
-});
-
-const formRules = ref<ElFormRules>({
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
deleted file mode 100644
index a42de8a..0000000
--- a/src/bpmn/panel/TaskPanel.vue
+++ /dev/null
@@ -1,491 +0,0 @@
-<template>
-  <div>
-    <el-form ref="formRef" size="default" :model="formData" :rules="formRules" label-width="100px">
-      <el-collapse v-model="currentCollapseItem">
-        <el-collapse-item name="1">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-              常规
-            </div>
-          </template>
-          <div>
-            <el-form-item prop="id" label="节点 ID">
-              <el-input v-model="formData.id" @change="idChange"> </el-input>
-            </el-form-item>
-            <el-form-item prop="name" label="节点名称">
-              <el-input v-model="formData.name" @change="nameChange"> </el-input>
-            </el-form-item>
-            <el-form-item v-if="showConfig.skipExpression" prop="skipExpression" label="跳过表达式">
-              <el-input v-model="formData.skipExpression" @change="skipExpressionChange"> </el-input>
-            </el-form-item>
-            <el-form-item v-loading="formManageListLoading" prop="formKey" label="表单地址">
-              <el-select v-model="formData.formKey" clearable filterable placeholder="请选择表单" style="width: 260px" @change="formKeyChange">
-                <el-option
-                  v-for="item in formManageList"
-                  :key="item.id"
-                  :label="item.formTypeName + ':' + item.formName"
-                  :value="item.formType + ':' + item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item name="2">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <Checked />
-              </el-icon>
-              任务
-            </div>
-          </template>
-          <div>
-            <el-form-item v-if="showConfig.async" prop="sync" label="是否异步">
-              <el-switch v-model="formData.async" inline-prompt active-text="是" inactive-text="否" @change="syncChange" />
-            </el-form-item>
-
-            <el-tabs tab-position="left" class="demo-tabs">
-              <el-tab-pane label="身份存储">
-                <el-form-item label="分配人员">
-                  <el-input v-model="formData.assignee" @blur="blurAssignee(formData.assignee)">
-                    <template #append>
-                      <el-button icon="Search" type="primary" @click="openSingleUserSelect" />
-                    </template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="候选人员">
-                  <el-badge :value="selectUserLength" :max="99">
-                    <el-button size="small" type="primary" @click="openUserSelect">选择人员</el-button>
-                  </el-badge>
-                </el-form-item>
-                <el-form-item label="候选组">
-                  <el-badge :value="selectRoleLength" :max="99">
-                    <el-button size="small" type="primary" @click="openRoleSelect">选择组</el-button>
-                  </el-badge>
-                </el-form-item>
-              </el-tab-pane>
-
-              <!-- <el-tab-pane label="固定值">
-                <el-form-item prop="auditUserType" label="分配类型">
-                  <el-select v-model="formData.allocationType">
-                    <el-option v-for="item in AllocationTypeSelect" :key="item.id" :value="item.value" :label="item.label"> </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="formData.allocationType === AllocationTypeEnum.USER" label="分配人员">
-                  <el-input v-model="formData.assignee">
-                    <template #append>
-                      <el-button icon="Search" type="primary" @click="openSingleUserSelect" />
-                    </template>
-                  </el-input>
-                </el-form-item>
-                <div v-if="formData.allocationType === AllocationTypeEnum.CANDIDATE">
-                  <el-form-item label="候选人员">
-                    <el-badge :value="selectUserLength" :max="99">
-                      <el-button size="small" type="primary" @click="openUserSelect">选择人员</el-button>
-                    </el-badge>
-                  </el-form-item>
-                  <el-form-item label="候选组">
-                    <el-badge :value="selectRoleLength" :max="99">
-                      <el-button size="small" type="primary" @click="openRoleSelect">选择组</el-button>
-                    </el-badge>
-                  </el-form-item>
-                </div>
-                <el-form-item v-if="formData.allocationType === AllocationTypeEnum.SPECIFY && showConfig.specifyDesc" style="">
-                  <el-radio-group v-model="formData.specifyDesc" class="ml-4">
-                    <el-radio v-for="item in SpecifyDesc" :key="item.id" :value="item.value" size="large">{{ item.label }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-tab-pane> -->
-            </el-tabs>
-
-            <el-form-item v-if="showConfig.dueDate" prop="dueDate" label="到期时间">
-              <el-input v-model="formData.dueDate" clearable @change="dueDateChange" @click="openDueDate">
-                <template #append>
-                  <el-button icon="Search" type="primary" @click="openDueDate" />
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-form-item v-if="showConfig.priority" prop="priority" label="优先级">
-              <el-input-number v-model="formData.priority" :min="0" @change="priorityChange"> </el-input-number>
-            </el-form-item>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item name="3">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <HelpFilled />
-              </el-icon>
-              多实例
-            </div>
-          </template>
-          <div>
-            <el-form-item label="多实例类型">
-              <el-select v-model="formData.multiInstanceType" @change="multiInstanceTypeChange">
-                <el-option v-for="item in constant.MultiInstanceType" :key="item.id" :value="item.value" :label="item.label"> </el-option>
-              </el-select>
-            </el-form-item>
-
-            <div v-if="formData.multiInstanceType !== MultiInstanceTypeEnum.NONE">
-              <el-form-item label="集合">
-                <template #label>
-                  <span>
-                    集合
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        属性会作为表达式进行解析。如果表达式解析为字符串而不是一个集合，<br />
-                        不论是因为本身配置的就是静态字符串值，还是表达式计算结果为字符串，<br />
-                        这个字符串都会被当做变量名，并从流程变量中用于获取实际的集合。
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.collection" @change="collectionChange"></el-input>
-              </el-form-item>
-              <el-form-item label="元素变量">
-                <template #label>
-                  <span>
-                    元素变量
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        每创建一个用户任务前，先以该元素变量为label，集合中的一项为value，<br />
-                        创建（局部）流程变量，该局部流程变量被用于指派用户任务。<br />
-                        一般来说，该字符串应与指定人员变量相同。
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.elementVariable" @change="elementVariableChange"> </el-input>
-              </el-form-item>
-              <el-form-item label="完成条件">
-                <template #label>
-                  <span>
-                    完成条件
-                    <el-tooltip placement="top">
-                      <el-icon><QuestionFilled /></el-icon>
-                      <template #content>
-                        多实例活动在所有实例都完成时结束，然而也可以指定一个表达式，在每个实例<br />
-                        结束时进行计算。当表达式计算为true时，将销毁所有剩余的实例，并结束多实例<br />
-                        活动，继续执行流程。例如 ${nrOfCompletedInstances/nrOfInstances >= 0.6 }，<br />
-                        表示当任务完成60%时，该节点就算完成
-                      </template>
-                    </el-tooltip>
-                  </span>
-                </template>
-                <el-input v-model="formData.completionCondition" @change="completionConditionChange"> </el-input>
-              </el-form-item>
-            </div>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item v-if="showConfig.taskListener" name="4">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <BellFilled />
-              </el-icon>
-              任务监听器
-            </div>
-          </template>
-          <div>
-            <TaskListener v-if="showConfig.taskListener" :element="element"></TaskListener>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item v-if="showConfig.executionListener" name="5">
-          <template #title>
-            <div class="collapse__title">
-              <el-icon>
-                <BellFilled />
-              </el-icon>
-              执行监听器
-            </div>
-          </template>
-          <div>
-            <ExecutionListener v-if="showConfig.executionListener" :element="element"></ExecutionListener>
-          </div>
-        </el-collapse-item>
-
-        <el-form-item v-if="showConfig.isForCompensation" prop="isForCompensation" label="是否为补偿">
-          <el-switch v-model="formData.isForCompensation" inline-prompt active-text="是" inactive-text="否" />
-        </el-form-item>
-        <el-form-item v-if="showConfig.triggerServiceTask" prop="triggerServiceTask" label="服务任务可触发">
-          <el-switch v-model="formData.triggerServiceTask" inline-prompt active-text="是" inactive-text="否" />
-        </el-form-item>
-        <el-form-item v-if="showConfig.autoStoreVariables" prop="autoStoreVariables" label="自动存储变量">
-          <el-switch v-model="formData.autoStoreVariables" inline-prompt active-text="是" inactive-text="否" />
-        </el-form-item>
-        <el-form-item v-if="showConfig.ruleVariablesInput" prop="skipExpression" label="输入变量">
-          <el-input v-model="formData.ruleVariablesInput"> </el-input>
-        </el-form-item>
-        <el-form-item v-if="showConfig.exclude" prop="exclude" label="排除">
-          <el-switch v-model="formData.exclude" inline-prompt active-text="是" inactive-text="否" />
-        </el-form-item>
-        <el-form-item v-if="showConfig.class" prop="class" label="类">
-          <el-input v-model="formData.class"> </el-input>
-        </el-form-item>
-      </el-collapse>
-    </el-form>
-    <UserSelect ref="userSelectRef" :data="formData.candidateUsers" @confirm-call-back="userSelectCallBack"></UserSelect>
-    <UserSelect ref="singleUserSelectRef" :data="formData.assignee" :multiple="false" @confirm-call-back="singleUserSelectCallBack"></UserSelect>
-    <RoleSelect ref="roleSelectRef" :data="formData.candidateGroups" @confirm-call-back="roleSelectCallBack"></RoleSelect>
-    <DueDate ref="dueDateRef" v-model="formData.dueDate" :data="formData.dueDate" @confirm-call-back="dueDateCallBack"></DueDate>
-  </div>
-</template>
-<script setup lang="ts">
-import useParseElement from '../hooks/useParseElement';
-import usePanel from '../hooks/usePanel';
-import UserSelect from '@/components/UserSelect';
-import RoleSelect from '@/components/RoleSelect';
-import ExecutionListener from './property/ExecutionListener.vue';
-import TaskListener from './property/TaskListener.vue';
-import DueDate from './property/DueDate.vue';
-import type { ModdleElement } from 'bpmn';
-import type { TaskPanel } from 'bpmnDesign';
-import { AllocationTypeEnum, MultiInstanceTypeEnum, SpecifyDescEnum } from '@/enums/bpmn/IndexEnums';
-import { UserVO } from '@/api/system/user/types';
-import { RoleVO } from '@/api/system/role/types';
-import { selectListFormManage } from '@/api/workflow/formManage';
-import { FormManageVO } from '@/api/workflow/formManage/types';
-const formManageList = ref<FormManageVO[]>([]);
-const formManageListLoading = ref(false);
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-const { showConfig, nameChange, formKeyChange, idChange, updateProperties, getExtensionElements, createModdleElement, constant } = usePanel({
-  element: toRaw(props.element)
-});
-const { parseData } = useParseElement({
-  element: toRaw(props.element)
-});
-
-const initFormData = {
-  id: '',
-  name: '',
-  dueDate: '',
-  multiInstanceType: MultiInstanceTypeEnum.NONE,
-  allocationType: AllocationTypeEnum.USER,
-  specifyDesc: SpecifyDescEnum.SPECIFY_SINGLE
-};
-const formData = ref({ ...initFormData, ...parseData<TaskPanel>() });
-const assignee = ref<Partial<UserVO>>({
-  userName: ''
-});
-const currentCollapseItem = ref(['1', '2']);
-const userSelectRef = ref<InstanceType<typeof UserSelect>>();
-const singleUserSelectRef = ref<InstanceType<typeof UserSelect>>();
-const roleSelectRef = ref<InstanceType<typeof RoleSelect>>();
-const dueDateRef = ref<InstanceType<typeof DueDate>>();
-
-const openUserSelect = () => {
-  userSelectRef.value.open();
-};
-const openSingleUserSelect = () => {
-  if (formData.value.assignee?.includes('$')) {
-    formData.value.assignee = '';
-  }
-  singleUserSelectRef.value.open();
-};
-const openRoleSelect = () => {
-  roleSelectRef.value.open();
-};
-const openDueDate = (e) => {
-  dueDateRef.value.openDialog();
-};
-const blurAssignee = (assignee) => {
-  updateProperties({ 'flowable:assignee': assignee ? assignee : undefined });
-};
-const singleUserSelectCallBack = (data: UserVO[]) => {
-  const user: UserVO = data.length !== 0 ? data[0] : undefined;
-  updateProperties({ 'flowable:assignee': user?.userId });
-  assignee.value = user ? user : { userName: '' };
-  formData.value.assignee = String(user?.userId);
-  let extensionElements = getExtensionElements();
-  extensionElements.values = extensionElements.get('values').filter((item) => item.$type !== 'flowable:extAssignee');
-  if (user) {
-    const extAssigneeElement = createModdleElement('flowable:extAssignee', { body: '' }, extensionElements);
-    extensionElements.get('values').push(extAssigneeElement);
-    extAssigneeElement.body = JSON.stringify({ userName: user.userName, userId: user.userId });
-  }
-  if (extensionElements.values.length === 0) {
-    extensionElements = undefined;
-  }
-  updateProperties({ extensionElements: extensionElements });
-};
-const userSelectCallBack = (data: UserVO[]) => {
-  let extensionElements = getExtensionElements();
-  extensionElements.values = extensionElements.values.filter((item) => item.$type !== 'flowable:extCandidateUsers');
-  if (data.length === 0) {
-    formData.value.candidateUsers = undefined;
-    updateProperties({ 'flowable:candidateUsers': undefined });
-  } else {
-    const userIds = data.map((item) => item.userId).join(',');
-    formData.value.candidateUsers = userIds;
-    updateProperties({ 'flowable:candidateUsers': userIds });
-    const extCandidateUsersElement = createModdleElement('flowable:extCandidateUsers', { body: '' }, extensionElements);
-    extensionElements.values.push(extCandidateUsersElement);
-    const users = data.map((item) => {
-      return {
-        userId: item.userId,
-        userName: item.userName
-      };
-    });
-    extCandidateUsersElement.body = JSON.stringify(users);
-  }
-  if (extensionElements.values.length === 0) {
-    extensionElements = undefined;
-  }
-  updateProperties({ extensionElements: extensionElements });
-};
-const roleSelectCallBack = (data: RoleVO[]) => {
-  if (data.length === 0) {
-    formData.value.candidateGroups = '';
-    updateProperties({ 'flowable:candidateGroups': undefined });
-  } else {
-    const roleIds = data.map((item) => item.roleId).join(',');
-    formData.value.candidateGroups = roleIds;
-    updateProperties({ 'flowable:candidateGroups': roleIds });
-  }
-};
-const dueDateCallBack = (data: string) => {
-  updateProperties({ 'flowable:dueDate': data });
-};
-
-const taskTabClick = (e) => {
-  formData.value.candidateGroups = '';
-  formData.value.candidateUsers = '';
-  formData.value.assignee = '';
-  // formData.value.fixedAssignee = '';
-  assignee.value = {};
-};
-
-const syncChange = (newVal) => {
-  updateProperties({ 'flowable:async': newVal });
-};
-const skipExpressionChange = (newVal) => {
-  updateProperties({ 'flowable:skipExpression': newVal && newVal.length > 0 ? newVal : undefined });
-};
-const priorityChange = (newVal) => {
-  updateProperties({ 'flowable:priority': newVal });
-};
-const fixedAssigneeChange = (newVal) => {
-  updateProperties({ 'flowable:assignee': newVal && newVal.length > 0 ? newVal : undefined });
-};
-const multiInstanceTypeChange = (newVal) => {
-  if (newVal !== MultiInstanceTypeEnum.NONE) {
-    let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-    if (!loopCharacteristics) {
-      loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-    }
-    loopCharacteristics.isSequential = newVal === MultiInstanceTypeEnum.SERIAL;
-    updateProperties({ loopCharacteristics: loopCharacteristics });
-  } else {
-    updateProperties({ loopCharacteristics: undefined });
-  }
-};
-const collectionChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  loopCharacteristics.collection = newVal && newVal.length > 0 ? newVal : undefined;
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-const elementVariableChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  loopCharacteristics.elementVariable = newVal && newVal.length > 0 ? newVal : undefined;
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-const completionConditionChange = (newVal) => {
-  let loopCharacteristics = props.element.businessObject.get<ModdleElement>('loopCharacteristics');
-  if (!loopCharacteristics) {
-    loopCharacteristics = createModdleElement('bpmn:MultiInstanceLoopCharacteristics', {}, props.element.businessObject);
-  }
-  if (newVal && newVal.length > 0) {
-    if (!loopCharacteristics.completionCondition) {
-      loopCharacteristics.completionCondition = createModdleElement('bpmn:Expression', { body: newVal }, loopCharacteristics);
-    } else {
-      loopCharacteristics.completionCondition.body = newVal;
-    }
-  } else {
-    loopCharacteristics.completionCondition = undefined;
-  }
-  updateProperties({ loopCharacteristics: loopCharacteristics });
-};
-const dueDateChange = (newVal) => {
-  updateProperties({ 'flowable:dueDate': newVal && newVal.length > 0 ? newVal : undefined });
-};
-const selectUserLength = computed(() => {
-  if (formData.value.candidateUsers) {
-    return formData.value.candidateUsers.split(',').length;
-  } else {
-    return 0;
-  }
-});
-const selectRoleLength = computed(() => {
-  if (formData.value.candidateGroups) {
-    return formData.value.candidateGroups.split(',').length;
-  } else {
-    return 0;
-  }
-});
-
-onBeforeMount(() => {
-  const extensionElements = getExtensionElements(false);
-  if (extensionElements && extensionElements.get('values')) {
-    let extAssigneeElement = extensionElements.get('values').find((item) => item.$type === 'flowable:extAssignee');
-    if (extAssigneeElement) {
-      assignee.value = JSON.parse(extAssigneeElement.body);
-    }
-  }
-
-  if (formData.value.loopCharacteristics) {
-    const loopCharacteristics = formData.value.loopCharacteristics;
-    formData.value.collection = loopCharacteristics.collection || '';
-    formData.value.elementVariable = loopCharacteristics.elementVariable || '';
-    formData.value.completionCondition = loopCharacteristics.completionCondition?.body || '';
-    formData.value.multiInstanceType = loopCharacteristics.isSequential ? MultiInstanceTypeEnum.SERIAL : MultiInstanceTypeEnum.PARALLEL;
-  }
-
-  if (formData.value.assignee) {
-    formData.value.fixedAssignee = formData.value.assignee;
-  }
-});
-
-const formRules = ref<ElFormRules>({
-  id: [{ required: true, message: '请输入', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-
-const AllocationTypeSelect = [
-  { id: 'b9cdf970-dd91-47c0-819f-42a7010ca2a6', label: '指定人员', value: AllocationTypeEnum.USER },
-  { id: '3f7ccbcd-c464-4602-bb9d-e96649d10585', label: '候选人员', value: AllocationTypeEnum.CANDIDATE },
-  { id: 'c49065e0-7f2d-4c09-aedb-ab2d47d9a454', label: '发起人自己', value: AllocationTypeEnum.YOURSELF },
-  { id: '6ef40a03-7e9a-4898-89b2-c88fe9064542', label: '发起人指定', value: AllocationTypeEnum.SPECIFY }
-];
-const SpecifyDesc = [
-  { id: 'fa253b34-4335-458c-b1bc-b039e2a2b7a6', label: '指定一个人', value: 'specifySingle' },
-  { id: '7365ff54-2e05-4312-9bfb-0b8edd779c5b', label: '指定多个人', value: 'specifyMultiple' }
-];
-
-const listFormManage = async () => {
-  formManageListLoading.value = true;
-  const res = await selectListFormManage();
-  formManageList.value = res.data;
-  formManageListLoading.value = false;
-};
-onMounted(() => {
-  nextTick(() => {
-    listFormManage();
-  });
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/bpmn/panel/index.vue b/src/bpmn/panel/index.vue
deleted file mode 100644
index 445571a..0000000
--- a/src/bpmn/panel/index.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <div ref="propertyPanel">
-    <div v-if="nodeName" class="node-name">{{ nodeName }}</div>
-    <component :is="component" v-if="element" :element="element" />
-  </div>
-</template>
-<script setup lang="ts" name="PropertyPanel">
-import { NodeName } from '../assets/lang/zh';
-import TaskPanel from './TaskPanel.vue';
-import ProcessPanel from './ProcessPanel.vue';
-import StartEndPanel from './StartEndPanel.vue';
-import GatewayPanel from './GatewayPanel.vue';
-import SequenceFlowPanel from './SequenceFlowPanel.vue';
-import ParticipantPanel from './ParticipantPanel.vue';
-import SubProcessPanel from './SubProcessPanel.vue';
-import type { Modeler, ModdleElement } from 'bpmn';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-interface propsType {
-  modeler: Modeler;
-}
-const props = withDefaults(defineProps<propsType>(), {});
-
-const element = ref<ModdleElement>();
-const processElement = ref<ModdleElement>();
-
-const startEndType = ['bpmn:IntermediateThrowEvent', 'bpmn:StartEvent', 'bpmn:EndEvent'];
-const taskType = [
-  'bpmn:UserTask',
-  'bpmn:Task',
-  'bpmn:SendTask',
-  'bpmn:ReceiveTask',
-  'bpmn:ManualTask',
-  'bpmn:BusinessRuleTask',
-  'bpmn:ServiceTask',
-  'bpmn:ScriptTask'
-];
-const sequenceType = ['bpmn:SequenceFlow'];
-const gatewayType = ['bpmn:InclusiveGateway', 'bpmn:ExclusiveGateway', 'bpmn:ParallelGateway', 'bpmn:EventBasedGateway', 'bpmn:ComplexGateway'];
-const processType = ['bpmn:Process'];
-
-// 组件计算
-const component = computed(() => {
-  if (!element.value) return null;
-  const type = element.value.type;
-  if (startEndType.includes(type)) return StartEndPanel;
-  if (taskType.includes(type)) return TaskPanel;
-  if (sequenceType.includes(type)) return SequenceFlowPanel;
-  if (gatewayType.includes(type)) return GatewayPanel;
-  if (processType.includes(type)) return ProcessPanel;
-  if (type === 'bpmn:Participant') return ParticipantPanel;
-  if (type === 'bpmn:SubProcess') return SubProcessPanel;
-  //return proxy?.$modal.msgWarning('面板开发中....');
-  return undefined;
-});
-
-const nodeName = computed(() => {
-  if (element.value) {
-    const bizObj = element.value.businessObject;
-    const type = bizObj?.eventDefinitions && bizObj?.eventDefinitions.length > 0 ? bizObj.eventDefinitions[0].$type : bizObj.$type;
-    return NodeName[type] || type;
-  }
-  return '';
-});
-
-const handleModeler = () => {
-  props.modeler.on('root.added', (e: any) => {
-    element.value = null;
-    if (e.element.type === 'bpmn:Process') {
-      nextTick(() => {
-        element.value = e.element;
-        processElement.value = e.element;
-      });
-    }
-  });
-  props.modeler.on('element.click', (e: any) => {
-    if (e.element.type === 'bpmn:Process') {
-      nextTick(() => {
-        element.value = e.element;
-        processElement.value = e.element;
-      });
-    }
-  });
-  props.modeler.on('selection.changed', (e: any) => {
-    // 先给null为了让vue刷新
-    element.value = null;
-    const newElement = e.newSelection[0];
-    if (newElement) {
-      nextTick(() => {
-        element.value = newElement;
-      });
-    } else {
-      nextTick(() => {
-        element.value = processElement.value;
-      });
-    }
-  });
-};
-
-onMounted(() => {
-  handleModeler();
-});
-</script>
-
-<style scoped lang="scss">
-.node-name {
-  font-size: 16px;
-  font-weight: bold;
-  padding: 10px;
-}
-</style>
diff --git a/src/bpmn/panel/property/DueDate.vue b/src/bpmn/panel/property/DueDate.vue
deleted file mode 100644
index 882766b..0000000
--- a/src/bpmn/panel/property/DueDate.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
-  <div>
-    <el-dialog v-model="visible" :title="title" width="600px" append-to-body>
-      <el-form label-width="100px">
-        <el-form-item label="小时">
-          <el-radio-group v-model="hourValue" @change="hourChange">
-            <el-radio-button label="4" value="4" />
-            <el-radio-button label="8" value="8" />
-            <el-radio-button label="12" value="12" />
-            <el-radio-button label="24" value="24" />
-            <el-radio-button label="自定义" value="自定义" />
-            <el-input-number v-show="hourValue === '自定义'" v-model="customHourValue" :min="1" @change="customHourValueChange"></el-input-number>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="天">
-          <el-radio-group v-model="dayValue" @change="dayChange">
-            <el-radio-button label="1" value="1" />
-            <el-radio-button label="2" value="2" />
-            <el-radio-button label="3" value="3" />
-            <el-radio-button label="4" value="4" />
-            <el-radio-button label="自定义" value="自定义" />
-            <el-input-number v-show="dayValue === '自定义'" v-model="customDayValue" :min="1" @change="customDayValueChange"></el-input-number>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="周">
-          <el-radio-group v-model="weekValue" @change="weekChange">
-            <el-radio-button label="1" value="1" />
-            <el-radio-button label="2" value="2" />
-            <el-radio-button label="3" value="3" />
-            <el-radio-button label="4" value="4" />
-            <el-radio-button label="自定义" value="自定义" />
-            <el-input-number v-show="weekValue === '自定义'" v-model="customWeekValue" :min="1" @change="customWeekValueChange"></el-input-number>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="月">
-          <el-radio-group v-model="monthValue" @change="monthChange">
-            <el-radio-button label="1" value="1" />
-            <el-radio-button label="2" value="2" />
-            <el-radio-button label="3" value="3" />
-            <el-radio-button label="4" value="4" />
-            <el-radio-button label="自定义" value="自定义" />
-            <el-input-number v-show="monthValue === '自定义'" v-model="customMonthValue" :min="1" @change="customMonthValueChange"></el-input-number>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <div>
-          <el-button @click="closeDialog">取消</el-button>
-          <el-button type="primary" @click="confirm">确定</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import useDialog from '@/hooks/useDialog';
-
-interface PropType {
-  modelValue?: string;
-  data?: string;
-}
-const prop = withDefaults(defineProps<PropType>(), {
-  modelValue: '',
-  data: ''
-});
-const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
-
-const { title, visible, openDialog, closeDialog } = useDialog({
-  title: '设置任务到期时间'
-});
-const formValue = ref();
-const valueType = ref();
-
-const hourValue = ref('');
-const dayValue = ref('');
-const weekValue = ref('');
-const monthValue = ref('');
-
-const customHourValue = ref(1);
-const customDayValue = ref(1);
-const customWeekValue = ref(1);
-const customMonthValue = ref(1);
-
-const hourValueConst = ['4', '8', '12', '24'];
-const dayAndWeekAndMonthValueConst = ['1', '2', '3', '4'];
-
-const initValue = () => {
-  formValue.value = prop.data;
-  if (prop.data) {
-    const lastStr = prop.data.substring(prop.data.length - 1);
-    if (lastStr === 'H') {
-      const hourValueValue = prop.data.substring(2, prop.data.length - 1);
-      if (hourValueConst.includes(hourValueValue)) {
-        hourValue.value = hourValueValue;
-      } else {
-        hourValue.value = '自定义';
-        customHourValue.value = Number(hourValueValue);
-      }
-    }
-    const dayAndWeekAndMonthValue = prop.data.substring(1, prop.data.length - 1);
-    if (lastStr === 'D') {
-      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
-        dayValue.value = dayAndWeekAndMonthValue;
-      } else {
-        dayValue.value = '自定义';
-        customDayValue.value = Number(dayAndWeekAndMonthValue);
-      }
-    }
-    if (lastStr === 'W') {
-      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
-        weekValue.value = dayAndWeekAndMonthValue;
-      } else {
-        weekValue.value = '自定义';
-        customWeekValue.value = Number(dayAndWeekAndMonthValue);
-      }
-    }
-    if (lastStr === 'M') {
-      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
-        monthValue.value = dayAndWeekAndMonthValue;
-      } else {
-        monthValue.value = '自定义';
-        customMonthValue.value = Number(dayAndWeekAndMonthValue);
-      }
-    }
-  }
-};
-
-const confirm = () => {
-  emit('update:modelValue', formValue.value);
-  emit('confirmCallBack', formValue.value);
-  closeDialog();
-};
-
-const customHourValueChange = (customHourValue) => {
-  formValue.value = `PT${customHourValue}H`;
-
-  dayValue.value = '';
-  weekValue.value = '';
-  monthValue.value = '';
-  customDayValue.value = 1;
-  customWeekValue.value = 1;
-  customMonthValue.value = 1;
-};
-const customDayValueChange = (customDayValue) => {
-  formValue.value = `P${customDayValue}D`;
-  hourValue.value = '';
-  weekValue.value = '';
-  monthValue.value = '';
-
-  customHourValue.value = 1;
-  customWeekValue.value = 1;
-  customMonthValue.value = 1;
-};
-
-const customWeekValueChange = (customWeekValue) => {
-  formValue.value = `P${customWeekValue}W`;
-  hourValue.value = '';
-  dayValue.value = '';
-  monthValue.value = '';
-
-  customHourValue.value = 1;
-  customDayValue.value = 1;
-  customMonthValue.value = 1;
-};
-
-const customMonthValueChange = (customMonthValue) => {
-  formValue.value = `P${customMonthValue}M`;
-  hourValue.value = '';
-  dayValue.value = '';
-  weekValue.value = '';
-
-  customHourValue.value = 1;
-  customDayValue.value = 1;
-  customWeekValue.value = 1;
-};
-
-const hourChange = (hourValue) => {
-  if (hourValue === '自定义') {
-    formValue.value = `PT${customHourValue.value}H`;
-  } else {
-    formValue.value = `PT${hourValue}H`;
-  }
-
-  dayValue.value = '';
-  weekValue.value = '';
-  monthValue.value = '';
-  customDayValue.value = 1;
-  customWeekValue.value = 1;
-  customMonthValue.value = 1;
-};
-const dayChange = (dayValue) => {
-  if (dayValue === '自定义') {
-    formValue.value = `P${customDayValue.value}D`;
-  } else {
-    formValue.value = `P${dayValue}D`;
-  }
-
-  hourValue.value = '';
-  weekValue.value = '';
-  monthValue.value = '';
-
-  customHourValue.value = 1;
-  customWeekValue.value = 1;
-  customMonthValue.value = 1;
-};
-const weekChange = (weekValue) => {
-  if (weekValue === '自定义') {
-    formValue.value = `P${customWeekValue.value}W`;
-  } else {
-    formValue.value = `P${weekValue}W`;
-  }
-
-  hourValue.value = '';
-  dayValue.value = '';
-  monthValue.value = '';
-
-  customHourValue.value = 1;
-  customDayValue.value = 1;
-  customMonthValue.value = 1;
-};
-const monthChange = (monthValue) => {
-  if (monthValue === '自定义') {
-    formValue.value = `P${customMonthValue.value}M`;
-  } else {
-    formValue.value = `P${monthValue}M`;
-  }
-
-  hourValue.value = '';
-  dayValue.value = '';
-  weekValue.value = '';
-
-  customHourValue.value = 1;
-  customDayValue.value = 1;
-  customWeekValue.value = 1;
-};
-
-watch(
-  () => visible.value,
-  () => {
-    if (visible.value) {
-      initValue();
-    }
-  }
-);
-
-defineExpose({
-  openDialog,
-  closeDialog
-});
-</script>
diff --git a/src/bpmn/panel/property/ExecutionListener.vue b/src/bpmn/panel/property/ExecutionListener.vue
deleted file mode 100644
index 3c584cb..0000000
--- a/src/bpmn/panel/property/ExecutionListener.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<template>
-  <div>
-    <vxe-toolbar>
-      <template #buttons>
-        <el-button type="primary" link size="small" @click="insertEvent">新增</el-button>
-        <el-button type="primary" link size="small" @click="removeSelectRowEvent">删除</el-button>
-      </template>
-    </vxe-toolbar>
-    <vxe-table
-      ref="tableRef"
-      size="mini"
-      height="100px"
-      border
-      show-overflow
-      keep-source
-      :data="tableData"
-      :menu-config="menuConfig"
-      @cell-dblclick="cellDBLClickEvent"
-      @menu-click="contextMenuClickEvent"
-    >
-      <vxe-column type="checkbox" width="40"></vxe-column>
-      <vxe-column type="seq" width="40"></vxe-column>
-      <vxe-column field="event" title="事件" min-width="100px">
-        <template #default="slotParams">
-          <span>{{ eventSelect.find((e) => e.value === slotParams.row.event)?.label }}</span>
-        </template>
-      </vxe-column>
-      <vxe-column field="type" title="类型" min-width="100px">
-        <template #default="slotParams">
-          <span>{{ typeSelect.find((e) => e.value === slotParams.row.type)?.label }}</span>
-        </template>
-      </vxe-column>
-      <vxe-column field="className" title="Java 类名" min-width="100px"> </vxe-column>
-    </vxe-table>
-
-    <el-dialog
-      v-model="formDialog.visible.value"
-      :title="formDialog.title.value"
-      width="600px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      append-to-body
-    >
-      <el-form ref="formRef" :model="formData" :rules="tableRules" label-width="100px">
-        <el-form-item label="事件" prop="event">
-          <el-select v-model="formData.event">
-            <el-option v-for="item in eventSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <template #label>
-            <span>
-              类型
-              <el-tooltip placement="top">
-                <el-icon><QuestionFilled /></el-icon>
-                <template #content>
-                  类：示例 com.company.MyCustomListener，自定义类必须实现 org.flowable.engine.delegate.TaskListener 接口<br />
-                  表达式：示例 ${myObject.callMethod(task, task.eventName)}<br />
-                  委托表达式：示例 ${myListenerSpringBean} ，该 springBean 需要实现 org.flowable.engine.delegate.TaskListener 接口
-                </template>
-              </el-tooltip>
-            </span>
-          </template>
-          <el-select v-model="formData.type">
-            <el-option v-for="item in typeSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="typeSelect.filter((e) => e.value === formData.type)[0] ? typeSelect.filter((e) => e.value === formData.type)[0]?.label : '表达式'"
-          prop="className"
-        >
-          <el-input v-model="formData.className" type="text"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-tabs type="border-card">
-        <el-tab-pane label="参数">
-          <ListenerParam ref="listenerParamRef" :table-data="formData.params" />
-        </el-tab-pane>
-      </el-tabs>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="formDialog.closeDialog">取 消</el-button>
-          <el-button type="primary" @click="submitEvent">确 定</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import ListenerParam from './ListenerParam.vue';
-import { VxeTableEvents, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import type { ExecutionListenerVO } from 'bpmnDesign';
-import type { Moddle, Modeler, ModdleElement } from 'bpmn';
-
-import usePanel from '../../hooks/usePanel';
-import useDialog from '@/hooks/useDialog';
-import useModelerStore from '@/store/modules/modeler';
-
-const emit = defineEmits(['close']);
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const selectRow = ref<ExecutionListenerVO | null>();
-const formDialog = useDialog({
-  title: selectRow.value ? '编辑&保存' : '新增&保存'
-});
-
-const { showConfig, elementType, updateProperties } = usePanel({
-  element: toRaw(props.element)
-});
-const { getModdle } = useModelerStore();
-const moddle = getModdle();
-
-const listenerParamRef = ref<InstanceType<typeof ListenerParam>>();
-const tableRef = ref<VxeTableInstance<ExecutionListenerVO>>();
-const formRef = ref<ElFormInstance>();
-
-const initData: ExecutionListenerVO = {
-  event: '',
-  type: '',
-  className: '',
-  params: []
-};
-const formData = ref<ExecutionListenerVO>({ ...initData });
-const tableData = ref<ExecutionListenerVO[]>([]);
-const tableRules = ref<ElFormRules>({
-  event: [{ required: true, message: '请选择', trigger: 'blur' }],
-  type: [{ required: true, message: '请选择', trigger: 'blur' }],
-  className: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-
-const submitEvent = async () => {
-  const error = await listenerParamRef.value.validate();
-  await formRef.value.validate((validate) => {
-    if (validate && !error) {
-      const $table = tableRef.value;
-      if ($table) {
-        formData.value.params = listenerParamRef.value.getTableData();
-        if (selectRow.value) {
-          Object.assign(selectRow.value, formData.value);
-        } else {
-          $table.insertAt({ ...formData.value }, -1);
-        }
-        updateElement();
-        formDialog.closeDialog();
-      }
-    }
-  });
-};
-
-const removeSelectRowEvent = async () => {
-  const $table = tableRef.value;
-  if ($table) {
-    const selectCount = $table.getCheckboxRecords().length;
-    if (selectCount === 0) {
-      proxy?.$modal.msgWarning('请选择行');
-    } else {
-      await $table.removeCheckboxRow();
-      updateElement();
-    }
-  }
-};
-const insertEvent = async () => {
-  Object.assign(formData.value, initData);
-  selectRow.value = null;
-  formDialog.openDialog();
-};
-
-const editEvent = (row: ExecutionListenerVO) => {
-  Object.assign(formData.value, row);
-  selectRow.value = row;
-  formDialog.openDialog();
-};
-
-const removeEvent = async (row: ExecutionListenerVO) => {
-  await proxy?.$modal.confirm('您确定要删除该数据?');
-  const $table = tableRef.value;
-  if ($table) {
-    await $table.remove(row);
-    updateElement();
-  }
-};
-const updateElement = () => {
-  const $table = tableRef.value;
-  const data = $table.getTableData().fullData;
-  if (data.length) {
-    let extensionElements = props.element.businessObject.get('extensionElements');
-    if (!extensionElements) {
-      extensionElements = moddle.create('bpmn:ExtensionElements');
-    }
-    // 清除旧值
-    extensionElements.values = extensionElements.values?.filter((item) => item.$type !== 'flowable:ExecutionListener') ?? [];
-    data.forEach((item) => {
-      const executionListener = moddle.create('flowable:ExecutionListener');
-      executionListener['event'] = item.event;
-      executionListener[item.type] = item.className;
-      if (item.params && item.params.length) {
-        item.params.forEach((field) => {
-          const fieldElement = moddle.create('flowable:Field');
-          fieldElement['name'] = field.name;
-          fieldElement[field.type] = field.value;
-          executionListener.get('fields').push(fieldElement);
-        });
-      }
-      extensionElements.get('values').push(executionListener);
-    });
-    updateProperties({ extensionElements: extensionElements });
-  } else {
-    const extensionElements = props.element.businessObject[`extensionElements`];
-    if (extensionElements) {
-      extensionElements.values = extensionElements.values?.filter((item) => item.$type !== 'flowable:ExecutionListener') ?? [];
-    }
-  }
-};
-
-const cellDBLClickEvent: VxeTableEvents.CellDblclick<ExecutionListenerVO> = ({ row }) => {
-  editEvent(row);
-};
-
-const menuConfig = reactive<VxeTablePropTypes.MenuConfig<ExecutionListenerVO>>({
-  body: {
-    options: [
-      [
-        { code: 'edit', name: '编辑', prefixIcon: 'vxe-icon-edit', disabled: false },
-        { code: 'remove', name: '删除', prefixIcon: 'vxe-icon-delete', disabled: false }
-      ]
-    ]
-  },
-  visibleMethod({ options, column }) {
-    const isDisabled = !column;
-    options.forEach((list) => {
-      list.forEach((item) => {
-        item.disabled = isDisabled;
-      });
-    });
-    return true;
-  }
-});
-const contextMenuClickEvent: VxeTableEvents.MenuClick<ExecutionListenerVO> = ({ menu, row, column }) => {
-  const $table = tableRef.value;
-  if ($table) {
-    switch (menu.code) {
-      case 'edit':
-        editEvent(row);
-        break;
-      case 'remove':
-        removeEvent(row);
-        break;
-    }
-  }
-};
-
-const initTableData = () => {
-  tableData.value =
-    props.element.businessObject.extensionElements?.values
-      .filter((item) => item.$type === 'flowable:ExecutionListener')
-      .map((item) => {
-        let type;
-        if ('class' in item) type = 'class';
-        if ('expression' in item) type = 'expression';
-        if ('delegateExpression' in item) type = 'delegateExpression';
-        return {
-          event: item.event,
-          type: type,
-          className: item[type],
-          params:
-            item.fields?.map((field) => {
-              let fieldType;
-              if ('stringValue' in field) fieldType = 'stringValue';
-              if ('expression' in field) fieldType = 'expression';
-              return {
-                name: field.name,
-                type: fieldType,
-                value: field[fieldType]
-              };
-            }) ?? []
-        };
-      }) ?? [];
-};
-
-onMounted(() => {
-  initTableData();
-});
-
-const typeSelect = [
-  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
-  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
-  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
-];
-const eventSelect = [
-  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: '开始', value: 'start' },
-  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: '结束', value: 'end' },
-  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: '启用', value: 'take' }
-];
-</script>
-
-<style scoped lang="scss">
-.el-badge {
-  :deep(.el-badge__content) {
-    top: 10px;
-  }
-}
-</style>
diff --git a/src/bpmn/panel/property/ListenerParam.vue b/src/bpmn/panel/property/ListenerParam.vue
deleted file mode 100644
index 21c6de1..0000000
--- a/src/bpmn/panel/property/ListenerParam.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <vxe-toolbar>
-    <template #buttons>
-      <el-button icon="Plus" @click="insertRow">新增</el-button>
-    </template>
-  </vxe-toolbar>
-  <vxe-table
-    ref="tableRef"
-    :height="height"
-    border
-    show-overflow
-    keep-source
-    :data="tableData"
-    :edit-rules="tableRules"
-    :edit-config="{ trigger: 'click', mode: 'row', showStatus: true }"
-  >
-    <vxe-column type="seq" width="40"></vxe-column>
-    <vxe-column field="type" title="类型" :edit-render="{}">
-      <template #default="slotParams">
-        <span>{{ typeSelect.find((e) => e.value === slotParams.row.type)?.label }}</span>
-      </template>
-      <template #edit="slotParams">
-        <vxe-select v-model="slotParams.row.type">
-          <vxe-option v-for="item in typeSelect" :key="item.id" :value="item.value" :label="item.label"></vxe-option>
-        </vxe-select>
-      </template>
-    </vxe-column>
-    <vxe-column field="name" title="名称" :edit-render="{}">
-      <template #edit="slotParams">
-        <vxe-input v-model="slotParams.row.name" type="text"></vxe-input>
-      </template>
-    </vxe-column>
-    <vxe-column field="value" title="值" :edit-render="{}">
-      <template #edit="slotParams">
-        <vxe-input v-model="slotParams.row.value" type="text"></vxe-input>
-      </template>
-    </vxe-column>
-    <vxe-column title="操作" width="100" show-overflow align="center">
-      <template #default="slotParams">
-        <el-tooltip content="删除" placement="top">
-          <el-button link type="danger" icon="Delete" @click="removeRow(slotParams.row)"></el-button>
-        </el-tooltip>
-      </template>
-    </vxe-column>
-  </vxe-table>
-</template>
-
-<script setup lang="ts">
-import { VXETable, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import type { ParamVO } from 'bpmnDesign';
-import useDialog from '@/hooks/useDialog';
-
-interface PropType {
-  height?: string;
-  tableData?: ParamVO[];
-}
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const props = withDefaults(defineProps<PropType>(), {
-  height: '200px',
-  tableData: () => []
-});
-
-const tableRules = ref<VxeTablePropTypes.EditRules>({
-  type: [{ required: true, message: '请选择', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }],
-  value: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-
-const { title, visible, openDialog, closeDialog } = useDialog({
-  title: '监听器参数'
-});
-const typeSelect = [
-  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '字符串', value: 'stringValue' },
-  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' }
-];
-
-const tableRef = ref<VxeTableInstance<ParamVO>>();
-
-const getTableData = () => {
-  const $table = tableRef.value;
-  if ($table) {
-    return $table.getTableData().fullData;
-  }
-  return [];
-};
-
-const insertRow = async () => {
-  const $table = tableRef.value;
-  if ($table) {
-    const { row: newRow } = await $table.insertAt({}, -1);
-    // 插入一条数据并触发校验
-    await $table.validate(newRow);
-  }
-};
-
-const removeRow = async (row: ParamVO) => {
-  await proxy?.$modal.confirm('您确定要删除该数据?');
-  const $table = tableRef.value;
-  if ($table) {
-    await $table.remove(row);
-  }
-};
-
-const validate = async () => {
-  const $table = tableRef.value;
-  if ($table) {
-    return await $table.validate(true);
-  }
-};
-
-defineExpose({
-  closeDialog,
-  openDialog,
-  validate,
-  getTableData
-});
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/src/bpmn/panel/property/TaskListener.vue b/src/bpmn/panel/property/TaskListener.vue
deleted file mode 100644
index 9a32c47..0000000
--- a/src/bpmn/panel/property/TaskListener.vue
+++ /dev/null
@@ -1,310 +0,0 @@
-<template>
-  <div>
-    <vxe-toolbar>
-      <template #buttons>
-        <el-button type="primary" link size="small" @click="insertEvent">新增</el-button>
-        <el-button type="primary" link size="small" @click="removeSelectRowEvent">删除</el-button>
-      </template>
-    </vxe-toolbar>
-    <vxe-table
-      ref="tableRef"
-      size="mini"
-      height="100px"
-      border
-      show-overflow
-      keep-source
-      :data="tableData"
-      :menu-config="menuConfig"
-      @cell-dblclick="cellDBLClickEvent"
-      @menu-click="contextMenuClickEvent"
-    >
-      <vxe-column type="checkbox" width="40"></vxe-column>
-      <vxe-column type="seq" width="40"></vxe-column>
-      <vxe-column field="event" title="事件" min-width="100px">
-        <template #default="slotParams">
-          <span>{{ eventSelect.find((e) => e.value === slotParams.row.event)?.label }}</span>
-        </template>
-      </vxe-column>
-      <vxe-column field="type" title="类型" min-width="100px">
-        <template #default="slotParams">
-          <span>{{ typeSelect.find((e) => e.value === slotParams.row.type)?.label }}</span>
-        </template>
-      </vxe-column>
-      <vxe-column field="className" title="Java 类名" min-width="100px"> </vxe-column>
-    </vxe-table>
-
-    <el-dialog
-      v-model="formDialog.visible.value"
-      :title="formDialog.title.value"
-      width="600px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      append-to-body
-    >
-      <el-form ref="formRef" :model="formData" :rules="tableRules" label-width="100px">
-        <el-form-item label="事件" prop="event">
-          <template #label>
-            <span>
-              事件
-              <el-tooltip placement="top">
-                <el-icon><QuestionFilled /></el-icon>
-                <template #content>
-                  create（创建）：当任务已经创建，并且所有任务参数都已经设置时触发。<br />
-                  assignment（指派）：当任务已经指派给某人时触发。请注意：当流程执行到达用户任务时，在触发create事件之前，会首先触发assignment事件。<br />
-                  complete（完成）：当任务已经完成，从运行时数据中删除前触发。<br />
-                  delete（删除）：在任务即将被删除前触发。请注意任务由completeTask正常完成时也会触发。
-                </template>
-              </el-tooltip>
-            </span>
-          </template>
-          <el-select v-model="formData.event">
-            <el-option v-for="item in eventSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <el-select v-model="formData.type">
-            <el-option v-for="item in typeSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="typeSelect.filter((e) => e.value === formData.type)[0] ? typeSelect.filter((e) => e.value === formData.type)[0]?.label : '表达式'"
-          prop="className"
-        >
-          <el-input v-model="formData.className" type="text"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-tabs type="border-card">
-        <el-tab-pane label="参数">
-          <ListenerParam ref="listenerParamRef" :table-data="formData.params" />
-        </el-tab-pane>
-      </el-tabs>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="formDialog.closeDialog">取 消</el-button>
-          <el-button type="primary" @click="submitEvent">确 定</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import ListenerParam from './ListenerParam.vue';
-import { VxeTableEvents, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import type { TaskListenerVO } from 'bpmnDesign';
-import type { ModdleElement } from 'bpmn';
-
-import usePanel from '../../hooks/usePanel';
-import useDialog from '@/hooks/useDialog';
-import useModelerStore from '@/store/modules/modeler';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-interface PropType {
-  element: ModdleElement;
-}
-const props = withDefaults(defineProps<PropType>(), {});
-
-const selectRow = ref<TaskListenerVO | null>();
-const formDialog = useDialog({
-  title: selectRow.value ? '编辑&保存' : '新增&保存'
-});
-const { showConfig, elementType, updateProperties } = usePanel({
-  element: toRaw(props.element)
-});
-const { getModdle } = useModelerStore();
-const moddle = getModdle();
-
-const listenerParamRef = ref<InstanceType<typeof ListenerParam>>();
-const tableRef = ref<VxeTableInstance<TaskListenerVO>>();
-const formRef = ref<ElFormInstance>();
-
-const initData: TaskListenerVO = {
-  event: '',
-  type: '',
-  className: '',
-  name: '',
-  params: []
-};
-const formData = ref<TaskListenerVO>({ ...initData });
-const currentIndex = ref(0);
-const tableData = ref<TaskListenerVO[]>([]);
-const tableRules = ref<VxeTablePropTypes.EditRules>({
-  event: [{ required: true, message: '请选择', trigger: 'blur' }],
-  type: [{ required: true, message: '请选择', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入', trigger: 'blur' }],
-  className: [{ required: true, message: '请输入', trigger: 'blur' }]
-});
-
-const submitEvent = async () => {
-  const error = await listenerParamRef.value.validate();
-  await formRef.value.validate((validate) => {
-    if (validate && !error) {
-      const $table = tableRef.value;
-      if ($table) {
-        formData.value.params = listenerParamRef.value.getTableData();
-        if (selectRow.value) {
-          Object.assign(selectRow.value, formData.value);
-        } else {
-          $table.insertAt({ ...formData.value }, -1);
-        }
-        updateElement();
-        formDialog.closeDialog();
-      }
-    }
-  });
-};
-
-const insertEvent = async () => {
-  Object.assign(formData.value, initData);
-  selectRow.value = null;
-  formDialog.openDialog();
-};
-
-const editEvent = (row: TaskListenerVO) => {
-  Object.assign(formData.value, row);
-  selectRow.value = row;
-  formDialog.openDialog();
-};
-const removeEvent = async (row: TaskListenerVO) => {
-  await proxy?.$modal.confirm('您确定要删除该数据?');
-  const $table = tableRef.value;
-  if ($table) {
-    await $table.remove(row);
-    updateElement();
-  }
-};
-
-const removeSelectRowEvent = async () => {
-  const $table = tableRef.value;
-  if ($table) {
-    const selectCount = $table.getCheckboxRecords().length;
-    if (selectCount === 0) {
-      proxy?.$modal.msgWarning('请选择行');
-    } else {
-      await $table.removeCheckboxRow();
-      updateElement();
-    }
-  }
-};
-const updateElement = () => {
-  const $table = tableRef.value;
-  const data = $table.getTableData().fullData;
-  if (data.length) {
-    let extensionElements = props.element.businessObject.get('extensionElements');
-    if (!extensionElements) {
-      extensionElements = moddle.create('bpmn:ExtensionElements');
-    }
-    // 清除旧值
-    extensionElements.values = extensionElements.values?.filter((item) => item.$type !== 'flowable:TaskListener') ?? [];
-    data.forEach((item) => {
-      const taskListener = moddle.create('flowable:TaskListener');
-      taskListener['event'] = item.event;
-      taskListener[item.type] = item.className;
-      if (item.params && item.params.length) {
-        item.params.forEach((field) => {
-          const fieldElement = moddle.create('flowable:Field');
-          fieldElement['name'] = field.name;
-          fieldElement[field.type] = field.value;
-          taskListener.get('fields').push(fieldElement);
-        });
-      }
-      extensionElements.get('values').push(taskListener);
-    });
-    updateProperties({ extensionElements: extensionElements });
-  } else {
-    const extensionElements = props.element.businessObject[`extensionElements`];
-    if (extensionElements) {
-      extensionElements.values = extensionElements.values?.filter((item) => item.$type !== 'flowable:TaskListener') ?? [];
-    }
-  }
-};
-
-const cellDBLClickEvent: VxeTableEvents.CellDblclick<TaskListenerVO> = ({ row }) => {
-  editEvent(row);
-};
-
-const menuConfig = reactive<VxeTablePropTypes.MenuConfig<TaskListenerVO>>({
-  body: {
-    options: [
-      [
-        { code: 'edit', name: '编辑', prefixIcon: 'vxe-icon-edit', disabled: false },
-        { code: 'remove', name: '删除', prefixIcon: 'vxe-icon-delete', disabled: false }
-      ]
-    ]
-  },
-  visibleMethod({ options, column }) {
-    const isDisabled = !column;
-    options.forEach((list) => {
-      list.forEach((item) => {
-        item.disabled = isDisabled;
-      });
-    });
-    return true;
-  }
-});
-const contextMenuClickEvent: VxeTableEvents.MenuClick<TaskListenerVO> = ({ menu, row, column }) => {
-  const $table = tableRef.value;
-  if ($table) {
-    switch (menu.code) {
-      case 'edit':
-        editEvent(row);
-        break;
-      case 'remove':
-        removeEvent(row);
-        break;
-    }
-  }
-};
-const initTableData = () => {
-  tableData.value =
-    props.element.businessObject.extensionElements?.values
-      .filter((item) => item.$type === 'flowable:TaskListener')
-      .map((item) => {
-        let type;
-        if ('class' in item) type = 'class';
-        if ('expression' in item) type = 'expression';
-        if ('delegateExpression' in item) type = 'delegateExpression';
-        return {
-          event: item.event,
-          type: type,
-          className: item[type],
-          params:
-            item.fields?.map((field) => {
-              let fieldType;
-              if ('stringValue' in field) fieldType = 'stringValue';
-              if ('expression' in field) fieldType = 'expression';
-              return {
-                name: field.name,
-                type: fieldType,
-                value: field[fieldType]
-              };
-            }) ?? []
-        };
-      }) ?? [];
-};
-
-onMounted(() => {
-  initTableData();
-});
-
-const typeSelect = [
-  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
-  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
-  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
-];
-const eventSelect = [
-  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: '创建', value: 'create' },
-  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: '指派', value: 'assignment' },
-  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: '完成', value: 'complete' },
-  { id: '68801972-85f1-482f-bd86-1fad015c26ed', label: '删除', value: 'delete' }
-];
-</script>
-
-<style scoped lang="scss">
-.el-badge {
-  :deep(.el-badge__content) {
-    top: 10px;
-  }
-}
-</style>
diff --git a/src/components/BpmnDesign/index.vue b/src/components/BpmnDesign/index.vue
deleted file mode 100644
index 1f84516..0000000
--- a/src/components/BpmnDesign/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div class="design">
-    <el-dialog v-model="visible" width="100%" fullscreen :title="title">
-      <div class="modeler">
-        <bpmn-design ref="bpmnDesignRef" @save-call-back="saveCallBack"></bpmn-design>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script lang="ts" setup name="Design">
-import { getInfo, editModelXml } from '@/api/workflow/model';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-import { ModelForm } from '@/api/workflow/model/types';
-import BpmnDesign from '@/bpmn/index.vue';
-import useDialog from '@/hooks/useDialog';
-const bpmnDesignRef = ref<InstanceType<typeof BpmnDesign>>();
-const modelForm = ref<ModelForm>();
-const emit = defineEmits(['closeCallBack']);
-const { visible, title } = useDialog({
-  title: '编辑流程'
-});
-const modelId = ref('');
-const open = async (id) => {
-  visible.value = true;
-  modelId.value = id;
-  const { data } = await getInfo(id);
-  modelForm.value = data;
-  bpmnDesignRef.value.initDiagram(modelForm.value.xml);
-};
-//保存模型
-const saveCallBack = async (data) => {
-  await proxy?.$modal.confirm('是否确认保存？');
-  data.loading.value = true;
-  modelForm.value.id = modelId.value;
-  modelForm.value.xml = data.xml;
-  modelForm.value.svg = data.svg;
-  modelForm.value.key = data.key;
-  modelForm.value.name = data.name;
-  editModelXml(modelForm.value).then((res) => {
-    if (res.code === 200) {
-      visible.value = false;
-      proxy?.$modal.msgSuccess('保存成功');
-      emit('closeCallBack', data);
-    }
-  });
-  data.loading.value = false;
-};
-
-/**
- * 对外暴露子组件方法
- */
-defineExpose({
-  open
-});
-</script>
-
-<style lang="scss" scoped>
-.design {
-  :deep(.el-dialog .el-dialog__body) {
-    max-height: 100% !important;
-    min-height: calc(100vh - 80px);
-    padding: 10px 0 10px 0 !important;
-  }
-  :deep(.el-dialog__header) {
-    padding: 0 0 5px 0 !important;
-  }
-}
-</style>
diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
deleted file mode 100644
index c5e0c7b..0000000
--- a/src/components/BpmnView/index.vue
+++ /dev/null
@@ -1,411 +0,0 @@
-<template>
-  <div v-loading="loading" class="bpmnDialogContainers">
-    <el-header style="border-bottom: 1px solid rgb(218 218 218); height: auto">
-      <div class="header-div">
-        <div>
-          <el-tooltip effect="dark" content="自适应屏幕" placement="bottom">
-            <el-button size="small" icon="Rank" @click="fitViewport" />
-          </el-tooltip>
-          <el-tooltip effect="dark" content="放大" placement="bottom">
-            <el-button size="small" icon="ZoomIn" @click="zoomViewport(true)" />
-          </el-tooltip>
-          <el-tooltip effect="dark" content="缩小" placement="bottom">
-            <el-button size="small" icon="ZoomOut" @click="zoomViewport(false)" />
-          </el-tooltip>
-        </div>
-        <div>
-          <div class="tips-label">
-            <div class="un-complete">未完成</div>
-            <div class="in-progress">进行中</div>
-            <div class="complete">已完成</div>
-          </div>
-        </div>
-      </div>
-    </el-header>
-    <div class="flow-containers">
-      <el-container class="bpmn-el-container" style="align-items: stretch">
-        <el-main style="padding: 0">
-          <div ref="canvas" class="canvas" />
-        </el-main>
-      </el-container>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import BpmnViewer from 'bpmn-js/lib/Viewer';
-import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas';
-import ZoomScrollModule from 'diagram-js/lib/navigation/zoomscroll';
-import { ModuleDeclaration } from 'didi';
-import type { Canvas, ModdleElement } from 'bpmn';
-import EventBus from 'diagram-js/lib/core/EventBus';
-import Overlays from 'diagram-js/lib/features/overlays/Overlays';
-import processApi from '@/api/workflow/processInstance/index';
-
-const canvas = ref<HTMLElement>();
-const modeler = ref<BpmnViewer>();
-const taskList = ref([]);
-const zoom = ref(1);
-const xml = ref('');
-const loading = ref(false);
-const bpmnVisible = ref(true);
-const historyList = ref([]);
-
-const init = (businessKey) => {
-  loading.value = true;
-  bpmnVisible.value = true;
-  nextTick(async () => {
-    if (modeler.value) modeler.value.destroy();
-    modeler.value = new BpmnViewer({
-      container: canvas.value,
-      additionalModules: [
-        {
-          //禁止滚轮滚动
-          zoomScroll: ['value', '']
-        },
-        ZoomScrollModule,
-        MoveCanvasModule
-      ] as ModuleDeclaration[]
-    });
-    const resp = await processApi.getHistoryList(businessKey);
-    xml.value = resp.data.xml;
-    taskList.value = resp.data.taskList;
-    historyList.value = resp.data.historyList;
-    await createDiagram(xml.value);
-    loading.value = false;
-  });
-};
-
-const initXml = (xmlStr: string) => {
-  loading.value = true;
-  bpmnVisible.value = true;
-  nextTick(async () => {
-    if (modeler.value) modeler.value.destroy();
-    modeler.value = new BpmnViewer({
-      container: canvas.value,
-      additionalModules: [
-        {
-          //禁止滚轮滚动
-          zoomScroll: ['value', '']
-        },
-        ZoomScrollModule,
-        MoveCanvasModule
-      ] as ModuleDeclaration[]
-    });
-    xml.value = xmlStr;
-    await createDiagram(xml.value);
-    loading.value = false;
-  });
-};
-
-const createDiagram = async (data) => {
-  try {
-    await modeler.value.importXML(data);
-    fitViewport();
-    fillColor();
-    loading.value = false;
-    addEventBusListener();
-  } catch (err) {
-    console.log(err);
-  }
-};
-const addEventBusListener = () => {
-  const eventBus = modeler.value.get<EventBus>('eventBus');
-  const overlays = modeler.value.get<Overlays>('overlays');
-  eventBus.on<ModdleElement>('element.hover', (e) => {
-    let data = historyList.value.find((t) => t.taskDefinitionKey === e.element.id);
-    if (e.element.type === 'bpmn:UserTask' && data) {
-      setTimeout(() => {
-        genNodeDetailBox(e, overlays, data);
-      }, 10);
-    }
-  });
-  eventBus.on('element.out', (e) => {
-    overlays.clear();
-  });
-};
-const genNodeDetailBox = (e, overlays, data) => {
-  overlays.add(e.element.id, {
-    position: { top: e.element.height, left: 0 },
-    html: `<div class="verlays">
-                    <p>审批人员: ${data.nickName || ''}<p/>
-                    <p>节点状态：${data.status || ''}</p>
-                    <p>开始时间：${data.startTime || ''}</p>
-                    <p>结束时间：${data.endTime || ''}</p>
-                    <p>审批耗时：${data.runDuration || ''}</p>
-                    <p>流程版本：v${data.version || ''}</p>
-                   </div>`
-  });
-};
-// 让图能自适应屏幕
-const fitViewport = () => {
-  zoom.value = modeler.value.get<Canvas>('canvas').zoom('fit-viewport');
-  const bbox = document.querySelector<SVGGElement>('.flow-containers .viewport').getBBox();
-  const currentViewBox = modeler.value.get('canvas').viewbox();
-  const elementMid = {
-    x: bbox.x + bbox.width / 2 - 65,
-    y: bbox.y + bbox.height / 2
-  };
-  modeler.value.get<Canvas>('canvas').viewbox({
-    x: elementMid.x - currentViewBox.width / 2,
-    y: elementMid.y - currentViewBox.height / 2,
-    width: currentViewBox.width,
-    height: currentViewBox.height
-  });
-  zoom.value = (bbox.width / currentViewBox.width) * 1.8;
-};
-// 放大缩小
-const zoomViewport = (zoomIn = true) => {
-  zoom.value = modeler.value.get<Canvas>('canvas').zoom();
-  zoom.value += zoomIn ? 0.1 : -0.1;
-  modeler.value.get<Canvas>('canvas').zoom(zoom.value);
-};
-//上色
-const fillColor = () => {
-  const canvas = modeler.value.get<Canvas>('canvas');
-  bpmnNodeList(modeler.value._definitions.rootElements[0].flowElements, canvas);
-};
-//递归上色
-const bpmnNodeList = (flowElements, canvas) => {
-  flowElements.forEach((n) => {
-    if (n.$type === 'bpmn:UserTask') {
-      const completeTask = taskList.value.find((m) => m.key === n.id);
-      if (completeTask) {
-        canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-        n.outgoing?.forEach((nn) => {
-          const targetTask = taskList.value.find((m) => m.key === nn.targetRef.id);
-          if (targetTask) {
-            canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo');
-          } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') {
-            canvas.addMarker(nn.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            canvas.addMarker(nn.targetRef.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            nn.targetRef.outgoing.forEach((e) => {
-              gateway(e.id, e.targetRef.$type, e.targetRef.id, canvas, completeTask.completed);
-            });
-          } else if (nn.targetRef.$type === 'bpmn:ParallelGateway') {
-            canvas.addMarker(nn.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            canvas.addMarker(nn.targetRef.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            nn.targetRef.outgoing.forEach((e) => {
-              gateway(e.id, e.targetRef.$type, e.targetRef.id, canvas, completeTask.completed);
-            });
-          } else if (nn.targetRef.$type === 'bpmn:InclusiveGateway') {
-            canvas.addMarker(nn.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            canvas.addMarker(nn.targetRef.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-            nn.targetRef.outgoing.forEach((e) => {
-              gateway(e.id, e.targetRef.$type, e.targetRef.id, canvas, completeTask.completed);
-            });
-          }
-        });
-      }
-    } else if (n.$type === 'bpmn:ExclusiveGateway') {
-      n.outgoing.forEach((nn) => {
-        const targetTask = taskList.value.find((m) => m.key === nn.targetRef.id);
-        if (targetTask) {
-          canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo');
-        }
-      });
-    } else if (n.$type === 'bpmn:ParallelGateway') {
-      n.outgoing.forEach((nn) => {
-        const targetTask = taskList.value.find((m) => m.key === nn.targetRef.id);
-        if (targetTask) {
-          canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo');
-        }
-      });
-    } else if (n.$type === 'bpmn:InclusiveGateway') {
-      n.outgoing.forEach((nn) => {
-        const targetTask = taskList.value.find((m) => m.key === nn.targetRef.id);
-        if (targetTask) {
-          canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo');
-        }
-      });
-    } else if (n.$type === 'bpmn:SubProcess') {
-      const completeTask = taskList.value.find((m) => m.key === n.id);
-      if (completeTask) {
-        canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo');
-      }
-      bpmnNodeList(n.flowElements, canvas);
-    } else if (n.$type === 'bpmn:StartEvent') {
-      canvas.addMarker(n.id, 'startEvent');
-      if (n.outgoing) {
-        n.outgoing.forEach((nn) => {
-          const completeTask = taskList.value.find((m) => m.key === nn.targetRef.id);
-          if (completeTask) {
-            canvas.addMarker(nn.id, 'highlight');
-            canvas.addMarker(n.id, 'highlight');
-          }
-        });
-      }
-    } else if (n.$type === 'bpmn:EndEvent') {
-      canvas.addMarker(n.id, 'endEvent');
-      const completeTask = taskList.value.find((m) => m.key === n.id);
-      if (completeTask) {
-        canvas.addMarker(completeTask.key, 'highlight');
-        canvas.addMarker(n.id, 'highlight');
-        return;
-      }
-    }
-  });
-};
-const gateway = (id, targetRefType, targetRefId, canvas, completed) => {
-  if (targetRefType === 'bpmn:ExclusiveGateway') {
-    canvas.addMarker(id, completed ? 'highlight' : 'highlight-todo');
-    canvas.addMarker(targetRefId, completed ? 'highlight' : 'highlight-todo');
-  }
-  if (targetRefType === 'bpmn:ParallelGateway') {
-    canvas.addMarker(id, completed ? 'highlight' : 'highlight-todo');
-    canvas.addMarker(targetRefId, completed ? 'highlight' : 'highlight-todo');
-  }
-  if (targetRefType === 'bpmn:InclusiveGateway') {
-    canvas.addMarker(id, completed ? 'highlight' : 'highlight-todo');
-    canvas.addMarker(targetRefId, completed ? 'highlight' : 'highlight-todo');
-  }
-};
-defineExpose({
-  init,
-  initXml
-});
-</script>
-
-<style lang="scss" scoped>
-.canvas {
-  width: 100%;
-  height: 100%;
-}
-
-.header-div {
-  display: flex;
-  padding: 10px 0;
-  justify-content: space-between;
-
-  .tips-label {
-    display: flex;
-    div {
-      margin-right: 10px;
-      padding: 5px;
-      font-size: 12px;
-    }
-    .un-complete {
-      border: 1px solid #000;
-    }
-    .in-progress {
-      background-color: rgb(255, 237, 204);
-      border: 1px dashed orange;
-    }
-    .complete {
-      background-color: rgb(204, 230, 204);
-      border: 1px solid green;
-    }
-  }
-}
-
-.view-mode {
-  .el-header,
-  .el-aside,
-  .djs-palette,
-  .bjs-powered-by {
-    display: none;
-  }
-  .el-loading-mask {
-    background-color: initial;
-  }
-  .el-loading-spinner {
-    display: none;
-  }
-}
-.bpmn-el-container {
-  height: calc(100vh - 350px);
-}
-.flow-containers {
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-  .canvas {
-    width: 100%;
-    height: 100%;
-  }
-  .load {
-    margin-right: 10px;
-  }
-  :deep(.el-form-item__label) {
-    font-size: 13px;
-  }
-
-  :deep(.djs-palette) {
-    left: 0 !important;
-    top: 0;
-    border-top: none;
-  }
-
-  :deep(.djs-container svg) {
-    min-height: 650px;
-  }
-
-  :deep(.startEvent.djs-shape .djs-visual > :nth-child(1)) {
-    fill: #77df6d !important;
-  }
-  :deep(.endEvent.djs-shape .djs-visual > :nth-child(1)) {
-    fill: #ee7b77 !important;
-  }
-  :deep(.highlight.djs-shape .djs-visual > :nth-child(1)) {
-    fill: green !important;
-    stroke: green !important;
-    fill-opacity: 0.2 !important;
-  }
-  :deep(.highlight.djs-shape .djs-visual > :nth-child(2)) {
-    fill: green !important;
-  }
-  :deep(.highlight.djs-shape .djs-visual > path) {
-    fill: green !important;
-    fill-opacity: 0.2 !important;
-    stroke: green !important;
-  }
-  :deep(.highlight.djs-connection > .djs-visual > path) {
-    stroke: green !important;
-  }
-
-  // 边框滚动动画
-  @keyframes path-animation {
-    from {
-      stroke-dashoffset: 100%;
-    }
-
-    to {
-      stroke-dashoffset: 0%;
-    }
-  }
-
-  :deep(.highlight-todo.djs-connection > .djs-visual > path) {
-    animation: path-animation 60s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    stroke-dasharray: 4px !important;
-    stroke: orange !important;
-    fill-opacity: 0.2 !important;
-    marker-end: url('#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr');
-  }
-
-  :deep(.highlight-todo.djs-shape .djs-visual > :nth-child(1)) {
-    animation: path-animation 60s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    stroke-dasharray: 4px !important;
-    stroke: orange !important;
-    fill: orange !important;
-    fill-opacity: 0.2 !important;
-  }
-}
-:deep(.verlays) {
-  width: 250px;
-  background: rgb(102, 102, 102);
-  border-radius: 4px;
-  border: 1px solid #ebeef5;
-  color: #fff;
-  padding: 15px 10px;
-  p {
-    line-height: 28px;
-    margin: 0;
-    padding: 0;
-  }
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index bb4ed91..baf86a7 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -2,39 +2,49 @@
   <div class="container">
     <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
       <el-tabs v-model="tabActiveName" class="demo-tabs">
-        <el-tab-pane label="流程图" name="bpmn">
-          <BpmnView ref="bpmnViewRef"></BpmnView>
+        <el-tab-pane v-loading="loading" label="流程图" name="bpmn">
+          <img :src="imgUrl" width="100%" style="margin: 0 auto" />
         </el-tab-pane>
         <el-tab-pane v-loading="loading" label="审批信息" name="info">
           <div>
             <el-table :data="historyList" style="width: 100%" border fit>
               <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
-              <el-table-column prop="name" label="任务名称" sortable align="center"></el-table-column>
-              <el-table-column prop="nickName" :show-overflow-tooltip="true" label="办理人" sortable align="center">
+              <el-table-column prop="nodeName" label="任务名称" sortable align="center"></el-table-column>
+              <el-table-column prop="approveName" :show-overflow-tooltip="true" label="办理人" sortable align="center">
                 <template #default="scope">
-                  <el-tag type="success">{{ scope.row.nickName || '无' }}</el-tag>
+                  <template v-if="scope.row.approveName">
+                    <el-tag v-for="(item, index) in scope.row.approveName.split(',')" :key="index" type="success">{{ item }}</el-tag>
+                  </template>
+                  <template v-else> <el-tag type="success">无</el-tag></template>
                 </template>
               </el-table-column>
-              <el-table-column label="状态" sortable align="center">
+              <el-table-column prop="flowStatus" label="状态" width="80" sortable align="center">
                 <template #default="scope">
-                  <el-tag type="success">{{ scope.row.statusName }}</el-tag>
+                  <dict-tag :options="wf_task_status" :value="scope.row.flowStatus"></dict-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="comment" label="审批意见" sortable align="center"></el-table-column>
-              <el-table-column prop="startTime" label="开始时间" sortable align="center"></el-table-column>
-              <el-table-column prop="endTime" label="结束时间" sortable align="center"></el-table-column>
-              <el-table-column prop="runDuration" label="运行时长" sortable align="center"></el-table-column>
-              <el-table-column prop="attachmentList" label="附件" sortable align="center">
+              <el-table-column prop="message" label="审批意见" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+              <el-table-column prop="createTime" label="开始时间" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+              <el-table-column prop="updateTime" label="结束时间" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+              <el-table-column
+                prop="runDuration"
+                label="运行时常"
+                width="140"
+                :show-overflow-tooltip="true"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column prop="attachmentList" width="120" label="附件" align="center">
                 <template #default="scope">
                   <el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
                     <template #reference>
-                      <el-button style="margin-right: 16px">附件</el-button>
+                      <el-button type="primary" style="margin-right: 16px">附件</el-button>
                     </template>
                     <el-table border :data="scope.row.attachmentList">
-                      <el-table-column prop="name" width="202" :show-overflow-tooltip="true" label="附件名称"></el-table-column>
+                      <el-table-column prop="originalName" width="202" :show-overflow-tooltip="true" label="附件名称"></el-table-column>
                       <el-table-column prop="name" width="80" align="center" :show-overflow-tooltip="true" label="操作">
                         <template #default="tool">
-                          <el-button type="text" @click="handleDownload(tool.row.contentId)">下载</el-button>
+                          <el-button type="text" @click="handleDownload(tool.row.ossId)">下载</el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -49,37 +59,51 @@
   </div>
 </template>
 <script lang="ts" setup>
-import BpmnView from '@/components/BpmnView/index.vue';
-import processApi from '@/api/workflow/processInstance';
+import { flowImage } from '@/api/workflow/instance';
 import { propTypes } from '@/utils/propTypes';
+import { listByIds } from '@/api/system/oss';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
 const props = defineProps({
-  width: propTypes.string.def('70%'),
+  width: propTypes.string.def('80%'),
   height: propTypes.string.def('100%')
 });
 const loading = ref(false);
 const visible = ref(false);
 const historyList = ref<Array<any>>([]);
 const tabActiveName = ref('bpmn');
-
-const bpmnViewRef = ref<BpmnView>();
+const imgUrl = ref('');
 
 //初始化查询审批记录
-const init = async (businessKey: string | number) => {
+const init = async (businessId: string | number) => {
   visible.value = true;
   loading.value = true;
   tabActiveName.value = 'bpmn';
   historyList.value = [];
-  processApi.getHistoryRecord(businessKey).then((resp) => {
-    historyList.value = resp.data;
-    loading.value = false;
-  });
-  await nextTick(() => {
-    bpmnViewRef.value.init(businessKey);
+  flowImage(businessId).then((resp) => {
+    if (resp.data) {
+      historyList.value = resp.data.list;
+      imgUrl.value = 'data:image/gif;base64,' + resp.data.image;
+      if (historyList.value.length > 0) {
+        historyList.value.forEach((item) => {
+          if (item.ext) {
+            getIds(item.ext).then((res) => {
+              item.attachmentList = res.data;
+            });
+          } else {
+            item.attachmentList = [];
+          }
+        });
+      }
+      loading.value = false;
+    }
   });
 };
+const getIds = async (ids: string | number) => {
+  const res = await listByIds(ids);
+  return res;
+};
 
 /** 下载按钮操作 */
 const handleDownload = (ossId: string) => {
diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue
deleted file mode 100644
index e366ea0..0000000
--- a/src/components/Process/multiInstanceUser.vue
+++ /dev/null
@@ -1,378 +0,0 @@
-<template>
-  <el-dialog v-model="visible" draggable :title="title" :width="width" :height="height" append-to-body :close-on-click-modal="false">
-    <div v-if="multiInstance === 'add'" class="p-2">
-      <el-row :gutter="20">
-        <!-- 部门树 -->
-        <el-col :lg="4" :xs="24" style="">
-          <el-card shadow="hover">
-            <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-            <el-tree
-              ref="deptTreeRef"
-              class="mt-2"
-              node-key="id"
-              :data="deptOptions"
-              :props="{ label: 'label', children: 'children' }"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              highlight-current
-              default-expand-all
-              @node-click="handleNodeClick"
-            ></el-tree>
-          </el-card>
-        </el-col>
-        <el-col :lg="20" :xs="24">
-          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div v-show="showSearch" class="search">
-              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="用户名称" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-          </transition>
-
-          <el-card shadow="hover">
-            <template #header>
-              <el-row :gutter="10">
-                <right-toolbar v-model:show-search="showSearch" :search="true" @query-table="handleQuery"></right-toolbar>
-              </el-row>
-            </template>
-
-            <el-table ref="multipleTableRef" v-loading="loading" :data="userList" row-key="userId" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column key="userId" label="用户编号" align="center" prop="userId" />
-              <el-table-column key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-              <el-table-column key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
-              <el-table-column key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
-              <el-table-column label="创建时间" align="center" prop="createTime" width="160">
-                <template #default="scope">
-                  <span>{{ scope.row.createTime }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <pagination
-              v-show="total > 0"
-              v-model:page="queryParams.pageNum"
-              v-model:limit="queryParams.pageSize"
-              :total="total"
-              @pagination="handleQuery"
-            />
-          </el-card>
-          <el-card shadow="hover">
-            <el-tag v-for="(user, index) in chooseUserList" :key="user.userId" style="margin: 2px" closable @close="handleCloseTag(user, index)"
-              >{{ user.userName }}
-            </el-tag>
-          </el-card>
-        </el-col>
-      </el-row>
-    </div>
-    <div v-if="multiInstance === 'delete'" class="p-2">
-      <el-table v-loading="loading" :data="taskList" @selection-change="handleTaskSelection">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="name" label="任务名称" />
-        <el-table-column prop="assigneeName" label="办理人" />
-      </el-table>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="visible = false">取 消</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup name="User" lang="ts">
-import { deptTreeSelect, listUser, optionSelect } from '@/api/system/user';
-import {
-  addMultiInstanceExecution,
-  deleteMultiInstanceExecution,
-  getTaskUserIdsByAddMultiInstance,
-  getListByDeleteMultiInstance
-} from '@/api/workflow/task';
-import { UserVO } from '@/api/system/user/types';
-import { DeptVO } from '@/api/system/dept/types';
-import { ComponentInternalInstance } from 'vue';
-import { ElTree, ElTable } from 'element-plus';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const props = defineProps({
-  // 宽
-  width: {
-    type: String,
-    default: '70%'
-  },
-  // 高
-  height: {
-    type: String,
-    default: '100%'
-  },
-  // 标题
-  title: {
-    type: String,
-    default: '加签人员'
-  },
-  //是否多选
-  multiple: {
-    type: Boolean,
-    default: true
-  },
-  //回显用户id
-  userIdList: {
-    type: Array,
-    default: () => []
-  }
-});
-const deptTreeRef = ref(ElTree);
-const multipleTableRef = ref(ElTable);
-
-const userList = ref<UserVO[]>();
-const taskList = ref<Array<any>[]>();
-const loading = ref(true);
-const showSearch = ref(true);
-const selectionTask = ref<Array<any>[]>();
-const visible = ref(false);
-const total = ref(0);
-const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
-const chooseUserList = ref(ref<UserVO[]>());
-const userIds = ref<Array<number | string>>([]);
-//加签或者减签
-const multiInstance = ref('');
-const queryParams = ref<Record<string, any>>({
-  pageNum: 1,
-  pageSize: 10,
-  userName: '',
-  nickName: '',
-  taskId: ''
-});
-/** 查询用户列表 */
-const getAddMultiInstanceList = async (taskId: string, userIdList: Array<number | string>) => {
-  deptOptions.value = [];
-  getTreeSelect();
-  multiInstance.value = 'add';
-  userIds.value = userIdList;
-  visible.value = true;
-  queryParams.value.taskId = taskId;
-  loading.value = true;
-  const res1 = await getTaskUserIdsByAddMultiInstance(taskId);
-  queryParams.value.excludeUserIds = res1.data;
-  const res = await listUser(queryParams.value);
-  loading.value = false;
-  userList.value = res.rows;
-  total.value = res.total;
-  if (userList.value && userIds.value.length > 0) {
-    const data = await optionSelect(userIds.value);
-    if (data.data && data.data.length > 0) {
-      chooseUserList.value = data.data;
-      data.data.forEach((user: UserVO) => {
-        multipleTableRef.value!.toggleRowSelection(
-          userList.value.find((item) => {
-            return item.userId == user.userId;
-          }),
-          true
-        );
-      });
-    }
-  }
-};
-
-const getList = async () => {
-  loading.value = true;
-  const res1 = await getTaskUserIdsByAddMultiInstance(queryParams.value.taskId);
-  queryParams.value.excludeUserIds = res1.data;
-  const res = await listUser(queryParams.value);
-  loading.value = false;
-  userList.value = res.rows;
-  total.value = res.total;
-  if (userList.value && userIds.value.length > 0) {
-    const data = await optionSelect(userIds.value);
-    if (data.data && data.data.length > 0) {
-      chooseUserList.value = data.data;
-      data.data.forEach((user: UserVO) => {
-        multipleTableRef.value!.toggleRowSelection(
-          userList.value.find((item) => {
-            return item.userId == user.userId;
-          }),
-          true
-        );
-      });
-    }
-  }
-};
-
-const getDeleteMultiInstanceList = async (taskId: string) => {
-  deptOptions.value = [];
-  loading.value = true;
-  queryParams.value.taskId = taskId;
-  multiInstance.value = 'delete';
-  visible.value = true;
-  const res = await getListByDeleteMultiInstance(taskId);
-  taskList.value = res.data;
-  loading.value = false;
-};
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getAddMultiInstanceList(queryParams.value.taskId, userIds.value);
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryParams.value.pageNum = 1;
-  queryParams.value.deptId = undefined;
-  queryParams.value.userName = undefined;
-  queryParams.value.nickName = undefined;
-  deptTreeRef.value.setCurrentKey(null);
-  handleQuery();
-};
-
-/** 选择条数  */
-const handleSelectionChange = (selection: UserVO[]) => {
-  if (props.multiple) {
-    chooseUserList.value = selection.filter((element, index, self) => {
-      return self.findIndex((x) => x.userId === element.userId) === index;
-    });
-    selection.forEach((u) => {
-      if (chooseUserList.value && !chooseUserList.value.includes(u)) {
-        multipleTableRef.value!.toggleRowSelection(u, undefined);
-      }
-    });
-    userIds.value = chooseUserList.value.map((item) => {
-      return item.userId;
-    });
-  } else {
-    chooseUserList.value = selection;
-    if (selection.length > 1) {
-      let delRow = selection.shift();
-      multipleTableRef.value!.toggleRowSelection(delRow, undefined);
-    }
-    if (selection.length === 0) {
-      chooseUserList.value = [];
-    }
-  }
-};
-/** 选择条数  */
-const handleTaskSelection = (selection: any) => {
-  selectionTask.value = selection;
-};
-
-/** 查询部门下拉树结构 */
-const getTreeSelect = async () => {
-  const res = await deptTreeSelect();
-  deptOptions.value = res.data;
-};
-
-/** 通过条件过滤节点  */
-const filterNode = (value: string, data: any) => {
-  if (!value) return true;
-  return data.label.indexOf(value) !== -1;
-};
-/** 根据名称筛选部门树 */
-watchEffect(
-  () => {
-    if (visible.value && deptOptions.value && deptOptions.value.length > 0) {
-      deptTreeRef.value.filter(deptName.value);
-    }
-  },
-  {
-    flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
-  }
-);
-/** 节点单击事件 */
-const handleNodeClick = (data: DeptVO) => {
-  queryParams.value.deptId = data.id;
-  getList();
-};
-//删除tag
-const handleCloseTag = (user: UserVO, index: any) => {
-  if (multipleTableRef.value.selection && multipleTableRef.value.selection.length > 0) {
-    multipleTableRef.value.selection.forEach((u: UserVO, i: number) => {
-      if (user.userId === u.userId) {
-        multipleTableRef.value.selection.splice(i, 1);
-      }
-    });
-  }
-  if (chooseUserList.value && chooseUserList.value.length > 0) {
-    chooseUserList.value.splice(index, 1);
-  }
-  multipleTableRef.value.toggleRowSelection(user, undefined);
-
-  if (userIds.value && userIds.value.length > 0) {
-    userIds.value.forEach((userId, i) => {
-      if (userId === user.userId) {
-        userIds.value.splice(i, 1);
-      }
-    });
-  }
-};
-const submitFileForm = async () => {
-  if (multiInstance.value === 'add') {
-    if (chooseUserList.value && chooseUserList.value.length > 0) {
-      loading.value = true;
-      let userIds = chooseUserList.value.map((item) => {
-        return item.userId;
-      });
-      let nickNames = chooseUserList.value.map((item) => {
-        return item.nickName;
-      });
-      let params = {
-        taskId: queryParams.value.taskId,
-        assignees: userIds,
-        assigneeNames: nickNames
-      };
-      await addMultiInstanceExecution(params);
-      emits('submitCallback');
-      loading.value = false;
-      proxy?.$modal.msgSuccess('操作成功');
-      visible.value = false;
-    }
-  } else {
-    if (selectionTask.value && selectionTask.value.length > 0) {
-      loading.value = true;
-      let taskIds = selectionTask.value.map((item: any) => {
-        return item.id;
-      });
-      let executionIds = selectionTask.value.map((item: any) => {
-        return item.executionId;
-      });
-      let assigneeIds = selectionTask.value.map((item: any) => {
-        return item.assignee;
-      });
-      let assigneeNames = selectionTask.value.map((item: any) => {
-        return item.assigneeName;
-      });
-      let params = {
-        taskId: queryParams.value.taskId,
-        taskIds: taskIds,
-        executionIds: executionIds,
-        assigneeIds: assigneeIds,
-        assigneeNames: assigneeNames
-      };
-      await deleteMultiInstanceExecution(params);
-      emits('submitCallback');
-      loading.value = false;
-      proxy?.$modal.msgSuccess('操作成功');
-      visible.value = false;
-    }
-  }
-};
-//事件
-const emits = defineEmits(['submitCallback']);
-
-/**
- * 对外暴露子组件方法
- */
-defineExpose({
-  getAddMultiInstanceList,
-  getDeleteMultiInstanceList
-});
-</script>
diff --git a/src/components/Process/processMeddle.vue b/src/components/Process/processMeddle.vue
new file mode 100644
index 0000000..7224755
--- /dev/null
+++ b/src/components/Process/processMeddle.vue
@@ -0,0 +1,207 @@
+<template>
+  <el-dialog v-model="visible" draggable title="流程干预" :width="props.width" :height="props.height" :close-on-click-modal="false">
+    <el-descriptions v-loading="loading" class="margin-top" :title="`${task.flowName}(${task.flowCode})`" :column="2" border>
+      <el-descriptions-item label="任务名称">{{ task.nodeName }}</el-descriptions-item>
+      <el-descriptions-item label="节点编码">{{ task.nodeCode }}</el-descriptions-item>
+      <el-descriptions-item label="开始时间">{{ task.createTime }}</el-descriptions-item>
+      <el-descriptions-item label="流程实例ID">{{ task.instanceId }}</el-descriptions-item>
+      <el-descriptions-item label="版本号">{{ task.version }}.0</el-descriptions-item>
+      <el-descriptions-item label="业务ID">{{ task.businessId }}</el-descriptions-item>
+    </el-descriptions>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
+        <el-button
+          v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="openMultiInstanceUser"
+        >
+          加签
+        </el-button>
+        <el-button
+          v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="handleTaskUser"
+        >
+          减签
+        </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
+      </span>
+    </template>
+    <!-- 转办 -->
+    <UserSelect ref="transferTaskRef" :multiple="false" @confirm-call-back="handleTransferTask"></UserSelect>
+    <!-- 加签组件 -->
+    <UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
+    <el-dialog v-model="deleteSignatureVisible" draggable title="减签人员" width="700px" height="400px" append-to-body :close-on-click-modal="false"
+      ><div>
+        <el-table :data="deleteUserList" border>
+          <el-table-column prop="nodeName" label="任务名称" />
+          <el-table-column prop="nickName" label="办理人" />
+          <el-table-column label="操作" align="center" width="160">
+            <template #default="scope">
+              <el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+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';
+const props = defineProps({
+  width: propTypes.string.def('50%'),
+  height: propTypes.string.def('100%')
+});
+const emits = defineEmits(['submitCallback']);
+const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
+const multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
+//遮罩层
+const loading = ref(true);
+//按钮
+const buttonDisabled = ref(true);
+const visible = ref(false);
+//减签弹窗
+const deleteSignatureVisible = ref(false);
+//可减签的人员
+const deleteUserList = ref<any>([]);
+//任务
+const task = ref<FlowTaskVO>({
+  id: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+  tenantId: undefined,
+  definitionId: undefined,
+  instanceId: undefined,
+  flowName: undefined,
+  businessId: undefined,
+  nodeCode: undefined,
+  nodeName: undefined,
+  flowCode: undefined,
+  flowStatus: undefined,
+  nodeType: undefined,
+  nodeRatio: undefined,
+  version: undefined
+});
+
+const open = (taskId: string) => {
+  visible.value = true;
+  getTask(taskId).then((response) => {
+    loading.value = false;
+    buttonDisabled.value = false;
+    task.value = response.data;
+  });
+};
+
+//打开转办
+const openTransferTask = () => {
+  transferTaskRef.value.open();
+};
+//转办
+const handleTransferTask = async (data) => {
+  if (data && data.length > 0) {
+    const taskOperationBo = reactive<TaskOperationBo>({
+      userId: data[0].userId,
+      taskId: task.value.id,
+      message: ''
+    });
+    await proxy?.$modal.confirm('是否确认提交？');
+    loading.value = true;
+    buttonDisabled.value = true;
+    await taskOperation(taskOperationBo, 'transferTask').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
+    visible.value = false;
+    emits('submitCallback');
+    proxy?.$modal.msgSuccess('操作成功');
+  } else {
+    proxy?.$modal.msgWarning('请选择用户！');
+  }
+};
+//加签
+const openMultiInstanceUser = async () => {
+  multiInstanceUserRef.value.open();
+};
+//加签
+const addMultiInstanceUser = async (data) => {
+  if (data && data.length > 0) {
+    const taskOperationBo = reactive<TaskOperationBo>({
+      userIds: data.map((e) => e.userId),
+      taskId: task.value.id,
+      message: ''
+    });
+    await proxy?.$modal.confirm('是否确认提交？');
+    loading.value = true;
+    buttonDisabled.value = true;
+    await taskOperation(taskOperationBo, 'addSignature').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
+    visible.value = false;
+    emits('submitCallback');
+    proxy?.$modal.msgSuccess('操作成功');
+  } else {
+    proxy?.$modal.msgWarning('请选择用户！');
+  }
+};
+//减签
+const deleteMultiInstanceUser = async (row) => {
+  await proxy?.$modal.confirm('是否确认提交？');
+  loading.value = true;
+  buttonDisabled.value = true;
+  const taskOperationBo = reactive<TaskOperationBo>({
+    userIds: [row.userId],
+    taskId: task.value.id,
+    message: ''
+  });
+  await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
+    loading.value = false;
+    buttonDisabled.value = false;
+  });
+  visible.value = false;
+  emits('submitCallback');
+  proxy?.$modal.msgSuccess('操作成功');
+};
+//获取办理人
+const handleTaskUser = async () => {
+  let data = await currentTaskAllUser(task.value.id);
+  deleteUserList.value = data.data;
+  if (deleteUserList.value && deleteUserList.value.length > 0) {
+    deleteUserList.value.forEach((e) => {
+      e.nodeName = task.value.nodeName;
+    });
+  }
+  deleteSignatureVisible.value = true;
+};
+
+//终止任务
+const handleTerminationTask = async () => {
+  let params = {
+    taskId: task.value.id,
+    comment: ''
+  };
+  await proxy?.$modal.confirm('是否确认终止？');
+  loading.value = true;
+  buttonDisabled.value = true;
+  await terminationTask(params).finally(() => {
+    loading.value = false;
+    buttonDisabled.value = false;
+  });
+  visible.value = false;
+  emits('submitCallback');
+  proxy?.$modal.msgSuccess('操作成功');
+};
+/**
+ * 对外暴露子组件方法
+ */
+defineExpose({
+  open
+});
+</script>
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 09fc82e..4c2ea88 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -3,47 +3,47 @@
     <el-form v-loading="loading" :model="form" label-width="120px">
       <el-form-item label="消息提醒">
         <el-checkbox-group v-model="form.messageType">
-          <el-checkbox label="1" name="type" disabled>站内信</el-checkbox>
-          <el-checkbox label="2" name="type">邮件</el-checkbox>
-          <el-checkbox label="3" name="type">短信</el-checkbox>
+          <el-checkbox value="1" name="type" disabled>站内信</el-checkbox>
+          <el-checkbox value="2" name="type">邮件</el-checkbox>
+          <el-checkbox value="3" name="type">短信</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item v-if="task.businessStatus === 'waiting'" label="附件">
-        <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" />
+      <el-form-item v-if="task.flowStatus === 'waiting'" label="附件">
+        <fileUpload v-model="form.fileId" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf']" :file-size="20" />
       </el-form-item>
       <el-form-item label="抄送">
         <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
         <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
-          {{ user.userName }}
+          {{ user.nickName }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="task.businessStatus === 'waiting'" label="审批意见">
+      <el-form-item v-if="task.flowStatus === 'waiting'" label="审批意见">
         <el-input v-model="form.message" type="textarea" resize="none" />
       </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
         <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
         <el-button
-          v-if="task.businessStatus === 'waiting' && task.multiInstance"
+          v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
           :disabled="buttonDisabled"
           type="primary"
-          @click="addMultiInstanceUser"
+          @click="openMultiInstanceUser"
         >
           加签
         </el-button>
         <el-button
-          v-if="task.businessStatus === 'waiting' && task.multiInstance"
+          v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
           :disabled="buttonDisabled"
           type="primary"
-          @click="deleteMultiInstanceUser"
+          @click="handleTaskUser"
         >
           减签
         </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
         <el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
       </span>
     </template>
@@ -54,14 +54,14 @@
     <!-- 委托 -->
     <UserSelect ref="delegateTaskRef" :multiple="false" @confirm-call-back="handleDelegateTask"></UserSelect>
     <!-- 加签组件 -->
-    <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="closeDialog" />
+    <UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
 
     <!-- 驳回开始 -->
     <el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
-      <el-form v-if="task.businessStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
+      <el-form v-if="task.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
         <el-form-item label="驳回节点">
-          <el-select v-model="backForm.targetActivityId" clearable placeholder="请选择" style="width: 300px">
-            <el-option v-for="item in taskNodeList" :key="item.nodeId" :label="item.nodeName" :value="item.nodeId" />
+          <el-select v-model="backForm.nodeCode" clearable placeholder="请选择" style="width: 300px">
+            <el-option v-for="item in taskNodeList" :key="item.nodeCode" :label="item.nodeName" :value="item.nodeCode" />
           </el-select>
         </el-form-item>
         <el-form-item label="消息提醒">
@@ -83,6 +83,19 @@
       </template>
     </el-dialog>
     <!-- 驳回结束 -->
+    <el-dialog v-model="deleteSignatureVisible" draggable title="减签人员" width="700px" height="400px" append-to-body :close-on-click-modal="false">
+      <div>
+        <el-table :data="deleteUserList" border>
+          <el-table-column prop="nodeName" label="任务名称" />
+          <el-table-column prop="nickName" label="办理人" />
+          <el-table-column label="操作" align="center" width="160">
+            <template #default="scope">
+              <el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除 </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
   </el-dialog>
 </template>
 
@@ -90,18 +103,17 @@
 import { ref } from 'vue';
 import { ComponentInternalInstance } from 'vue';
 import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task';
+import { completeTask, backProcess, getTask, taskOperation, terminationTask, getBackTaskNode, currentTaskAllUser } from '@/api/workflow/task';
 import UserSelect from '@/components/UserSelect';
-import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { UserVO } from '@/api/system/user/types';
-import { TaskVO } from '@/api/workflow/task/types';
+import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
+
 const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
 const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
 const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
-
-//加签组件
-const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
+const multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
 
 const props = defineProps({
   taskVariables: {
@@ -119,65 +131,53 @@ const taskId = ref<string>('');
 const selectCopyUserList = ref<UserVO[]>([]);
 //抄送人id
 const selectCopyUserIds = ref<string>(undefined);
-// 驳回是否显示
+//可减签的人员
+const deleteUserList = ref<any>([]);
+//驳回是否显示
 const backVisible = ref(false);
 const backLoading = ref(true);
 const backButtonDisabled = ref(true);
 // 可驳回得任务节点
 const taskNodeList = ref([]);
 //任务
-const task = ref<TaskVO>({
+const task = ref<FlowTaskVO>({
   id: undefined,
-  name: undefined,
-  description: undefined,
-  priority: undefined,
-  owner: undefined,
-  assignee: undefined,
-  assigneeName: undefined,
-  processInstanceId: undefined,
-  executionId: undefined,
-  taskDefinitionId: undefined,
-  processDefinitionId: undefined,
-  endTime: undefined,
-  taskDefinitionKey: undefined,
-  dueDate: undefined,
-  category: undefined,
-  parentTaskId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
   tenantId: undefined,
-  claimTime: undefined,
-  businessStatus: undefined,
-  businessStatusName: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined,
-  participantVo: undefined,
-  multiInstance: undefined,
-  businessKey: undefined,
-  wfNodeConfigVo: undefined
+  definitionId: undefined,
+  instanceId: undefined,
+  flowName: undefined,
+  businessId: undefined,
+  nodeCode: undefined,
+  nodeName: undefined,
+  flowCode: undefined,
+  flowStatus: undefined,
+  formCustom: undefined,
+  formPath: undefined,
+  nodeType: undefined,
+  nodeRatio: undefined
 });
-//加签 减签标题
-const title = ref('');
 const dialog = reactive<DialogOption>({
   visible: false,
   title: '提示'
 });
-
+//减签弹窗
+const deleteSignatureVisible = ref(false);
 const form = ref<Record<string, any>>({
   taskId: undefined,
   message: undefined,
   variables: {},
   messageType: ['1'],
-  wfCopyList: []
+  flowCopyList: []
 });
 const backForm = ref<Record<string, any>>({
   taskId: undefined,
-  targetActivityId: undefined,
+  nodeCode: undefined,
   message: undefined,
   variables: {},
   messageType: ['1']
 });
-const closeDialog = () => {
-  dialog.visible = false;
-};
 //打开弹窗
 const openDialog = (id?: string) => {
   selectCopyUserIds.value = undefined;
@@ -189,7 +189,7 @@ const openDialog = (id?: string) => {
   loading.value = true;
   buttonDisabled.value = true;
   nextTick(() => {
-    getTaskById(taskId.value).then((response) => {
+    getTask(taskId.value).then((response) => {
       task.value = response.data;
       loading.value = false;
       buttonDisabled.value = false;
@@ -205,15 +205,15 @@ const handleCompleteTask = async () => {
   form.value.taskId = taskId.value;
   form.value.taskVariables = props.taskVariables;
   if (selectCopyUserList.value && selectCopyUserList.value.length > 0) {
-    let wfCopyList = [];
+    let flowCopyList = [];
     selectCopyUserList.value.forEach((e) => {
       let copyUser = {
         userId: e.userId,
         userName: e.nickName
       };
-      wfCopyList.push(copyUser);
+      flowCopyList.push(copyUser);
     });
-    form.value.wfCopyList = wfCopyList;
+    form.value.flowCopyList = flowCopyList;
   }
   await proxy?.$modal.confirm('是否确认提交？');
   loading.value = true;
@@ -236,11 +236,11 @@ const handleBackProcessOpen = async () => {
   backVisible.value = true;
   backLoading.value = true;
   backButtonDisabled.value = true;
-  let data = await getTaskNodeList(task.value.processInstanceId);
+  let data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
   taskNodeList.value = data.data;
   backLoading.value = false;
   backButtonDisabled.value = false;
-  backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
+  backForm.value.nodeCode = taskNodeList.value[0].nodeCode;
 };
 /** 驳回流程 */
 const handleBackProcess = async () => {
@@ -249,7 +249,10 @@ const handleBackProcess = async () => {
   loading.value = true;
   backLoading.value = true;
   backButtonDisabled.value = true;
-  await backProcess(backForm.value).finally(() => (loading.value = false));
+  await backProcess(backForm.value).finally(() => {
+    loading.value = false;
+    buttonDisabled.value = false;
+  });
   dialog.visible = false;
   backLoading.value = false;
   backButtonDisabled.value = false;
@@ -282,18 +285,48 @@ const handleCopyCloseTag = (user: UserVO) => {
   selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
 };
 //加签
-const addMultiInstanceUser = () => {
-  if (multiInstanceUserRef.value) {
-    title.value = '加签人员';
-    multiInstanceUserRef.value.getAddMultiInstanceList(taskId.value, []);
+const openMultiInstanceUser = async () => {
+  multiInstanceUserRef.value.open();
+};
+//加签
+const addMultiInstanceUser = async (data) => {
+  if (data && data.length > 0) {
+    const taskOperationBo = reactive<TaskOperationBo>({
+      userIds: data.map((e) => e.userId),
+      taskId: taskId.value,
+      message: form.value.message
+    });
+    await proxy?.$modal.confirm('是否确认提交？');
+    loading.value = true;
+    buttonDisabled.value = true;
+    await taskOperation(taskOperationBo, 'addSignature').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
+    dialog.visible = false;
+    emits('submitCallback');
+    proxy?.$modal.msgSuccess('操作成功');
+  } else {
+    proxy?.$modal.msgWarning('请选择用户！');
   }
 };
 //减签
-const deleteMultiInstanceUser = () => {
-  if (multiInstanceUserRef.value) {
-    title.value = '减签人员';
-    multiInstanceUserRef.value.getDeleteMultiInstanceList(taskId.value);
-  }
+const deleteMultiInstanceUser = async (row) => {
+  await proxy?.$modal.confirm('是否确认提交？');
+  loading.value = true;
+  buttonDisabled.value = true;
+  const taskOperationBo = reactive<TaskOperationBo>({
+    userIds: [row.userId],
+    taskId: taskId.value,
+    message: form.value.message
+  });
+  await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
+    loading.value = false;
+    buttonDisabled.value = false;
+  });
+  dialog.visible = false;
+  emits('submitCallback');
+  proxy?.$modal.msgSuccess('操作成功');
 };
 //打开转办
 const openTransferTask = () => {
@@ -302,15 +335,18 @@ const openTransferTask = () => {
 //转办
 const handleTransferTask = async (data) => {
   if (data && data.length > 0) {
-    let params = {
-      taskId: taskId.value,
+    const taskOperationBo = reactive<TaskOperationBo>({
       userId: data[0].userId,
-      comment: form.value.message
-    };
+      taskId: taskId.value,
+      message: form.value.message
+    });
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
-    await transferTask(params).finally(() => (loading.value = false));
+    await taskOperation(taskOperationBo, 'transferTask').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
@@ -326,15 +362,18 @@ const openDelegateTask = () => {
 //委托
 const handleDelegateTask = async (data) => {
   if (data && data.length > 0) {
-    let params = {
-      taskId: taskId.value,
+    const taskOperationBo = reactive<TaskOperationBo>({
       userId: data[0].userId,
-      nickName: data[0].nickName
-    };
+      taskId: taskId.value,
+      message: form.value.message
+    });
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
-    await delegateTask(params).finally(() => (loading.value = false));
+    await taskOperation(taskOperationBo, 'delegateTask').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
@@ -343,7 +382,7 @@ const handleDelegateTask = async (data) => {
   }
 };
 //终止任务
-const handleTerminationTask = async (data) => {
+const handleTerminationTask = async () => {
   let params = {
     taskId: taskId.value,
     comment: form.value.message
@@ -351,11 +390,24 @@ const handleTerminationTask = async (data) => {
   await proxy?.$modal.confirm('是否确认终止？');
   loading.value = true;
   buttonDisabled.value = true;
-  await terminationTask(params).finally(() => (loading.value = false));
+  await terminationTask(params).finally(() => {
+    loading.value = false;
+    buttonDisabled.value = false;
+  });
   dialog.visible = false;
   emits('submitCallback');
   proxy?.$modal.msgSuccess('操作成功');
 };
+const handleTaskUser = async () => {
+  let data = await currentTaskAllUser(taskId.value);
+  deleteUserList.value = data.data;
+  if (deleteUserList.value && deleteUserList.value.length > 0) {
+    deleteUserList.value.forEach((e) => {
+      e.nodeName = task.value.nodeName;
+    });
+  }
+  deleteSignatureVisible.value = true;
+};
 
 /**
  * 对外暴露子组件方法
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 4b93bb3..937a395 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -43,7 +43,7 @@
           <el-card shadow="hover">
             <template v-if="prop.multiple" #header>
               <el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px" @close="handleCloseTag(user)">
-                {{ user.userName }}
+                {{ user.nickName }}
               </el-tag>
             </template>
 
@@ -100,14 +100,14 @@
 <script setup lang="ts">
 import api from '@/api/system/user';
 import { UserQuery, UserVO } from '@/api/system/user/types';
-import { DeptVO } from '@/api/system/dept/types';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
 import { VxeTableInstance } from 'vxe-table';
 import useDialog from '@/hooks/useDialog';
 
 interface PropType {
   modelValue?: UserVO[] | UserVO | undefined;
   multiple?: boolean;
-  data?: string | number | (string | number)[];
+  data?: string | number | (string | number)[] | undefined;
 }
 const prop = withDefaults(defineProps<PropType>(), {
   multiple: true,
@@ -125,7 +125,7 @@ const showSearch = ref(true);
 const total = ref(0);
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
+const deptOptions = ref<DeptTreeVO[]>([]);
 const selectUserList = ref<UserVO[]>([]);
 
 const deptTreeRef = ref<ElTreeInstance>();
diff --git a/src/enums/bpmn/IndexEnums.ts b/src/enums/bpmn/IndexEnums.ts
deleted file mode 100644
index 8c39823..0000000
--- a/src/enums/bpmn/IndexEnums.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export enum AllocationTypeEnum {
-  USER = 'user',
-  CANDIDATE = 'candidate',
-  YOURSELF = 'yourself',
-  SPECIFY = 'specify'
-}
-
-export enum SpecifyDescEnum {
-  SPECIFY_MULTIPLE = 'specifyMultiple',
-  SPECIFY_SINGLE = 'specifySingle'
-}
-
-export enum MultiInstanceTypeEnum {
-  SERIAL = 'serial',
-  PARALLEL = 'parallel',
-  NONE = 'none'
-}
diff --git a/src/router/index.ts b/src/router/index.ts
index c5b472f..2ab09dd 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -176,6 +176,20 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true }
       }
     ]
+  },
+  {
+    path: '/workflow/design',
+    component: Layout,
+    hidden: true,
+    permissions: ['workflow:leave:edit'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/workflow/processDefinition/design.vue'),
+        name: 'design',
+        meta: { title: '流程设计', activeMenu: '/workflow/processDefinition', noCache: true }
+      }
+    ]
   }
 ];
 
diff --git a/src/store/modules/modeler.ts b/src/store/modules/modeler.ts
deleted file mode 100644
index 204f450..0000000
--- a/src/store/modules/modeler.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import type { Modeler, Modeling, Canvas, ElementRegistry, Moddle, BpmnFactory } from 'bpmn';
-
-type ModelerStore = {
-  modeler: Modeler | undefined;
-  moddle: Moddle | undefined;
-  modeling: Modeling | undefined;
-  canvas: Canvas | undefined;
-  elementRegistry: ElementRegistry | undefined;
-  bpmnFactory: BpmnFactory | undefined;
-  // 流程定义根节点信息
-  procDefId: string | undefined;
-  procDefName: string | undefined;
-};
-
-const defaultState: ModelerStore = {
-  modeler: undefined,
-  moddle: undefined,
-  modeling: undefined,
-  canvas: undefined,
-  elementRegistry: undefined,
-  bpmnFactory: undefined,
-  procDefId: undefined,
-  procDefName: undefined
-};
-export const useModelerStore = defineStore('modeler', () => {
-  let modeler = defaultState.modeler;
-  let moddle = defaultState.moddle;
-  let modeling = defaultState.modeling;
-  let canvas = defaultState.canvas;
-  let elementRegistry = defaultState.elementRegistry;
-  let bpmnFactory = defaultState.bpmnFactory;
-  const procDefId = ref(defaultState.procDefId);
-  const procDefName = ref(defaultState.procDefName);
-
-  const getModeler = () => modeler;
-  const getModdle = () => moddle;
-  const getModeling = (): Modeling | undefined => modeling;
-  const getCanvas = (): Canvas | undefined => canvas;
-  const getElRegistry = (): ElementRegistry | undefined => elementRegistry;
-  const getBpmnFactory = (): BpmnFactory | undefined => bpmnFactory;
-  const getProcDefId = (): string | undefined => procDefId.value;
-  const getProcDefName = (): string | undefined => procDefName.value;
-
-  // 设置根节点
-  const setModeler = (modelers: Modeler | undefined) => {
-    if (modelers) {
-      modeler = modelers;
-      modeling = modelers.get<Modeling>('modeling');
-      moddle = modelers.get<Moddle>('moddle');
-      canvas = modelers.get<Canvas>('canvas');
-      bpmnFactory = modelers.get<BpmnFactory>('bpmnFactory');
-      elementRegistry = modelers.get<ElementRegistry>('elementRegistry');
-    } else {
-      modeling = moddle = canvas = elementRegistry = bpmnFactory = undefined;
-    }
-  };
-  // 设置流程定义根节点信息
-  const setProcDef = (modeler: Modeler | undefined) => {
-    procDefId.value = modeler.get<Canvas>('canvas').getRootElement().businessObject.get('id');
-    procDefName.value = modeler.get<Canvas>('canvas').getRootElement().businessObject.get('name');
-  };
-
-  return {
-    getModeler,
-    getModdle,
-    getModeling,
-    getCanvas,
-    getElRegistry,
-    getBpmnFactory,
-    getProcDefId,
-    getProcDefName,
-    setModeler,
-    setProcDef
-  };
-});
-export default useModelerStore;
diff --git a/src/types/bpmn/editor/global.d.ts b/src/types/bpmn/editor/global.d.ts
deleted file mode 100644
index 1b9a634..0000000
--- a/src/types/bpmn/editor/global.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { MessageApiInjection } from 'naive-ui/lib/message/src/MessageProvider';
-
-declare global {
-  interface Window {
-    bpmnInstances: any;
-    __messageBox: MessageApiInjection;
-    URL: any;
-  }
-}
-
-declare interface Window {
-  bpmnInstances: any;
-}
diff --git a/src/types/bpmn/index.d.ts b/src/types/bpmn/index.d.ts
deleted file mode 100644
index f8e8d15..0000000
--- a/src/types/bpmn/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-declare module 'bpmn' {
-  import type modeler from 'bpmn-js/lib/Modeler';
-  import type modeling from 'bpmn-js/lib/features/modeling/Modeling';
-  import type canvas from 'diagram-js/lib/core/Canvas';
-  import type elementRegistry from 'diagram-js/lib/core/ElementRegistry';
-  import type bpmnFactory from 'bpmn-js/lib/features/modeling/BpmnFactory';
-
-  export type Modeler = modeler;
-  export type Modeling = modeling;
-  export type Canvas = canvas;
-  export type ElementRegistry = elementRegistry;
-  export type Moddle = import('moddle').Moddle;
-  export type ModdleElement = import('moddle').ModdleElement;
-  export type BpmnFactory = bpmnFactory;
-}
diff --git a/src/types/bpmn/moddle.d.ts b/src/types/bpmn/moddle.d.ts
deleted file mode 100644
index 1ed7933..0000000
--- a/src/types/bpmn/moddle.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-declare module 'moddle' {
-  import type { Element as element } from 'bpmn-js/lib/model/Types';
-
-  export type Element = {
-    get<T>(name: string): T;
-
-    set(name: string, value: any): void;
-  } & element;
-
-  export interface ModdleElement extends Element {
-    $model: Moddle;
-    readonly $type: string;
-    $attrs: object | {};
-    $parent: any;
-    businessObject: ModdleElement;
-    type: string;
-
-    [field: string]: any;
-
-    hasType(element: ModdleElement, type?: string): boolean;
-  }
-
-  export interface Package {
-    name: string;
-    prefix: string;
-  }
-
-  export interface Moddle {
-    typeCache: Record<string, ModdleElement>;
-
-    getPackage: typeof Registry.prototype.getPackage;
-
-    getPackages: typeof Registry.prototype.getPackages;
-
-    create(type: string, attrs?: any): ModdleElement;
-  }
-}
diff --git a/src/types/bpmn/panel.d.ts b/src/types/bpmn/panel.d.ts
deleted file mode 100644
index 3179261..0000000
--- a/src/types/bpmn/panel.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-declare module 'bpmnDesign' {
-  import { AllocationTypeEnum, SpecifyDescEnum, MultiInstanceTypeEnum } from '@/enums/bpmn/IndexEnums';
-
-  export interface ParamVO {
-    type: string;
-    name: string;
-    value: string;
-  }
-
-  export interface TaskListenerVO {
-    event: string;
-    type: string;
-    name: string;
-    className: string;
-    params: ParamVO[];
-  }
-
-  export interface ExecutionListenerVO {
-    event: string;
-    type: string;
-    className: string;
-    params: ParamVO[];
-  }
-
-  interface BasePanel {
-    id: string;
-    name: string;
-  }
-  export interface ProcessPanel extends BasePanel {}
-
-  export interface TaskPanel extends BasePanel {
-    allocationType: AllocationTypeEnum;
-    specifyDesc: SpecifyDescEnum;
-    multiInstanceType: MultiInstanceTypeEnum;
-    async?: boolean;
-    priority?: number;
-    formKey?: string;
-    skipExpression?: string;
-    isForCompensation?: boolean;
-    triggerServiceTask?: boolean;
-    autoStoreVariables?: boolean;
-    ruleVariablesInput?: string;
-    excludeTaskListener?: boolean;
-    exclude?: boolean;
-    class?: string;
-    dueDate?: string;
-    fixedAssignee?: string;
-
-    candidateUsers?: string;
-    assignee?: string;
-    candidateGroups?: string;
-    collection?: string;
-    elementVariable?: string;
-    completionCondition?: string;
-    isSequential?: boolean;
-
-    loopCharacteristics?: {
-      collection: string;
-      elementVariable: string;
-      isSequential: boolean;
-      completionCondition: {
-        body: string;
-      };
-    };
-  }
-
-  export interface StartEndPanel extends BasePanel {}
-  export interface GatewayPanel extends BasePanel {}
-  export interface SequenceFlowPanel extends BasePanel {
-    conditionExpression: {
-      body: string;
-    };
-    conditionExpressionValue: string;
-    skipExpression: string;
-  }
-
-  export interface ParticipantPanel extends BasePanel {}
-  export interface SubProcessPanel extends BasePanel {
-    multiInstanceType: MultiInstanceTypeEnum;
-    collection?: string;
-    elementVariable?: string;
-    completionCondition?: string;
-    loopCharacteristics?: {
-      collection: string;
-      elementVariable: string;
-      isSequential: boolean;
-      completionCondition: {
-        body: string;
-      };
-    };
-  }
-}
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index 401edcf..d3e87ea 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -6,9 +6,6 @@
           <el-form-item label="分类名称" prop="categoryName">
             <el-input v-model="queryParams.categoryName" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="分类编码" prop="categoryCode">
-            <el-input v-model="queryParams.categoryCode" placeholder="请输入分类编码" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -21,64 +18,66 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:category:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['workflow:category:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
       <el-table
         ref="categoryTableRef"
         v-loading="loading"
         :data="categoryList"
-        row-key="id"
+        row-key="categoryId"
         :default-expand-all="isExpandAll"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
-        <el-table-column label="分类名称" prop="categoryName" />
-        <el-table-column label="分类编码" align="center" prop="categoryCode" />
-        <el-table-column label="排序" align="center" prop="sortNum" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="分类名称" prop="categoryName" width="260"/>
+        <el-table-column label="显示顺序" align="center" prop="orderNum" width="200" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['workflow:category:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['workflow:category:edit']" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button v-hasPermi="['workflow:category:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['workflow:category:add']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['workflow:category:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['workflow:category:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <!-- 添加或修改流程分类对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="categoryFormRef" v-loading="loading" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="父级分类" prop="parentId">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="categoryFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="上级分类" prop="parentId">
           <el-tree-select
             v-model="form.parentId"
             :data="categoryOptions"
-            :props="{ value: 'id', label: 'categoryName', children: 'children' }"
-            value-key="id"
-            placeholder="请选择父级id"
+            :props="{ value: 'categoryId', label: 'categoryName', children: 'children' }"
+            value-key="categoryId"
+            placeholder="请选择上级分类"
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="分类名称" prop="categoryName">
-          <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
-        </el-form-item>
-        <el-form-item label="分类编码" prop="categoryCode">
-          <el-input v-model="form.categoryCode" placeholder="请输入分类编码" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sortNum">
-          <el-input-number v-model="form.sortNum" placeholder="请输入排序" controls-position="right" :min="0" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="分类名称" prop="categoryName">
+              <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <template #footer>
+    <template #footer>
         <div class="dialog-footer">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -89,16 +88,17 @@
 </template>
 
 <script setup name="Category" lang="ts">
-import { listCategory, getCategory, delCategory, addCategory, updateCategory } from '@/api/workflow/category';
+import { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/workflow/category";
 import { CategoryVO, CategoryQuery, CategoryForm } from '@/api/workflow/category/types';
 
 type CategoryOption = {
-  id: number;
+  categoryId: number;
   categoryName: string;
   children?: CategoryOption[];
-};
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const categoryList = ref<CategoryVO[]>([]);
 const categoryOptions = ref<CategoryOption[]>([]);
@@ -109,34 +109,32 @@ const loading = ref(false);
 
 const queryFormRef = ref<ElFormInstance>();
 const categoryFormRef = ref<ElFormInstance>();
-const categoryTableRef = ref<ElTableInstance>();
+const categoryTableRef = ref<ElTableInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
+
 const initFormData: CategoryForm = {
-  id: undefined,
-  categoryName: undefined,
-  categoryCode: undefined,
+  categoryId: undefined,
+  categoryName: "",
   parentId: undefined,
-  sortNum: 0
-};
+  orderNum: 0,
+}
 
 const data = reactive<PageData<CategoryForm, CategoryQuery>>({
-  form: { ...initFormData },
+  form: {...initFormData},
   queryParams: {
-    pageNum: 1,
-    pageSize: 10,
     categoryName: undefined,
-    categoryCode: undefined
   },
   rules: {
-    id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
-    categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
-    categoryCode: [{ required: true, message: '分类编码不能为空', trigger: 'blur' }],
-    parentId: [{ required: true, message: '父级id不能为空', trigger: 'blur' }]
+    categoryId: [
+      { required: true, message: "流程分类ID不能为空", trigger: "blur" }
+    ],
+    parentId: [{ required: true, message: "请选择上级分类", trigger: "change" }],
+    categoryName: [{ required: true, message: "请输入分类名称", trigger: "blur" }]
   }
 });
 
@@ -146,116 +144,112 @@ 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, 'id', 'parentId');
+  const data = proxy?.handleTree<CategoryVO>(res.data, "categoryId", "parentId");
   if (data) {
     categoryList.value = data;
     loading.value = false;
   }
-};
+}
 
 /** 查询流程分类下拉树结构 */
 const getTreeselect = async () => {
   const res = await listCategory();
   categoryOptions.value = [];
-  const data: CategoryOption = { id: 0, categoryName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
-  categoryOptions.value.push(data);
+  // 处理树形数据
+  const data = proxy?.handleTree<CategoryOption>(res.data, "categoryId", "parentId");
+  if (data) {
+    categoryOptions.value = data; // 将处理后的树形数据赋值
+  }
 };
 
 // 取消按钮
 const cancel = () => {
   reset();
   dialog.visible = false;
-};
+}
 
 // 表单重置
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData}
   categoryFormRef.value?.resetFields();
-};
+}
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getList();
-};
+}
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-};
+}
 
 /** 新增按钮操作 */
 const handleAdd = (row?: CategoryVO) => {
+  reset();
+  getTreeselect();
+  if (row?.categoryId) {
+    form.value.parentId = row.categoryId;
+  } else {
+    form.value.parentId = undefined;
+  }
   dialog.visible = true;
-  dialog.title = '添加流程分类';
-  nextTick(() => {
-    reset();
-    getTreeselect();
-    if (row != null && row.id) {
-      form.value.parentId = row.id;
-    } else {
-      form.value.parentId = 0;
-    }
-  });
-};
+  dialog.title = "添加流程分类";
+}
 
 /** 展开/折叠操作 */
 const handleToggleExpandAll = () => {
   isExpandAll.value = !isExpandAll.value;
-  toggleExpandAll(categoryList.value, isExpandAll.value);
-};
+  toggleExpandAll(categoryList.value, isExpandAll.value)
+}
 
 /** 展开/折叠操作 */
 const toggleExpandAll = (data: CategoryVO[], status: boolean) => {
   data.forEach((item) => {
-    categoryTableRef.value?.toggleRowExpansion(item, status);
-    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
-  });
-};
+    categoryTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
 
 /** 修改按钮操作 */
-const handleUpdate = (row: CategoryVO) => {
-  loading.value = true;
+const handleUpdate = async (row: CategoryVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getCategory(row.categoryId);
+  Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = '修改流程分类';
-  nextTick(async () => {
-    reset();
-    await getTreeselect();
-    if (row != null) {
-      form.value.parentId = row.id;
-    }
-    const res = await getCategory(row.id);
-    loading.value = false;
-    Object.assign(form.value, res.data);
-  });
-};
+  dialog.title = "修改流程分类";
+}
 
 /** 提交按钮 */
 const submitForm = () => {
-  categoryFormRef.value.validate(async (valid: boolean) => {
+  categoryFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.id) {
-        await updateCategory(form.value).finally(() => (buttonLoading.value = false));
+      if (form.value.categoryId) {
+        await updateCategory(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addCategory(form.value).finally(() => (buttonLoading.value = false));
+        await addCategory(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
-      await getList();
+      getList();
     }
   });
-};
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (row: CategoryVO) => {
-  await proxy?.$modal.confirm('是否确认删除流程分类编号为"' + row.id + '"的数据项？');
+  await proxy?.$modal.confirm('是否确认删除"' + row.categoryName + '"的分类？');
   loading.value = true;
-  await delCategory(row.id).finally(() => (loading.value = false));
+  await delCategory(row.categoryId).finally(() => loading.value = false);
   await getList();
-  proxy?.$modal.msgSuccess('删除成功');
-};
+  proxy?.$modal.msgSuccess("删除成功");
+}
 
 onMounted(() => {
   getList();
diff --git a/src/views/workflow/formManage/index.vue b/src/views/workflow/formManage/index.vue
deleted file mode 100644
index e77fd75..0000000
--- a/src/views/workflow/formManage/index.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="search">
-        <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-          <el-form-item label="表单名称" prop="formName">
-            <el-input v-model="queryParams.formName" placeholder="请输入表单名称" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:formManage:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:formManage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:formManage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:formManage:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="formManageList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="表单名称" align="center" prop="formName" />
-        <el-table-column label="表单类型" align="center">
-          <template #default="scope">
-            <dict-tag :options="wf_form_type" :value="scope.row.formType"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="地址" align="center" prop="router" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['workflow:formManage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['workflow:formManage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改表单管理对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="formManageFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="表单名称" prop="formName">
-          <el-input v-model="form.formName" placeholder="请输入表单名称" />
-        </el-form-item>
-        <el-form-item label="表单类型" prop="formType">
-          <el-radio-group v-model="form.formType" @change="form.router = ''">
-            <el-radio v-for="dict in wf_form_type" :key="dict.value" border :value="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item v-if="form.formType === 'static'" label="路由地址" prop="router">
-          <el-input v-model="form.router" placeholder="请输入路由地址" />
-        </el-form-item>
-        <el-form-item v-else label="表单" prop="router">
-          <el-input v-model="form.router" disabled placeholder="请选择表单">
-            <template #append>
-              <el-button icon="Search" />
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="FormManage" lang="ts">
-import { listFormManage, getFormManage, delFormManage, addFormManage, updateFormManage } from '@/api/workflow/formManage';
-import { FormManageVO, FormManageQuery, FormManageForm } from '@/api/workflow/formManage/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_form_type } = toRefs<any>(proxy?.useDict('wf_form_type'));
-
-const formManageList = ref<FormManageVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const formManageFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: FormManageForm = {
-  id: undefined,
-  formName: undefined,
-  formType: 'static',
-  remark: undefined
-};
-const data = reactive<PageData<FormManageForm, FormManageQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    formName: undefined,
-    formType: undefined
-  },
-  rules: {
-    id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
-    formName: [{ required: true, message: '表单名称不能为空', trigger: 'blur' }],
-    formType: [{ required: true, message: '表单类型不能为空', trigger: 'change' }],
-    router: [{ required: true, message: '不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询表单管理列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listFormManage(queryParams.value);
-  formManageList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  formManageFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: FormManageVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加表单管理';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: FormManageVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getFormManage(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改表单管理';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  formManageFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateFormManage(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addFormManage(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: FormManageVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除表单管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delFormManage(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'workflow/formManage/export',
-    {
-      ...queryParams.value
-    },
-    `formManage_${new Date().getTime()}.xlsx`
-  );
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 1708b64..64f0c57 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -31,7 +31,7 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="主键" align="center" prop="id" />
         <el-table-column label="请假类型" align="center">
@@ -56,38 +56,28 @@
             <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="162">
           <template #default="scope">
-            <el-button
-              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
-              v-hasPermi="['workflow:leave:edit']"
-              size="small"
-              link
-              type="primary"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              >修改</el-button
-            >
-            <el-button
-              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
-              v-hasPermi="['workflow:leave:remove']"
-              size="small"
-              link
-              type="primary"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
-            <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
-            <el-button
-              v-if="scope.row.status === 'waiting'"
-              link
-              size="small"
-              type="primary"
-              icon="Notification"
-              @click="handleCancelProcessApply(scope.row.id)"
-              >撤销</el-button
-            >
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                >
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                  >删除</el-button
+                >
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
+                <el-button size="small" type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">撤销</el-button>
+              </el-col>
+            </el-row>
           </template>
         </el-table-column>
       </el-table>
@@ -99,7 +89,7 @@
 
 <script setup name="Leave" lang="ts">
 import { delLeave, listLeave } from '@/api/workflow/leave';
-import { cancelProcessApply } from '@/api/workflow/processInstance';
+import { cancelProcessApply } from '@/api/workflow/instance';
 import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -232,7 +222,11 @@ const handleExport = () => {
 const handleCancelProcessApply = async (id: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
-  await cancelProcessApply(id).finally(() => (loading.value = false));
+  let data = {
+    businessId: id,
+    message: '申请人撤销流程！'
+  };
+  await cancelProcessApply(data).finally(() => (loading.value = false));
   await getList();
   proxy?.$modal.msgSuccess('撤销成功');
 };
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 418f272..8ef66a5 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -44,6 +44,17 @@
     <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
     <!-- 审批记录 -->
     <approvalRecord ref="approvalRecordRef" />
+    <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose" width="500">
+      <el-select v-model="flowCode" placeholder="Select" style="width: 240px">
+        <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="submitFlow()"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -80,6 +91,35 @@ const options = [
     label: '婚假'
   }
 ];
+const flowCodeOptions = [
+  {
+    value: 'leave1',
+    label: '请假申请-普通'
+  },
+  {
+    value: 'leave2',
+    label: '请假申请-排他网关'
+  },
+  {
+    value: 'leave3',
+    label: '请假申请-并行网关'
+  },
+  {
+    value: 'leave4',
+    label: '请假申请-会签'
+  },
+  {
+    value: 'leave5',
+    label: '请假申请-并行会签网关'
+  }
+];
+
+const flowCode = ref<string>('');
+
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
 //提交组件
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 //审批记录组件
@@ -88,8 +128,8 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const leaveFormRef = ref<ElFormInstance>();
 
 const submitFormData = ref<StartProcessBo>({
-  businessKey: '',
-  tableName: '',
+  businessId: '',
+  flowCode: '',
   variables: {}
 });
 const taskVariables = ref<Record<string, any>>({});
@@ -119,6 +159,11 @@ const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   }
 });
 
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
 const { form, rules } = toRefs(data);
 
 /** 表单重置 */
@@ -174,6 +219,15 @@ const submitForm = (status: string) => {
           proxy.$tab.closePage(proxy.$route);
           proxy.$router.go(-1);
         } else {
+          if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+            flowCode.value = flowCodeOptions[0].value;
+            dialogVisible.visible = true;
+            return;
+          }
+          //说明启动过先随意穿个参数
+          if (flowCode.value === '' || flowCode.value === null) {
+            flowCode.value = 'xx';
+          }
           await handleStartWorkFlow(res.data);
         }
       }
@@ -183,17 +237,19 @@ const submitForm = (status: string) => {
   }
 };
 
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
 //提交申请
 const handleStartWorkFlow = async (data: LeaveVO) => {
   try {
-    submitFormData.value.tableName = 'test_leave';
-    submitFormData.value.businessKey = data.id;
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
     //流程变量
     taskVariables.value = {
-      entity: data,
       leaveDays: data.leaveDays,
-      userList: ['1', '3'],
-      userList2: ['1', '3']
+      userList: ['1', '3', '4']
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);
diff --git a/src/views/workflow/model/index.vue b/src/views/workflow/model/index.vue
deleted file mode 100644
index 86249bb..0000000
--- a/src/views/workflow/model/index.vue
+++ /dev/null
@@ -1,383 +0,0 @@
-<template>
-  <div class="p-2">
-    <el-row :gutter="20">
-      <!-- 流程分类树 -->
-      <el-col :lg="4" :xs="24" style="">
-        <el-card shadow="hover">
-          <el-input v-model="categoryName" placeholder="请输入流程分类名" prefix-icon="Search" clearable />
-          <el-tree
-            ref="categoryTreeRef"
-            class="mt-2"
-            node-key="id"
-            :data="categoryOptions"
-            :props="{ label: 'categoryName', children: 'children' }"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          ></el-tree>
-        </el-card>
-      </el-col>
-      <el-col :lg="20" :xs="24">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-          <div v-show="showSearch" class="mb-[10px]">
-            <el-card shadow="hover">
-              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="模型名称" prop="name">
-                  <el-input v-model="queryParams.name" placeholder="请输入模型名称" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="模型KEY" prop="key">
-                  <el-input v-model="queryParams.key" placeholder="请输入模型KEY" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                </el-form-item>
-              </el-form>
-            </el-card>
-          </div>
-        </transition>
-        <el-card shadow="hover">
-          <template #header>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="primary" plain :disabled="multiple" icon="Download" @click="clickExportZip()">导出</el-button>
-              </el-col>
-              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
-            </el-row>
-          </template>
-
-          <el-table v-loading="loading" border :data="modelList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="80"></el-table-column>
-            <el-table-column align="center" :show-overflow-tooltip="true" prop="name" label="模型名称" width="200"></el-table-column>
-            <el-table-column align="center" prop="key" label="模型KEY"></el-table-column>
-            <el-table-column align="center" prop="version" label="版本号" width="90">
-              <template #default="scope"> v{{ scope.row.version }}.0</template>
-            </el-table-column>
-            <el-table-column align="center" prop="metaInfo" label="备注说明" min-width="130"></el-table-column>
-            <el-table-column align="center" :show-overflow-tooltip="true" prop="createTime" label="创建时间" width="160"></el-table-column>
-            <el-table-column align="center" :show-overflow-tooltip="true" prop="lastUpdateTime" label="更新时间" width="160"></el-table-column>
-            <el-table-column fixed="right" label="操作" align="center" width="170" class-name="small-padding fixed-width">
-              <template #default="scope">
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Pointer" @click="clickDesign(scope.row.id)">设计流程</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="ScaleToOriginal" @click="clickDeploy(scope.row.id, scope.row.key)">
-                      流程部署
-                    </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopy(scope.row)"> 复制模型 </el-button>
-                  </el-col>
-                </el-row>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            :total="total"
-            @pagination="getList"
-          />
-        </el-card>
-      </el-col>
-    </el-row>
-    <!-- 设计流程开始 -->
-    <Design ref="designRef" @close-call-back="handleQuery"></Design>
-    <!-- 设计流程结束 -->
-    <!-- 添加模型对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="650px" append-to-body :close-on-click-modal="false">
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="模型名称：" prop="name">
-          <el-input v-model="form.name" :disabled="ids && ids.length > 0 && billType === 'update'" maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item label="模型KEY：" prop="key">
-          <el-input v-model="form.key" :disabled="ids && ids.length > 0 && billType === 'update'" maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item label="流程分类" prop="categoryCode">
-          <el-tree-select
-            v-model="form.categoryCode"
-            :data="categoryOptions"
-            :props="{ value: 'categoryCode', label: 'categoryName', children: 'children' }"
-            value-key="categoryCode"
-            placeholder="请选择流程分类"
-            check-strictly
-          />
-        </el-form-item>
-        <el-form-item label="备注：" prop="description">
-          <el-input v-model="form.description" type="textarea" maxlength="200" show-word-limit></el-input>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script lang="ts" setup name="Model">
-import Design from '../../../components/BpmnDesign/index.vue';
-import { listModel, addModel, delModel, modelDeploy, getInfo, update } from '@/api/workflow/model';
-import { ModelQuery, ModelForm, ModelVO } from '@/api/workflow/model/types';
-import { listCategory } from '@/api/workflow/category';
-import { copyModel } from '@/api/workflow/model';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const formRef = ref<ElFormInstance>();
-const queryFormRef = ref<ElFormInstance>();
-const categoryTreeRef = ref<ElTreeInstance>();
-const designRef = ref<InstanceType<typeof Design>>();
-
-type CategoryOption = {
-  categoryCode: string;
-  categoryName: string;
-  children?: CategoryOption[];
-};
-
-const buttonLoading = ref(false);
-const loading = ref(true);
-const ids = ref<string[]>([]);
-const single = ref(true);
-const multiple = ref(true);
-const showSearch = ref(true);
-const total = ref(0);
-const modelList = ref<ModelVO[]>([]);
-const categoryOptions = ref<CategoryOption[]>([]);
-const categoryName = ref('');
-const billType = ref<string>('');
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: ModelForm = {
-  id: '',
-  name: '',
-  key: '',
-  categoryCode: '',
-  xml: '',
-  svg: '',
-  description: ''
-};
-const data = reactive<PageData<ModelForm, ModelQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    name: '',
-    key: '',
-    categoryCode: ''
-  },
-  rules: {
-    name: [{ required: true, message: '模型不能为空', trigger: 'blur' }],
-    key: [{ required: true, message: '模型KEY不能为空', trigger: 'blur' }],
-    categoryCode: [{ required: true, message: '流程分类不能为空', trigger: 'blur' }]
-  }
-});
-const { queryParams, form, rules } = toRefs(data);
-
-onMounted(() => {
-  getList();
-  getTreeselect();
-});
-
-/** 节点单击事件 */
-const handleNodeClick = (data: ModelForm) => {
-  queryParams.value.categoryCode = data.categoryCode;
-  if (data.categoryCode === 'ALL') {
-    queryParams.value.categoryCode = '';
-  }
-  handleQuery();
-};
-/** 通过条件过滤节点  */
-const filterNode = (value: string, data: any) => {
-  if (!value) return true;
-  return data.categoryName.indexOf(value) !== -1;
-};
-/** 根据名称筛选部门树 */
-watchEffect(
-  () => {
-    categoryTreeRef.value?.filter(categoryName.value);
-  },
-  {
-    flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
-  }
-);
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  queryParams.value.categoryCode = '';
-  queryParams.value.pageNum = 1;
-  queryParams.value.pageSize = 10;
-  handleQuery();
-};
-// 多选框选中数据
-const handleSelectionChange = (selection: ModelVO[]) => {
-  ids.value = selection.map((item: ModelVO) => item.id);
-  single.value = selection.length !== 1;
-  multiple.value = !selection.length;
-};
-//分页
-const getList = async () => {
-  loading.value = true;
-  const resp = await listModel(queryParams.value);
-  modelList.value = resp.rows;
-  total.value = resp.total;
-  loading.value = false;
-};
-/** 删除按钮操作 */
-const handleDelete = async (row?: ModelVO) => {
-  const id = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除模型id为【' + id + '】的数据项？');
-  loading.value = true;
-  await delModel(id).finally(() => (loading.value = false));
-  await getList();
-  proxy?.$modal.msgSuccess('删除成功');
-};
-// 流程部署
-const clickDeploy = async (id: string, key: string) => {
-  await proxy?.$modal.confirm('是否部署模型key为【' + key + '】流程？');
-  loading.value = true;
-  await modelDeploy(id).finally(() => (loading.value = false));
-  await getList();
-  proxy?.$modal.msgSuccess('部署成功');
-};
-//新增打开
-const handleAdd = () => {
-  billType.value = 'add';
-  ids.value = [];
-  getTreeselect();
-  form.value = { ...initFormData };
-  dialog.visible = true;
-  dialog.title = '新增模型';
-};
-//修改打开
-const handleUpdate = () => {
-  billType.value = 'update';
-  dialog.title = '修改模型';
-  nextTick(async () => {
-    await getTreeselect();
-    const _id = ids.value[0];
-    const res = await getInfo(_id);
-    Object.assign(form.value, res.data);
-    dialog.visible = true;
-  });
-};
-
-//复制打开
-const handleCopy = (row?: ModelVO) => {
-  billType.value = 'copy';
-  dialog.title = '复制模型';
-  nextTick(async () => {
-    await getTreeselect();
-    form.value = { ...initFormData };
-    form.value.id = row.id;
-    dialog.visible = true;
-  });
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  formRef.value.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if ('copy' === billType.value) {
-        await copyModel(form.value);
-        proxy?.$modal.msgSuccess('操作成功');
-      } else if (ids.value && ids.value.length > 0 && 'update' === billType.value) {
-        form.value.id = ids.value[0];
-        await update(form.value);
-        proxy?.$modal.msgSuccess('操作成功');
-      } else {
-        initXml(form.value.key, form.value.name);
-        form.value.xml = xml.value;
-        await addModel(form.value);
-        proxy?.$modal.msgSuccess('操作成功');
-      }
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  formRef.value.resetFields();
-};
-
-// 打开设计流程
-const clickDesign = async (id: string) => {
-  await designRef.value.open(id);
-};
-// 导出流程模型
-const clickExportZip = () => {
-  proxy?.$download.zip('/workflow/model/export/zip/' + ids.value, '模型');
-};
-/** 查询流程分类下拉树结构 */
-const getTreeselect = async () => {
-  const res = await listCategory();
-  categoryOptions.value = [];
-  const data: CategoryOption = { categoryCode: 'ALL', categoryName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
-  categoryOptions.value.push(data);
-};
-
-const xml = ref<string>('');
-
-const initXml = async (key: string, name: string) => {
-  xml.value = `<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" targetNamespace="http://www.flowable.org/processdef">
-  <process id="${key}" name="${name}">
-    <startEvent id="startNode1" name="开始" />
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_flow">
-    <bpmndi:BPMNPlane id="BPMNPlane_flow" bpmnElement="T-2d89e7a3-ba79-4abd-9f64-ea59621c258c">
-      <bpmndi:BPMNShape id="BPMNShape_startNode1" bpmnElement="startNode1" bioc:stroke="">
-        <omgdc:Bounds x="240" y="200" width="30" height="30" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="242" y="237" width="23" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>`;
-  return xml;
-};
-</script>
diff --git a/src/views/workflow/processDefinition/components/processPreview.vue b/src/views/workflow/processDefinition/components/processPreview.vue
deleted file mode 100644
index 19a95df..0000000
--- a/src/views/workflow/processDefinition/components/processPreview.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <el-dialog v-model="data.visible" title="预览" width="70%" append-to-body destroy-on-close>
-    <div v-if="data.type === 'bpmn' && data.xmlStr">
-      <BpmnViewer ref="bpmnViewerRef"></BpmnViewer>
-    </div>
-    <div v-if="data.type === 'xml' && data.xmlStr">
-      <highlightjs language="xml" :code="data.xmlStr" />
-    </div>
-    <template #footer>
-      <span v-if="data.type === 'xml'" class="dialog-footer"> </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import BpmnViewer from '@/components/BpmnView/index.vue';
-
-const data = reactive({
-  visible: false,
-  type: '',
-  xmlStr: ''
-});
-
-const bpmnViewerRef = ref<InstanceType<typeof BpmnViewer>>();
-type PreviewType = 'xml' | 'bpmn';
-//打开
-const openDialog = (xmlStr: string, type: PreviewType) => {
-  data.visible = true;
-  data.xmlStr = xmlStr;
-  data.type = type;
-  /** 流程图 */
-  if (type === 'bpmn') {
-    /** 必须放在nextTick 否则第一次打开为空 */
-    nextTick(() => {
-      bpmnViewerRef.value?.initXml(data.xmlStr);
-    });
-  }
-};
-/**
- * 对外暴露子组件方法
- */
-defineExpose({
-  openDialog
-});
-</script>
diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
new file mode 100644
index 0000000..cb11045
--- /dev/null
+++ b/src/views/workflow/processDefinition/design.vue
@@ -0,0 +1,52 @@
+<template>
+  <div ref="container" class="container">
+    <iframe ref="iframe" :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+  </div>
+</template>
+
+<script setup name="WarmFlow">
+const { proxy } = getCurrentInstance();
+import { onMounted } from 'vue';
+// definitionId为需要查询的流程定义id，
+// disabled为是否可编辑, 例如：查看的时候不可编辑，不可保存
+const iframeUrl = ref('');
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+import { getToken } from '@/utils/auth';
+const iframeLoaded = () => {
+  // iframe监听组件内设计器保存事件
+  window.onmessage = (event) => {
+    switch (event.data.method) {
+      case 'close':
+        close();
+        break;
+    }
+  };
+};
+const open = async (definitionId, disabled) => {
+  let url = baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`;
+  iframeUrl.value = url + '&Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID;
+};
+/** 关闭按钮 */
+function close() {
+  const obj = { path: '/workflow/processDefinition' };
+  proxy.$tab.closeOpenPage(obj);
+}
+
+onMounted(() => {
+  iframeLoaded();
+  open(proxy.$route.query.definitionId, proxy.$route.query.disabled);
+});
+/**
+ * 对外暴露子组件方法
+ */
+defineExpose({
+  open
+});
+</script>
+
+<style scoped>
+.container {
+  width: 100%;
+  height: calc(100vh - 84px);
+}
+</style>
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 6c686bf..38ba903 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -10,7 +10,7 @@
             class="mt-2"
             node-key="id"
             :data="categoryOptions"
-            :props="{ label: 'categoryName', children: 'children' }"
+            :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             highlight-current
@@ -24,11 +24,11 @@
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
-                <el-form-item label="流程定义名称" prop="name">
-                  <el-input v-model="queryParams.name" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
+                <el-form-item label="流程定义名称" prop="flowName">
+                  <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
-                <el-form-item label="流程定义KEY" prop="key">
-                  <el-input v-model="queryParams.key" placeholder="请输入流程定义KEY" clearable @keyup.enter="handleQuery" />
+                <el-form-item label="流程定义KEY" prop="flowCode">
+                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义KEY" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -41,94 +41,87 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="success" icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
+              </el-col>
               <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
-
-          <el-table v-loading="loading" border :data="processDefinitionList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-            <el-table-column align="center" prop="name" label="流程定义名称" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column align="center" prop="key" label="标识KEY" width="80"></el-table-column>
-            <el-table-column align="center" prop="version" label="版本号" width="80">
-              <template #default="scope"> v{{ scope.row.version }}.0</template>
-            </el-table-column>
-            <el-table-column align="center" prop="resourceName" label="流程XML" width="100" :show-overflow-tooltip="true">
-              <template #default="scope">
-                <el-link type="primary" @click="clickPreview(scope.row.id, 'xml')">{{ scope.row.resourceName }}</el-link>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="diagramResourceName" label="流程图片" width="100" :show-overflow-tooltip="true">
-              <template #default="scope">
-                <el-link type="primary" @click="clickPreview(scope.row.id, 'bpmn')">{{ scope.row.diagramResourceName }}</el-link>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="suspensionState" label="状态" width="80">
-              <template #default="scope">
-                <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
-                <el-tag v-else type="danger">挂起</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="deploymentTime" label="部署时间" width="120" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column align="center" label="表名/表单KEY" width="120" :show-overflow-tooltip="true">
-              <template #default="scope">
-                <span v-if="scope.row.wfDefinitionConfigVo">
-                  {{ scope.row.wfDefinitionConfigVo.tableName }}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column fixed="right" label="操作" align="center" width="220" class-name="small-padding fixed-width">
-              <template #default="scope">
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      :icon="scope.row.suspensionState === 1 ? 'Lock' : 'Unlock'"
-                      @click="handleProcessDefState(scope.row)"
-                    >
-                      {{ scope.row.suspensionState === 1 ? '挂起流程' : '激活流程' }}
-                    </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Document" @click="getProcessDefinitionHitoryList(scope.row.id, scope.row.key)">
-                      历史版本
-                    </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Sort" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Tickets" @click="handleDefinitionConfigOpen(scope.row)">绑定业务</el-button>
-                  </el-col>
-                </el-row>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            :total="total"
-            @pagination="getList"
-          />
+          <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+            <el-tab-pane label="已发布" name="0"></el-tab-pane>
+            <el-tab-pane label="未发布" name="1"></el-tab-pane>
+            <el-table v-loading="loading" border :data="processDefinitionList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column align="center" prop="id" label="主键" v-if="false"></el-table-column>
+              <el-table-column align="center" prop="flowName" label="流程定义名称" :show-overflow-tooltip="true"></el-table-column>
+              <el-table-column align="center" prop="flowCode" label="标识KEY" :show-overflow-tooltip="true"></el-table-column>
+              <el-table-column align="center" prop="version" label="版本号" width="80">
+                <template #default="scope"> v{{ scope.row.version }}.0</template>
+              </el-table-column>
+              <el-table-column align="center" prop="activityStatus" label="激活状态" width="130">
+                <template #default="scope">
+                  <el-switch
+                    v-model="scope.row.activityStatus"
+                    :active-value="1"
+                    :inactive-value="0"
+                    @change="(status) => handleProcessDefState(scope.row, status)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="isPublish" label="发布状态" width="100">
+                <template #default="scope">
+                  <el-tag v-if="scope.row.isPublish == 0" type="danger">未发布</el-tag>
+                  <el-tag v-else-if="scope.row.isPublish == 1" type="success">已发布</el-tag>
+                  <el-tag v-else type="danger">失效</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" label="操作" align="center" width="170" class-name="small-padding fixed-width">
+                <template #default="scope">
+                  <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                      <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                      <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                      <el-button link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)"
+                        >流程设计</el-button
+                      >
+                      <el-button link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
+                    </el-col>
+                    <el-col v-if="scope.row.isPublish !== 1" :span="1.5">
+                      <el-button link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
+                    </el-col>
+                  </el-row>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-show="total > 0"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              :total="total"
+              @pagination="handleQuery"
+            />
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
-    <!-- 预览图片或xml -->
-    <process-preview ref="previewRef" />
 
     <!-- 部署文件 -->
     <el-dialog v-if="uploadDialog.visible" v-model="uploadDialog.visible" :title="uploadDialog.title" width="30%">
@@ -138,9 +131,9 @@
           <el-tree-select
             v-model="selectCategory"
             :data="categoryOptions"
-            :props="{ value: 'categoryCode', label: 'categoryName', children: 'children' }"
+            :props="{ value: 'id', label: 'label', children: 'children' }"
             filterable
-            value-key="categoryCode"
+            value-key="id"
             :render-after-expand="false"
             check-strictly
             style="width: 240px"
@@ -152,7 +145,7 @@
           multiple
           accept="application/zip,application/xml,.bpmn"
           :before-upload="handlerBeforeUpload"
-          :http-request="handerDeployProcessFile"
+          :http-request="handlerImportDefinition"
         >
           <el-icon class="UploadFilled"><upload-filled /></el-icon>
           <div class="el-upload__text"><em>点击上传，选择BPMN流程文件</em></div>
@@ -162,88 +155,35 @@
       </div>
     </el-dialog>
 
-    <!-- 历史版本 -->
-    <el-dialog v-if="processDefinitionDialog.visible" v-model="processDefinitionDialog.visible" :title="processDefinitionDialog.title" width="70%">
-      <el-table v-loading="loading" :data="processDefinitionHistoryList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column align="center" prop="name" label="流程定义名称" :show-overflow-tooltip="true" min-width="80"></el-table-column>
-        <el-table-column align="center" prop="key" label="标识KEY"></el-table-column>
-        <el-table-column align="center" prop="version" label="版本号" width="90">
-          <template #default="scope"> v{{ scope.row.version }}.0</template>
-        </el-table-column>
-        <el-table-column align="center" prop="resourceName" label="流程XML" min-width="80" :show-overflow-tooltip="true">
-          <template #default="scope">
-            <el-link type="primary" @click="clickPreviewXML(scope.row.id)">{{ scope.row.resourceName }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="diagramResourceName" label="流程图片" min-width="80" :show-overflow-tooltip="true">
-          <template #default="scope">
-            <el-link type="primary" @click="clickPreviewImg(scope.row.id)">{{ scope.row.diagramResourceName }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="suspensionState" label="状态" min-width="70">
-          <template #default="scope">
-            <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
-            <el-tag v-else type="danger">挂起</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="deploymentTime" label="部署时间" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  link
-                  type="primary"
-                  size="small"
-                  :icon="scope.row.suspensionState === 1 ? 'Lock' : 'Unlock'"
-                  @click="handleProcessDefState(scope.row)"
-                >
-                  {{ scope.row.suspensionState === 1 ? '挂起流程' : '激活流程' }}
-                </el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="text" size="small" icon="Tickets" @click="handleDefinitionConfigOpen(scope.row)">绑定业务</el-button>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button link type="primary" icon="Sort" size="small" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button link type="primary" icon="Delete" size="small" @click="handleDelete(scope.row)">删除</el-button>
-              </el-col>
-            </el-row>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <!-- 表单配置 -->
-    <el-dialog
-      v-model="definitionConfigDialog.visible"
-      :title="definitionConfigDialog.title"
-      width="650px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form :model="definitionConfigForm" label-width="auto">
-        <el-form-item label="流程KEY">
-          <el-input v-model="definitionConfigForm.processKey" disabled />
-        </el-form-item>
-        <el-form-item label="表名" prop="formId">
-          <el-input v-model="definitionConfigForm.tableName" placeholder="示例:test_leave" />
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="definitionConfigForm.remark" type="textarea" resize="none" />
-        </el-form-item>
-      </el-form>
-
+    <!-- 新增/编辑流程定义 -->
+    <el-dialog v-model="modelDialog.visible" :title="modelDialog.title" width="650px" append-to-body :close-on-click-modal="false">
       <template #footer>
+        <el-form ref="defFormRef" :model="form" :rules="rules" label-width="110px">
+          <el-form-item label="流程类别" prop="category">
+            <el-tree-select
+              v-model="form.category"
+              :data="categoryOptions"
+              :props="{ value: 'id', label: 'label', children: 'children' }"
+              filterable
+              value-key="id"
+              :render-after-expand="false"
+              check-strictly
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item label="流程编码" prop="flowCode">
+            <el-input v-model="form.flowCode" placeholder="请输入流程编码" maxlength="40" show-word-limit />
+          </el-form-item>
+          <el-form-item label="流程名称" prop="flowName">
+            <el-input v-model="form.flowName" placeholder="请输入流程名称" maxlength="100" show-word-limit />
+          </el-form-item>
+          <el-form-item label="表单路径" prop="flowName">
+            <el-input v-model="form.formPath" placeholder="请输入表单路径" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-form>
         <div class="dialog-footer">
-          <el-button @click="definitionConfigDialog.visible = false">取消</el-button>
-          <el-button type="primary" @click="handlerSaveForm">保存</el-button>
+          <el-button @click="modelDialog.visible = false">取消</el-button>
+          <el-button type="primary" @click="handleSubmit">保存</el-button>
         </div>
       </template>
     </el-dialog>
@@ -251,53 +191,32 @@
 </template>
 
 <script lang="ts" setup name="processDefinition">
-import {
-  listProcessDefinition,
-  definitionImage,
-  definitionXml,
-  deleteProcessDefinition,
-  updateDefinitionState,
-  convertToModel,
-  deployProcessFile,
-  getListByKey
-} from '@/api/workflow/processDefinition';
-import { getByTableNameNotDefId, getByDefId, saveOrUpdate } from '@/api/workflow/definitionConfig';
-import ProcessPreview from './components/processPreview.vue';
-import { listCategory } from '@/api/workflow/category';
-import { CategoryVO } from '@/api/workflow/category/types';
-import { ProcessDefinitionQuery, ProcessDefinitionVO } from '@/api/workflow/processDefinition/types';
-import { DefinitionConfigForm } from '@/api/workflow/definitionConfig/types';
-import { UploadRequestOptions, ElMessage, ElMessageBox } from 'element-plus';
+import { listDefinition, deleteDefinition, active, importDef, unPublishList, publish, add, edit, getInfo, copy } from '@/api/workflow/definition';
+import { categoryTree } from '@/api/workflow/category';
+import { CategoryTreeVO } from '@/api/workflow/category/types';
+import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types';
+import { UploadRequestOptions, TabsPaneContext } from 'element-plus';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const previewRef = ref<InstanceType<typeof ProcessPreview>>();
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
-const definitionConfigForm = ref<DefinitionConfigForm>({});
-
-type CategoryOption = {
-  categoryCode: string;
-  categoryName: string;
-  children?: CategoryOption[];
-};
 
 const loading = ref(true);
 const ids = ref<Array<any>>([]);
-const deploymentIds = ref<Array<any>>([]);
-const keys = ref<Array<any>>([]);
+const flowCodeList = ref<Array<any>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
 const uploadDialogLoading = ref(false);
-const processDefinitionList = ref<ProcessDefinitionVO[]>([]);
-const processDefinitionHistoryList = ref<ProcessDefinitionVO[]>([]);
-const categoryOptions = ref<CategoryOption[]>([]);
+const processDefinitionList = ref<FlowDefinitionVo[]>([]);
+const categoryOptions = ref<CategoryTreeVO[]>([]);
 const categoryName = ref('');
 /** 部署文件分类选择 */
 const selectCategory = ref();
-
+const defFormRef = ref<ElFormInstance>();
+const activeName = ref('0');
 const uploadDialog = reactive<DialogOption>({
   visible: false,
   title: '部署流程文件'
@@ -308,30 +227,49 @@ const processDefinitionDialog = reactive<DialogOption>({
   title: '历史版本'
 });
 
-const definitionConfigDialog = reactive<DialogOption>({
+const modelDialog = reactive<DialogOption>({
   visible: false,
-  title: '流程定义配置'
+  title: ''
 });
 
 // 查询参数
-const queryParams = ref<ProcessDefinitionQuery>({
+const queryParams = ref<FlowDefinitionQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  key: undefined,
-  categoryCode: undefined
+  flowName: undefined,
+  flowCode: undefined,
+  category: undefined
+});
+const rules = {
+  category: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+  flowName: [{ required: true, message: '流程定义名称不能为空', trigger: 'blur' }],
+  flowCode: [{ required: true, message: '流程定义编码不能为空', trigger: 'blur' }]
+};
+const initFormData: FlowDefinitionForm = {
+  id: '',
+  flowName: '',
+  flowCode: '',
+  category: '',
+  formPath: ''
+};
+//流程定义参数
+const form = ref<FlowDefinitionForm>({
+  id: '',
+  flowName: '',
+  flowCode: '',
+  category: '',
+  formPath: ''
 });
-
 onMounted(() => {
-  getList();
+  handleQuery();
   getTreeselect();
 });
 
 /** 节点单击事件 */
-const handleNodeClick = (data: CategoryVO) => {
-  queryParams.value.categoryCode = data.categoryCode;
-  if (data.categoryCode === 'ALL') {
-    queryParams.value.categoryCode = '';
+const handleNodeClick = (data: CategoryTreeVO) => {
+  queryParams.value.category = data.id;
+  if (data.id === '0') {
+    queryParams.value.category = '';
   }
   handleQuery();
 };
@@ -352,22 +290,27 @@ watchEffect(
 
 /** 查询流程分类下拉树结构 */
 const getTreeselect = async () => {
-  const res = await listCategory();
-  categoryOptions.value = [];
-  const data: CategoryOption = { categoryCode: 'ALL', categoryName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
-  categoryOptions.value.push(data);
+  const res = await categoryTree();
+  categoryOptions.value = res.data;
+};
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+  // v-model处理有延迟 需要手动处理
+  activeName.value = tab.index;
+  handleQuery();
 };
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
-  getList();
+  if (activeName.value === '0') {
+    getList();
+  } else {
+    getUnPublishList();
+  }
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
-  queryParams.value.categoryCode = '';
+  queryParams.value.category = '';
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
   handleQuery();
@@ -375,73 +318,69 @@ const resetQuery = () => {
 // 多选框选中数据
 const handleSelectionChange = (selection: any) => {
   ids.value = selection.map((item: any) => item.id);
-  deploymentIds.value = selection.map((item: any) => item.deploymentId);
-  keys.value = selection.map((item: any) => item.key);
+  flowCodeList.value = selection.map((item: any) => item.flowCode);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 //分页
 const getList = async () => {
   loading.value = true;
-  const resp = await listProcessDefinition(queryParams.value);
+  const resp = await listDefinition(queryParams.value);
   processDefinitionList.value = resp.rows;
   total.value = resp.total;
   loading.value = false;
 };
-//获取历史流程定义
-const getProcessDefinitionHitoryList = async (id: string, key: string) => {
-  processDefinitionDialog.visible = true;
+//查询未发布的流程定义列表
+const getUnPublishList = async () => {
   loading.value = true;
-  const resp = await getListByKey(key);
-  if (resp.data && resp.data.length > 0) {
-    processDefinitionHistoryList.value = resp.data.filter((item: any) => item.id !== id);
-  }
+  const resp = await unPublishList(queryParams.value);
+  processDefinitionList.value = resp.rows;
+  total.value = resp.total;
   loading.value = false;
 };
 
-type PreviewType = 'xml' | 'bpmn';
-//预览 公共方法
-const clickPreview = async (id: string, type: PreviewType) => {
-  loading.value = true;
-  const resp = await definitionXml(id);
-  if (previewRef.value) {
-    const xmlStr = resp.data.xmlStr;
-    loading.value = false;
-    previewRef.value.openDialog(xmlStr, type);
-  }
-};
-
 /** 删除按钮操作 */
-const handleDelete = async (row?: ProcessDefinitionVO) => {
+const handleDelete = async (row?: FlowDefinitionVo) => {
   const id = row?.id || ids.value;
-  const deployIds = row?.deploymentId || deploymentIds.value;
-  const defKeys = row?.key || keys.value;
-  await proxy?.$modal.confirm('是否确认删除流程定义KEY为【' + defKeys + '】的数据项？');
+  const defList = processDefinitionList.value.filter((x) => id.indexOf(x.id) != -1).map((x) => x.flowCode);
+  await proxy?.$modal.confirm('是否确认删除流程定义KEY为【' + defList + '】的数据项？');
   loading.value = true;
-  await deleteProcessDefinition(deployIds, id).finally(() => (loading.value = false));
-  await getList();
+  await deleteDefinition(id).finally(() => (loading.value = false));
+  await handleQuery();
   proxy?.$modal.msgSuccess('删除成功');
 };
-/** 挂起/激活 */
-const handleProcessDefState = async (row: ProcessDefinitionVO) => {
-  let msg: string;
-  if (row.suspensionState === 1) {
-    msg = `暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${row.name || row.key}】吗？`;
-  } else {
-    msg = `启动后，此流程下的所有任务都允许往后流转，您确定激活【${row.name || row.key}】吗？`;
-  }
-  await proxy?.$modal.confirm(msg);
+
+/** 发布流程定义 */
+const handlePublish = async (row?: FlowDefinitionVo) => {
+  await proxy?.$modal.confirm(
+    '是否确认发布流程定义KEY为【' + row.flowCode + '】版本为【' + row.version + '】的数据项？，发布后会将已发布流程定义改为失效！'
+  );
   loading.value = true;
-  await updateDefinitionState(row.id).finally(() => (loading.value = false));
-  await getList();
-  proxy?.$modal.msgSuccess('操作成功');
+  await publish(row.id).finally(() => (loading.value = false));
+  processDefinitionDialog.visible = false;
+  await handleQuery();
+  proxy?.$modal.msgSuccess('发布成功');
 };
-/** 流程定义转换为模型 */
-const handleConvertToModel = async (row: ProcessDefinitionVO) => {
-  await proxy?.$modal.confirm('是否确认转换流程定义key为【' + row.key + '】的数据项？');
-  await convertToModel(row.id).finally(() => (loading.value = false));
-  getList();
-  proxy?.$modal.msgSuccess('操作成功');
+/** 挂起/激活 */
+const handleProcessDefState = async (row: FlowDefinitionVo, status: number | string | boolean) => {
+  let msg: string;
+  if (status === 0) {
+    msg = `暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${row.flowName || row.flowCode}】吗？`;
+  } else {
+    msg = `启动后，此流程下的所有任务都允许往后流转，您确定激活【${row.flowName || row.flowCode}】吗？`;
+  }
+  try {
+    loading.value = true;
+    await proxy?.$modal.confirm(msg);
+    await active(row.id, !!status);
+    await handleQuery();
+    proxy?.$modal.msgSuccess('操作成功');
+  } catch (error) {
+    row.activityStatus = status === 0 ? 1 : 0;
+    console.error(error);
+  } finally {
+    loading.value = false;
+  }
 };
 
 //上传文件前的钩子
@@ -456,12 +395,12 @@ const handlerBeforeUpload = () => {
   }
 };
 //部署文件
-const handerDeployProcessFile = (data: UploadRequestOptions): XMLHttpRequest => {
+const handlerImportDefinition = (data: UploadRequestOptions): XMLHttpRequest => {
   let formData = new FormData();
   uploadDialogLoading.value = true;
   formData.append('file', data.file);
-  formData.append('categoryCode', selectCategory.value);
-  deployProcessFile(formData)
+  formData.append('category', selectCategory.value);
+  importDef(formData)
     .then(() => {
       uploadDialog.visible = false;
       proxy?.$modal.msgSuccess('部署成功');
@@ -472,46 +411,91 @@ const handerDeployProcessFile = (data: UploadRequestOptions): XMLHttpRequest =>
     });
   return;
 };
-//打开流程定义配置
-const handleDefinitionConfigOpen = async (row: ProcessDefinitionVO) => {
-  definitionConfigDialog.visible = true;
-  definitionConfigForm.value.processKey = row.key;
-  definitionConfigForm.value.definitionId = row.id;
-  definitionConfigForm.value.version = row.version;
-  const resp = await getByDefId(row.id);
-  if (resp.data) {
-    definitionConfigForm.value = resp.data;
-  } else {
-    definitionConfigForm.value.tableName = undefined;
-    definitionConfigForm.value.remark = undefined;
-  }
-};
-//保存表单
-const handlerSaveForm = async () => {
-  getByTableNameNotDefId(definitionConfigForm.value.tableName, definitionConfigForm.value.definitionId).then((res) => {
-    if (res.data && res.data.length > 0) {
-      ElMessageBox.confirm('表名已被【' + res.data[0].processKey + '】版本v' + res.data[0].version + '.0绑定确认后将会删除绑定的流程KEY!', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        saveOrUpdate(definitionConfigForm.value).then((resp) => {
-          if (resp.code === 200) {
-            proxy?.$modal.msgSuccess('操作成功');
-            definitionConfigDialog.visible = false;
-            getList();
-          }
-        });
-      });
-    } else {
-      saveOrUpdate(definitionConfigForm.value).then((resp) => {
-        if (resp.code === 200) {
-          proxy?.$modal.msgSuccess('操作成功');
-          definitionConfigDialog.visible = false;
-          getList();
-        }
-      });
+/**
+ * 设计流程
+ * @param row
+ */
+const design = async (row: FlowDefinitionVo) => {
+  proxy.$router.push({
+    path: `/workflow/design/index`,
+    query: {
+      definitionId: row.id,
+      disabled: false
     }
   });
 };
+
+/**
+ * 查看流程
+ * @param row
+ */
+const designView = async (row: FlowDefinitionVo) => {
+  proxy.$router.push({
+    path: `/workflow/design/index`,
+    query: {
+      definitionId: row.id,
+      disabled: true
+    }
+  });
+};
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  defFormRef.value?.resetFields();
+};
+/**
+ * 新增
+ */
+const handleAdd = async () => {
+  reset();
+  modelDialog.visible = true;
+  modelDialog.title = '新增流程';
+};
+/** 修改按钮操作 */
+const handleUpdate = async (row?: FlowDefinitionVo) => {
+  reset();
+  const id = row?.id || ids.value[0];
+  const res = await getInfo(id);
+  Object.assign(form.value, res.data);
+  modelDialog.visible = true;
+  modelDialog.title = '修改流程';
+};
+
+const handleSubmit = async () => {
+  defFormRef.value.validate(async (valid: boolean) => {
+    if (valid) {
+      loading.value = true;
+      if (form.value.id) {
+        await edit(form.value).finally(() => loading.value = false);
+      } else {
+        await add(form.value).finally(() => loading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      modelDialog.visible = false;
+      handleQuery();
+    }
+  });
+};
+//复制
+const handleCopyDef = async (row: FlowDefinitionVo) => {
+  ElMessageBox.confirm(`是否确认复制【${row.flowCode}】版本为【${row.version}】的流程定义！`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    loading.value = true;
+    copy(row.id).then((resp) => {
+      if (resp.code === 200) {
+        proxy?.$modal.msgSuccess('操作成功');
+        activeName.value = "1"
+        handleQuery();
+      }
+    }).finally(() => loading.value = false);
+  });
+};
+
+/** 导出按钮操作 */
+const handleExportDef = () => {
+  proxy?.download(`/workflow/definition/exportDef/${ids.value[0]}`, {}, `${flowCodeList.value[0]}.xml`);
+};
 </script>
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 084cf13..140cdaf 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -10,7 +10,7 @@
             class="mt-2"
             node-key="id"
             :data="categoryOptions"
-            :props="{ label: 'categoryName', children: 'children' }"
+            :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             highlight-current
@@ -20,23 +20,31 @@
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
-        <div class="mb-[10px]">
-          <el-card shadow="hover" class="text-center">
-            <el-radio-group v-model="tab" @change="changeTab(tab)">
-              <el-radio-button value="running">运行中</el-radio-button>
-              <el-radio-button value="finish">已完成</el-radio-button>
-            </el-radio-group>
-          </el-card>
-        </div>
+        <!--        <div class="mb-[10px]">
+                  <el-card shadow="hover" class="text-center">
+                    <el-radio-group v-model="tab" @change="changeTab(tab)">
+                      <el-radio-button value="running">运行中</el-radio-button>
+                      <el-radio-button value="finish">已完成</el-radio-button>
+                    </el-radio-group>
+                  </el-card>
+                </div>-->
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
-              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
-                <el-form-item label="流程定义名称" prop="name">
-                  <el-input v-model="queryParams.name" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item>
+                  <el-badge :value="userSelectCount" :max="10" class="item">
+                    <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+                  </el-badge>
                 </el-form-item>
-                <el-form-item label="流程定义KEY" prop="key">
-                  <el-input v-model="queryParams.key" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+                <el-form-item label="任务名称" prop="nodeName">
+                  <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="流程定义名称" label-width="100" prop="flowName">
+                  <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -55,66 +63,74 @@
               <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
-
-          <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
-              <template #default="scope">
-                <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-            <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90">
-              <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
-            </el-table-column>
-            <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
-              <template #default="scope">
-                <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
-                <el-tag v-else type="danger">挂起</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="流程状态" min-width="70">
-              <template #default="scope">
-                <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
-            <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" :width="130">
-              <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-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" />
-                      <div style="text-align: right; margin: 5px 0px 0px 0px">
-                        <el-button size="small" text @click="cancelPopover(scope.$index)">取消</el-button>
-                        <el-button size="small" type="primary" @click="handleInvalid(scope.row)">确认</el-button>
-                      </div>
-                      <template #reference>
-                        <el-button link type="primary" size="small" icon="CircleClose">作废</el-button>
-                      </template>
-                    </el-popover>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
-                  </el-col>
-                </el-row>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            :total="total"
-            @pagination="handleQuery"
-          />
+          <el-tabs v-model="tab" @tab-click="changeTab">
+            <el-tab-pane name="running" label="运行中"></el-tab-pane>
+            <el-tab-pane name="finish" label="已完成"></el-tab-pane>
+            <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+              <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
+                <template #default="scope">
+                  <span>{{ scope.row.flowName }}v{{ scope.row.version }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+              <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+              <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
+              <el-table-column align="center" prop="version" label="版本号" width="90">
+                <template #default="scope"> v{{ scope.row.version }}.0</template>
+              </el-table-column>
+              <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
+                <template #default="scope">
+                  <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
+                  <el-tag v-else type="danger">挂起</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="流程状态" min-width="70">
+                <template #default="scope">
+                  <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column>
+              <el-table-column v-if="tab === 'finish'" align="center" prop="updateTime" label="结束时间" width="160"></el-table-column>
+              <el-table-column label="操作" align="center" :width="162">
+                <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-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" />
+                        <div style="text-align: right; margin: 5px 0px 0px 0px">
+                          <el-button size="small" text @click="cancelPopover(scope.$index)">取消</el-button>
+                          <el-button size="small" type="primary" @click="handleInvalid(scope.row)">确认</el-button>
+                        </div>
+                        <template #reference>
+                          <el-button type="danger" size="small" icon="CircleClose">作废</el-button>
+                        </template>
+                      </el-popover>
+                    </el-col>
+                    <el-col :span="1.5">
+                      <el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                      <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                      <el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
+                    </el-col>
+                  </el-row>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-show="total > 0"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              :total="total"
+              @pagination="handleQuery"
+            />
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
@@ -122,6 +138,7 @@
       <el-table v-loading="loading" :data="processDefinitionHistoryList">
         <el-table-column fixed align="center" type="index" label="序号" width="60"></el-table-column>
         <el-table-column fixed align="center" prop="name" label="流程定义名称"></el-table-column>
+        <el-table-column fixed align="center" prop="nodeName" label="任务名称"></el-table-column>
         <el-table-column align="center" prop="key" label="标识Key"></el-table-column>
         <el-table-column align="center" prop="version" label="版本号" width="90">
           <template #default="scope"> v{{ scope.row.version }}.0</template>
@@ -133,42 +150,55 @@
           </template>
         </el-table-column>
         <el-table-column align="center" prop="deploymentTime" label="部署时间" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-button link type="primary" size="small" icon="Sort" @click="handleChange(scope.row.id)">切换</el-button>
-          </template>
-        </el-table-column>
       </el-table>
     </el-dialog>
+    <!-- 流程变量开始 -->
+    <el-dialog v-model="variableVisible" draggable title="流程变量" width="60%" :close-on-click-modal="false">
+      <el-card v-loading="variableLoading" class="box-card">
+        <template #header>
+          <div class="clearfix">
+            <span
+              >流程定义名称：<el-tag>{{ processDefinitionName }}</el-tag></span
+            >
+          </div>
+        </template>
+        <div class="max-h-500px overflow-y-auto">
+          <VueJsonPretty :data="formatToJsonObject(variables)" />
+        </div>
+      </el-card>
+    </el-dialog>
+    <!-- 流程变量结束 -->
+
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import {
-  getPageByRunning,
-  getPageByFinish,
-  deleteRunAndHisInstance,
-  deleteFinishAndHisInstance,
-  deleteRunInstance
-} from '@/api/workflow/processInstance';
-import { getListByKey, migrationDefinition } from '@/api/workflow/processDefinition';
-import { listCategory } from '@/api/workflow/category';
-import { CategoryVO } from '@/api/workflow/category/types';
-import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
+import { pageByRunning, pageByFinish, deleteByInstanceIds, instanceVariable, invalid } 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 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 UserSelect from '@/components/UserSelect/index.vue';
 //审批记录组件
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
 
+const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
 const ids = ref<Array<any>>([]);
-// 选中业务id数组
-const businessKeys = ref<Array<any>>([]);
+// 选中实例id数组
+const instanceIds = ref<Array<number | string>>([]);
 // 非单个禁用
 const single = ref(true);
 // 非多个禁用
@@ -177,10 +207,15 @@ const multiple = ref(true);
 const showSearch = ref(true);
 // 总条数
 const total = ref(0);
-// 流程定义id
-const processDefinitionId = ref<string>('');
+
+// 流程变量是否显示
+const variableVisible = ref(false);
+const variableLoading = ref(true);
+const variables = ref<string>('');
+//流程定义名称
+const processDefinitionName = ref();
 // 模型定义表格数据
-const processInstanceList = ref<ProcessInstanceVO[]>([]);
+const processInstanceList = ref<FlowInstanceVO[]>([]);
 const processDefinitionHistoryList = ref<Array<any>>([]);
 const categoryOptions = ref<CategoryOption[]>([]);
 const categoryName = ref('');
@@ -191,7 +226,7 @@ const processDefinitionDialog = reactive<DialogOption>({
 });
 
 type CategoryOption = {
-  categoryCode: string;
+  id: string;
   categoryName: string;
   children?: CategoryOption[];
 };
@@ -199,20 +234,27 @@ type CategoryOption = {
 const tab = ref('running');
 // 作废原因
 const deleteReason = ref('');
+
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
-const queryParams = ref<ProcessInstanceQuery>({
+const queryParams = ref<FlowInstanceQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  key: undefined,
-  categoryCode: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  createByIds: [],
+  category: undefined
 });
 
 /** 节点单击事件 */
-const handleNodeClick = (data: CategoryVO) => {
-  queryParams.value.categoryCode = data.categoryCode;
-  if (data.categoryCode === 'ALL') {
-    queryParams.value.categoryCode = '';
+const handleNodeClick = (data: CategoryTreeVO) => {
+  queryParams.value.category = data.id;
+  if (data.id === '0') {
+    queryParams.value.category = '';
   }
   handleQuery();
 };
@@ -233,11 +275,8 @@ watchEffect(
 
 /** 查询流程分类下拉树结构 */
 const getTreeselect = async () => {
-  const res = await listCategory();
-  categoryOptions.value = [];
-  const data: CategoryOption = { categoryCode: 'ALL', categoryName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
-  categoryOptions.value.push(data);
+  const res = await categoryTree();
+  categoryOptions.value = res.data;
 };
 
 /** 搜索按钮操作 */
@@ -251,22 +290,24 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
-  queryParams.value.categoryCode = '';
+  queryParams.value.category = '';
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
-const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
+const handleSelectionChange = (selection: FlowInstanceVO[]) => {
   ids.value = selection.map((item: any) => item.id);
-  businessKeys.value = selection.map((item: any) => item.businessKey);
+  instanceIds.value = selection.map((item: FlowInstanceVO) => item.id);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 //分页
 const getProcessInstanceRunningList = () => {
   loading.value = true;
-  getPageByRunning(queryParams.value).then((resp) => {
+  pageByRunning(queryParams.value).then((resp) => {
     processInstanceList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -275,7 +316,7 @@ const getProcessInstanceRunningList = () => {
 //分页
 const getProcessInstanceFinishList = () => {
   loading.value = true;
-  getPageByFinish(queryParams.value).then((resp) => {
+  pageByFinish(queryParams.value).then((resp) => {
     processInstanceList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -283,15 +324,15 @@ const getProcessInstanceFinishList = () => {
 };
 
 /** 删除按钮操作 */
-const handleDelete = async (row: any) => {
-  const businessKey = row.businessKey || businessKeys.value;
-  await proxy?.$modal.confirm('是否确认删除业务id为【' + businessKey + '】的数据项？');
+const handleDelete = async (row: FlowInstanceVO) => {
+  const instanceIdList = row.id || instanceIds.value;
+  await proxy?.$modal.confirm('是否确认删除？');
   loading.value = true;
   if ('running' === tab.value) {
-    await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
+    await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
     getProcessInstanceRunningList();
   } else {
-    await deleteFinishAndHisInstance(businessKey).finally(() => (loading.value = false));
+    await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
     getProcessInstanceFinishList();
   }
   proxy?.$modal.msgSuccess('删除成功');
@@ -299,22 +340,22 @@ const handleDelete = async (row: any) => {
 const changeTab = async (data: string) => {
   processInstanceList.value = [];
   queryParams.value.pageNum = 1;
-  if ('running' === data) {
+  if ('running' === data.paneName) {
     getProcessInstanceRunningList();
   } else {
     getProcessInstanceFinishList();
   }
 };
 /** 作废按钮操作 */
-const handleInvalid = async (row: ProcessInstanceVO) => {
-  await proxy?.$modal.confirm('是否确认作废业务id为【' + row.businessKey + '】的数据项？');
+const handleInvalid = async (row: FlowInstanceVO) => {
+  await proxy?.$modal.confirm('是否确认作废？');
   loading.value = true;
   if ('running' === tab.value) {
     let param = {
-      businessKey: row.businessKey,
-      deleteReason: deleteReason.value
+      id: row.id,
+      comment: deleteReason.value
     };
-    await deleteRunInstance(param).finally(() => (loading.value = false));
+    await invalid(param).finally(() => (loading.value = false));
     getProcessInstanceRunningList();
     proxy?.$modal.msgSuccess('操作成功');
   }
@@ -322,41 +363,53 @@ const handleInvalid = async (row: ProcessInstanceVO) => {
 const cancelPopover = async (index: any) => {
   (proxy?.$refs[`popoverRef${index}`] as any).hide(); //关闭弹窗
 };
-//获取流程定义
-const getProcessDefinitionHitoryList = (id: string, key: string) => {
-  processDefinitionDialog.visible = true;
-  processDefinitionId.value = id;
-  loading.value = true;
-  getListByKey(key).then((resp) => {
-    if (resp.data && resp.data.length > 0) {
-      processDefinitionHistoryList.value = resp.data.filter((item: any) => item.id !== id);
-    }
-    loading.value = false;
-  });
-};
-//切换流程版本
-const handleChange = async (id: string) => {
-  await proxy?.$modal.confirm('是否确认切换？');
-  loading.value = true;
-  migrationDefinition(processDefinitionId.value, id).then((resp) => {
-    proxy?.$modal.msgSuccess('操作成功');
-    getProcessInstanceRunningList();
-    processDefinitionDialog.visible = false;
-    loading.value = false;
-  });
-};
 /** 查看按钮操作 */
 const handleView = (row) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: 'view'
+    type: 'view',
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
 
+//查询流程变量
+const handleInstanceVariable = async (row: FlowInstanceVO) => {
+  variableLoading.value = true;
+  variableVisible.value = true;
+  processDefinitionName.value = row.flowName;
+  let data = await instanceVariable(row.id);
+  variables.value = data.data.variable;
+  variableLoading.value = false;
+};
+
+/**
+ * json转为对象
+ * @param data 原始数据
+ */
+function formatToJsonObject(data: string) {
+  try {
+    return JSON.parse(data);
+  } catch (error) {
+    return data;
+  }
+}
+
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getProcessInstanceRunningList();
   getTreeselect();
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 0bcfd31..1a01be2 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -1,25 +1,19 @@
 <template>
   <div class="p-2">
-    <div class="mb-[10px]">
-      <el-card shadow="hover" class="text-center">
-        <el-radio-group v-model="tab" @change="changeTab(tab)">
-          <el-radio-button value="waiting">待办任务</el-radio-button>
-          <el-radio-button value="finish">已办任务</el-radio-button>
-        </el-radio-group>
-      </el-card>
-    </div>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item>
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
-            <el-form-item label="流程定义名称" label-width="100" prop="processDefinitionName">
-              <el-input v-model="queryParams.processDefinitionName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            <el-form-item label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="流程定义KEY" label-width="100" prop="processDefinitionKey">
-              <el-input v-model="queryParams.processDefinitionKey" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+            <el-form-item label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -32,122 +26,103 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">修改办理人</el-button>
+          <el-col :span="1.5" v-if="tab === 'waiting'">
+            <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">修改办理人 </el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
-
-      <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
-          <template #default="scope">
-            <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-        <el-table-column align="center" prop="name" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="assigneeName" label="办理人">
-          <template v-if="tab === 'waiting'" #default="scope">
-            <template v-if="scope.row.participantVo && scope.row.assignee === null">
-              <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
-                {{ item }}
-              </el-tag>
+      <el-tabs v-model="tab" @tab-click="changeTab">
+        <el-tab-pane name="waiting" label="待办任务"> </el-tab-pane>
+        <el-tab-pane name="finish" label="已办任务"> </el-tab-pane>
+        <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
+          <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+          <el-table-column align="center" prop="version" label="版本号" width="90">
+            <template #default="scope"> v{{ scope.row.version }}.0</template>
+          </el-table-column>
+          <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+          <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
+          <el-table-column align="center" label="办理人">
+            <template #default="scope">
+              <template v-if="tab === 'waiting'">
+                <template v-if="scope.row.assigneeNames">
+                  <el-tag v-for="(name, index) in scope.row.assigneeNames.split(',')" :key="index" type="success">
+                    {{ name }}
+                  </el-tag>
+                </template>
+                <template v-else>
+                  <el-tag type="success"> 无</el-tag>
+                </template>
+              </template>
+              <template v-else>
+                <el-tag type="success"> {{ scope.row.approveName }}</el-tag>
+              </template>
             </template>
-            <template v-else>
-              <el-tag type="success">
-                {{ scope.row.assigneeName || '无' }}
-              </el-tag>
+          </el-table-column>
+          <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="70">
+            <template #default="scope">
+              <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
             </template>
-          </template>
-          <template v-else-if="tab === 'finish'" #default="scope">
-            <el-tag type="success">
-              {{ scope.row.assigneeName || '无' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="流程状态" min-width="70">
-          <template #default="scope">
-            <dict-tag v-if="tab === 'waiting'" :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
-            <el-tag v-else type="success">已完成</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="tab === 'waiting'" align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
-        <el-table-column v-if="tab === 'finish'" align="center" prop="startTime" label="创建时间" width="160"></el-table-column>
-        <el-table-column label="操作" align="center" :width="tab === 'finish' ? '80' : '151'">
-          <template #default="scope">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
-              </el-col>
-              <el-col v-if="tab === 'waiting'" :span="1.5">
-                <el-button link type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">流程变量</el-button>
-              </el-col>
-            </el-row>
-            <el-row v-if="scope.row.multiInstance" :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button link type="primary" size="small" icon="Remove" @click="deleteMultiInstanceUser(scope.row)">减签</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button link type="primary" size="small" icon="CirclePlus" @click="addMultiInstanceUser(scope.row)">加签</el-button>
-              </el-col>
-            </el-row>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total > 0"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
-        :total="total"
-        @pagination="handleQuery"
-      />
+          </el-table-column>
+          <el-table-column v-if="tab === 'finish'" align="center" label="任务状态" prop="flowTaskStatus" min-width="70">
+            <template #default="scope">
+              <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
+          <el-table-column label="操作" align="center" :width="tab === 'finish' ? '88' : '188'">
+            <template #default="scope">
+              <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'">
+                  <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                </el-col>
+                <el-col :span="1.5" v-if="tab === 'waiting'">
+                  <el-button type="primary" size="small" icon="Setting" @click="handleMeddle(scope.row)">流程干预 </el-button>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          :total="total"
+          @pagination="handleQuery"
+        />
+      </el-tabs>
     </el-card>
-    <!-- 加签组件 -->
-    <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="handleQuery" />
     <!-- 选人组件 -->
     <UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="submitCallback"></UserSelect>
-    <!-- 流程变量开始 -->
-    <el-dialog v-model="variableVisible" draggable title="流程变量" width="60%" :close-on-click-modal="false">
-      <el-card v-loading="variableLoading" class="box-card">
-        <template #header>
-          <div class="clearfix">
-            <span
-              >流程定义名称：<el-tag>{{ processDefinitionName }}</el-tag></span
-            >
-          </div>
-        </template>
-        <div v-for="(v, index) in variableList" :key="index">
-          <el-form v-if="v.key !== '_FLOWABLE_SKIP_EXPRESSION_ENABLED'" :label-position="'right'" label-width="150px">
-            <el-form-item :label="v.key + '：'">
-              {{ v.value }}
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-    </el-dialog>
-    <!-- 流程变量结束 -->
+    <!-- 选人组件 -->
+    <processMeddle ref="processMeddleRef" @submitCallback="getWaitingList"></processMeddle>
+    <!-- 申请人 -->
+    <UserSelect ref="applyUserSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable } from '@/api/workflow/task';
-import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
+import { pageByAllTaskWait, pageByAllTaskFinish, updateAssignee } from '@/api/workflow/task';
 import UserSelect from '@/components/UserSelect';
-import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
+import { TaskQuery } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-//审批记录组件
-//加签组件
-const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
+import processMeddle from '@/components/Process/processMeddle';
+import { UserVO } from '@/api/system/user/types';
+import { TabsPaneContext } from 'element-plus';
 //选人组件
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
-
+//流程干预组件
+const processMeddleRef = ref<InstanceType<typeof processMeddle>>();
+//选人组件
+const applyUserSelectRef = ref<InstanceType<typeof UserSelect>>();
 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 loading = ref(true);
 // 选中数组
@@ -163,40 +138,21 @@ const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
 const title = ref('');
-// 流程变量是否显示
-const variableVisible = ref(false);
-const variableLoading = ref(true);
-// 流程变量
-const variableList = ref<VariableVo>({
-  key: '',
-  value: ''
-});
-//流程定义名称
-const processDefinitionName = ref();
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  createByIds: []
 });
 const tab = ref('waiting');
 
-//加签
-const addMultiInstanceUser = (row: TaskVO) => {
-  if (multiInstanceUserRef.value) {
-    title.value = '加签人员';
-    multiInstanceUserRef.value.getAddMultiInstanceList(row.id, []);
-  }
-};
-//减签
-const deleteMultiInstanceUser = (row: TaskVO) => {
-  if (multiInstanceUserRef.value) {
-    title.value = '减签人员';
-    multiInstanceUserRef.value.getDeleteMultiInstanceList(row.id);
-  }
-};
 /** 搜索按钮操作 */
 const handleQuery = () => {
   if ('waiting' === tab.value) {
@@ -210,6 +166,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -218,10 +176,10 @@ const handleSelectionChange = (selection: any) => {
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
-const changeTab = async (data: string) => {
+const changeTab = async (data: TabsPaneContext) => {
   taskList.value = [];
   queryParams.value.pageNum = 1;
-  if ('waiting' === data) {
+  if ('waiting' === data.paneName) {
     getWaitingList();
   } else {
     getFinishList();
@@ -230,7 +188,7 @@ const changeTab = async (data: string) => {
 //分页
 const getWaitingList = () => {
   loading.value = true;
-  getPageByAllTaskWait(queryParams.value).then((resp) => {
+  pageByAllTaskWait(queryParams.value).then((resp) => {
     taskList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -238,7 +196,7 @@ const getWaitingList = () => {
 };
 const getFinishList = () => {
   loading.value = true;
-  getPageByAllTaskFinish(queryParams.value).then((resp) => {
+  pageByAllTaskFinish(queryParams.value).then((resp) => {
     taskList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -260,26 +218,33 @@ const submitCallback = async (data) => {
     proxy?.$modal.msgWarning('请选择用户！');
   }
 };
-//查询流程变量
-const handleInstanceVariable = async (row: TaskVO) => {
-  variableLoading.value = true;
-  variableVisible.value = true;
-  processDefinitionName.value = row.processDefinitionName;
-  let data = await getInstanceVariable(row.id);
-  variableList.value = data.data;
-  variableLoading.value = false;
-};
 /** 查看按钮操作 */
 const handleView = (row) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: 'view'
+    type: 'view',
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
+const handleMeddle = (row) => {
+  processMeddleRef.value.open(row.id);
+};
+//打开申请人选择
+const openUserSelect = () => {
+  applyUserSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getWaitingList();
 });
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 0a2ef19..baee949 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -10,7 +10,7 @@
             class="mt-2"
             node-key="id"
             :data="categoryOptions"
-            :props="{ label: 'categoryName', children: 'children' }"
+            :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             highlight-current
@@ -24,8 +24,8 @@
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
-                <el-form-item label="流程定义名称" prop="name">
-                  <el-input v-model="queryParams.name" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+                <el-form-item label="流程定义编码" prop="flowCode">
+                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -46,14 +46,10 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
             <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
-              <template #default="scope">
-                <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-            <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90">
-              <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
+            <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"> </el-table-column>
+            <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+            <el-table-column align="center" prop="version" label="版本号" width="90">
+              <template #default="scope"> v{{ scope.row.version }}.0</template>
             </el-table-column>
             <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
               <template #default="scope">
@@ -63,33 +59,30 @@
             </el-table-column>
             <el-table-column align="center" label="流程状态" min-width="70">
               <template #default="scope">
-                <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+                <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
-            <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column>
+            <el-table-column label="操作" align="center" width="162">
               <template #default="scope">
-                <el-tooltip
-                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
-                  content="修改"
-                  placement="top"
-                >
-                  <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
-                </el-tooltip>
-                <el-tooltip
-                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
-                  content="删除"
-                  placement="top"
-                >
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-                </el-tooltip>
-                <el-tooltip placement="top" content="查看">
-                  <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
-                </el-tooltip>
-                <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top">
-                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
-                </el-tooltip>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
+                    <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button>
+                  </el-col>
+                  <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
+                    <el-button type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5">
+                    <el-button type="primary" size="small" icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button>
+                  </el-col>
+                  <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">
+                    <el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)"
+                      >撤销</el-button
+                    >
+                  </el-col>
+                </el-row>
               </template>
             </el-table-column>
           </el-table>
@@ -109,10 +102,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance';
-import { listCategory } from '@/api/workflow/category';
-import { CategoryVO } from '@/api/workflow/category/types';
-import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
+import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } 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 workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -123,7 +116,8 @@ const categoryTreeRef = ref<ElTreeInstance>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
-const businessKeys = ref<Array<any>>([]);
+const businessIds = ref<Array<number | string>>([]);
+const instanceIds = ref<Array<number | string>>([]);
 // 非单个禁用
 const single = ref(true);
 // 非多个禁用
@@ -133,24 +127,18 @@ const showSearch = ref(true);
 // 总条数
 const total = ref(0);
 // 模型定义表格数据
-const processInstanceList = ref<ProcessInstanceVO[]>([]);
+const processInstanceList = ref<FlowInstanceVO[]>([]);
 
-const categoryOptions = ref<CategoryOption[]>([]);
+const categoryOptions = ref<CategoryTreeVO[]>([]);
 const categoryName = ref('');
 
-interface CategoryOption {
-  categoryCode: string;
-  categoryName: string;
-  children?: CategoryOption[];
-}
-
 const tab = ref('running');
 // 查询参数
-const queryParams = ref<ProcessInstanceQuery>({
+const queryParams = ref<FlowInstanceQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  categoryCode: undefined
+  flowCode: undefined,
+  category: undefined
 });
 
 onMounted(() => {
@@ -159,10 +147,10 @@ onMounted(() => {
 });
 
 /** 节点单击事件 */
-const handleNodeClick = (data: CategoryVO) => {
-  queryParams.value.categoryCode = data.categoryCode;
-  if (data.categoryCode === 'ALL') {
-    queryParams.value.categoryCode = '';
+const handleNodeClick = (data: CategoryTreeVO) => {
+  queryParams.value.category = data.id;
+  if (data.id === '0') {
+    queryParams.value.category = '';
   }
   handleQuery();
 };
@@ -183,11 +171,8 @@ watchEffect(
 
 /** 查询流程分类下拉树结构 */
 const getTreeselect = async () => {
-  const res = await listCategory();
-  categoryOptions.value = [];
-  const data: CategoryOption = { categoryCode: 'ALL', categoryName: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
-  categoryOptions.value.push(data);
+  const res = await categoryTree();
+  categoryOptions.value = res.data;
 };
 
 /** 搜索按钮操作 */
@@ -197,21 +182,22 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
-  queryParams.value.categoryCode = '';
+  queryParams.value.category = '';
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
   handleQuery();
 };
 // 多选框选中数据
-const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
-  businessKeys.value = selection.map((item: any) => item.businessKey);
+const handleSelectionChange = (selection: FlowInstanceVO[]) => {
+  businessIds.value = selection.map((item: any) => item.businessId);
+  instanceIds.value = selection.map((item: FlowInstanceVO) => item.id);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 //分页
 const getList = () => {
   loading.value = true;
-  getPageByCurrent(queryParams.value).then((resp) => {
+  pageByCurrent(queryParams.value).then((resp) => {
     processInstanceList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -219,23 +205,27 @@ const getList = () => {
 };
 
 /** 删除按钮操作 */
-const handleDelete = async (row: ProcessInstanceVO) => {
-  const businessKey = row.businessKey || businessKeys.value;
-  await proxy?.$modal.confirm('是否确认删除业务id为【' + businessKey + '】的数据项？');
+const handleDelete = async (row: FlowInstanceVO) => {
+  const instanceIdList = row.id || instanceIds.value;
+  await proxy?.$modal.confirm('是否确认删除？');
   loading.value = true;
   if ('running' === tab.value) {
-    await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
+    await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('删除成功');
 };
 
 /** 撤销按钮操作 */
-const handleCancelProcessApply = async (businessKey: string) => {
+const handleCancelProcessApply = async (businessId: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   if ('running' === tab.value) {
-    await cancelProcessApply(businessKey).finally(() => (loading.value = false));
+    let data = {
+      businessId: businessId,
+      message: '申请人撤销流程！'
+    };
+    await cancelProcessApply(data).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('撤销成功');
@@ -244,11 +234,11 @@ const handleCancelProcessApply = async (businessKey: string) => {
 //办理
 const handleOpen = async (row, type) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: type
+    type: type,
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index c978cbd..6224fff 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -4,14 +4,14 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="流程定义名称" label-width="100" prop="processDefinitionName">
-              <el-input v-model="queryParams.processDefinitionName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            <el-form-item label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="流程定义KEY" label-width="100" prop="processDefinitionKey">
-              <el-input v-model="queryParams.processDefinitionKey" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,30 +31,15 @@
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
-          <template #default="scope">
-            <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-        <el-table-column align="center" prop="name" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="assigneeName" label="办理人">
-          <template #default="scope">
-            <template v-if="scope.row.participantVo && scope.row.assignee === null">
-              <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
-                {{ item }}
-              </el-tag>
-            </template>
-            <template v-else>
-              <el-tag type="success">
-                {{ scope.row.assigneeName || '无' }}
-              </el-tag>
-            </template>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
+        <el-table-column align="center" prop="flowCode" label="流程定义KEY"></el-table-column>
+        <el-table-column align="center" prop="version" label="版本号" width="90">
+          <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
+        <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
         <el-table-column align="center" label="流程状态" min-width="70">
           <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="200">
@@ -75,7 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getPageByTaskCopy } from '@/api/workflow/task';
+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';
@@ -101,9 +86,9 @@ const taskList = ref([]);
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined
 });
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -125,7 +110,7 @@ const handleSelectionChange = (selection: any) => {
 //分页
 const getTaskCopyList = () => {
   loading.value = true;
-  getPageByTaskCopy(queryParams.value).then((resp) => {
+  pageByTaskCopy(queryParams.value).then((resp) => {
     taskList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
@@ -135,11 +120,11 @@ const getTaskCopyList = () => {
 /** 查看按钮操作 */
 const handleView = (row) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: 'view'
+    type: 'view',
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index dadef15..298ddcf 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -4,14 +4,19 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item>
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
-            <el-form-item label="流程定义名称" label-width="100" prop="processDefinitionName">
-              <el-input v-model="queryParams.processDefinitionName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            <el-form-item label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="流程定义KEY" label-width="100" prop="processDefinitionKey">
-              <el-input v-model="queryParams.processDefinitionKey" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+            <el-form-item label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,21 +36,31 @@
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
-          <template #default="scope">
-            <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-          </template>
+        <el-table-column align="center" prop="flowName" label="流程定义名称"></el-table-column>
+        <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+        <el-table-column align="center" prop="version" label="版本号" width="90">
+          <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
-        <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-        <el-table-column align="center" prop="name" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="assigneeName" label="办理人">
+        <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+        <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
+        <el-table-column align="center" prop="approverName" label="办理人">
           <template #default="scope">
             <el-tag type="success">
-              {{ scope.row.assigneeName || '无' }}
+              {{ scope.row.approveName || '无' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="startTime" label="创建时间" width="160"></el-table-column>
+        <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="70">
+          <template #default="scope">
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="任务状态" prop="flowTaskStatus" min-width="70">
+          <template #default="scope">
+            <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="scope">
             <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
@@ -60,17 +75,26 @@
         @pagination="handleQuery"
       />
     </el-card>
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { getPageByTaskFinish } from '@/api/workflow/task';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/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';
 //审批记录组件
 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>>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
@@ -89,10 +113,15 @@ const taskList = ref([]);
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  createByIds: []
 });
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getFinishList();
@@ -102,6 +131,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -112,24 +143,36 @@ const handleSelectionChange = (selection: any) => {
 };
 const getFinishList = () => {
   loading.value = true;
-  getPageByTaskFinish(queryParams.value).then((resp) => {
+  pageByTaskFinish(queryParams.value).then((resp) => {
     taskList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
   });
 };
 /** 查看按钮操作 */
-const handleView = (row: TaskVO) => {
+const handleView = (row: FlowTaskVO) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: 'view'
+    type: 'view',
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
-
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 onMounted(() => {
   getFinishList();
 });
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 6d54829..876e335 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -4,14 +4,19 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item>
+              <el-badge :value="userSelectCount" :max="10" class="item">
+                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+              </el-badge>
             </el-form-item>
-            <el-form-item label="流程定义名称" label-width="100" prop="processDefinitionName">
-              <el-input v-model="queryParams.processDefinitionName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            <el-form-item label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="流程定义KEY" label-width="100" prop="processDefinitionKey">
-              <el-input v-model="queryParams.processDefinitionKey" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+            <el-form-item label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,30 +36,25 @@
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
+        <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
+        <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+        <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+        <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
+        <el-table-column align="center" label="办理人">
           <template #default="scope">
-            <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
-        <el-table-column align="center" prop="name" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="assigneeName" label="办理人">
-          <template #default="scope">
-            <template v-if="scope.row.participantVo && scope.row.assignee === null">
-              <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
-                {{ item }}
+            <template v-if="scope.row.assigneeNames">
+              <el-tag v-for="(name, index) in scope.row.assigneeNames.split(',')" :key="index" type="success">
+                {{ name }}
               </el-tag>
             </template>
             <template v-else>
-              <el-tag type="success">
-                {{ scope.row.assigneeName || '无' }}
-              </el-tag>
+              <el-tag type="success"> 无</el-tag>
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="流程状态" min-width="70">
+        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70">
           <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
@@ -72,16 +72,24 @@
         @pagination="handleQuery"
       />
     </el-card>
+    <!-- 申请人 -->
+    <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { getPageByTaskWait } from '@/api/workflow/task';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/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';
+
 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 userSelectRef = ref<InstanceType<typeof UserSelect>>();
 //提交组件
 const queryFormRef = ref<ElFormInstance>();
 // 遮罩层
@@ -98,13 +106,19 @@ const showSearch = ref(true);
 const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
+
+//申请人id
+const selectUserIds = ref<Array<number | string>>([]);
+//申请人选择数量
+const userSelectCount = ref(0);
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  createByIds: []
 });
 onMounted(() => {
   getWaitingList();
@@ -118,6 +132,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
+  queryParams.value.createByIds = [];
+  userSelectCount.value = 0;
   handleQuery();
 };
 // 多选框选中数据
@@ -129,21 +145,34 @@ const handleSelectionChange = (selection: any) => {
 //分页
 const getWaitingList = () => {
   loading.value = true;
-  getPageByTaskWait(queryParams.value).then((resp) => {
+  pageByTaskWait(queryParams.value).then((resp) => {
     taskList.value = resp.rows;
     total.value = resp.total;
     loading.value = false;
   });
 };
 //办理
-const handleOpen = async (row: TaskVO) => {
+const handleOpen = async (row: FlowTaskVO) => {
   const routerJumpVo = reactive<RouterJumpVo>({
-    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
-    wfNodeConfigVo: row.wfNodeConfigVo,
-    businessKey: row.businessKey,
+    businessId: row.businessId,
     taskId: row.id,
-    type: 'approval'
+    type: 'approval',
+    formCustom: row.formCustom,
+    formPath: row.formPath
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
+//打开申请人选择
+const openUserSelect = () => {
+  userSelectRef.value.open();
+};
+//确认选择申请人
+const userSelectCallBack = (data: UserVO[]) => {
+  userSelectCount.value = 0;
+  if (data && data.length > 0) {
+    userSelectCount.value = data.length;
+    selectUserIds.value = data.map((item) => item.userId);
+    queryParams.value.createByIds = selectUserIds.value;
+  }
+};
 </script>
diff --git a/vite.config.ts b/vite.config.ts
index 97c8d9d..e125e36 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -64,16 +64,6 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
         'echarts',
         'vue-i18n',
         '@vueup/vue-quill',
-        'bpmn-js/lib/Viewer',
-        'bpmn-js/lib/Modeler.js',
-        'bpmn-js-properties-panel',
-        'min-dash',
-        'diagram-js/lib/navigation/movecanvas',
-        'diagram-js/lib/navigation/zoomscroll',
-        'bpmn-js/lib/features/palette/PaletteProvider',
-        'bpmn-js/lib/features/context-pad/ContextPadProvider',
-        'diagram-js/lib/draw/BaseRenderer',
-        'tiny-svg',
         'image-conversion',
         'element-plus/es/components/**/css'
       ]

From e0eed9c89aebd5a7c4f8b0cd302875d62eb0f40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 13 Jan 2025 19:38:01 +0800
Subject: [PATCH 57/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 38ba903..de55192 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -358,6 +358,7 @@ const handlePublish = async (row?: FlowDefinitionVo) => {
   loading.value = true;
   await publish(row.id).finally(() => (loading.value = false));
   processDefinitionDialog.visible = false;
+  activeName.value = "0"
   await handleQuery();
   proxy?.$modal.msgSuccess('发布成功');
 };
@@ -404,6 +405,7 @@ const handlerImportDefinition = (data: UploadRequestOptions): XMLHttpRequest =>
     .then(() => {
       uploadDialog.visible = false;
       proxy?.$modal.msgSuccess('部署成功');
+      activeName.value = "1"
       handleQuery();
     })
     .finally(() => {

From 2fc220f9d3ebd451ecaf874570b9a5e66b262d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 15 Jan 2025 17:42:32 +0800
Subject: [PATCH 58/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=ACjson=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index de55192..a45e484 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -143,13 +143,13 @@
           class="upload-demo"
           drag
           multiple
-          accept="application/zip,application/xml,.bpmn"
+          accept="application/json,application/text"
           :before-upload="handlerBeforeUpload"
           :http-request="handlerImportDefinition"
         >
           <el-icon class="UploadFilled"><upload-filled /></el-icon>
-          <div class="el-upload__text"><em>点击上传，选择BPMN流程文件</em></div>
-          <div class="el-upload__text">仅支持 .zip、.bpmn20.xml、bpmn 格式文件</div>
+          <div class="el-upload__text"><em>点击上传，选择JSON流程文件</em></div>
+          <div class="el-upload__text">仅支持json格式文件</div>
           <div class="el-upload__text">PS:如若部署请部署从本项目模型管理导出的数据</div>
         </el-upload>
       </div>
@@ -498,6 +498,6 @@ const handleCopyDef = async (row: FlowDefinitionVo) => {
 
 /** 导出按钮操作 */
 const handleExportDef = () => {
-  proxy?.download(`/workflow/definition/exportDef/${ids.value[0]}`, {}, `${flowCodeList.value[0]}.xml`);
+  proxy?.download(`/workflow/definition/exportDef/${ids.value[0]}`, {}, `${flowCodeList.value[0]}.json`);
 };
 </script>

From 71528c78acb8702c7de73ac0416f18642aa6e120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 15 Jan 2025 18:20:29 +0800
Subject: [PATCH 59/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/design.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index cb11045..7606690 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -1,17 +1,30 @@
 <template>
   <div ref="container" class="container">
-    <iframe ref="iframe" :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+    <iframe ref="iframe" :src="iframeUrl" frameborder="0" :width="sidebarStatusWidth()" height="100%"></iframe>
   </div>
 </template>
 
 <script setup name="WarmFlow">
+
 const { proxy } = getCurrentInstance();
 import { onMounted } from 'vue';
+import { getToken } from '@/utils/auth';
+
+const sidebarStatus = useStorage('sidebarStatus', '1');
+
+console.log(sidebarStatus.value)
+
+const sidebarStatusWidth = () => {
+  if (sidebarStatus.value === '0') {
+    return "115%";
+  }
+  return "104%";
+}
+
 // definitionId为需要查询的流程定义id，
 // disabled为是否可编辑, 例如：查看的时候不可编辑，不可保存
 const iframeUrl = ref('');
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-import { getToken } from '@/utils/auth';
 const iframeLoaded = () => {
   // iframe监听组件内设计器保存事件
   window.onmessage = (event) => {

From b7e96dec3899477a89d2d5588b859272ec7a1d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 16 Jan 2025 16:00:12 +0800
Subject: [PATCH 60/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=94=BE=E5=A4=A7/=E7=BC=A9=E6=94=BE=20=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/approvalRecord.vue | 147 +++++++++++++++++++++-
 1 file changed, 143 insertions(+), 4 deletions(-)

diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index baf86a7..dc91bd7 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -2,8 +2,21 @@
   <div class="container">
     <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
       <el-tabs v-model="tabActiveName" class="demo-tabs">
-        <el-tab-pane v-loading="loading" label="流程图" name="bpmn">
-          <img :src="imgUrl" width="100%" style="margin: 0 auto" />
+        <el-tab-pane v-loading="loading" label="流程图" name="image">
+          <div
+            ref="imageWrapperRef"
+            class="image-wrapper"
+            @wheel="handleMouseWheel"
+            @mousedown="handleMouseDown"
+            @mousemove="handleMouseMove"
+            @mouseup="handleMouseUp"
+            @mouseleave="handleMouseLeave"
+            @dblclick="resetTransform"
+            :style="transformStyle"
+          >
+            <el-image :src="imgUrl" class="scalable-image" />
+          </div>
+<!--          <img :src="imgUrl" width="100%" style="margin: 0 auto" />-->
         </el-tab-pane>
         <el-tab-pane v-loading="loading" label="审批信息" name="info">
           <div>
@@ -72,14 +85,14 @@ const props = defineProps({
 const loading = ref(false);
 const visible = ref(false);
 const historyList = ref<Array<any>>([]);
-const tabActiveName = ref('bpmn');
+const tabActiveName = ref('image');
 const imgUrl = ref('');
 
 //初始化查询审批记录
 const init = async (businessId: string | number) => {
   visible.value = true;
   loading.value = true;
-  tabActiveName.value = 'bpmn';
+  tabActiveName.value = 'image';
   historyList.value = [];
   flowImage(businessId).then((resp) => {
     if (resp.data) {
@@ -109,6 +122,111 @@ const getIds = async (ids: string | number) => {
 const handleDownload = (ossId: string) => {
   proxy?.$download.oss(ossId);
 };
+
+const imageWrapperRef = ref<HTMLElement | null>(null);
+const scale = ref(1); // 初始缩放比例
+const maxScale = 3; // 最大缩放比例
+const minScale = 0.5; // 最小缩放比例
+
+let isDragging = false;
+let startX = 0;
+let startY = 0;
+let currentTranslateX = 0;
+let currentTranslateY = 0;
+
+const handleMouseWheel = (event: WheelEvent) => {
+  event.preventDefault();
+  let newScale = scale.value - event.deltaY / 1000;
+  newScale = Math.max(minScale, Math.min(newScale, maxScale));
+  if (newScale !== scale.value) {
+    scale.value = newScale;
+    resetDragPosition(); // 重置拖拽位置，使图片居中
+  }
+};
+
+const handleMouseDown = (event: MouseEvent) => {
+  if (scale.value > 1) {
+    event.preventDefault(); // 阻止默认行为，防止拖拽
+    isDragging = true;
+    startX = event.clientX;
+    startY = event.clientY;
+  }
+};
+
+const handleMouseMove = (event: MouseEvent) => {
+  if (!isDragging || !imageWrapperRef.value) return;
+
+  const deltaX = event.clientX - startX;
+  const deltaY = event.clientY - startY;
+  startX = event.clientX;
+  startY = event.clientY;
+
+  currentTranslateX += deltaX;
+  currentTranslateY += deltaY;
+
+  // 边界检测，防止图片被拖出容器
+  const bounds = getBounds();
+  if (currentTranslateX > bounds.maxTranslateX) {
+    currentTranslateX = bounds.maxTranslateX;
+  } else if (currentTranslateX < bounds.minTranslateX) {
+    currentTranslateX = bounds.minTranslateX;
+  }
+
+  if (currentTranslateY > bounds.maxTranslateY) {
+    currentTranslateY = bounds.maxTranslateY;
+  } else if (currentTranslateY < bounds.minTranslateY) {
+    currentTranslateY = bounds.minTranslateY;
+  }
+
+  applyTransform();
+};
+
+const handleMouseUp = () => {
+  isDragging = false;
+};
+
+const handleMouseLeave = () => {
+  isDragging = false;
+};
+
+const resetTransform = () => {
+  scale.value = 1;
+  currentTranslateX = 0;
+  currentTranslateY = 0;
+  applyTransform();
+};
+
+const resetDragPosition = () => {
+  currentTranslateX = 0;
+  currentTranslateY = 0;
+  applyTransform();
+};
+
+const applyTransform = () => {
+  if (imageWrapperRef.value) {
+    imageWrapperRef.value.style.transform = `translate(${currentTranslateX}px, ${currentTranslateY}px) scale(${scale.value})`;
+  }
+};
+
+const getBounds = () => {
+  if (!imageWrapperRef.value) return { minTranslateX: 0, maxTranslateX: 0, minTranslateY: 0, maxTranslateY: 0 };
+
+  const imgRect = imageWrapperRef.value.getBoundingClientRect();
+  const containerRect = imageWrapperRef.value.parentElement?.getBoundingClientRect() ?? imgRect;
+
+  const minTranslateX = (containerRect.width - imgRect.width * scale.value) / 2;
+  const maxTranslateX = -(containerRect.width - imgRect.width * scale.value) / 2;
+  const minTranslateY = (containerRect.height - imgRect.height * scale.value) / 2;
+  const maxTranslateY = -(containerRect.height - imgRect.height * scale.value) / 2;
+
+  return { minTranslateX, maxTranslateX, minTranslateY, maxTranslateY };
+};
+
+const transformStyle = computed(() => ({
+  transition: isDragging ? 'none' : 'transform 0.2s ease',
+}));
+
+
 /**
  * 对外暴露子组件方法
  */
@@ -137,4 +255,25 @@ defineExpose({
     min-height: calc(100vh - 170px) !important;
   }
 }
+
+.image-wrapper {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  margin: 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  user-select: none; /* 禁用文本选择 */
+  cursor: grab; /* 设置初始鼠标指针为可拖动 */
+}
+
+.image-wrapper:active {
+  cursor: grabbing; /* 当正在拖动时改变鼠标指针 */
+}
+
+.scalable-image {
+  width: 100%;
+}
 </style>

From 522087e18f8f0b685827c1c5f6c7358ad06b5f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 16 Jan 2025 16:27:03 +0800
Subject: [PATCH 61/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/approvalRecord.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index dc91bd7..8d4bcc6 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="container">
     <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
-      <el-tabs v-model="tabActiveName" class="demo-tabs">
-        <el-tab-pane v-loading="loading" label="流程图" name="image">
+      <el-tabs v-model="tabActiveName" class="demo-tabs" >
+        <el-tab-pane v-loading="loading" label="流程图" name="image" style="height: 500px">
           <div
             ref="imageWrapperRef"
             class="image-wrapper"
@@ -16,7 +16,6 @@
           >
             <el-image :src="imgUrl" class="scalable-image" />
           </div>
-<!--          <img :src="imgUrl" width="100%" style="margin: 0 auto" />-->
         </el-tab-pane>
         <el-tab-pane v-loading="loading" label="审批信息" name="info">
           <div>
@@ -274,6 +273,7 @@ defineExpose({
 }
 
 .scalable-image {
+  object-fit: contain;
   width: 100%;
 }
 </style>

From 9cc8195237a0d29e151a30209dc722652dae2066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 16 Jan 2025 16:49:43 +0800
Subject: [PATCH 62/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/approvalRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 8d4bcc6..130181e 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -2,7 +2,7 @@
   <div class="container">
     <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
       <el-tabs v-model="tabActiveName" class="demo-tabs" >
-        <el-tab-pane v-loading="loading" label="流程图" name="image" style="height: 500px">
+        <el-tab-pane v-loading="loading" label="流程图" name="image" style="height: 68vh;">
           <div
             ref="imageWrapperRef"
             class="image-wrapper"

From ecf2337205e878afff74364ce4037ec68b890528 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 17 Jan 2025 21:31:55 +0800
Subject: [PATCH 63/73] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E5=9B=BE=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/approvalRecord.vue       | 13 +++++++------
 src/views/workflow/processDefinition/design.vue | 14 +-------------
 src/views/workflow/processInstance/index.vue    |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 130181e..5c46a58 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="container">
     <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
-      <el-tabs v-model="tabActiveName" class="demo-tabs" >
-        <el-tab-pane v-loading="loading" label="流程图" name="image" style="height: 68vh;">
+      <el-tabs v-model="tabActiveName" class="demo-tabs">
+        <el-tab-pane v-loading="loading" label="流程图" name="image" style="height: 68vh">
           <div
             ref="imageWrapperRef"
             class="image-wrapper"
@@ -14,7 +14,9 @@
             @dblclick="resetTransform"
             :style="transformStyle"
           >
-            <el-image :src="imgUrl" class="scalable-image" />
+            <el-card class="box-card">
+              <el-image :src="imgUrl" class="scalable-image" />
+            </el-card>
           </div>
         </el-tab-pane>
         <el-tab-pane v-loading="loading" label="审批信息" name="info">
@@ -222,10 +224,9 @@ const getBounds = () => {
 };
 
 const transformStyle = computed(() => ({
-  transition: isDragging ? 'none' : 'transform 0.2s ease',
+  transition: isDragging ? 'none' : 'transform 0.2s ease'
 }));
 
-
 /**
  * 对外暴露子组件方法
  */
@@ -257,7 +258,6 @@ defineExpose({
 
 .image-wrapper {
   width: 100%;
-  height: 100%;
   overflow: hidden;
   position: relative;
   margin: 0 auto;
@@ -275,5 +275,6 @@ defineExpose({
 .scalable-image {
   object-fit: contain;
   width: 100%;
+  padding: 15px;
 }
 </style>
diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 7606690..46a2cc4 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -1,26 +1,14 @@
 <template>
   <div ref="container" class="container">
-    <iframe ref="iframe" :src="iframeUrl" frameborder="0" :width="sidebarStatusWidth()" height="100%"></iframe>
+    <iframe ref="iframe" :src="iframeUrl" frameborder="0" style="height: 100%; width: inherit"></iframe>
   </div>
 </template>
 
 <script setup name="WarmFlow">
-
 const { proxy } = getCurrentInstance();
 import { onMounted } from 'vue';
 import { getToken } from '@/utils/auth';
 
-const sidebarStatus = useStorage('sidebarStatus', '1');
-
-console.log(sidebarStatus.value)
-
-const sidebarStatusWidth = () => {
-  if (sidebarStatus.value === '0') {
-    return "115%";
-  }
-  return "104%";
-}
-
 // definitionId为需要查询的流程定义id，
 // disabled为是否可编辑, 例如：查看的时候不可编辑，不可保存
 const iframeUrl = ref('');
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 140cdaf..b58b189 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -93,7 +93,7 @@
               </el-table-column>
               <el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column>
               <el-table-column v-if="tab === 'finish'" align="center" prop="updateTime" label="结束时间" width="160"></el-table-column>
-              <el-table-column label="操作" align="center" :width="162">
+              <el-table-column label="操作" align="center" :width="165">
                 <template #default="scope">
                   <el-row v-if="tab === 'running'" :gutter="10" class="mb8">
                     <el-col :span="1.5">

From 490eecccc5d550fd68920bfdaf372f7dea4a333b Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 17 Jan 2025 21:40:37 +0800
Subject: [PATCH 64/73] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/design.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 46a2cc4..ead501a 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="container" class="container">
+  <div ref="container" class="w-full h-[calc(100vh-84px)]">
     <iframe ref="iframe" :src="iframeUrl" frameborder="0" style="height: 100%; width: inherit"></iframe>
   </div>
 </template>
@@ -44,10 +44,3 @@ defineExpose({
   open
 });
 </script>
-
-<style scoped>
-.container {
-  width: 100%;
-  height: calc(100vh - 84px);
-}
-</style>

From 3c2409169b9e9ce44fd8e20feb2b85e03df226b7 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 17 Jan 2025 21:59:11 +0800
Subject: [PATCH 65/73] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/design.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index ead501a..3ec44f7 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="container" class="w-full h-[calc(100vh-84px)]">
-    <iframe ref="iframe" :src="iframeUrl" frameborder="0" style="height: 100%; width: inherit"></iframe>
+  <div ref="container" class="w-full h-[calc(100vh-88px)]">
+    <iframe ref="iframe" :src="iframeUrl" frameborder="0" height="100%" style="height: 100%; width: inherit"></iframe>
   </div>
 </template>
 

From 801700044c72187774396e1a4c5bffd180abfe20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 10:08:58 +0800
Subject: [PATCH 66/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/SettingTypeEnum.ts   | 16 ----------------
 src/enums/layout/LayoutEnum.ts |  4 ----
 src/hooks/useDialog.ts         | 31 -------------------------------
 3 files changed, 51 deletions(-)
 delete mode 100644 src/enums/SettingTypeEnum.ts
 delete mode 100644 src/enums/layout/LayoutEnum.ts
 delete mode 100644 src/hooks/useDialog.ts

diff --git a/src/enums/SettingTypeEnum.ts b/src/enums/SettingTypeEnum.ts
deleted file mode 100644
index bf4ec43..0000000
--- a/src/enums/SettingTypeEnum.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export enum SettingTypeEnum {
-  TITLE = 'title',
-  THEME = 'theme',
-  SIDE_THEME = 'sideTheme',
-  SHOW_SETTINGS = 'showSettings',
-  TOP_NAV = 'topNav',
-  TAGS_VIEW = 'tagsView',
-  FIXED_HEADER = 'fixedHeader',
-  SIDEBAR_LOGO = 'sidebarLogo',
-  DYNAMIC_TITLE = 'dynamicTitle',
-  ANIMATION_ENABLE = 'animationEnable',
-  LAYOUT = 'layout',
-  DARK = 'dark',
-
-  LAYOUT_SETTING = 'layout-setting'
-}
diff --git a/src/enums/layout/LayoutEnum.ts b/src/enums/layout/LayoutEnum.ts
deleted file mode 100644
index 0aa601b..0000000
--- a/src/enums/layout/LayoutEnum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum ThemeEnum {
-  DARK = 'theme-dark',
-  LIGHT = 'theme-light'
-}
diff --git a/src/hooks/useDialog.ts b/src/hooks/useDialog.ts
deleted file mode 100644
index 547f199..0000000
--- a/src/hooks/useDialog.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Ref } from 'vue';
-
-interface Options {
-  title?: string;
-}
-interface Return {
-  title: Ref<string>;
-  visible: Ref<boolean>;
-  openDialog: () => void;
-  closeDialog: () => void;
-}
-export default (ops?: Options): Return => {
-  const visible = ref(false);
-  const title = ref(ops.title || '');
-
-  const openDialog = () => {
-    visible.value = true;
-  };
-
-  const closeDialog = () => {
-    visible.value = false;
-  };
-
-  return {
-    title,
-    visible,
-
-    openDialog,
-    closeDialog
-  };
-};

From 8d398d2940df74723a07c6a8ec877b3f203fb428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 10:16:27 +0800
Subject: [PATCH 67/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8json=20?=
 =?UTF-8?q?=E4=B9=A6=E5=86=99=E6=9B=B4=E6=96=B9=E4=BE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en_US.json | 81 ++++++++++++++++++++++++++++++++++++++++++
 src/lang/en_US.ts   | 85 ---------------------------------------------
 src/lang/index.ts   |  4 +--
 src/lang/zh_CN.json | 81 ++++++++++++++++++++++++++++++++++++++++++
 src/lang/zh_CN.ts   | 85 ---------------------------------------------
 5 files changed, 164 insertions(+), 172 deletions(-)
 create mode 100644 src/lang/en_US.json
 delete mode 100644 src/lang/en_US.ts
 create mode 100644 src/lang/zh_CN.json
 delete mode 100644 src/lang/zh_CN.ts

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
new file mode 100644
index 0000000..f465aa6
--- /dev/null
+++ b/src/lang/en_US.json
@@ -0,0 +1,81 @@
+{
+  "route": {
+    "dashboard": "Dashboard",
+    "document": "Document"
+  },
+  "login": {
+    "selectPlaceholder": "Please select/enter a company name",
+    "username": "Username",
+    "password": "Password",
+    "login": "Login",
+    "logging": "Logging...",
+    "code": "Verification Code",
+    "rememberPassword": "Remember me",
+    "switchRegisterPage": "Sign up now",
+    "rule": {
+      "tenantId": {
+        "required": "Please enter your tenant id"
+      },
+      "username": {
+        "required": "Please enter your account"
+      },
+      "password": {
+        "required": "Please enter your password"
+      },
+      "code": {
+        "required": "Please enter a verification code"
+      }
+    },
+    "social": {
+      "wechat": "Wechat Login",
+      "maxkey": "MaxKey Login",
+      "topiam": "TopIam Login",
+      "gitee": "Gitee Login",
+      "github": "Github Login"
+    }
+  },
+  "register": {
+    "selectPlaceholder": "Please select/enter a company name",
+    "username": "Username",
+    "password": "Password",
+    "confirmPassword": "Confirm Password",
+    "register": "Register",
+    "registering": "Registering...",
+    "registerSuccess": "Congratulations, your {username} account has been registered!",
+    "code": "Verification Code",
+    "switchLoginPage": "Log in with an existing account",
+    "rule": {
+      "tenantId": {
+        "required": "Please enter your tenant id"
+      },
+      "username": {
+        "required": "Please enter your account",
+        "length": "The length of the user account must be between {min} and {max}"
+      },
+      "password": {
+        "required": "Please enter your password",
+        "length": "The user password must be between {min} and {max} in length",
+        "pattern": "Can't contain illegal characters: {strings}"
+      },
+      "code": {
+        "required": "Please enter a verification code"
+      },
+      "confirmPassword": {
+        "required": "Please enter your password again",
+        "equalToPassword": "The password entered twice is inconsistent"
+      }
+    }
+  },
+  "navbar": {
+    "full": "Full Screen",
+    "language": "Language",
+    "dashboard": "Dashboard",
+    "document": "Document",
+    "message": "Message",
+    "layoutSize": "Layout Size",
+    "selectTenant": "Select Tenant",
+    "layoutSetting": "Layout Setting",
+    "personalCenter": "Personal Center",
+    "logout": "Logout"
+  }
+}
diff --git a/src/lang/en_US.ts b/src/lang/en_US.ts
deleted file mode 100644
index b090d3e..0000000
--- a/src/lang/en_US.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-export default {
-  // 路由国际化
-  route: {
-    dashboard: 'Dashboard',
-    document: 'Document'
-  },
-  // 登录页面国际化
-  login: {
-    selectPlaceholder: 'Please select/enter a company name',
-    username: 'Username',
-    password: 'Password',
-    login: 'Login',
-    logging: 'Logging...',
-    code: 'Verification Code',
-    rememberPassword: 'Remember me',
-    switchRegisterPage: 'Sign up now',
-    rule: {
-      tenantId: {
-        required: 'Please enter your tenant id'
-      },
-      username: {
-        required: 'Please enter your account'
-      },
-      password: {
-        required: 'Please enter your password'
-      },
-      code: {
-        required: 'Please enter a verification code'
-      }
-    },
-    social: {
-      wechat: 'Wechat Login',
-      maxkey: 'MaxKey Login',
-      topiam: 'TopIam Login',
-      gitee: 'Gitee Login',
-      github: 'Github Login'
-    }
-  },
-  // 注册页面国际化
-  register: {
-    selectPlaceholder: 'Please select/enter a company name',
-    username: 'Username',
-    password: 'Password',
-    confirmPassword: 'Confirm Password',
-    register: 'Register',
-    registering: 'Registering...',
-    registerSuccess: 'Congratulations, your {username} account has been registered!',
-    code: 'Verification Code',
-    switchLoginPage: 'Log in with an existing account',
-    rule: {
-      tenantId: {
-        required: 'Please enter your tenant id'
-      },
-      username: {
-        required: 'Please enter your account',
-        length: 'The length of the user account must be between {min} and {max}'
-      },
-      password: {
-        required: 'Please enter your password',
-        length: 'The user password must be between {min} and {max} in length',
-        pattern: "Can't contain illegal characters: {strings}"
-      },
-      code: {
-        required: 'Please enter a verification code'
-      },
-      confirmPassword: {
-        required: 'Please enter your password again',
-        equalToPassword: 'The password entered twice is inconsistent'
-      }
-    }
-  },
-  // 导航栏国际化
-  navbar: {
-    full: 'Full Screen',
-    language: 'Language',
-    dashboard: 'Dashboard',
-    document: 'Document',
-    message: 'Message',
-    layoutSize: 'Layout Size',
-    selectTenant: 'Select Tenant',
-    layoutSetting: 'Layout Setting',
-    personalCenter: 'Personal Center',
-    logout: 'Logout'
-  }
-};
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 4f8e74c..a6bf6b8 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,8 +2,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.json';
+import en_US from '@/lang/en_US.json';
 
 /**
  * 获取当前语言
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
new file mode 100644
index 0000000..14138b5
--- /dev/null
+++ b/src/lang/zh_CN.json
@@ -0,0 +1,81 @@
+{
+  "route": {
+    "dashboard": "首页",
+    "document": "项目文档"
+  },
+  "login": {
+    "selectPlaceholder": "请选择/输入公司名称",
+    "username": "用户名",
+    "password": "密码",
+    "login": "登 录",
+    "logging": "登 录 中...",
+    "code": "验证码",
+    "rememberPassword": "记住我",
+    "switchRegisterPage": "立即注册",
+    "rule": {
+      "tenantId": {
+        "required": "请输入您的租户编号"
+      },
+      "username": {
+        "required": "请输入您的账号"
+      },
+      "password": {
+        "required": "请输入您的密码"
+      },
+      "code": {
+        "required": "请输入验证码"
+      }
+    },
+    "social": {
+      "wechat": "微信登录",
+      "maxkey": "MaxKey登录",
+      "topiam": "TopIam登录",
+      "gitee": "Gitee登录",
+      "github": "Github登录"
+    }
+  },
+  "register": {
+    "selectPlaceholder": "请选择/输入公司名称",
+    "username": "用户名",
+    "password": "密码",
+    "confirmPassword": "确认密码",
+    "register": "注 册",
+    "registering": "注 册 中...",
+    "registerSuccess": "恭喜你，您的账号 {username} 注册成功！",
+    "code": "验证码",
+    "switchLoginPage": "使用已有账户登录",
+    "rule": {
+      "tenantId": {
+        "required": "请输入您的租户编号"
+      },
+      "username": {
+        "required": "请输入您的账号",
+        "length": "用户账号长度必须介于 {min} 和 {max} 之间"
+      },
+      "password": {
+        "required": "请输入您的密码",
+        "length": "用户密码长度必须介于 {min} 和 {max} 之间",
+        "pattern": "不能包含非法字符：{strings}"
+      },
+      "code": {
+        "required": "请输入验证码"
+      },
+      "confirmPassword": {
+        "required": "请再次输入您的密码",
+        "equalToPassword": "两次输入的密码不一致"
+      }
+    }
+  },
+  "navbar": {
+    "full": "全屏",
+    "language": "语言",
+    "dashboard": "首页",
+    "document": "项目文档",
+    "message": "消息",
+    "layoutSize": "布局大小",
+    "selectTenant": "选择租户",
+    "layoutSetting": "布局设置",
+    "personalCenter": "个人中心",
+    "logout": "退出登录"
+  }
+}
diff --git a/src/lang/zh_CN.ts b/src/lang/zh_CN.ts
deleted file mode 100644
index 3cc9872..0000000
--- a/src/lang/zh_CN.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-export default {
-  // 路由国际化
-  route: {
-    dashboard: '首页',
-    document: '项目文档'
-  },
-  // 登录页面国际化
-  login: {
-    selectPlaceholder: '请选择/输入公司名称',
-    username: '用户名',
-    password: '密码',
-    login: '登 录',
-    logging: '登 录 中...',
-    code: '验证码',
-    rememberPassword: '记住我',
-    switchRegisterPage: '立即注册',
-    rule: {
-      tenantId: {
-        required: '请输入您的租户编号'
-      },
-      username: {
-        required: '请输入您的账号'
-      },
-      password: {
-        required: '请输入您的密码'
-      },
-      code: {
-        required: '请输入验证码'
-      }
-    },
-    social: {
-      wechat: '微信登录',
-      maxkey: 'MaxKey登录',
-      topiam: 'TopIam登录',
-      gitee: 'Gitee登录',
-      github: 'Github登录'
-    }
-  },
-  // 注册页面国际化
-  register: {
-    selectPlaceholder: '请选择/输入公司名称',
-    username: '用户名',
-    password: '密码',
-    confirmPassword: '确认密码',
-    register: '注 册',
-    registering: '注 册 中...',
-    registerSuccess: '恭喜你，您的账号 {username} 注册成功！',
-    code: '验证码',
-    switchLoginPage: '使用已有账户登录',
-    rule: {
-      tenantId: {
-        required: '请输入您的租户编号'
-      },
-      username: {
-        required: '请输入您的账号',
-        length: '用户账号长度必须介于 {min} 和 {max} 之间'
-      },
-      password: {
-        required: '请输入您的密码',
-        length: '用户密码长度必须介于 {min} 和 {max} 之间',
-        pattern: '不能包含非法字符：{strings}'
-      },
-      code: {
-        required: '请输入验证码'
-      },
-      confirmPassword: {
-        required: '请再次输入您的密码',
-        equalToPassword: '两次输入的密码不一致'
-      }
-    }
-  },
-  // 导航栏国际化
-  navbar: {
-    full: '全屏',
-    language: '语言',
-    dashboard: '首页',
-    document: '项目文档',
-    message: '消息',
-    layoutSize: '布局大小',
-    selectTenant: '选择租户',
-    layoutSetting: '布局设置',
-    personalCenter: '个人中心',
-    logout: '退出登录'
-  }
-};

From 0d493f1c74da38550eb837325de16539f0a520d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 10:41:45 +0800
Subject: [PATCH 68/73] update vue-i18n 10.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 223af4f..1d6d5c1 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "screenfull": "6.0.2",
     "vue": "3.5.13",
     "vue-cropper": "1.1.1",
-    "vue-i18n": "9.10.2",
+    "vue-i18n": "10.0.5",
     "vue-json-pretty": "2.4.0",
     "vue-router": "4.4.5",
     "vue-types": "5.1.3",

From 11e269546592fa32d8f6a91daf962895fc573687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 10:57:45 +0800
Subject: [PATCH 69/73] =?UTF-8?q?Revert=20"update=20=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?json=20=E4=B9=A6=E5=86=99=E6=9B=B4=E6=96=B9=E4=BE=BF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8d398d2940df74723a07c6a8ec877b3f203fb428.
---
 src/lang/en_US.json | 81 ------------------------------------------
 src/lang/en_US.ts   | 85 +++++++++++++++++++++++++++++++++++++++++++++
 src/lang/index.ts   |  4 +--
 src/lang/zh_CN.json | 81 ------------------------------------------
 src/lang/zh_CN.ts   | 85 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 172 insertions(+), 164 deletions(-)
 delete mode 100644 src/lang/en_US.json
 create mode 100644 src/lang/en_US.ts
 delete mode 100644 src/lang/zh_CN.json
 create mode 100644 src/lang/zh_CN.ts

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
deleted file mode 100644
index f465aa6..0000000
--- a/src/lang/en_US.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "Dashboard",
-    "document": "Document"
-  },
-  "login": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "login": "Login",
-    "logging": "Logging...",
-    "code": "Verification Code",
-    "rememberPassword": "Remember me",
-    "switchRegisterPage": "Sign up now",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account"
-      },
-      "password": {
-        "required": "Please enter your password"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      }
-    },
-    "social": {
-      "wechat": "Wechat Login",
-      "maxkey": "MaxKey Login",
-      "topiam": "TopIam Login",
-      "gitee": "Gitee Login",
-      "github": "Github Login"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "register": "Register",
-    "registering": "Registering...",
-    "registerSuccess": "Congratulations, your {username} account has been registered!",
-    "code": "Verification Code",
-    "switchLoginPage": "Log in with an existing account",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account",
-        "length": "The length of the user account must be between {min} and {max}"
-      },
-      "password": {
-        "required": "Please enter your password",
-        "length": "The user password must be between {min} and {max} in length",
-        "pattern": "Can't contain illegal characters: {strings}"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      },
-      "confirmPassword": {
-        "required": "Please enter your password again",
-        "equalToPassword": "The password entered twice is inconsistent"
-      }
-    }
-  },
-  "navbar": {
-    "full": "Full Screen",
-    "language": "Language",
-    "dashboard": "Dashboard",
-    "document": "Document",
-    "message": "Message",
-    "layoutSize": "Layout Size",
-    "selectTenant": "Select Tenant",
-    "layoutSetting": "Layout Setting",
-    "personalCenter": "Personal Center",
-    "logout": "Logout"
-  }
-}
diff --git a/src/lang/en_US.ts b/src/lang/en_US.ts
new file mode 100644
index 0000000..b090d3e
--- /dev/null
+++ b/src/lang/en_US.ts
@@ -0,0 +1,85 @@
+export default {
+  // 路由国际化
+  route: {
+    dashboard: 'Dashboard',
+    document: 'Document'
+  },
+  // 登录页面国际化
+  login: {
+    selectPlaceholder: 'Please select/enter a company name',
+    username: 'Username',
+    password: 'Password',
+    login: 'Login',
+    logging: 'Logging...',
+    code: 'Verification Code',
+    rememberPassword: 'Remember me',
+    switchRegisterPage: 'Sign up now',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account'
+      },
+      password: {
+        required: 'Please enter your password'
+      },
+      code: {
+        required: 'Please enter a verification code'
+      }
+    },
+    social: {
+      wechat: 'Wechat Login',
+      maxkey: 'MaxKey Login',
+      topiam: 'TopIam Login',
+      gitee: 'Gitee Login',
+      github: 'Github Login'
+    }
+  },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: 'Please select/enter a company name',
+    username: 'Username',
+    password: 'Password',
+    confirmPassword: 'Confirm Password',
+    register: 'Register',
+    registering: 'Registering...',
+    registerSuccess: 'Congratulations, your {username} account has been registered!',
+    code: 'Verification Code',
+    switchLoginPage: 'Log in with an existing account',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account',
+        length: 'The length of the user account must be between {min} and {max}'
+      },
+      password: {
+        required: 'Please enter your password',
+        length: 'The user password must be between {min} and {max} in length',
+        pattern: "Can't contain illegal characters: {strings}"
+      },
+      code: {
+        required: 'Please enter a verification code'
+      },
+      confirmPassword: {
+        required: 'Please enter your password again',
+        equalToPassword: 'The password entered twice is inconsistent'
+      }
+    }
+  },
+  // 导航栏国际化
+  navbar: {
+    full: 'Full Screen',
+    language: 'Language',
+    dashboard: 'Dashboard',
+    document: 'Document',
+    message: 'Message',
+    layoutSize: 'Layout Size',
+    selectTenant: 'Select Tenant',
+    layoutSetting: 'Layout Setting',
+    personalCenter: 'Personal Center',
+    logout: 'Logout'
+  }
+};
diff --git a/src/lang/index.ts b/src/lang/index.ts
index a6bf6b8..4f8e74c 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,8 +2,8 @@
 import { createI18n } from 'vue-i18n';
 
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import zh_CN from '@/lang/zh_CN.json';
-import en_US from '@/lang/en_US.json';
+import zh_CN from '@/lang/zh_CN';
+import en_US from '@/lang/en_US';
 
 /**
  * 获取当前语言
diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
deleted file mode 100644
index 14138b5..0000000
--- a/src/lang/zh_CN.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "首页",
-    "document": "项目文档"
-  },
-  "login": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "login": "登 录",
-    "logging": "登 录 中...",
-    "code": "验证码",
-    "rememberPassword": "记住我",
-    "switchRegisterPage": "立即注册",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号"
-      },
-      "password": {
-        "required": "请输入您的密码"
-      },
-      "code": {
-        "required": "请输入验证码"
-      }
-    },
-    "social": {
-      "wechat": "微信登录",
-      "maxkey": "MaxKey登录",
-      "topiam": "TopIam登录",
-      "gitee": "Gitee登录",
-      "github": "Github登录"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "confirmPassword": "确认密码",
-    "register": "注 册",
-    "registering": "注 册 中...",
-    "registerSuccess": "恭喜你，您的账号 {username} 注册成功！",
-    "code": "验证码",
-    "switchLoginPage": "使用已有账户登录",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号",
-        "length": "用户账号长度必须介于 {min} 和 {max} 之间"
-      },
-      "password": {
-        "required": "请输入您的密码",
-        "length": "用户密码长度必须介于 {min} 和 {max} 之间",
-        "pattern": "不能包含非法字符：{strings}"
-      },
-      "code": {
-        "required": "请输入验证码"
-      },
-      "confirmPassword": {
-        "required": "请再次输入您的密码",
-        "equalToPassword": "两次输入的密码不一致"
-      }
-    }
-  },
-  "navbar": {
-    "full": "全屏",
-    "language": "语言",
-    "dashboard": "首页",
-    "document": "项目文档",
-    "message": "消息",
-    "layoutSize": "布局大小",
-    "selectTenant": "选择租户",
-    "layoutSetting": "布局设置",
-    "personalCenter": "个人中心",
-    "logout": "退出登录"
-  }
-}
diff --git a/src/lang/zh_CN.ts b/src/lang/zh_CN.ts
new file mode 100644
index 0000000..3cc9872
--- /dev/null
+++ b/src/lang/zh_CN.ts
@@ -0,0 +1,85 @@
+export default {
+  // 路由国际化
+  route: {
+    dashboard: '首页',
+    document: '项目文档'
+  },
+  // 登录页面国际化
+  login: {
+    selectPlaceholder: '请选择/输入公司名称',
+    username: '用户名',
+    password: '密码',
+    login: '登 录',
+    logging: '登 录 中...',
+    code: '验证码',
+    rememberPassword: '记住我',
+    switchRegisterPage: '立即注册',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号'
+      },
+      password: {
+        required: '请输入您的密码'
+      },
+      code: {
+        required: '请输入验证码'
+      }
+    },
+    social: {
+      wechat: '微信登录',
+      maxkey: 'MaxKey登录',
+      topiam: 'TopIam登录',
+      gitee: 'Gitee登录',
+      github: 'Github登录'
+    }
+  },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: '请选择/输入公司名称',
+    username: '用户名',
+    password: '密码',
+    confirmPassword: '确认密码',
+    register: '注 册',
+    registering: '注 册 中...',
+    registerSuccess: '恭喜你，您的账号 {username} 注册成功！',
+    code: '验证码',
+    switchLoginPage: '使用已有账户登录',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号',
+        length: '用户账号长度必须介于 {min} 和 {max} 之间'
+      },
+      password: {
+        required: '请输入您的密码',
+        length: '用户密码长度必须介于 {min} 和 {max} 之间',
+        pattern: '不能包含非法字符：{strings}'
+      },
+      code: {
+        required: '请输入验证码'
+      },
+      confirmPassword: {
+        required: '请再次输入您的密码',
+        equalToPassword: '两次输入的密码不一致'
+      }
+    }
+  },
+  // 导航栏国际化
+  navbar: {
+    full: '全屏',
+    language: '语言',
+    dashboard: '首页',
+    document: '项目文档',
+    message: '消息',
+    layoutSize: '布局大小',
+    selectTenant: '选择租户',
+    layoutSetting: '布局设置',
+    personalCenter: '个人中心',
+    logout: '退出登录'
+  }
+};

From 25189f30525ea19844d2e8680e8bdb947a450879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 11:06:19 +0800
Subject: [PATCH 70/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=20=E5=8F=98=E9=87=8F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 26 +++++++++++++-------------
 src/views/login.vue              | 28 +++++++++++++++-------------
 src/views/register.vue           | 18 ++++++++++--------
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index f821448..01cc22e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,7 +13,7 @@
           clearable
           filterable
           reserve-keyword
-          :placeholder="$t('navbar.selectTenant')"
+          :placeholder="proxy.$t('navbar.selectTenant')"
           @change="dynamicTenantEvent"
           @clear="dynamicClearEvent"
         >
@@ -29,7 +29,7 @@
           </div>
         </el-tooltip>
         <!-- 消息 -->
-        <el-tooltip :content="$t('navbar.message')" effect="dark" placement="bottom">
+        <el-tooltip :content="proxy.$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>
@@ -47,19 +47,19 @@
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="$t('navbar.document')" effect="dark" placement="bottom">
+        <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="$t('navbar.full')" effect="dark" placement="bottom">
+        <el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="$t('navbar.language')" effect="dark" placement="bottom">
+        <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">
           <lang-select id="lang-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom">
+        <el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
       </template>
@@ -72,13 +72,13 @@
           <template #dropdown>
             <el-dropdown-menu>
               <router-link v-if="!dynamic" to="/user/profile">
-                <el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item>
+                <el-dropdown-item>{{ proxy.$t('navbar.personalCenter') }}</el-dropdown-item>
               </router-link>
               <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
-                <span>{{ $t('navbar.layoutSetting') }}</span>
+                <span>{{ proxy.$t('navbar.layoutSetting') }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided command="logout">
-                <span>{{ $t('navbar.logout') }}</span>
+                <span>{{ proxy.$t('navbar.logout') }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </template>
@@ -128,8 +128,8 @@ const dynamicTenantEvent = async (tenantId: string) => {
     await dynamicTenant(tenantId);
     dynamic.value = true;
     await proxy?.$router.push('/');
-    await proxy?.$tab.closeAllPage();
-    await proxy?.$tab.refreshPage();
+    await proxy?.proxy.$tab.closeAllPage();
+    await proxy?.proxy.$tab.refreshPage();
   }
 };
 
@@ -137,8 +137,8 @@ const dynamicClearEvent = async () => {
   await dynamicClear();
   dynamic.value = false;
   await proxy?.$router.push('/');
-  await proxy?.$tab.closeAllPage();
-  await proxy?.$tab.refreshPage();
+  await proxy?.proxy.$tab.closeAllPage();
+  await proxy?.proxy.$tab.refreshPage();
 };
 
 /** 租户列表 */
diff --git a/src/views/login.vue b/src/views/login.vue
index ae70f75..cbc980c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,13 +6,13 @@
         <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="loginForm.tenantId" filterable :placeholder="$t('login.selectPlaceholder')" style="width: 100%">
+        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('login.username')">
+        <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
@@ -22,7 +22,7 @@
           type="password"
           size="large"
           auto-complete="off"
-          :placeholder="$t('login.password')"
+          :placeholder="proxy.$t('login.password')"
           @keyup.enter="handleLogin"
         >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -33,7 +33,7 @@
           v-model="loginForm.code"
           size="large"
           auto-complete="off"
-          :placeholder="$t('login.code')"
+          :placeholder="proxy.$t('login.code')"
           style="width: 63%"
           @keyup.enter="handleLogin"
         >
@@ -43,31 +43,31 @@
           <img :src="codeUrl" class="login-code-img" @click="getCode" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ $t('login.rememberPassword') }}</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
       <el-form-item style="float: right">
-        <el-button circle :title="$t('login.social.wechat')" @click="doSocialLogin('wechat')">
+        <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">
           <svg-icon icon-class="wechat" />
         </el-button>
-        <el-button circle :title="$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">
+        <el-button circle :title="proxy.$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">
           <svg-icon icon-class="maxkey" />
         </el-button>
-        <el-button circle :title="$t('login.social.topiam')" @click="doSocialLogin('topiam')">
+        <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">
           <svg-icon icon-class="topiam" />
         </el-button>
-        <el-button circle :title="$t('login.social.gitee')" @click="doSocialLogin('gitee')">
+        <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">
           <svg-icon icon-class="gitee" />
         </el-button>
-        <el-button circle :title="$t('login.social.github')" @click="doSocialLogin('github')">
+        <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">
           <svg-icon icon-class="github" />
         </el-button>
       </el-form-item>
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
-          <span v-if="!loading">{{ $t('login.login') }}</span>
-          <span v-else>{{ $t('login.logging') }}</span>
+          <span v-if="!loading">{{ proxy.$t('login.login') }}</span>
+          <span v-else>{{ proxy.$t('login.logging') }}</span>
         </el-button>
         <div v-if="register" style="float: right">
-          <router-link class="link-type" :to="'/register'">{{ $t('login.switchRegisterPage') }}</router-link>
+          <router-link class="link-type" :to="'/register'">{{ proxy.$t('login.switchRegisterPage') }}</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -87,6 +87,8 @@ import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
 import { useI18n } from 'vue-i18n';
 
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
 const userStore = useUserStore();
 const router = useRouter();
 const { t } = useI18n();
diff --git a/src/views/register.vue b/src/views/register.vue
index 9f76c70..f1d1e5a 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -6,13 +6,13 @@
         <lang-select />
       </div>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="registerForm.tenantId" filterable :placeholder="$t('register.selectPlaceholder')" style="width: 100%">
+        <el-select v-model="registerForm.tenantId" filterable :placeholder="proxy.$t('register.selectPlaceholder')" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('register.username')">
+        <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('register.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
@@ -22,7 +22,7 @@
           type="password"
           size="large"
           auto-complete="off"
-          :placeholder="$t('register.password')"
+          :placeholder="proxy.$t('register.password')"
           @keyup.enter="handleRegister"
         >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -34,7 +34,7 @@
           type="password"
           size="large"
           auto-complete="off"
-          :placeholder="$t('register.confirmPassword')"
+          :placeholder="proxy.$t('register.confirmPassword')"
           @keyup.enter="handleRegister"
         >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@@ -45,7 +45,7 @@
           v-model="registerForm.code"
           size="large"
           auto-complete="off"
-          :placeholder="$t('register.code')"
+          :placeholder="proxy.$t('register.code')"
           style="width: 63%"
           @keyup.enter="handleRegister"
         >
@@ -57,11 +57,11 @@
       </el-form-item>
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleRegister">
-          <span v-if="!loading">{{ $t('register.register') }}</span>
-          <span v-else>{{ $t('register.registering') }}</span>
+          <span v-if="!loading">{{ proxy.$t('register.register') }}</span>
+          <span v-else>{{ proxy.$t('register.registering') }}</span>
         </el-button>
         <div style="float: right">
-          <router-link class="link-type" :to="'/login'">{{ $t('register.switchLoginPage') }}</router-link>
+          <router-link class="link-type" :to="'/login'">{{ proxy.$t('register.switchLoginPage') }}</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -78,6 +78,8 @@ import { RegisterForm, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
 import { useI18n } from 'vue-i18n';
 
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
 const router = useRouter();
 
 const { t } = useI18n();

From 4c12943e3ca84a78f9e8871cdb005a4e787573fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 11:18:10 +0800
Subject: [PATCH 71/73] =?UTF-8?q?update=20=E6=81=A2=E5=A4=8D=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useDialog.ts | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/hooks/useDialog.ts

diff --git a/src/hooks/useDialog.ts b/src/hooks/useDialog.ts
new file mode 100644
index 0000000..547f199
--- /dev/null
+++ b/src/hooks/useDialog.ts
@@ -0,0 +1,31 @@
+import { Ref } from 'vue';
+
+interface Options {
+  title?: string;
+}
+interface Return {
+  title: Ref<string>;
+  visible: Ref<boolean>;
+  openDialog: () => void;
+  closeDialog: () => void;
+}
+export default (ops?: Options): Return => {
+  const visible = ref(false);
+  const title = ref(ops.title || '');
+
+  const openDialog = () => {
+    visible.value = true;
+  };
+
+  const closeDialog = () => {
+    visible.value = false;
+  };
+
+  return {
+    title,
+    visible,
+
+    openDialog,
+    closeDialog
+  };
+};

From bbe94610a28e72414df1fb2b36a6d11385873e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 11:30:16 +0800
Subject: [PATCH 72/73] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20parseTime?=
 =?UTF-8?q?=20=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RoleSelect/index.vue            | 2 +-
 src/views/monitor/logininfor/index.vue         | 2 +-
 src/views/monitor/online/index.vue             | 2 +-
 src/views/monitor/operlog/index.vue            | 2 +-
 src/views/monitor/operlog/oper-info-dialog.vue | 2 +-
 src/views/system/config/index.vue              | 2 +-
 src/views/system/dept/index.vue                | 2 +-
 src/views/system/dict/data.vue                 | 2 +-
 src/views/system/dict/index.vue                | 2 +-
 src/views/system/notice/index.vue              | 2 +-
 src/views/system/oss/index.vue                 | 2 +-
 src/views/system/post/index.vue                | 2 +-
 src/views/system/role/index.vue                | 2 +-
 src/views/system/role/selectUser.vue           | 2 +-
 src/views/system/tenant/index.vue              | 2 +-
 src/views/system/user/authRole.vue             | 2 +-
 src/views/system/user/profile/onlineDevice.vue | 2 +-
 src/views/workflow/leave/index.vue             | 4 ++--
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/RoleSelect/index.vue b/src/components/RoleSelect/index.vue
index 6ba2076..56a784b 100644
--- a/src/components/RoleSelect/index.vue
+++ b/src/components/RoleSelect/index.vue
@@ -53,7 +53,7 @@
           </vxe-column>
           <vxe-column field="createTime" title="创建时间" align="center">
             <template #default="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
             </template>
           </vxe-column>
         </vxe-table>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index ec4b8fe..d914544 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -94,7 +94,7 @@
         <el-table-column label="描述" align="center" prop="msg" :show-overflow-tooltip="true" />
         <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.loginTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index eb12364..7a58bb7 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -42,7 +42,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>{{ parseTime(scope.row.loginTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 5bf8430..0c64af4 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -95,7 +95,7 @@
         </el-table-column>
         <el-table-column label="操作日期" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.operTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.operTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/monitor/operlog/oper-info-dialog.vue b/src/views/monitor/operlog/oper-info-dialog.vue
index fd620ae..66491e2 100644
--- a/src/views/monitor/operlog/oper-info-dialog.vue
+++ b/src/views/monitor/operlog/oper-info-dialog.vue
@@ -41,7 +41,7 @@
         </template>
       </el-descriptions-item>
       <el-descriptions-item label="操作时间">
-        <template #default> {{ parseTime(info.operTime) }}</template>
+        <template #default> {{ proxy.parseTime(info.operTime) }}</template>
       </el-descriptions-item>
       <el-descriptions-item v-if="info.status === 1" label="异常信息">
         <template #default>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 64a0d4c..ddc0753 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -74,7 +74,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>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 15dfaa2..1f5facb 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -55,7 +55,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right" align="center" label="操作">
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 0faf1fa..3e9b0a1 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -66,7 +66,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>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index adb0b27..d30ad54 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -67,7 +67,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>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index d99b42c..5d7d9ba 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -61,7 +61,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>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 37b2e91..f76dbab 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -93,7 +93,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" sortable="custom">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="上传人" align="center" prop="createByName" />
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 95ad1ec..4aa4e3a 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template #default="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b86a8ec..fc42cd5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -68,7 +68,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
 
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index ec7a257..e55120a 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -27,7 +27,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
             <template #default="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index c6f011e..df97b64 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -61,7 +61,7 @@
         <el-table-column label="社会信用代码" align="center" prop="licenseNumber" />
         <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ proxy.parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="租户状态" align="center" prop="status">
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 070221a..fe2e974 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -39,7 +39,7 @@
           <el-table-column label="权限字符" align="center" prop="roleKey" />
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
             <template #default="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/system/user/profile/onlineDevice.vue b/src/views/system/user/profile/onlineDevice.vue
index bd7c822..7634b06 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>{{ parseTime(scope.row.loginTime) }}</span>
+          <span>{{ proxy.parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 64f0c57..2c8da0e 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -41,12 +41,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center" prop="startDate">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ proxy.parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center" prop="endDate">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+            <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="请假天数" align="center" prop="leaveDays" />

From 3280baff16f6de226beeb1aeb2315552d194fbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 11:36:07 +0800
Subject: [PATCH 73/73] =?UTF-8?q?=E5=8F=91=E5=B8=83=205.3.0-BETA=20?=
 =?UTF-8?q?=E5=85=AC=E6=B5=8B=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        | 2 +-
 src/views/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1d6d5c1..caac7c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "name": "ruoyi-vue-plus",
-  "version": "5.2.3",
+  "version": "5.3.0-BETA",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",
diff --git a/src/views/index.vue b/src/views/index.vue
index b67eb07..8e6b23d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
           * 部署方式 Docker 容器编排 一键部署业务集群<br />
           * 国际化 SpringMessage Spring标准国际化方案<br />
         </p>
-        <p><b>当前版本:</b> <span>v5.2.3</span></p>
+        <p><b>当前版本:</b> <span>v5.3.0-BETA</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>