From ff4295358a99b2d35265a5fed445e4407cf6ed9a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 五月 2020 14:48:10 +0800
Subject: [PATCH] 2020-05-18

---
 src/templates/sharecomponent/columncomponent/index.jsx |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 4a514cc..0d7d14d 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -60,7 +60,7 @@
     ) {
       this.setState({columnlist: nextProps.pasteContent.columns})
     } else if (!is(fromJS(nextProps.config.columns), fromJS(this.props.config.columns)) && !is(fromJS(nextProps.config.columns), fromJS(columnlist))) {
-      this.setState({columnlist: nextProps.config.columns})
+      this.setState({columnlist: fromJS(nextProps.config.columns).toJS()})
     }
   }
 
@@ -74,8 +74,9 @@
       this.setState({columnlist: list})
       this.handleColumn(card)
     } else {
-      this.setState({columnlist: list})
-      this.props.updatecolumn({...config, columns: list})
+      this.setState({columnlist: list}, ()=> {     
+        this.props.updatecolumn({...config, columns: list})
+      })
     }
   }
 
@@ -280,8 +281,9 @@
           card: null,
           columnlist: _columnlist,
           modaltype: ''
+        }, ()=> {
+          this.props.updatecolumn({...config, columns: _columnlist})
         })
-        this.props.updatecolumn({...config, columns: _columnlist})
       })
     } else if (modaltype === 'gridbtn') {
       this.gridBtnFormRef.handleConfirm().then(res => {
@@ -330,8 +332,9 @@
 
         _this.setState({
           columnlist: _columnlist
+        }, ()=> {
+          _this.props.updatecolumn({...config, columns: _columnlist})
         })
-        _this.props.updatecolumn({...config, columns: _columnlist})
       },
       onCancel() {}
     })
@@ -417,9 +420,9 @@
       card: null,
       columnlist: _columnlist,
       modaltype: ''
+    }, ()=> { 
+      this.props.updatecolumn({...config, columns: _columnlist})
     })
-    this.props.updatecolumn({...config, columns: _columnlist})
-    
   }
 
   /**

--
Gitblit v1.8.0