From 432b788acf901b0720184b8ee8bc81a2e6fa47e0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 九月 2021 18:22:02 +0800
Subject: [PATCH] 2021-09-28

---
 src/tabviews/custom/components/table/normal-table/index.jsx |   64 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 8494aee..9adf4bf 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -56,11 +56,16 @@
    * 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
    */
   UNSAFE_componentWillMount () {
-    const { data, initdata, BID } = this.props
+    const { data, initdata, BID, BData } = this.props
     let _config = fromJS(this.props.config).toJS()
     let _cols = new Map()
     let _data = null
     let _sync = _config.setting.sync === 'true'
+    let setting = {..._config.setting, ..._config.wrap, style: {}}
+
+    if (setting.selected !== 'always' && setting.selected !== 'init') {
+      setting.selected = 'false'
+    }
 
     if (_config.setting.sync === 'true' && data) {
       _data = data[_config.dataName] || []
@@ -75,9 +80,19 @@
         item.key = index
         item.$$uuid = item[_config.setting.primaryKey] || ''
         item.$$BID = BID || ''
+        item.$$BData = BData || ''
         item.$Index = index + 1 + ''
         return item
       })
+
+      if (setting.selected !== 'false') {
+        setTimeout(() => {
+          MKEmitter.emit('mkCheckTopLine', _config.uuid)
+        }, 200)
+        if (setting.selected === 'init') {
+          setting.selected = 'false'
+        }
+      }
     }
 
     _config.columns.forEach(item => {
@@ -97,7 +112,6 @@
       }
     })
 
-    let setting = {..._config.setting, ..._config.wrap, style: {}}
     if (setting.color) {
       setting.style.color = setting.color
     }
@@ -111,6 +125,7 @@
 
     this.setState({
       BID: BID || '',
+      BData: BData || '',
       title: _config.wrap.title,
       sync: _sync,
       data: _data,
@@ -178,7 +193,17 @@
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
+      if (setting.selected !== 'false') {
+        setTimeout(() => {
+          MKEmitter.emit('mkCheckTopLine', config.uuid)
+        }, 200)
+        if (setting.selected === 'init') {
+          this.setState({setting: {...setting, selected: 'false'}})
+        }
+      } else {
+        MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
+      }
+      
       reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
 
       let start = 1
@@ -498,20 +523,30 @@
   }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
-    const { sync, config, BID } = this.state
+    const { sync, config, setting, BID, BData } = this.state
 
     if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
       let _data = []
       if (nextProps.data && nextProps.data[config.dataName]) {
         _data = nextProps.data[config.dataName] || []
+        _data = _data.map((item, index) => {
+          item.key = index
+          item.$$uuid = item[config.setting.primaryKey] || ''
+          item.$$BID = BID || ''
+          item.$$BData = BData || ''
+          item.$Index = index + 1 + ''
+          return item
+        })
+
+        if (setting.selected !== 'false') {
+          setTimeout(() => {
+            MKEmitter.emit('mkCheckTopLine', config.uuid)
+          }, 200)
+          if (setting.selected === 'init') {
+            this.setState({setting: {...setting, selected: 'false'}})
+          }
+        }
       }
-      _data = _data.map((item, index) => {
-        item.key = index
-        item.$$uuid = item[config.setting.primaryKey] || ''
-        item.$$BID = BID || ''
-        item.$Index = index + 1 + ''
-        return item
-      })
 
       this.setState({sync: false, data: _data})
     } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -546,7 +581,7 @@
   }
 
   render() {
-    const { BID, setting, searchlist, actions, config, columns, selectedData } = this.state
+    const { BID, setting, searchlist, actions, config, columns, selectedData, BData } = this.state
 
     return (
       <div className="custom-normal-table" style={config.style}>
@@ -559,7 +594,7 @@
               BID={BID}
               setting={setting}
               actions={actions}
-              BData={this.state.BData}
+              BData={BData}
               columns={config.columns}
               selectedData={selectedData}
             />
@@ -588,7 +623,7 @@
             BID={BID}
             setting={setting}
             actions={actions}
-            BData={this.state.BData}
+            BData={BData}
             columns={config.columns}
             selectedData={selectedData}
           />
@@ -616,7 +651,6 @@
 const mapStateToProps = (state) => {
   return {
     menuType: state.editLevel,
-    tabviews: state.tabviews,
     permAction: state.permAction,
     permMenus: state.permMenus
   }

--
Gitblit v1.8.0