From a1b34fcc49cfeb7324cb7f4584380426ec6b092f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 20:08:00 +0800
Subject: [PATCH] 2022-05-29

---
 src/tabviews/zshare/normalTable/index.jsx |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index dbe02b5..4bf5a88 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -754,7 +754,6 @@
                   setting={this.props.setting}
                   columns={this.props.fields || this.props.columns}
                   ContainerId={this.props.ContainerId}
-                  lineBtn={true}
                 />
               )
             } else if (btn.OpenType === 'popview') {
@@ -767,7 +766,6 @@
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
-                  lineBtn={true}
                 />
               )
             } else if (btn.OpenType === 'tab') {
@@ -780,7 +778,6 @@
                   BData={this.props.BData}
                   MenuID={this.props.MenuID}
                   setting={this.props.setting}
-                  lineBtn={true}
                 />
               )
             } else if (btn.OpenType === 'innerpage' || btn.OpenType === 'outerpage') {
@@ -792,7 +789,6 @@
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
-                  lineBtn={true}
                 />
               )
             }
@@ -1049,11 +1045,12 @@
    * 
    */
   onSelectChange = selectedRowKeys => {
-    const { setting } = this.props
+    const { setting, data } = this.props
 
     let index = ''
     let _activeIndex = null
     if (selectedRowKeys.length > 0) {
+      selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
       index = selectedRowKeys.slice(-1)[0]
     }
 
@@ -1065,7 +1062,7 @@
 
     this.setState({ selectedRowKeys, activeIndex: _activeIndex })
 
-    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+    let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
 
     this.props.chgSelectData(selects)
   }

--
Gitblit v1.8.0