From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/colsControl/index.jsx | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/colsControl/index.jsx b/src/menu/components/share/colsControl/index.jsx
index f7967b9..882c037 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
--
Gitblit v1.8.0