From 82fd0b8bce6d1fdaa7e80213b6c3c53ec8eaaf88 Mon Sep 17 00:00:00 2001
From: zhang0ZGC <zgc@tqzgc.com>
Date: Mon, 3 Dec 2018 17:13:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#2965=20=E6=9F=A5=E8=AF=A2=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=85=B3=E9=97=AD=E9=85=8D=E7=BD=AEModal=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B8=90=E9=9A=90=E6=95=88=E6=9E=9C=20(#2980?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/List/TableList.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/List/TableList.js b/src/pages/List/TableList.js
index 1853dab6..eed64c72 100644
--- a/src/pages/List/TableList.js
+++ b/src/pages/List/TableList.js
@@ -66,6 +66,12 @@ const CreateForm = Form.create()(props => {
 
 @Form.create()
 class UpdateForm extends PureComponent {
+  static defaultProps = {
+    handleUpdate: () => {},
+    handleUpdateModalVisible: () => {},
+    values: {},
+  };
+
   constructor(props) {
     super(props);
 
@@ -203,13 +209,13 @@ class UpdateForm extends PureComponent {
   };
 
   renderFooter = currentStep => {
-    const { handleUpdateModalVisible } = this.props;
+    const { handleUpdateModalVisible, values } = this.props;
     if (currentStep === 1) {
       return [
         <Button key="back" style={{ float: 'left' }} onClick={this.backward}>
           上一步
         </Button>,
-        <Button key="cancel" onClick={() => handleUpdateModalVisible()}>
+        <Button key="cancel" onClick={() => handleUpdateModalVisible(false, values)}>
           取消
         </Button>,
         <Button key="forward" type="primary" onClick={() => this.handleNext(currentStep)}>
@@ -222,7 +228,7 @@ class UpdateForm extends PureComponent {
         <Button key="back" style={{ float: 'left' }} onClick={this.backward}>
           上一步
         </Button>,
-        <Button key="cancel" onClick={() => handleUpdateModalVisible()}>
+        <Button key="cancel" onClick={() => handleUpdateModalVisible(false, values)}>
           取消
         </Button>,
         <Button key="submit" type="primary" onClick={() => this.handleNext(currentStep)}>
@@ -231,7 +237,7 @@ class UpdateForm extends PureComponent {
       ];
     }
     return [
-      <Button key="cancel" onClick={() => handleUpdateModalVisible()}>
+      <Button key="cancel" onClick={() => handleUpdateModalVisible(false, values)}>
         取消
       </Button>,
       <Button key="forward" type="primary" onClick={() => this.handleNext(currentStep)}>
@@ -241,7 +247,7 @@ class UpdateForm extends PureComponent {
   };
 
   render() {
-    const { updateModalVisible, handleUpdateModalVisible } = this.props;
+    const { updateModalVisible, handleUpdateModalVisible, values } = this.props;
     const { currentStep, formVals } = this.state;
 
     return (
@@ -252,7 +258,8 @@ class UpdateForm extends PureComponent {
         title="规则配置"
         visible={updateModalVisible}
         footer={this.renderFooter(currentStep)}
-        onCancel={() => handleUpdateModalVisible()}
+        onCancel={() => handleUpdateModalVisible(false, values)}
+        afterClose={() => handleUpdateModalVisible()}
       >
         <Steps style={{ marginBottom: 28 }} size="small" current={currentStep}>
           <Step title="基本信息" />
-- 
GitLab