From b56258e497bdefe3efb7321047ed77c6b0155841 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 30 Nov 2023 18:05:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[10362196752793?=
 =?UTF-8?q?60]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=A1=8C=E9=AB=98=E5=BE=88=E5=A4=A7=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E6=96=B9=E6=8F=92=E5=85=A5=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=A1=8C=E9=AB=98=E4=B8=8E=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=80=E6=A0=B7=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1036219675279?=
 =?UTF-8?q?360?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/TsSheet.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 22978c4e..f5b32d31 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -1159,7 +1159,7 @@ export default {
           rindex = this.handlerCell.row + (this.handlerCell.rowspan || 1);
         }
         if (rindex >= 0) {
-          this.config.lefterList.push({ height: this.minHeight });
+          this.config.lefterList.splice(rindex, 0, { height: this.minHeight });
           this.config.tableList.forEach(cell => {
             if (cell.row >= rindex) {
               cell.row = cell.row + 1;
-- 
Gitee


From 5be6869833efe6a9635bbdf018a014e5ed9a7a23 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 30 Nov 2023 18:07:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91-=E5=AD=90=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=AA=E8=AF=BB=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index 093c2b20..e3eb9aeb 100644
--- a/src/resources/plugins/TsSheet/form-edit.vue
+++ b/src/resources/plugins/TsSheet/form-edit.vue
@@ -57,7 +57,7 @@
             </div>
           </div>
           <div class="action-group">
-            <div class="action-item">
+            <div v-if="formDataQueue.length <=1" class="action-item">
               <div class="flex-start">
                 <span>
                   <Poptip
-- 
Gitee