From fbe92541144e4ac3b8603b4d022f0966fee5e5e5 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, 25 Sep 2025 11:34:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E4=B8=8D=E8=AE=BE=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Process/submitVerify.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index 6163cfb2..7b4b6522 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -259,7 +259,7 @@ const openDialog = async (id?: string) => { const response = await getTask(taskId.value); task.value = response.data; buttonObj.value = {}; - task.value.buttonList.forEach((e) => { + task.value.buttonList?.forEach((e) => { buttonObj.value[e.code] = e.show; }); selectCopyUserList.value = task.value.copyList; From c9cfefdc3e3fe4a35c9e3a43901ad9569503b0ae 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, 26 Sep 2025 11:57:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=A7=9F=E6=88=B7=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/tenant/index.ts | 8 ++++++++ src/views/system/tenant/index.vue | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index d1d8ff82..675447c6 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -99,3 +99,11 @@ export function syncTenantDict() { method: 'get' }); } + +// 同步租户字典 +export function syncTenantConfig() { + return request({ + url: '/system/tenant/syncTenantConfig', + method: 'get' + }); +} diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index b5945460..dd31700e 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -47,6 +47,9 @@ 同步租户字典 + + 同步租户参数配置 + @@ -152,7 +155,8 @@ import { updateTenant, changeTenantStatus, syncTenantPackage, - syncTenantDict + syncTenantDict, + syncTenantConfig } from '@/api/system/tenant'; import { selectTenantPackage } from '@/api/system/tenantPackage'; import { useUserStore } from '@/store/modules/user'; @@ -365,6 +369,13 @@ const handleSyncTenantDict = async () => { proxy?.$modal.msgSuccess(res.msg); }; +/**同步租户参数配置*/ +const handleSyncTenantConfig = async () => { + await proxy?.$modal.confirm('确认要同步所有租户参数配置吗？'); + const res = await syncTenantConfig(); + proxy?.$modal.msgSuccess(res.msg); +}; + onMounted(() => { getList(); }); From 04c6131fb0c8e725727855f9d8871b7ba82c5b49 Mon Sep 17 00:00:00 2001 From: JackyTang Date: Fri, 26 Sep 2025 12:17:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7unocss=E7=89=88?= =?UTF-8?q?=E6=9C=AC,=20=E8=A7=A3=E5=86=B3=20nodejs=20lts=2022=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 7d4b418a..f486d8ed 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,9 @@ "@types/js-cookie": "3.0.6", "@types/node": "^22.13.4", "@types/nprogress": "0.2.3", - "@unocss/preset-attributify": "66.0.0", - "@unocss/preset-icons": "66.0.0", - "@unocss/preset-uno": "66.0.0", + "@unocss/preset-attributify": "66.5.2", + "@unocss/preset-icons": "66.5.2", + "@unocss/preset-uno": "66.5.2", "@vitejs/plugin-vue": "5.2.3", "@vue/compiler-sfc": "3.5.13", "@vue/eslint-config-prettier": "10.2.0", @@ -68,7 +68,7 @@ "prettier": "3.5.2", "sass": "1.87.0", "typescript": "~5.8.3", - "unocss": "66.0.0", + "unocss": "66.5.2", "unplugin-auto-import": "19.1.2", "unplugin-icons": "22.1.0", "unplugin-vue-components": "28.5.0", From 014bedd301063fd5246223fa0295e0d9afb9de36 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, 26 Sep 2025 15:20:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E9=80=89=E6=8B=A9=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?(=E6=97=A0=E6=AD=A4=E5=8A=9F=E8=83=BD)?= 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 f6f2ff33..2d027c39 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -189,7 +189,7 @@ - 是 + 是 否 From b89e9cee7f7dd34b957020cea57be39c261299bc Mon Sep 17 00:00:00 2001 From: lau <1807121535@qq.com> Date: Sun, 28 Sep 2025 10:23:17 +0800 Subject: [PATCH 5/8] =?UTF-8?q?update=20=E6=8C=82=E8=BD=BD=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BA=E6=93=8D=E4=BD=9C?= =?UTF-8?q?vue=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/module.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/module.d.ts b/src/types/module.d.ts index 3b2f3781..69297762 100644 --- a/src/types/module.d.ts +++ b/src/types/module.d.ts @@ -12,7 +12,7 @@ import type { LanguageType } from '@/lang'; export {}; -declare module '@vue/runtime-core' { +declare module 'vue' { interface ComponentCustomProperties { // 全局方法声明 $modal: typeof modal; From 53e7d03a1c948025065e25c4fa27eddcb6ec8ceb Mon Sep 17 00:00:00 2001 From: Lau Date: Sun, 28 Sep 2025 03:27:45 +0000 Subject: [PATCH 6/8] =?UTF-8?q?!245=20update=20=E9=A1=B5=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E9=A2=98=E9=83=BD=E4=BB=8E=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E8=8E=B7=E5=8F=96=20*=20update=20=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D=20*=20up?= =?UTF-8?q?date=20=E5=B0=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E9=83=BD=E4=BB=8E=E9=85=8D=E7=BD=AE=E9=A1=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.production | 1 + index.html | 2 +- src/layout/components/Sidebar/Logo.vue | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 14e13358..3737274c 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ # 页面标题 VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统 +VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/.env.production b/.env.production index 1109bc61..883c8f19 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ # 页面标题 VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统 +VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/index.html b/index.html index aa1c86d9..f0742cad 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - RuoYi-Vue-Plus多租户管理系统 + %VITE_APP_TITLE%