From 30e1ea1c6daf08fde986f6a0f1743015b30b8721 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, 28 Mar 2025 22:51:01 +0800 Subject: [PATCH 01/36] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AFdownload=E6=96=B9=E6=B3=95=E5=93=8D=E5=BA=94json?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/request.ts b/src/utils/request.ts index 9682b819..f3b06ad0 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -191,7 +191,8 @@ export function download(url: string, params: any, fileName: string) { const blob = new Blob([resp]); FileSaver.saveAs(blob, fileName); } else { - const resText = await resp.data.text(); + const blob = new Blob([resp]); + const resText = await blob.text(); const rspObj = JSON.parse(resText); const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']; ElMessage.error(errMsg); -- Gitee From de926211ef0e583a34e0f54dff5aa130e09e0843 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, 31 Mar 2025 09:39:59 +0800 Subject: [PATCH 02/36] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BB?= =?UTF-8?q?=E5=87=BA=E4=B9=8B=E5=90=8E=E6=B8=85=E7=90=86tabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 626089d8..81083bd5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -171,6 +171,7 @@ const logout = async () => { redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/') } }); + proxy?.$tab.closeAllPage(); }); }; -- Gitee From 35b90aa7465d4316479a26f58374cda116e102b1 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, 2 Apr 2025 14:37:32 +0800 Subject: [PATCH 03/36] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E6=8F=90=E4=BA=A4=E6=9C=AA=E5=8F=96=E6=B6=88=E6=8C=89?= =?UTF-8?q?=E9=92=AEloading=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/leave/leaveEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 0a0660ac..d2101987 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -212,9 +212,9 @@ const submitForm = (status: string) => { buttonLoading.value = true; let res: AxiosResponse; if (form.value.id) { - res = await updateLeave(form.value); + res = await updateLeave(form.value).finally(() => (buttonLoading.value = false)); } else { - res = await addLeave(form.value); + res = await addLeave(form.value).finally(() => (buttonLoading.value = false)); } form.value = res.data; if (status === 'draft') { -- Gitee From 15acd995f9fe35f9503785b9aea8d8679280f55b 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, 2 Apr 2025 14:45:23 +0800 Subject: [PATCH 04/36] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E6=97=B6=E9=97=B4=20=E6=97=B6=E9=97=B4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=B2=A1=E6=B3=95=E5=92=8Crule=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98(ele=E7=9A=84bug=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=E5=BF=85=E5=A1=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/leave/leaveEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index d2101987..11f64e77 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -20,7 +20,7 @@ - + Date: Mon, 7 Apr 2025 16:22:04 +0800 Subject: [PATCH 05/36] =?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=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TreeSelect/index.vue | 147 ---------------------------- 1 file changed, 147 deletions(-) delete mode 100644 src/components/TreeSelect/index.vue diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue deleted file mode 100644 index 244f3f4d..00000000 --- a/src/components/TreeSelect/index.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - - - -- Gitee From bbc656a26ca83c75191c24e87b04cec12b00e292 Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 10 Apr 2025 11:33:12 +0800 Subject: [PATCH 06/36] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1]:=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E5=88=86=E7=B1=BB=E4=B8=8E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=96=B0=E5=A2=9E=E8=81=94=E5=8A=A8?= 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 789041dc..b64cd96a 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -466,6 +466,8 @@ const reset = () => { */ const handleAdd = async () => { reset(); + if (queryParams.value.category != '') + form.value.category = `${queryParams.value.category}` modelDialog.visible = true; modelDialog.title = '新增流程'; }; -- Gitee From c98a14e2ac55ec81f13f31138fa224525f1020f6 Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 10 Apr 2025 15:41:30 +0800 Subject: [PATCH 07/36] =?UTF-8?q?if=E6=B7=BB=E5=8A=A0=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/processDefinition/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index b64cd96a..c3fe1c87 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -466,8 +466,9 @@ const reset = () => { */ const handleAdd = async () => { reset(); - if (queryParams.value.category != '') + if (queryParams.value.category != '') { form.value.category = `${queryParams.value.category}` + } modelDialog.visible = true; modelDialog.title = '新增流程'; }; -- Gitee From 5ec984ac7d8b3f87210134de8ff59f3cdc90b97f 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, 11 Apr 2025 15:32:27 +0800 Subject: [PATCH 08/36] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E9=87=8F=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/leave/leaveEdit.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 11f64e77..16e62358 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -252,7 +252,9 @@ const handleStartWorkFlow = async (data: LeaveForm) => { submitFormData.value.businessId = data.id; //流程变量 taskVariables.value = { + // leave2/6 使用的流程变量 leaveDays: data.leaveDays, + // leave4/5 使用的流程变量 userList: ['1', '3', '4'] }; submitFormData.value.variables = taskVariables.value; -- Gitee From e9e8a2eaaf96ff3f1e3fea2fb44aa393a7e7157a Mon Sep 17 00:00:00 2001 From: Myles Date: Mon, 14 Apr 2025 13:14:57 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=8B=E5=80=BC?= 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, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index c3fe1c87..9851c61c 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -467,7 +467,7 @@ const reset = () => { const handleAdd = async () => { reset(); if (queryParams.value.category != '') { - form.value.category = `${queryParams.value.category}` + form.value.category = queryParams.value.category } modelDialog.visible = true; modelDialog.title = '新增流程'; -- Gitee From 6fe23176815ea6ee2e28d7db6738ecd7a7c78b41 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, 16 Apr 2025 15:28:14 +0800 Subject: [PATCH 10/36] update vite 5.4.11 => 5.4.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index df8c23e8..9708f86a 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "unplugin-icons": "0.18.5", "unplugin-vue-components": "28.0.0", "unplugin-vue-setup-extend-plus": "1.0.1", - "vite": "5.4.11", + "vite": "5.4.18", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons-ng": "^1.2.2", "vite-plugin-vue-devtools": "7.7.1", -- Gitee From d5eac1709707b0f4f72aa6a5c997333f8b1161a8 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, 17 Apr 2025 15:19:58 +0800 Subject: [PATCH 11/36] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=A6=81=E7=94=A8=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=86?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/authRole.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index fe2e9741..ec7bc236 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -33,7 +33,7 @@ {{ (pageNum - 1) * pageSize + scope.$index + 1 }} - + @@ -80,8 +80,10 @@ const tableRef = ref(); /** 单击选中行数据 */ const clickRow = (row: RoleVO) => { - row.flag = !row.flag; - tableRef.value?.toggleRowSelection(row, row.flag); + if (checkSelectable(row)) { + row.flag = !row.flag; + tableRef.value?.toggleRowSelection(row, row.flag); + } }; /** 多选框选中数据 */ const handleSelectionChange = (selection: RoleVO[]) => { @@ -91,6 +93,10 @@ const handleSelectionChange = (selection: RoleVO[]) => { const getRowKey = (row: RoleVO): string => { return String(row.roleId); }; +/** 检查角色状态 */ +const checkSelectable = (row: RoleVO): boolean => { + return row.status === "0"; +}; /** 关闭按钮 */ const close = () => { const obj: RouteLocationNormalized = { -- Gitee From 660d5b3d4f7e12fb6ecac606f674c6b034916210 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, 18 Apr 2025 17:47:55 +0800 Subject: [PATCH 12/36] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=85=B3?= =?UTF-8?q?=E4=BA=8Eexcel=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/index.vue b/src/views/index.vue index f7a11438..ea1898dc 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -26,7 +26,7 @@ * 文件存储 七牛、阿里、腾讯 云存储
* 监控框架 SpringBoot-Admin 全方位服务监控
* 校验框架 Validation 增强接口安全性 严谨性
- * Excel框架 Alibaba EasyExcel 性能优异 扩展性强
+ * Excel框架 FastExcel(原Alibaba EasyExcel) 性能优异 扩展性强
* 文档框架 SpringDoc、javadoc 无注解零入侵基于java注释
* 工具类框架 Hutool、Lombok 减少代码冗余 增加安全性
* 代码生成器 适配MP、SpringDoc规范化代码 一键生成前后端代码
-- Gitee From e5de3f4e9df494436ddbcb357d980d30756c3d44 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, 22 Apr 2025 13:32:15 +0800 Subject: [PATCH 13/36] =?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/assets/styles/sidebar.scss | 2 +- src/components/TopNav/index.vue | 2 +- src/layout/components/AppMain.vue | 2 +- src/views/login.vue | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index f19abe4b..7410b6fb 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -26,7 +26,7 @@ z-index: 1001; overflow: hidden; -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35); - box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35); + box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.1); // reset element-ui css .horizontal-collapse-transition { diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index a9dd3344..75a93229 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -51,7 +51,7 @@ const topMenus = computed(() => { routers.value.map((menu) => { if (menu.hidden !== true) { // 兼容顶部栏一级菜单内部跳转 - if (menu.path === '/') { + if (menu.path === '/' && menu.children) { topMenus.push(menu.children ? menu.children[0] : menu); } else { topMenus.push(menu); diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index f27a37f3..8a555092 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -43,7 +43,7 @@ onMounted(() => { addIframe() }) -watchEffect((route) => { +watchEffect(() => { addIframe() }) diff --git a/src/views/login.vue b/src/views/login.vue index eebde18e..f6415492 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -260,10 +260,9 @@ onMounted(() => { background: #ffffff; width: 400px; padding: 25px 25px 5px 25px; - + z-index: 1; .el-input { height: 40px; - input { height: 40px; } -- Gitee From de22609196c3cc1e9c2eae8aeb62fb3c6132d36a 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, 22 Apr 2025 15:23:36 +0800 Subject: [PATCH 14/36] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=20update=20elemen?= =?UTF-8?q?t-plus=202.9.8=20update=20pinia=203.0.2=20update=20vue-router?= =?UTF-8?q?=204.5.0=20update=20vue-types=206.0.0=20update=20vxe-table=204.?= =?UTF-8?q?13.7=20update=20sass=201.87.0=20update=20typescript=205.8.3=20u?= =?UTF-8?q?pdate=20vite=206.3.2=20........=E7=AD=89=E7=AD=89=E5=BE=88?= =?UTF-8?q?=E5=A4=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc-auto-import.json | 5 ++- package.json | 47 ++++++++++++++------------ src/layout/components/notice/index.vue | 7 ++-- src/main.ts | 2 +- 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 98226d9c..cb7058aa 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -315,6 +315,9 @@ "watchThrottled": true, "watchTriggerable": true, "watchWithFilter": true, - "whenever": true + "whenever": true, + "Slot": true, + "Slots": true, + "createRef": true } } diff --git a/package.json b/package.json index 9708f86a..fc60498b 100644 --- a/package.json +++ b/package.json @@ -23,31 +23,31 @@ "@element-plus/icons-vue": "2.3.1", "@highlightjs/vue-plugin": "2.1.0", "@vueup/vue-quill": "1.2.0", - "@vueuse/core": "12.7.0", + "@vueuse/core": "13.1.0", "animate.css": "4.1.1", "await-to-js": "3.0.0", - "axios": "1.7.8", + "axios": "1.8.4", "crypto-js": "4.2.0", - "echarts": "5.5.0", - "element-plus": "2.8.8", + "echarts": "5.6.0", + "element-plus": "2.9.8", "file-saver": "2.0.5", "highlight.js": "11.9.0", "image-conversion": "2.1.1", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", "nprogress": "0.2.0", - "pinia": "2.2.6", + "pinia": "3.0.2", "screenfull": "6.0.2", "vue": "3.5.13", "vue-cropper": "1.1.1", - "vue-i18n": "10.0.5", + "vue-i18n": "11.1.3", "vue-json-pretty": "2.4.0", - "vue-router": "4.4.5", - "vue-types": "5.1.3", - "vxe-table": "4.5.22" + "vue-router": "4.5.0", + "vue-types": "6.0.0", + "vxe-table": "4.13.7" }, "devDependencies": { - "@iconify/json": "2.2.276", + "@iconify/json": "^2.2.276", "@types/crypto-js": "4.2.2", "@types/file-saver": "2.0.7", "@types/js-cookie": "3.0.6", @@ -56,8 +56,8 @@ "@unocss/preset-attributify": "66.0.0", "@unocss/preset-icons": "66.0.0", "@unocss/preset-uno": "66.0.0", - "@vitejs/plugin-vue": "5.2.1", - "@vue/compiler-sfc": "3.4.23", + "@vitejs/plugin-vue": "5.2.3", + "@vue/compiler-sfc": "3.5.13", "@vue/eslint-config-prettier": "10.2.0", "@vue/eslint-config-typescript": "14.4.0", "autoprefixer": "10.4.20", @@ -66,19 +66,22 @@ "eslint-plugin-vue": "9.32.0", "globals": "16.0.0", "prettier": "3.5.2", - "sass": "1.84.0", - "typescript": "~5.7.3", + "sass": "1.87.0", + "typescript": "~5.8.3", "unocss": "66.0.0", - "unplugin-auto-import": "0.17.5", - "unplugin-icons": "0.18.5", - "unplugin-vue-components": "28.0.0", + "unplugin-auto-import": "19.1.2", + "unplugin-icons": "22.1.0", + "unplugin-vue-components": "28.5.0", "unplugin-vue-setup-extend-plus": "1.0.1", - "vite": "5.4.18", + "vite": "6.3.2", "vite-plugin-compression": "0.5.1", - "vite-plugin-svg-icons-ng": "^1.2.2", - "vite-plugin-vue-devtools": "7.7.1", - "vitest": "3.0.5", - "vue-tsc": "^2.2.2" + "vite-plugin-svg-icons-ng": "^1.4.0", + "vite-plugin-vue-devtools": "7.7.5", + "vitest": "3.1.2", + "vue-tsc": "^2.2.8" + }, + "overrides": { + "quill": "2.0.2" }, "engines": { "node": ">=18.18.0", diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue index b287daf2..684ae6a9 100644 --- a/src/layout/components/notice/index.vue +++ b/src/layout/components/notice/index.vue @@ -24,10 +24,9 @@ diff --git a/src/layout/components/IframeToggle/index.vue b/src/layout/components/IframeToggle/index.vue index e1b93b0a..62a834bb 100644 --- a/src/layout/components/IframeToggle/index.vue +++ b/src/layout/components/IframeToggle/index.vue @@ -18,7 +18,7 @@ const tagsViewStore = useTagsViewStore(); function iframeUrl(url: string | undefined, query: any) { if (Object.keys(query).length > 0) { - let params = Object.keys(query) + const params = Object.keys(query) .map((key) => key + '=' + query[key]) .join('&'); return url + '?' + params; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index af63dbf2..efb1ae3b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -98,7 +98,7 @@ import { dynamicClear, dynamicTenant } from '@/api/system/tenant'; import { TenantVO } from '@/api/types'; import notice from './notice/index.vue'; import router from '@/router'; -import {ElMessageBoxOptions} from "element-plus/es/components/message-box/src/message-box.type"; +import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type'; const appStore = useAppStore(); const userStore = useUserStore(); diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 5e82ea3a..a11159bd 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -86,7 +86,7 @@ const resolvePath = (routePath: string, routeQuery?: string): any => { return props.basePath; } if (routeQuery) { - let query = JSON.parse(routeQuery); + const query = JSON.parse(routeQuery); return { path: getNormalPath(props.basePath + '/' + routePath), query: query }; } return getNormalPath(props.basePath + '/' + routePath); diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue index 746de20a..a5cd7683 100644 --- a/src/layout/components/SocialCallback/index.vue +++ b/src/layout/components/SocialCallback/index.vue @@ -63,9 +63,9 @@ const loginByCode = async (data: LoginData) => { const init = async () => { // 如果域名不相等 则重定向处理 - let host = window.location.host; + const host = window.location.host; if (domain !== host) { - let urlFull = new URL(window.location.href); + const urlFull = new URL(window.location.href); urlFull.host = domain; window.location.href = urlFull.toString(); return; diff --git a/src/layout/components/TopBar/search.vue b/src/layout/components/TopBar/search.vue index c50bb3cc..9cb36dbf 100644 --- a/src/layout/components/TopBar/search.vue +++ b/src/layout/components/TopBar/search.vue @@ -67,7 +67,7 @@ const closeSearch = () => { }; // 菜单搜索数据过滤 const menuSearch = (queryString: string, cb: (options: any[]) => void) => { - let options = state.menuList.filter((item) => { + const options = state.menuList.filter((item) => { return item.title.indexOf(queryString) > -1; }); cb(options); diff --git a/src/permission.ts b/src/permission.ts index 353adb5f..fb60b07c 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -14,8 +14,8 @@ NProgress.configure({ showSpinner: false }); const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*']; const isWhiteList = (path: string) => { - return whiteList.some(pattern => isPathMatch(pattern, path)) -} + return whiteList.some((pattern) => isPathMatch(pattern, path)); +}; router.beforeEach(async (to, from, next) => { NProgress.start(); diff --git a/src/store/index.ts b/src/store/index.ts index e32948cc..02ae96a9 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,4 +1,4 @@ -import { createPinia } from "pinia"; +import { createPinia } from 'pinia'; const store = createPinia(); diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 4dacdfee..1169cc88 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -99,14 +99,14 @@ export const usePermissionStore = defineStore('permission', () => { }; const filterChildren = (childrenMap: RouteRecordRaw[], lastRouter?: RouteRecordRaw): RouteRecordRaw[] => { let children: RouteRecordRaw[] = []; - childrenMap.forEach(el => { + childrenMap.forEach((el) => { el.path = lastRouter ? lastRouter.path + '/' + el.path : el.path; if (el.children && el.children.length && el.component?.toString() === 'ParentView') { children = children.concat(filterChildren(el.children, el)); } else { children.push(el); } - }) + }); return children; }; return { diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts index c26024c4..bcd237a1 100644 --- a/src/store/modules/settings.ts +++ b/src/store/modules/settings.ts @@ -5,7 +5,6 @@ import { useStorage } from '@vueuse/core'; import { ref } from 'vue'; export const useSettingsStore = defineStore('setting', () => { - // @ts-ignore const storageSetting = useStorage('layout-setting', { topNav: defaultSettings.topNav, tagsView: defaultSettings.tagsView, diff --git a/src/types/module.d.ts b/src/types/module.d.ts index 2fc273ac..3b2f3781 100644 --- a/src/types/module.d.ts +++ b/src/types/module.d.ts @@ -48,4 +48,3 @@ export type ObjKeysToUnion = T extends object [K in keyof T]: ObjKeysToUnion; }[keyof T] : P; - diff --git a/src/utils/ruoyi.ts b/src/utils/ruoyi.ts index 79f55473..8cb9f978 100644 --- a/src/utils/ruoyi.ts +++ b/src/utils/ruoyi.ts @@ -178,11 +178,11 @@ export const handleTree = (data: any[], id?: string, parentId?: string, child for (const d of data) { const parentId = d[config.parentId]; - const parentObj = childrenListMap[parentId] + const parentObj = childrenListMap[parentId]; if (!parentObj) { tree.push(d); } else { - parentObj[config.childrenList].push(d) + parentObj[config.childrenList].push(d); } } return tree; diff --git a/src/views/error/401.vue b/src/views/error/401.vue index 968550c7..f90f50bd 100644 --- a/src/views/error/401.vue +++ b/src/views/error/401.vue @@ -22,7 +22,7 @@ diff --git a/src/views/register.vue b/src/views/register.vue index 447443c7..8b3d6dc0 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -203,7 +203,6 @@ onMounted(() => { line-height: 0; color: #7483a3; } - } .register-form { diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue index 1f14b4ca..81739df8 100644 --- a/src/views/system/client/index.vue +++ b/src/views/system/client/index.vue @@ -300,7 +300,7 @@ const handleExport = () => { /** 状态修改 */ const handleStatusChange = async (row: ClientVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '"吗?'); await changeStatus(row.clientId, row.status); diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue index db9d68ff..5d73bc89 100644 --- a/src/views/system/oss/config.vue +++ b/src/views/system/oss/config.vue @@ -87,16 +87,16 @@ - + - + @@ -316,7 +316,7 @@ const submitForm = () => { }; /** 状态修改 */ const handleStatusChange = async (row: OssConfigVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '""' + row.configKey + '"配置吗?'); await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey); diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue index f76dbab4..1c1d6084 100644 --- a/src/views/system/oss/index.vue +++ b/src/views/system/oss/index.vue @@ -255,9 +255,9 @@ const handleHeaderCLick = (column: any) => { handleOrderChange(column.property, column.multiOrder); }; const handleOrderChange = (prop: string, order: string) => { - let orderByArr = queryParams.value.orderByColumn ? queryParams.value.orderByColumn.split(',') : []; - let isAscArr = queryParams.value.isAsc ? queryParams.value.isAsc.split(',') : []; - let propIndex = orderByArr.indexOf(prop); + const orderByArr = queryParams.value.orderByColumn ? queryParams.value.orderByColumn.split(',') : []; + const isAscArr = queryParams.value.isAsc ? queryParams.value.isAsc.split(',') : []; + const propIndex = orderByArr.indexOf(prop); if (propIndex !== -1) { if (order) { //排序里已存在 只修改排序 @@ -306,7 +306,7 @@ const handleDownload = (row: OssVO) => { }; /** 预览开关按钮 */ const handlePreviewListResource = async (preview: boolean) => { - let text = preview ? '启用' : '停用'; + const text = preview ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '""预览列表图片"配置吗?'); await proxy?.updateConfigByKey('sys.oss.previewListResource', preview); diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 9f0ea11a..9f1bc89c 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -323,7 +323,7 @@ const handleSelectionChange = (selection: RoleVO[]) => { /** 角色状态修改 */ const handleStatusChange = async (row: RoleVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?'); await changeRoleStatus(row.roleId, row.status); @@ -346,11 +346,11 @@ const getMenuTreeselect = async () => { /** 所有部门节点数据 */ const getDeptAllCheckedKeys = (): any => { // 目前被选中的部门节点 - let checkedKeys = deptRef.value?.getCheckedKeys(); + const checkedKeys = deptRef.value?.getCheckedKeys(); // 半选中的部门节点 - let halfCheckedKeys = deptRef.value?.getHalfCheckedKeys(); + const halfCheckedKeys = deptRef.value?.getHalfCheckedKeys(); if (halfCheckedKeys) { - checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys); + checkedKeys?.unshift(...halfCheckedKeys); } return checkedKeys; }; @@ -404,14 +404,14 @@ const getRoleDeptTreeSelect = async (roleId: string | number) => { /** 树权限（展开/折叠）*/ const handleCheckedTreeExpand = (value: boolean, type: string) => { if (type == 'menu') { - let treeList = menuOptions.value; + const treeList = menuOptions.value; for (let i = 0; i < treeList.length; i++) { if (menuRef.value) { menuRef.value.store.nodesMap[treeList[i].id].expanded = value; } } } else if (type == 'dept') { - let treeList = deptOptions.value; + const treeList = deptOptions.value; for (let i = 0; i < treeList.length; i++) { if (deptRef.value) { deptRef.value.store.nodesMap[treeList[i].id].expanded = value; @@ -438,11 +438,11 @@ const handleCheckedTreeConnect = (value: any, type: string) => { /** 所有菜单节点数据 */ const getMenuAllCheckedKeys = (): any => { // 目前被选中的菜单节点 - let checkedKeys = menuRef.value?.getCheckedKeys(); + const checkedKeys = menuRef.value?.getCheckedKeys(); // 半选中的菜单节点 - let halfCheckedKeys = menuRef.value?.getHalfCheckedKeys(); + const halfCheckedKeys = menuRef.value?.getHalfCheckedKeys(); if (halfCheckedKeys) { - checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys); + checkedKeys?.unshift(...halfCheckedKeys); } return checkedKeys; }; diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 1e3ff815..82b27954 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -245,7 +245,7 @@ const getList = async () => { // 租户套餐状态修改 const handleStatusChange = async (row: TenantVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '""' + row.companyName + '"租户吗？'); await changeTenantStatus(row.id, row.tenantId, row.status); @@ -361,7 +361,7 @@ const handleExport = () => { /**同步租户字典*/ const handleSyncTenantDict = async () => { await proxy?.$modal.confirm('确认要同步所有租户字典吗？'); - let res = await syncTenantDict(); + const res = await syncTenantDict(); proxy?.$modal.msgSuccess(res.msg); }; diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue index 1609b6d9..8959da42 100644 --- a/src/views/system/tenantPackage/index.vue +++ b/src/views/system/tenantPackage/index.vue @@ -167,11 +167,11 @@ const getMenuTreeselect = async () => { // 所有菜单节点数据 const getMenuAllCheckedKeys = (): any => { // 目前被选中的菜单节点 - let checkedKeys = menuTreeRef.value?.getCheckedKeys(); + const checkedKeys = menuTreeRef.value?.getCheckedKeys(); // 半选中的菜单节点 - let halfCheckedKeys = menuTreeRef.value?.getHalfCheckedKeys(); + const halfCheckedKeys = menuTreeRef.value?.getHalfCheckedKeys(); if (halfCheckedKeys) { - checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys); + checkedKeys?.unshift(...halfCheckedKeys); } return checkedKeys; }; @@ -194,7 +194,7 @@ const getList = async () => { // 租户套餐状态修改 const handleStatusChange = async (row: TenantPkgVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; const [err] = await to(proxy?.$modal.confirm('确认要"' + text + '""' + row.packageName + '"套餐吗？') as Promise); if (err) { row.status = row.status === '0' ? '1' : '0'; @@ -241,7 +241,7 @@ const handleSelectionChange = (selection: TenantPkgVO[]) => { // 树权限（展开/折叠） const handleCheckedTreeExpand = (value: CheckboxValueType, type: string) => { if (type == 'menu') { - let treeList = menuOptions.value; + const treeList = menuOptions.value; for (let i = 0; i < treeList.length; i++) { if (menuTreeRef.value) { menuTreeRef.value.store.nodesMap[treeList[i].id].expanded = value as boolean; diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index ec7bc236..93ca5b7c 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -95,7 +95,7 @@ const getRowKey = (row: RoleVO): string => { }; /** 检查角色状态 */ const checkSelectable = (row: RoleVO): boolean => { - return row.status === "0"; + return row.status === '0'; }; /** 关闭按钮 */ const close = () => { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index fdc50187..7d0e2cde 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -498,7 +498,7 @@ const handleDelete = async (row?: UserVO) => { /** 用户状态修改 */ const handleStatusChange = async (row: UserVO) => { - let text = row.status === '0' ? '启用' : '停用'; + const text = row.status === '0' ? '启用' : '停用'; try { await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?'); await api.changeUserStatus(row.userId, row.status); diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue index a417791c..8709289f 100644 --- a/src/views/system/user/profile/userAvatar.vue +++ b/src/views/system/user/profile/userAvatar.vue @@ -134,7 +134,7 @@ const beforeUpload = (file: UploadRawFile): any => { /** 上传图片 */ const uploadImg = async () => { cropper.value.getCropBlob(async (data: any) => { - let formData = new FormData(); + const formData = new FormData(); formData.append('avatarfile', data, options.fileName); const res = await uploadAvatar(formData); open.value = false; diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index b4df31b5..451895dd 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -113,8 +113,8 @@ diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 16e62358..d68a0f2a 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -1,17 +1,15 @@ @@ -257,11 +260,31 @@ + + + + + + + -- Gitee From 2a5ad70155f24b95db351d45c2e768382e26d9ff Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 24 May 2025 13:06:04 +0800 Subject: [PATCH 24/36] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/menu/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 2bef4782..587217cd 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -360,7 +360,7 @@ const getTreeselect = async () => { /** 取消按钮 */ const cancel = () => { reset(); - dialog.visible = false; + deleteDialog.visible = false; }; /** 表单重置 */ const reset = () => { @@ -455,7 +455,7 @@ const submitDeleteForm = async () => { await getList(); proxy?.$modal.msgSuccess('删除成功'); deleteDialog.visible = false; -} +}; onMounted(() => { getList(); -- Gitee From 1ea70dd3ceebbc8855bc7c9061ee1445a8cb1b78 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 24 May 2025 13:13:45 +0800 Subject: [PATCH 25/36] =?UTF-8?q?update=20=E8=A1=A8=E6=A0=BC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0border?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demo/demo/index.vue | 2 +- src/views/demo/tree/index.vue | 1 + src/views/monitor/logininfor/index.vue | 1 + src/views/monitor/online/index.vue | 1 + src/views/monitor/operlog/index.vue | 1 + src/views/system/client/index.vue | 2 +- src/views/system/config/index.vue | 2 +- src/views/system/dept/index.vue | 1 + src/views/system/dict/data.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/menu/index.vue | 1 + src/views/system/notice/index.vue | 2 +- src/views/system/oss/config.vue | 2 +- src/views/system/oss/index.vue | 1 + src/views/system/post/index.vue | 2 +- src/views/system/role/authUser.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/tenantPackage/index.vue | 2 +- src/views/system/user/authRole.vue | 1 + src/views/system/user/index.vue | 2 +- src/views/system/user/profile/onlineDevice.vue | 2 +- src/views/system/user/profile/thirdParty.vue | 2 +- src/views/tool/gen/editTable.vue | 2 +- src/views/tool/gen/importTable.vue | 2 +- src/views/tool/gen/index.vue | 2 +- src/views/workflow/category/index.vue | 1 + 28 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue index da1bc167..06da4cf8 100644 --- a/src/views/demo/demo/index.vue +++ b/src/views/demo/demo/index.vue @@ -49,7 +49,7 @@ - + diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue index 01a74b4f..ef923be7 100644 --- a/src/views/demo/tree/index.vue +++ b/src/views/demo/tree/index.vue @@ -33,6 +33,7 @@ v-loading="loading" :data="treeList" row-key="id" + border :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index d9145446..da928cc2 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -63,6 +63,7 @@ v-loading="loading" :data="loginInfoList" :default-sort="defaultSort" + border @selection-change="handleSelectionChange" @sort-change="handleSortChange" > diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index 7a58bb7e..b93325cd 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -19,6 +19,7 @@ diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index 0c64af4d..dc663713 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -65,6 +65,7 @@ ref="operLogTableRef" v-loading="loading" :data="operlogList" + border :default-sort="defaultSort" @selection-change="handleSelectionChange" @sort-change="handleSortChange" diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue index 81739df8..0354d0d4 100644 --- a/src/views/system/client/index.vue +++ b/src/views/system/client/index.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index ddc07537..74014944 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -60,7 +60,7 @@ - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 191c8a06..56f4b176 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -42,6 +42,7 @@ v-loading="loading" :data="deptList" row-key="deptId" + border :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll" > diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 215ed258..be5c87a9 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -44,7 +44,7 @@ - + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index bfa8f72e..c97b92e7 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -53,7 +53,7 @@ - + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 587217cd..c2636be7 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -42,6 +42,7 @@ v-loading="loading" :data="menuList" row-key="menuId" + border :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll" > diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 5d7d9ba5..c219828a 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -44,7 +44,7 @@ - + diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue index 5d73bc89..89898d68 100644 --- a/src/views/system/oss/config.vue +++ b/src/views/system/oss/config.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue index 1c1d6084..f5966d78 100644 --- a/src/views/system/oss/index.vue +++ b/src/views/system/oss/index.vue @@ -70,6 +70,7 @@ v-if="showTable" v-loading="loading" :data="ossList" + border :header-cell-class-name="handleHeaderClass" @selection-change="handleSelectionChange" @header-click="handleHeaderCLick" diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 2e778669..289abbdc 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -84,7 +84,7 @@ - + diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 49bac805..7c7fbeb7 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 9f1bc89c..c6d83b42 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -55,7 +55,7 @@ - + diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue index 12df8282..cf36fb08 100644 --- a/src/views/system/role/selectUser.vue +++ b/src/views/system/role/selectUser.vue @@ -14,7 +14,7 @@ - + diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 82b27954..b5945460 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -51,7 +51,7 @@ - + diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue index 8959da42..0a442f02 100644 --- a/src/views/system/tenantPackage/index.vue +++ b/src/views/system/tenantPackage/index.vue @@ -39,7 +39,7 @@ - + diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index 93ca5b7c..d322942b 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -23,6 +23,7 @@ - + diff --git a/src/views/system/user/profile/onlineDevice.vue b/src/views/system/user/profile/onlineDevice.vue index b8844466..3ce63ba5 100644 --- a/src/views/system/user/profile/onlineDevice.vue +++ b/src/views/system/user/profile/onlineDevice.vue @@ -1,6 +1,6 @@ - {{ dict.label }} + {{ dict.label }} @@ -246,7 +246,7 @@ - + {{ dict.label }} -- Gitee From a614dee5c62433437fe343521f99f2b0c9e190b0 Mon Sep 17 00:00:00 2001 From: warm <290631660@qq.com> Date: Tue, 27 May 2025 16:58:18 +0800 Subject: [PATCH 30/36] =?UTF-8?q?feat=20=E6=96=B0=E5=A2=9E=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=BE=E6=96=B9=E5=BC=8F=20feat=20=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9E=E7=90=86=E4=BA=BA=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=AF=94=E5=A6=82=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=BD=AC=E7=94=A8=E6=88=B7=20update=20=E5=8D=87=E7=BA=A7warm-f?= =?UTF-8?q?low-1.7.3-m1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflow/workflowCommon/index.ts | 3 +- src/api/workflow/workflowCommon/types.ts | 1 + src/components/Process/approvalRecord.vue | 10 +-- src/components/Process/flowChart.vue | 79 +++----------------- src/views/workflow/leave/leaveEdit.vue | 2 +- src/views/workflow/processInstance/index.vue | 5 +- src/views/workflow/task/allTaskWaiting.vue | 3 +- src/views/workflow/task/myDocument.vue | 5 +- src/views/workflow/task/taskCopyList.vue | 3 +- src/views/workflow/task/taskFinish.vue | 3 +- src/views/workflow/task/taskWaiting.vue | 3 +- 11 files changed, 34 insertions(+), 83 deletions(-) diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index 0f5ce1b2..696312e6 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -8,7 +8,8 @@ export default { query: { id: routerJumpVo.businessId, type: routerJumpVo.type, - taskId: routerJumpVo.taskId + taskId: routerJumpVo.taskId, + instanceId: routerJumpVo.instanceId } }); } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 3e7a71d5..2d091157 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -4,6 +4,7 @@ export interface RouterJumpVo { type: string; formCustom: string; formPath: string; + instanceId: string | number; } export interface StartProcessBo { diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index e70d289b..96108f7d 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -3,7 +3,7 @@ - +
@@ -73,20 +73,18 @@ const loading = ref(false); const visible = ref(false); const historyList = ref>([]); const tabActiveName = ref('image'); -const imgUrl = ref(''); -const defJson = ref(''); +const insId = ref(null); //初始化查询审批记录 -const init = async (businessId: string | number) => { +const init = async (businessId: string | number, instanceId: string | number) => { visible.value = true; loading.value = true; tabActiveName.value = 'image'; historyList.value = []; + insId.value = instanceId; flowImage(businessId).then((resp) => { if (resp.data) { historyList.value = resp.data.list; - imgUrl.value = 'data:image/gif;base64,' + resp.data.image; - defJson.value = resp.data.defChart.defJson; if (historyList.value.length > 0) { historyList.value.forEach((item) => { if (item.ext) { diff --git a/src/components/Process/flowChart.vue b/src/components/Process/flowChart.vue index d5cd2c15..f0afe466 100644 --- a/src/components/Process/flowChart.vue +++ b/src/components/Process/flowChart.vue @@ -1,84 +1,29 @@