From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/index.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 0e5e8d8..04d7504 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -71,7 +71,9 @@
if (_card.mergeCol) {
let col = _card.cols[_card.mergeCol[0]]
- _card.cols.splice(_card.mergeCol[0], 1, ...col.pops)
+ if (col.pops) {
+ _card.cols.splice(_card.mergeCol[0], 1, ...col.pops)
+ }
}
if (_card.wrap.commit === 'simple') {
--
Gitblit v1.8.0