From 3659f0773a14b54c18ed0af8b64de4afe8227489 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十二月 2020 19:31:12 +0800
Subject: [PATCH] 2020-12-04
---
src/tabviews/commontable/secretKeyTable/index.jsx | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/commontable/secretKeyTable/index.jsx b/src/tabviews/commontable/secretKeyTable/index.jsx
index 1f5aa55..ec09fb6 100644
--- a/src/tabviews/commontable/secretKeyTable/index.jsx
+++ b/src/tabviews/commontable/secretKeyTable/index.jsx
@@ -78,12 +78,9 @@
config.columns.forEach(col => {
if (col.field) {
_arrField.push(col.field)
-
}
if (col.type === 'colspan' && col.sublist) { // 绛涢�夐殣钘忓垪
_hideCol = _hideCol.concat(col.sublist)
- } else if (col.Hide === 'true') {
- _hideCol.push(col.uuid)
}
colMap.set(col.uuid, col)
})
@@ -92,10 +89,14 @@
config.columns.forEach(col => {
if (_hideCol.includes(col.uuid)) return
- if (col.type === 'colspan' && col.sublist) {
- let _col = JSON.parse(JSON.stringify(col))
+ if (col.type === 'colspan') {
+ if (col.unfold !== 'true') { // 涓嶅睍寮�涓烘棫鐗堝悎骞跺垪
+ col.type = 'old_colspan'
+ }
+
+ let _col = fromJS(col).toJS()
let subcols = []
- _col.sublist.forEach(sub => {
+ _col.sublist && _col.sublist.forEach(sub => {
if (colMap.has(sub)) {
subcols.push(colMap.get(sub))
}
@@ -346,7 +347,6 @@
<SubTable
tableId={this.props.Tab.uuid}
pickup={pickup}
- config={config}
setting={setting}
columns={columns}
dict={this.state.dict}
--
Gitblit v1.8.0