From 0703d8c97921cfe9219bc499a9c5ecc66c369a41 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 18 二月 2024 16:04:28 +0800 Subject: [PATCH] 2024-02-18 --- src/menu/components/share/colsControl/index.jsx | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/menu/components/share/colsControl/index.jsx b/src/menu/components/share/colsControl/index.jsx index f7967b9..ee34472 100644 --- a/src/menu/components/share/colsControl/index.jsx +++ b/src/menu/components/share/colsControl/index.jsx @@ -164,8 +164,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