From b8aa5da1b2873bea760483cc5ab335fde9fb6de6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 五月 2022 18:15:56 +0800
Subject: [PATCH] 2022-05-12
---
src/tabviews/custom/components/share/normalTable/index.jsx | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 0c6f9ad..4d753fc 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -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)
@@ -480,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']
@@ -502,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')
})
}
@@ -892,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