From a1b34fcc49cfeb7324cb7f4584380426ec6b092f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 20:08:00 +0800
Subject: [PATCH] 2022-05-29
---
src/tabviews/zshare/normalTable/index.jsx | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 88e69c8..4bf5a88 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) => {
@@ -633,9 +654,11 @@
let photos = ''
if (item.field && record.hasOwnProperty(item.field)) {
photos = record[item.field] + ''
- photos = photos.split(',').filter(Boolean)
+ }
+ if (/^data:image/.test(photos)) {
+ photos = [photos]
} else {
- photos = ''
+ photos = photos.split(',').filter(Boolean)
}
let maxHeight = item.maxHeight || 128
@@ -832,7 +855,12 @@
let photos = []
try {
photos = record[col.field] + ''
- photos = photos.split(',').filter(Boolean)
+
+ if (/^data:image/.test(photos)) {
+ photos = [photos]
+ } else {
+ photos = photos.split(',').filter(Boolean)
+ }
} catch (e) {
photos = []
}
@@ -1017,11 +1045,12 @@
*
*/
onSelectChange = selectedRowKeys => {
- const { setting } = this.props
+ const { setting, data } = this.props
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
+ selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
index = selectedRowKeys.slice(-1)[0]
}
@@ -1033,7 +1062,7 @@
this.setState({ selectedRowKeys, activeIndex: _activeIndex })
- let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+ let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
this.props.chgSelectData(selects)
}
@@ -1178,7 +1207,7 @@
if (!setting.doubleClick) return
if (record.$disabled) return
- MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+ MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
}
render() {
--
Gitblit v1.8.0