From 21167ece56edd628e6f6546d1d642947cc3a048f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 八月 2024 22:17:33 +0800
Subject: [PATCH] 2024-08-12
---
src/menu/components/table/edit-table/index.jsx | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 2595c3d..3e92baf 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -284,6 +284,10 @@
res.borderRadius = card.wrap.borderRadius || 0
res.resetContrl = card.wrap.resetContrl || 'init'
+ if (res.commit === 'check' && !res.tableType) {
+ res.tableType = 'radio'
+ }
+
let _card = {...card, wrap: res}
if (res.tableType) {
@@ -296,6 +300,25 @@
updatecolumn = (config) => {
config.absFields = []
config.mergeCol = false
+ 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)
+ }
+ })
+ }
config.cols.forEach((col, index) => {
delete col.pops
@@ -304,14 +327,13 @@
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) {
- col.subcols.forEach(scol => {
- if (scol.type === 'number') {
- if (scol.format === 'abs') {
- config.absFields.push(scol.field)
- }
- }
- })
+ mapCol(col.subcols)
} else if (col.type === 'text') {
if (col.editable === 'true' && col.editType === 'popSelect' && /^tab:/.test(col.initval)) {
config.mergeCol = config.mergeCol || []
@@ -361,7 +383,7 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="editable" card={card}/>
- <PasteComponent config={card} options={['action', 'search', 'form', 'cols']} updateConfig={this.updateComponent} />
+ <PasteComponent config={card} options={['action', 'search', 'form', 'editcols']} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
@@ -371,7 +393,7 @@
</Popover>
<SearchComponent config={card} updatesearch={this.updateComponent}/>
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <ColumnComponent config={card} updatecolumn={this.updatecolumn}/>
+ <ColumnComponent config={card} updatecolumn={this.updatecolumn} addColumns={this.addColumns}/>
<div className="component-name">
<div className="center">
<div className="title" onDoubleClick={() => {
--
Gitblit v1.8.0