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 |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 123c966..4bf5a88 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -278,12 +278,20 @@
     MKEmitter.removeListener('mkTableCheckTopLine', this.mkTableCheckTopLine)
   }
 
-  mkTableCheckTopLine = (id) => {
-    if (id !== this.props.MenuID) return
+  mkTableCheckTopLine = (menuid, id) => {
+    const {MenuID, data} = this.props
 
-    if (this.props.data.length > 0) {
-      this.changeRow(this.props.data[0], 0)
+    if (menuid !== MenuID || data.length === 0) return
+
+    let index = 0
+    if (id) {
+      index = data.findIndex(item => item.$$uuid === id)
+      if (index === -1) {
+        index = 0
+      }
     }
+
+    this.changeRow(data[index], index)
   }
 
   autoSelectData = (id, index) => {
@@ -646,9 +654,11 @@
       let photos = ''
       if (item.field && record.hasOwnProperty(item.field)) {
         photos = record[item.field] + ''
-        photos = photos.split(',').filter(Boolean)
+      }
+      if (/^data:image/.test(photos)) {
+        photos = [photos]
       } else {
-        photos = ''
+        photos = photos.split(',').filter(Boolean)
       }
 
       let maxHeight = item.maxHeight || 128
@@ -739,7 +749,6 @@
                   btn={btn}
                   BID={record.$$BID}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -754,7 +763,6 @@
                   btn={btn}
                   BID={record.$$BID}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -766,7 +774,6 @@
                   key={btn.uuid}
                   btn={btn}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   MenuID={this.props.MenuID}
@@ -779,7 +786,6 @@
                   key={btn.uuid}
                   btn={btn}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -849,7 +855,12 @@
           let photos = []
           try {
             photos = record[col.field] + ''
-            photos = photos.split(',').filter(Boolean)
+
+            if (/^data:image/.test(photos)) {
+              photos = [photos]
+            } else {
+              photos = photos.split(',').filter(Boolean)
+            }
           } catch (e) {
             photos = []
           }
@@ -1034,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]
     }
 
@@ -1050,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)
   }
@@ -1195,7 +1207,7 @@
     if (!setting.doubleClick) return
     if (record.$disabled) return
 
-    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
   }
 
   render() {

--
Gitblit v1.8.0