From 365ea069f179ee71a7a8cc7785ccd2d86bd4881c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 二月 2021 18:33:45 +0800
Subject: [PATCH] 2021-02-03
---
src/tabviews/custom/components/share/normalTable/index.jsx | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index e75297d..255cfa3 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -248,6 +248,10 @@
content = md5(content)
}
+ if (col.rowspan === 'true') {
+ resProps.rowSpan = record['$$' + col.field]
+ }
+
if (col.linkThdMenu || col.linkurl) {
content = (
<div>
@@ -573,7 +577,7 @@
index = selectedRowKeys.slice(-1)[0]
}
- if (setting.tableType === 'checkbox') {
+ if (setting.tableType === 'checkbox' || setting.tableType === 'radio') {
_activeIndex = index === '' ? null : index
}
@@ -599,7 +603,7 @@
if (setting.tableType === 'radio') {
newkeys = [index]
this.changedata(index)
- this.setState({ selectedRowKeys: newkeys })
+ this.setState({ selectedRowKeys: newkeys, activeIndex: index })
} else {
let _index = ''
if (newkeys.includes(index)) {
@@ -689,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