From 14377705e7e3e4d7145be0a3becf267ac73bdd9c Mon Sep 17 00:00:00 2001 From: Netfan Date: Wed, 23 Apr 2025 12:20:52 +0800 Subject: [PATCH 01/13] fix: alert confirm state in beforeClose callback (#6019) --- packages/@core/ui-kit/popup-ui/src/alert/alert.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/@core/ui-kit/popup-ui/src/alert/alert.vue b/packages/@core/ui-kit/popup-ui/src/alert/alert.vue index 9b133ee1..6223ecd7 100644 --- a/packages/@core/ui-kit/popup-ui/src/alert/alert.vue +++ b/packages/@core/ui-kit/popup-ui/src/alert/alert.vue @@ -47,6 +47,10 @@ function onAlertClosed() { isConfirm.value = false; } +function onEscapeKeyDown() { + isConfirm.value = false; +} + const getIconRender = computed(() => { let iconRender: Component | null = null; if (props.icon) { @@ -116,13 +120,11 @@ function handleCancel() { const loading = ref(false); async function handleOpenChange(val: boolean) { - const confirmState = isConfirm.value; - isConfirm.value = false; - await nextTick(); + await nextTick(); // 等待标记isConfirm状态 if (!val && props.beforeClose) { loading.value = true; try { - const res = await props.beforeClose({ isConfirm: confirmState }); + const res = await props.beforeClose({ isConfirm: isConfirm.value }); if (res !== false) { open.value = false; } @@ -142,6 +144,7 @@ async function handleOpenChange(val: boolean) { :overlay-blur="overlayBlur" @opened="emits('opened')" @closed="onAlertClosed" + @escape-key-down="onEscapeKeyDown" :class=" cn( containerClass, From 5ffd7db8e0b57b27545049200191acf63dc2e9cb Mon Sep 17 00:00:00 2001 From: panda7 Date: Fri, 25 Apr 2025 08:35:03 +0800 Subject: [PATCH 02/13] fix: the initial value echo for the check-button-group (#6029) Co-authored-by: sqchen <9110848@qq.com> --- .../shadcn-ui/src/components/button/check-button-group.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue b/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue index 834b883f..c29cea5a 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue @@ -41,7 +41,6 @@ watch( innerValue.value.length > 0 ? innerValue.value[0] : undefined; } }, - { immediate: true }, ); watch( @@ -60,7 +59,7 @@ watch( innerValue.value = val === undefined ? [] : [val as ValueType]; } }, - { deep: true }, + { deep: true, immediate: true }, ); async function onBtnClick(value: ValueType) { From cb45987fe2bd69fb013c8a849f5bdd6deaa0896d Mon Sep 17 00:00:00 2001 From: Netfan Date: Fri, 25 Apr 2025 11:44:47 +0800 Subject: [PATCH 03/13] docs: update example (#6036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 跟进后端菜单逻辑的修改,现已无需传递basicLayout布局 --- docs/src/guide/in-depth/access.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/src/guide/in-depth/access.md b/docs/src/guide/in-depth/access.md index be7d2ba0..0dbd0819 100644 --- a/docs/src/guide/in-depth/access.md +++ b/docs/src/guide/in-depth/access.md @@ -114,8 +114,6 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) { ```ts const dashboardMenus = [ { - // 这里固定写死 BasicLayout,不可更改 - component: 'BasicLayout', meta: { order: -1, title: 'page.dashboard.title', @@ -144,6 +142,16 @@ const dashboardMenus = [ }, ], }, + { + name: 'Test', + path: '/test', + component: '/test/index', + meta: { + title: 'page.test', + // 部分特殊页面如果不需要基础布局(页面顶部和侧边栏),可将noBasicLayout设置为true + noBasicLayout: true, + }, + }, ]; ``` From be840460d891bb6e446a8a319f36e5766435e475 Mon Sep 17 00:00:00 2001 From: Netfan Date: Fri, 25 Apr 2025 23:37:03 +0800 Subject: [PATCH 04/13] feat: vbenSelect support prop `allowClear` (#6043) --- .../src/components/select/select.vue | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue index 66525c02..24b8ea2a 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue @@ -1,4 +1,6 @@