fix: update modal

Author: wangxueliang

components/modal/ConfirmDialog.jsx

@@ -64,7 +64,7 @@ export default {
         {cancelText}
       </ActionButton>
     );
-    const iconNode = typeof icon === 'string' ? <Icon type={icon} /> : icon;
+    const iconNode = typeof icon === 'string' ? <Icon type={icon} /> : icon(h);
 
     return (
       <Dialog

components/modal/demo/confirm-router.md

@@ -20,20 +20,20 @@ import Button from '../../button'
 export default {
   methods: {
     showConfirm() {
+      const _self = this
       for (let i = 0; i < 3; i += 1) {
         setTimeout(() => {
           this.$confirm({
-            content: (
-              <Button onClick={this.destroyAll}>
-                Click to destroy all
-              </Button>
-            ),
+            content: 'destroy all',
             onOk() {
               return new Promise((resolve, reject) => {
                 setTimeout(Math.random() > 0.5 ? resolve : reject, 1000);
               }).catch(() => console.log('Oops errors!'));
             },
-            onCancel() {},
+            cancelText: 'Click to destroy all',
+            onCancel() {
+              _self.destroyAll()
+            },
           });
         }, i * 500);
       }

components/modal/index.js

@@ -1,13 +1,16 @@
 import Modal, { destroyFns } from './Modal';
 import modalConfirm from './confirm';
+import Icon from '../icon';
 
 // export { ActionButtonProps } from './ActionButton'
 // export { ModalProps, ModalFuncProps } from './Modal'
 
 const info = function(props) {
   const config = {
     type: 'info',
-    icon: <Icon type="info-circle" />,
+    icon: (h) => {
+      return <Icon type="info-circle" />;
+    },
     okCancel: false,
     ...props,
   };
@@ -17,7 +20,9 @@ const info = function(props) {
 const success = function(props) {
   const config = {
     type: 'success',
-    icon: <Icon type="check-circle" />,
+    icon: (h) => {
+      return <Icon type="check-circle" />;
+    },
     okCancel: false,
     ...props,
   };
@@ -27,7 +32,9 @@ const success = function(props) {
 const error = function(props) {
   const config = {
     type: 'error',
-    icon: <Icon type="close-circle" />,
+    icon: (h) => {
+      return <Icon type="close-circle" />;
+    },
     okCancel: false,
     ...props,
   };
@@ -37,7 +44,9 @@ const error = function(props) {
 const warning = function(props) {
   const config = {
     type: 'warning',
-    icon: <Icon type="exclamation-circle" />,
+    icon: (h) => {
+      return <Icon type="exclamation-circle" />;
+    },
     okCancel: false,
     ...props,
   };