From 7cdc8fa2ed47233c32ed9e1e969999684a3a5e04 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 30 十二月 2021 15:41:16 +0800
Subject: [PATCH] 2021-12-30

---
 src/menu/components/table/edit-table/columns/tableIn/index.jsx |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index b11ab29..633ae38 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -168,26 +168,26 @@
   }
 
   UNSAFE_componentWillMount() {
-    const { columns, cols, card, setting } = this.props
+    const { columns, card, setting } = this.props
     let _verify = fromJS(card).toJS()
     _verify.sheet = _verify.sheet || setting.tableName
 
     let fieldLabel = {}
-    let _columns = []
-    let _fields = {}
+    // let _columns = []
+    // let _fields = {}
 
     columns.forEach(col => {
       fieldLabel[col.field] = col.label
-      _fields[col.field] = col
+      // _fields[col.field] = col
     })
-    cols.forEach(col => {
-      if (!col.field || col.type === 'index' || !_fields[col.field]) return
+    // cols.forEach(col => {
+    //   if (!col.field || col.type === 'index' || !_fields[col.field]) return
       
-      _columns.push(_fields[col.field])
-    })
+    //   _columns.push(_fields[col.field])
+    // })
 
     this.setState({
-      fields: _columns,
+      fields: fromJS(columns).toJS().filter(item => item.field !== setting.primaryKey),
       fieldLabel,
       verify: _verify
     }, () => {

--
Gitblit v1.8.0