From c5a07dba94694d13f0a78e051dfa26c3522933ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十一月 2024 18:10:02 +0800
Subject: [PATCH] 2024-11-15
---
src/menu/components/share/colsControl/index.jsx | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/share/colsControl/index.jsx b/src/menu/components/share/colsControl/index.jsx
index f7967b9..29a113c 100644
--- a/src/menu/components/share/colsControl/index.jsx
+++ b/src/menu/components/share/colsControl/index.jsx
@@ -35,6 +35,9 @@
title: '瀵规瘮鏂瑰紡',
dataIndex: 'match',
width: '18%',
+ render: text => {
+ return text === 'regexp' ? '姝ｅ垯琛ㄨ揪寮�' : text
+ }
},
{
title: '瀵规瘮鍊�',
@@ -164,8 +167,10 @@
let cvalues = {}
let cols = config.cols.map(item => {
- let types = {custom: '鑷畾涔夊垪', colspan: '鍚堝苟鍒�'}
- let label = types[item.type] ? `${item.label}锛�${types[item.type]}锛塦 : item.label
+ let label = item.label
+ if (item.type === 'colspan' && item.subcols && item.subcols.length > 0) {
+ label = `${item.label}锛�${item.subcols.map(cell => cell.label).join('銆�')}锛塦
+ }
cvalues[item.uuid] = label
@@ -240,7 +245,7 @@
_config.colsCtrls = colsCtrls
if (this.customForm && this.customForm.state.editItem) {
- const _this = this
+ const that = this
let title = '瀛樺湪鏈繚瀛橀」锛岀‘瀹氬拷鐣ュ悧锛�'
if (s.length > 0) {
title = `瀛樺湪鏈繚瀛橀」锛屼笖绗� ${s.join('銆�')} 琛屼腑瀛楁鍦ㄦ悳绱㈡潯浠朵腑涓嶅瓨鍦紝纭畾蹇界暐鍚楋紵`
@@ -248,18 +253,18 @@
confirm({
title: title,
onOk() {
- _this.setState({ visible: false })
- _this.props.onSubmit(_config)
+ that.setState({ visible: false })
+ that.props.onSubmit(_config)
},
onCancel() {}
})
} else if (s.length > 0) {
- const _this = this
+ const that = this
confirm({
title: `绗� ${s.join('銆�')} 琛屼腑瀛楁鍦ㄦ悳绱㈡潯浠朵腑涓嶅瓨鍦紝纭畾蹇界暐鍚楋紵`,
onOk() {
- _this.setState({ visible: false })
- _this.props.onSubmit(_config)
+ that.setState({ visible: false })
+ that.props.onSubmit(_config)
},
onCancel() {}
})
--
Gitblit v1.8.0