From ec3cc73f8deaf0b83b0b517e65f949a5a5c496dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 一月 2020 09:07:46 +0800
Subject: [PATCH] 2020-01-07

---
 src/tabviews/commontable/index.jsx |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 2b576ed..c9d7e50 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -138,7 +138,7 @@
       }
 
       let _actions = config.action.filter(item => item.position === 'toolbar') // 杩囨护宸ュ叿鏍忔寜閽紙鏈粡杩囨潈闄愯繃婊わ級
-      let _tab = config.tabs.filter(tab => tab.supMenu === 'mainTable')        // 妫�鏌ユ槸鍚︽湁涓庝富琛ㄥ叧鑱旂殑瀛愯〃
+      let _isLinkMain = false        // 妫�鏌ユ槸鍚︽湁涓庝富琛ㄥ叧鑱旂殑瀛愯〃
       let supmenus = {}
       config.tabgroups.forEach(group => {
         if (config[group] && config[group].length > 0) {
@@ -150,6 +150,7 @@
             }
             if (config.setting.subtabs.includes(tab.uuid)) {
               tab.supMenu = 'mainTable'
+              _isLinkMain = true
             } else if (supmenus[tab.uuid]) {
               tab.supMenu = supmenus[tab.uuid]
             }
@@ -166,7 +167,7 @@
         searchlist: config.search,
         actions: _actions,
         columns: _columns,
-        isLinkMain: _tab.length > 0,
+        isLinkMain: _isLinkMain,
         arr_field: _arrField.join(','),
         search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
         loading: true
@@ -292,6 +293,10 @@
     } else {
       param = this.getDefaultParam()
     }
+
+    this.setState({
+      pickup: false
+    })
 
     this.handleTableId('mainTable', '')
 
@@ -661,7 +666,7 @@
     const { setting, searchlist, actions, columns, loadingview, viewlost, setsingle, pickup, isLinkMain, config } = this.state
 
     return (
-      <div className="commontable" id={'commontable' + this.props.MenuID}>
+      <div className={'commontable ' + (isLinkMain ? 'pick-control' : '')} id={'commontable' + this.props.MenuID}>
         {loadingview && <Spin size="large" />}
         {searchlist && searchlist.length > 0 ?
           <MainSearch
@@ -686,8 +691,12 @@
         }
         {columns && setting.onload !== 'false' ?
           <div className="main-table-box">
-            {isLinkMain && setting.tableType === 'checkbox' ? <Switch title="鍗曢�夊垏鎹�" checkedChildren="澶�" unCheckedChildren="鍗�" defaultChecked={setsingle} onChange={this.checkChange} /> : null}
-            {isLinkMain && this.state.BIDs.mainTable && (setting.tableType === 'radio' || setsingle) ? <Switch title="鏀惰捣" checkedChildren="鍏�" unCheckedChildren="寮�" defaultChecked={pickup} onChange={this.pickupChange} /> : null}
+            {isLinkMain ?
+              <div className="pickchange">
+                {setting.tableType === 'checkbox' ? <Switch title="鍗曢�夊垏鎹�" checkedChildren="澶�" unCheckedChildren="鍗�" defaultChecked={setsingle} onChange={this.checkChange} /> : null}
+                {this.state.BIDs.mainTable && (setting.tableType === 'radio' || setsingle) ? <Switch title="鏀惰捣" checkedChildren="鍏�" unCheckedChildren="寮�" defaultChecked={pickup} onChange={this.pickupChange} /> : null}
+              </div> : null
+            }
             <MainTable
               ref="mainTable"
               pickup={pickup}

--
Gitblit v1.8.0