From f0524f158d89a91ac0dfb758405afa302149442a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 四月 2024 01:57:40 +0800
Subject: [PATCH] 2024-04-30
---
src/menu/components/table/normal-table/index.jsx | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 6bdefb2..de2356b 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -278,11 +278,11 @@
}
getWrapForms = () => {
- const { wrap, action, columns, cols } = this.state.card
+ const { card } = this.state
let _actions = []
- cols.forEach(col => {
+ card.cols.forEach(col => {
if (col.type === 'custom') {
col.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -292,7 +292,7 @@
}
})
- return getWrapForm(wrap, _actions, columns, action)
+ return getWrapForm(card.wrap, _actions, card.columns, card.action, card.supNodes || [], card.uuid)
}
updateWrap = (res) => {
@@ -311,26 +311,40 @@
res.borderRadius = card.wrap.borderRadius || 0
res.resetContrl = card.wrap.resetContrl || 'init'
- this.updateComponent({...card, wrap: res})
+ let _card = {...card, wrap: res}
+
+ if (res.supNodes) {
+ _card.supNodes = res.supNodes
+ _card.supNodes = _card.supNodes.map(item => {
+ item.componentId = item.nodes[item.nodes.length - 1]
+ return item
+ })
+
+ delete res.supNodes
+ } else {
+ delete _card.supNodes
+ }
+
+ this.updateComponent(_card)
}
updatecolumn = (config) => {
config.absFields = []
- config.cols.forEach(col => {
- if (col.type === 'number') {
- if (col.format === 'abs') {
- config.absFields.push(col.field)
- }
- } else if (col.type === 'colspan' && col.subcols) {
- col.subcols.forEach(scol => {
- if (scol.type === 'number') {
- if (scol.format === 'abs') {
- config.absFields.push(scol.field)
- }
+ config.hasExtend = false
+ let mapCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'number') {
+ if (col.format === 'abs') {
+ config.absFields.push(col.field)
}
- })
- }
- })
+ } else if (col.type === 'extend') {
+ config.hasExtend = true
+ } else if (col.type === 'colspan' && col.subcols) {
+ mapCol(col.subcols)
+ }
+ })
+ }
+ mapCol(config.cols)
if (config.absFields.length) {
config.absFields = Array.from(new Set(config.absFields))
--
Gitblit v1.8.0