From 88b499f5fa6de9101d6108b5fca10b494b46bc61 Mon Sep 17 00:00:00 2001 From: ShanaMaid Date: Mon, 16 Jul 2018 15:54:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(modal):=20=E4=BF=AE=E5=A4=8DonOk=20handler?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Modal/Modal.tsx | 3 ++- docs/pages/Modal/demo/modalDemo.tsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/Modal/Modal.tsx b/components/Modal/Modal.tsx index 75f5347..6072780 100644 --- a/components/Modal/Modal.tsx +++ b/components/Modal/Modal.tsx @@ -89,7 +89,8 @@ class Modal extends Component { className, style, title, bodyCotent, content, icon, width, zIndex, showCancel, okText, cancelText, type, closeText, showClose, - maskStyle, maskClosable, showMask, maskClick, + maskStyle, maskClosable, showMask, maskClick, onOk, + onCancel, ...otherProps } = this.props; const preCls = 'yoshino-modal'; diff --git a/docs/pages/Modal/demo/modalDemo.tsx b/docs/pages/Modal/demo/modalDemo.tsx index 1ad2bae..45f3bcc 100644 --- a/docs/pages/Modal/demo/modalDemo.tsx +++ b/docs/pages/Modal/demo/modalDemo.tsx @@ -8,6 +8,7 @@ export default function () { title: '这是一个标题!!!', content: '这是一个内容主题!这是一个内容主题!这是一个内容主题!这是一个内容主题!!', width: 400, + onOk: () => true, }); };