From 90625782c02ba3a4dc6ab8178c352e64c417ae83 Mon Sep 17 00:00:00 2001 From: afe1 <2279948211@qq.com> Date: Thu, 8 May 2025 16:51:12 +0800 Subject: [PATCH 01/54] fix: delete useless code (#6143) --- apps/web-antd/src/router/guard.ts | 2 +- apps/web-ele/src/router/guard.ts | 2 +- apps/web-naive/src/router/guard.ts | 2 +- playground/src/router/guard.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/router/guard.ts b/apps/web-antd/src/router/guard.ts index e12766f91..a1ad6d88c 100644 --- a/apps/web-antd/src/router/guard.ts +++ b/apps/web-antd/src/router/guard.ts @@ -18,7 +18,7 @@ function setupCommonGuard(router: Router) { // 记录已经加载的页面 const loadedPaths = new Set(); - router.beforeEach(async (to) => { + router.beforeEach((to) => { to.meta.loaded = loadedPaths.has(to.path); // 页面加载进度条 diff --git a/apps/web-ele/src/router/guard.ts b/apps/web-ele/src/router/guard.ts index e12766f91..a1ad6d88c 100644 --- a/apps/web-ele/src/router/guard.ts +++ b/apps/web-ele/src/router/guard.ts @@ -18,7 +18,7 @@ function setupCommonGuard(router: Router) { // 记录已经加载的页面 const loadedPaths = new Set(); - router.beforeEach(async (to) => { + router.beforeEach((to) => { to.meta.loaded = loadedPaths.has(to.path); // 页面加载进度条 diff --git a/apps/web-naive/src/router/guard.ts b/apps/web-naive/src/router/guard.ts index 4810f13a9..28d1cea74 100644 --- a/apps/web-naive/src/router/guard.ts +++ b/apps/web-naive/src/router/guard.ts @@ -18,7 +18,7 @@ function setupCommonGuard(router: Router) { // 记录已经加载的页面 const loadedPaths = new Set(); - router.beforeEach(async (to) => { + router.beforeEach((to) => { to.meta.loaded = loadedPaths.has(to.path); // 页面加载进度条 diff --git a/playground/src/router/guard.ts b/playground/src/router/guard.ts index 11ac9479d..3bbe8dcae 100644 --- a/playground/src/router/guard.ts +++ b/playground/src/router/guard.ts @@ -18,7 +18,7 @@ function setupCommonGuard(router: Router) { // 记录已经加载的页面 const loadedPaths = new Set(); - router.beforeEach(async (to) => { + router.beforeEach((to) => { to.meta.loaded = loadedPaths.has(to.path); // 页面加载进度条 From 9e67929ee786b204358a556119976dd2b79acbbb Mon Sep 17 00:00:00 2001 From: anyup <85225562+anyup@users.noreply.github.com> Date: Sat, 10 May 2025 22:33:31 +0800 Subject: [PATCH 02/54] feat: support to refresh the tab page by route name (#6153) Co-authored-by: anyup --- packages/effects/hooks/src/use-tabs.ts | 4 ++-- packages/stores/src/modules/tabbar.ts | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/effects/hooks/src/use-tabs.ts b/packages/effects/hooks/src/use-tabs.ts index 60f70f14a..25bc4883d 100644 --- a/packages/effects/hooks/src/use-tabs.ts +++ b/packages/effects/hooks/src/use-tabs.ts @@ -41,8 +41,8 @@ export function useTabs() { await tabbarStore.toggleTabPin(tab || route); } - async function refreshTab() { - await tabbarStore.refresh(router); + async function refreshTab(name?: string) { + await tabbarStore.refresh(name || router); } async function openTabInNewWindow(tab?: RouteLocationNormalized) { diff --git a/packages/stores/src/modules/tabbar.ts b/packages/stores/src/modules/tabbar.ts index ec64bdc47..234bb02ff 100644 --- a/packages/stores/src/modules/tabbar.ts +++ b/packages/stores/src/modules/tabbar.ts @@ -334,7 +334,13 @@ export const useTabbarStore = defineStore('core-tabbar', { /** * 刷新标签页 */ - async refresh(router: Router) { + async refresh(router: Router | string) { + // 如果是Router路由，那么就根据当前路由刷新 + // 如果是string字符串，为路由名称，则定向刷新指定标签页，不能是当前路由名称，否则不会刷新 + if (typeof router === 'string') { + return await this.refreshByName(router); + } + const { currentRoute } = router; const { name } = currentRoute.value; @@ -349,6 +355,15 @@ export const useTabbarStore = defineStore('core-tabbar', { stopProgress(); }, + /** + * 根据路由名称刷新指定标签页 + */ + async refreshByName(name: string) { + this.excludeCachedTabs.add(name); + await new Promise((resolve) => setTimeout(resolve, 200)); + this.excludeCachedTabs.delete(name); + }, + /** * @zh_CN 重置标签页标题 */ From 5922f45112c258abbeeffd4f1b30dea39078839c Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 12 May 2025 11:31:50 +0800 Subject: [PATCH 03/54] fix: locales --- apps/web-antd/src/adapter/form.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web-antd/src/adapter/form.ts b/apps/web-antd/src/adapter/form.ts index cf75673e5..d0932a0da 100644 --- a/apps/web-antd/src/adapter/form.ts +++ b/apps/web-antd/src/adapter/form.ts @@ -45,7 +45,7 @@ setupVbenForm({ if (value === undefined || value === null || value.length === 0) { return true; } else if (!MOBILE_REGEX.test(value)) { - return $t('ui.formRules.phone', [ctx.label]); + return $t('ui.formRules.mobile', [ctx.label]); } return true; }, @@ -55,7 +55,7 @@ setupVbenForm({ return $t('ui.formRules.required', [ctx.label]); } if (!MOBILE_REGEX.test(value)) { - return $t('ui.formRules.phone', [ctx.label]); + return $t('ui.formRules.mobile', [ctx.label]); } return true; }, From 708587f0237e8ea02212cbd50153f06b9d27312c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 12 May 2025 12:58:57 +0800 Subject: [PATCH 04/54] =?UTF-8?q?review=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/utils/formCreate.ts | 2 +- apps/web-antd/src/views/bpm/group/index.vue | 1 + apps/web-antd/src/views/bpm/processExpression/data.ts | 1 + .../src/views/bpm/processInstance/detail/modules/time-line.vue | 1 + packages/icons/src/svg/index.ts | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/utils/formCreate.ts b/apps/web-antd/src/utils/formCreate.ts index d7f944c0f..1129f63fb 100644 --- a/apps/web-antd/src/utils/formCreate.ts +++ b/apps/web-antd/src/utils/formCreate.ts @@ -1,7 +1,7 @@ /** * 针对 https://github.com/xaboy/form-create-designer 封装的工具类 */ - +// TODO @芋艿：后续这些 form-create 的优化；另外需要使用 form-create-helper 会好点 import { isRef } from 'vue'; // 编码表单 Conf diff --git a/apps/web-antd/src/views/bpm/group/index.vue b/apps/web-antd/src/views/bpm/group/index.vue index 55e0a930a..7f5406cac 100644 --- a/apps/web-antd/src/views/bpm/group/index.vue +++ b/apps/web-antd/src/views/bpm/group/index.vue @@ -126,6 +126,7 @@ onMounted(async () => { +