From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26

---
 src/tabviews/zshare/normalTable/index.jsx |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index bc497d5..2481f06 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -115,8 +115,17 @@
         }
       }
   
-      columns.forEach((item, index) => {
-        if (item.hidden === true || item.Hide === 'true') return
+      columns.forEach(item => {
+        if (item.hidden === true || item.Hide === 'true') {
+          if (item.marks) { // 鎻愬彇琛屾爣璁�
+            item.marks.forEach(mark => {
+              if (mark.signType !== 'line') return
+
+              lineMarks.push(mark)
+            })
+          }
+          return
+        }
         let cell = null
   
         if (item.type === 'colspan') {
@@ -216,7 +225,11 @@
           }
         }
         
-        _columns.push(cell)
+        if (item.type === 'action' && item.position === 'left') {
+          _columns.unshift(cell)
+        } else {
+          _columns.push(cell)
+        }
       })
   
       if (rowspans.length === 0) {
@@ -231,7 +244,7 @@
       pageOptions.push(size)
       pageOptions = pageOptions.sort((a, b) => a - b)
     }
-    
+
     this.setState({
       pageOptions,
       columns: _columns,
@@ -265,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) => {

--
Gitblit v1.8.0