From 42232f310806fd8118cfb627f6e90e4c11bae26a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 四月 2022 15:55:40 +0800
Subject: [PATCH] 2022-04-27

---
 src/tabviews/custom/components/share/normalTable/index.jsx |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 6ff2056..0c6f9ad 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -175,6 +175,8 @@
         if (col.format === 'percent') {
           content = content * 100
           decimal = decimal > 2 ? decimal - 2 : 0
+        } else if (col.format === 'abs') {
+          content = Math.abs(content)
         }
   
         content = content.toFixed(decimal)
@@ -380,7 +382,6 @@
     lineMarks: PropTypes.array,      // 琛屾爣璁�
     fields: PropTypes.array,         // 缁勪欢瀛楁闆�
     ContainerId: PropTypes.any,      // 鏍囩椤靛灞侷d
-    BData: PropTypes.any,            // 涓昏〃鏁版嵁
     data: PropTypes.any,             // 琛ㄦ牸鏁版嵁
     total: PropTypes.any,            // 鎬绘暟
     loading: PropTypes.bool,         // 琛ㄦ牸鍔犺浇涓�
@@ -526,18 +527,27 @@
     MKEmitter.removeListener('resetTable', this.resetTable)
   }
 
-  mkCheckTopLine = (menuId) => {
+  mkCheckTopLine = (menuId, id) => {
     const { MenuID, data, setting } = this.props
 
     if (MenuID !== menuId || !data || data.length === 0) return
-    if (data[0].$disabled) return
 
-    this.changedata(0)
-    this.setState({ selectedRowKeys: [0], activeIndex: 0 })
-    this.props.chgSelectData([data[0]])
+    let index = 0
+    if (id) {
+      index = data.findIndex(item => item.$$uuid === id)
+      if (index === -1) {
+        index = 0
+      }
+    }
+
+    if (data[index].$disabled) return
+
+    this.changedata(index)
+    this.setState({ selectedRowKeys: [index], activeIndex: index })
+    this.props.chgSelectData([data[index]])
 
     if (setting.$hasSyncModule) {
-      MKEmitter.emit('syncBalconyData', MenuID, [data[0]], data.length === 1)
+      MKEmitter.emit('syncBalconyData', MenuID, [data[index]], data.length === 1)
     }
   }
 
@@ -720,13 +730,13 @@
   }
 
   changedata = (index) => {
-    const { MenuID, data, setting } = this.props
+    const { MenuID, data } = this.props
 
     let _id = ''
     let _data = ''
 
     if (data && data.length > 0 && index !== '') {
-      _id = data[index][setting.primaryKey] || ''
+      _id = data[index].$$uuid || ''
       _data = data[index] || ''
     }
 

--
Gitblit v1.8.0