From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/index.jsx | 8 +++++++-
1 files changed, 7 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..7be53fa 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') {
@@ -138,6 +140,10 @@
if (card.errors.length === 0) {
card.$tables = getTables(card)
}
+
+ delete card.$c_ds
+ delete card.$c_ac
+ delete card.$c_cl
}
this.setState({
--
Gitblit v1.8.0