From 86da3cedc2b97983e63be105fadb9ebee0fb437b Mon Sep 17 00:00:00 2001 From: zhang Date: Wed, 9 Apr 2025 16:16:56 +0800 Subject: [PATCH 01/12] =?UTF-8?q?chore:=20=E5=AF=BC=E5=87=BA=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E8=87=AA=E5=B8=A6=E7=9A=84=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=8B=AC=E7=AB=8B=E9=A1=B5=E9=9D=A2=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20(#5876)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/effects/common-ui/src/components/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/effects/common-ui/src/components/index.ts b/packages/effects/common-ui/src/components/index.ts index bf99bc41..fc50391e 100644 --- a/packages/effects/common-ui/src/components/index.ts +++ b/packages/effects/common-ui/src/components/index.ts @@ -14,12 +14,15 @@ export * from '@vben-core/popup-ui'; // 给文档用 export { + VbenAvatar, VbenButton, VbenButtonGroup, VbenCheckButtonGroup, VbenCountToAnimator, + VbenFullScreen, VbenInputPassword, VbenLoading, + VbenLogo, VbenPinInput, VbenSpinner, VbenTree, From 9bd5a190c2a117a6a56cde9fb5c647de1412ee36 Mon Sep 17 00:00:00 2001 From: Netfan Date: Sat, 12 Apr 2025 00:59:56 +0800 Subject: [PATCH 02/12] fix: alert action button focus, fixed #5921 (#5922) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复Alert组件的按钮焦点切换问题 --- packages/@core/ui-kit/popup-ui/src/alert/alert.vue | 7 ++++--- playground/src/views/examples/modal/index.vue | 3 +++ 2 files changed, 7 insertions(+), 3 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 8c7c4541..5c02ed2a 100644 --- a/packages/@core/ui-kit/popup-ui/src/alert/alert.vue +++ b/packages/@core/ui-kit/popup-ui/src/alert/alert.vue @@ -138,7 +138,7 @@ async function handleOpenChange(val: boolean) {
{{ $t(title) }} - +
- + {{ cancelText || $t('cancel') }} - + +

通过快捷方法创建动态提示弹窗,适合一些轻量的提示和确认、输入等

- + {{ $t('pages.common.more') }} From 4ead56eaf18d2c2b4db16787329a4ece6f172923 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Sat, 12 Apr 2025 10:44:53 +0800 Subject: [PATCH 12/12] fix: onClosed --- .../workflow/processDefinition/process-definition-modal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue index d4b024ea..c73efbd8 100644 --- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue +++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue @@ -75,7 +75,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff( const [BasicDrawer, modalApi] = useVbenModal({ onBeforeClose, - onCancel: handleClosed, + onClosed: handleClosed, onConfirm: handleConfirm, async onOpenChange(isOpen) { if (!isOpen) {