From b23db4e1b9e8bc813b4b3b95d35552e5e2e980c6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 二月 2021 18:51:00 +0800
Subject: [PATCH] 2021-02-01
---
src/tabviews/custom/components/share/normalTable/index.jsx | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index ec561d4..ca764a7 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -170,7 +170,7 @@
}
render() {
- let { col, config, record, className, style, triggerLink, updateStatus, ...resProps } = this.props
+ let { col, config, record, className, style, triggerLink, ...resProps } = this.props
if (!col) return (<td {...resProps} className={className} style={style}/>)
@@ -246,6 +246,10 @@
if (col.blur) {
content = md5(content)
+ }
+
+ if (col.rowspan === 'true') {
+ resProps.rowSpan = record['$$' + col.field]
}
if (col.linkThdMenu || col.linkurl) {
@@ -347,12 +351,12 @@
} else if (col.type === 'custom') {
style.padding = '0px'
resProps.children = (
- <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+ <CardCellComponent data={record} cards={config} elements={col.elements}/>
)
} else if (col.type === 'action') {
style.padding = '0px 5px'
resProps.children = (
- <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+ <CardCellComponent data={record} cards={config} elements={col.elements}/>
)
}
@@ -376,7 +380,6 @@
loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲
- refreshbyaction: PropTypes.func, // 鎸夐挳鎵ц瀹屾垚鍚庡埛鏂�
}
state = {
@@ -442,8 +445,7 @@
record,
col: item,
config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null,
- triggerLink: this.triggerLink,
- updateStatus: this.updateStatus
+ triggerLink: this.triggerLink
})
}
}
@@ -498,12 +500,6 @@
return
}
MKEmitter.removeListener('resetTable', this.resetTable)
- }
-
- updateStatus = (type, positon, btn) => {
- if (type === 'refresh') {
- this.props.refreshbyaction(positon, btn)
- }
}
// 瀛楁閫忚
@@ -697,13 +693,13 @@
let preItem = data[index - 1]
rowspans.forEach((cell, i) => {
if (i === 0) {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
}
} else {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
--
Gitblit v1.8.0