From 43a517b80f2803e0dcf6658113520c4a14c8c17f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 五月 2023 18:21:52 +0800
Subject: [PATCH] 2023-05-22

---
 src/menu/components/table/edit-table/columns/index.jsx |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index cc785fd..51b977c 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -482,7 +482,22 @@
   deleteCol = (col) => {
     let _columns = fromJS(this.state.columns).toJS()
 
-    _columns = this.loopDelCol(_columns, col)
+    if (col.type === 'colspan' && col.subcols && col.subcols.length > 0) {
+      let Index = _columns.findIndex(item => item.uuid === col.uuid)
+
+      if (Index !== -1) {
+        let list = col.subcols.map(item => {
+          item.isSub = false
+          return item
+        })
+
+        _columns.splice(Index, 1, ...list)
+      } else {
+        _columns = this.loopDelCol(_columns, col)
+      }
+    } else {
+      _columns = this.loopDelCol(_columns, col)
+    }
 
     this.setState({
       columns: _columns

--
Gitblit v1.8.0