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 |   59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 41e586a..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(null, 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) => {
@@ -281,7 +302,7 @@
     let i = index - (pageIndex - 1) * pageSize - 1
 
     if (this.props.data[i]) {
-      this.changeRow(null, i)
+      this.changeRow(this.props.data[i], i)
       MKEmitter.emit('autoTransSelectData', this.props.MenuID, this.props.data[i])
     } else {
       MKEmitter.emit('autoMaticOver', this.props.MenuID)
@@ -481,7 +502,7 @@
         content = md5(content)
       }
 
-      if (item.linkThdMenu || item.linkurl) {
+      if (!record.$disabled && (item.linkThdMenu || item.linkurl)) {
         if (item.rowspan === 'true') {
           return {
             children: (
@@ -580,7 +601,7 @@
         content = md5(content)
       }
 
-      if (item.linkThdMenu || item.linkurl) {
+      if (!record.$disabled && (item.linkThdMenu || item.linkurl)) {
         if (item.rowspan === 'true') {
           return {
             children: (
@@ -725,6 +746,8 @@
                   key={btn.uuid}
                   btn={btn}
                   BID={record.$$BID}
+                  disabled={record.$disabled}
+                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -738,6 +761,8 @@
                   key={btn.uuid}
                   btn={btn}
                   BID={record.$$BID}
+                  disabled={record.$disabled}
+                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -748,6 +773,8 @@
                 <TabButton
                   key={btn.uuid}
                   btn={btn}
+                  disabled={record.$disabled}
+                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   MenuID={this.props.MenuID}
@@ -759,6 +786,8 @@
                 <NewPageButton
                   key={btn.uuid}
                   btn={btn}
+                  disabled={record.$disabled}
+                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -1029,7 +1058,7 @@
 
     this.setState({ selectedRowKeys, activeIndex: _activeIndex })
 
-    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index))
+    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
 
     this.props.chgSelectData(selects)
   }
@@ -1039,6 +1068,7 @@
    */
   changeRow = (record, index) => {
     if (!this.props.setting.tableType || this.props.pickup) return
+    if (record.$disabled) return
     
     let newkeys = fromJS(this.state.selectedRowKeys).toJS()
 
@@ -1171,6 +1201,7 @@
     const { setting } = this.props
 
     if (!setting.doubleClick) return
+    if (record.$disabled) return
 
     MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
   }
@@ -1281,7 +1312,9 @@
           dataSource={_data}
           rowClassName={(record) => {
             let className = ''
-            if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) {
+            if (record.$disabled) {
+              className = 'mk-disabled '
+            } else if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) {
               className = 'mk-row-active '
             }
 

--
Gitblit v1.8.0