fix: modal add dialogStyle dialogClass #2285

vueComponent · May 24, 2020 · 1410dee · 1410dee
1 parent ffc002f
commit 1410dee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/antdv-demo b/antdv-demo
diff --git a/components/vc-dialog/Dialog.jsx b/components/vc-dialog/Dialog.jsx
@@ -218,8 +218,10 @@ export default {
         visible,
         bodyProps,
         forceRender,
+        dialogStyle,
+        dialogClass,
       } = this;
-      const dest = {};
+      const dest = { ...dialogStyle };
       if (width !== undefined) {
         dest.width = typeof width === 'number' ? `${width}px` : width;
       }
@@ -276,7 +278,7 @@ export default {
           role="document"
           ref="dialog"
           style={style}
-          class={cls}
+          class={[cls, dialogClass]}
           forceRender={forceRender}
           onMousedown={this.onDialogMouseDown}
         >

diff --git a/components/vc-dialog/IDialogPropTypes.js b/components/vc-dialog/IDialogPropTypes.js
@@ -33,7 +33,7 @@ function IDialogPropTypes() {
     wrapProps: PropTypes.any,
     getContainer: PropTypes.any,
     dialogStyle: PropTypes.object.def(() => ({})),
-    dialogClass: PropTypes.object.def(() => ({})),
+    dialogClass: PropTypes.object.def(''),
     closeIcon: PropTypes.any,
     forceRender: PropTypes.bool,
     getOpenCount: PropTypes.func,