From db942b44e0755ee1ce4bc8912be2cb1ca5f89c95 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 七月 2024 17:04:41 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/index.jsx | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index a7ce910..d53420d 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -331,6 +331,7 @@
updatecolumn = (config) => {
config.absFields = []
config.hasExtend = false
+ config.parCtrl = false
let mapCol = (cols) => {
cols.forEach(col => {
if (col.type === 'number') {
@@ -339,6 +340,9 @@
}
} else if (col.type === 'extend') {
config.hasExtend = true
+ if (col.supField) {
+ config.parCtrl = true
+ }
} else if (col.type === 'colspan' && col.subcols) {
mapCol(col.subcols)
}
--
Gitblit v1.8.0