From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/normal-table/index.jsx | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 9286025..7ec4411 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -66,8 +66,8 @@
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
],
scripts: [],
isNew: true
@@ -161,6 +161,10 @@
if (card.errors.length === 0) {
card.$tables = getTables(card)
}
+
+ delete card.$c_ds
+ delete card.$c_ac
+ delete card.$c_cl
}
this.setState({
@@ -330,21 +334,25 @@
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
+ config.parCtrl = 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
+ if (col.supField) {
+ config.parCtrl = 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))
@@ -403,7 +411,7 @@
</Popover>
{appType !== 'mob' ? <SearchComponent config={card} updatesearch={this.updateComponent}/> : null}
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <ColumnComponent config={card} updatecolumn={this.updateComponent}/>
+ <ColumnComponent config={card} updatecolumn={this.updatecolumn}/>
<div className="component-name">
<div className="center">
<div className="title" onDoubleClick={() => {
--
Gitblit v1.8.0