From 8dc7dca7a83592a1b89dd534f977a7dae75222bd Mon Sep 17 00:00:00 2001 From: Uyarn Date: Mon, 16 Dec 2024 10:57:19 +0800 Subject: [PATCH 1/2] fix(Dialog): fix dialog props duplicate --- src/dialog/dialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialog/dialog.tsx b/src/dialog/dialog.tsx index 1cc72ab73..b7ae6f06c 100644 --- a/src/dialog/dialog.tsx +++ b/src/dialog/dialog.tsx @@ -141,7 +141,7 @@ export default mixins(ActionMixin, getConfigReceiverMixins('d } return topStyle; }, - dialogStyle(): Styles { + computedDialogStyle(): Styles { return !this.isFullScreen ? { width: getCSSValue(this.width) } : {}; // width全屏模式不生效; }, }, @@ -477,7 +477,7 @@ export default mixins(ActionMixin, getConfigReceiverMixins('d // 非模态形态下draggable为true才允许拖拽
-
+
{this.getIcon()} From a8277bd0f95197c5d361d35434e74a8bd89c0ec8 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Mon, 16 Dec 2024 10:59:26 +0800 Subject: [PATCH 2/2] fix(Dialog): fix dialog props duplicate --- src/dialog/dialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialog/dialog.tsx b/src/dialog/dialog.tsx index b7ae6f06c..96f36772a 100644 --- a/src/dialog/dialog.tsx +++ b/src/dialog/dialog.tsx @@ -142,7 +142,7 @@ export default mixins(ActionMixin, getConfigReceiverMixins('d return topStyle; }, computedDialogStyle(): Styles { - return !this.isFullScreen ? { width: getCSSValue(this.width) } : {}; // width全屏模式不生效; + return !this.isFullScreen ? { width: getCSSValue(this.width), ...this.dialogStyle } : { ...this.dialogStyle }; // width全屏模式不生效; }, },