From 24e45df087aa0ae882b8a5c964fa12e056cb47c6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 五月 2022 19:12:07 +0800
Subject: [PATCH] 2022-05-24

---
 src/tabviews/custom/components/share/normalTable/index.jsx |   59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 4a50717..0946175 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -185,7 +185,7 @@
           content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
         }
   
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       if (col.marks) {
@@ -224,7 +224,12 @@
       let photos = ''
       if (record[col.field]) {
         photos = `${record[col.field]}`
-        photos = photos.split(',')
+      }
+
+      if (/^data:image/.test(photos)) {
+        photos = [photos]
+      } else {
+        photos = photos.split(',').filter(Boolean)
       }
 
       let cols = 24 / (col.picSort || 1)
@@ -254,7 +259,7 @@
       }
 
       if (content) {
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       if (col.blur) {
@@ -382,7 +387,6 @@
     lineMarks: PropTypes.array,      // 琛屾爣璁�
     fields: PropTypes.array,         // 缁勪欢瀛楁闆�
     ContainerId: PropTypes.any,      // 鏍囩椤靛灞侷d
-    BData: PropTypes.any,            // 涓昏〃鏁版嵁
     data: PropTypes.any,             // 琛ㄦ牸鏁版嵁
     total: PropTypes.any,            // 鎬绘暟
     loading: PropTypes.bool,         // 琛ㄦ牸鍔犺浇涓�
@@ -481,12 +485,12 @@
       return uuid.join('')
     }) ()
 
-    if (setting.borderColor) { // 杈规棰滆壊
-      let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${setting.borderColor}}`
-      let ele = document.createElement('style')
-      ele.innerHTML = style
-      document.getElementsByTagName('head')[0].appendChild(ele)
-    }
+    // if (setting.borderColor) { // 杈规棰滆壊
+    //   let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${setting.borderColor}}`
+    //   let ele = document.createElement('style')
+    //   ele.innerHTML = style
+    //   document.getElementsByTagName('head')[0].appendChild(ele)
+    // }
 
     let size = (setting.pageSize || 10) + ''
     let pageOptions = ['10', '25', '50', '100', '500', '1000']
@@ -503,6 +507,12 @@
       rowspans,
       tableId,
       orderfields
+    }, () => {
+      const element = document.getElementById(tableId)
+      element && element.style.setProperty('--mk-table-border-color', setting.borderColor || '#e8e8e8')
+      element && element.style.setProperty('--mk-table-color', setting.color || 'rgba(0, 0, 0, 0.65)')
+      element && element.style.setProperty('--mk-table-font-size', setting.fontSize || '14px')
+      element && element.style.setProperty('--mk-table-font-weight', setting.fontWeight || 'normal')
     })
   }
 
@@ -528,18 +538,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)
     }
   }
 
@@ -722,13 +741,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] || ''
     }
 
@@ -824,7 +843,7 @@
     if (!setting.doubleClick) return
     if (record.$disabled) return
 
-    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
   }
 
   render() {
@@ -884,7 +903,7 @@
         }
         <Table
           components={components}
-          style={setting.style}
+          // style={setting.style}
           size={setting.size || 'middle'}
           bordered={setting.bordered !== 'false'}
           rowSelection={rowSelection}

--
Gitblit v1.8.0