From ff2f7655bffba9c6c2b4fc2531ec2b5d24dac83e Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 14 Sep 2023 09:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draw-app/properties/RelateRelayConfig.vue | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/components/draw-app/properties/RelateRelayConfig.vue b/src/components/draw-app/properties/RelateRelayConfig.vue
index e9e4a67..80a654a 100644
--- a/src/components/draw-app/properties/RelateRelayConfig.vue
+++ b/src/components/draw-app/properties/RelateRelayConfig.vue
@@ -54,13 +54,21 @@
                       {{ item }}
                     </q-chip>
                   </div>
-                  <q-btn
-                    v-show="combinationtype.refRelaysCode.length > 0"
-                    style="width: 130px"
-                    label="清空框选的继电器"
-                    color="red"
-                    @click="clearAllSelect(index)"
-                  />
+                  <div>
+                    <q-btn
+                      v-show="combinationtype.refRelaysCode.length > 0"
+                      style="width: 130px"
+                      label="清空框选的继电器"
+                      color="red"
+                      class="q-mr-md"
+                      @click="clearAllSelect(index)"
+                    />
+                    <q-btn
+                      label="删除组合类型"
+                      color="secondary"
+                      @click="deleteCombinationtype(index)"
+                    />
+                  </div>
                 </q-item-section>
               </q-item>
             </q-card>
@@ -271,6 +279,10 @@ function removeSelect(code: string) {
 function clearAllSelect(index: number) {
   relateRelayConfig.value.combinationtypes[index].refRelays = [];
   relateRelayConfig.value.combinationtypes[index].refRelaysCode = [];
+  clearAllSelectAtCanvas();
+}
+
+function clearAllSelectAtCanvas() {
   selectGraphic = [];
   relayCabinetStore.getDrawApp().updateSelected();
 }
@@ -284,6 +296,11 @@ function addCombinationtype() {
   });
 }
 
+function deleteCombinationtype(index: number) {
+  relateRelayConfig.value.combinationtypes.splice(index, 1);
+  clearAllSelectAtCanvas();
+}
+
 function onReset() {
   clickIndex = null;
   handleState.value = '新建设备关联继电器';
@@ -294,8 +311,7 @@ function onReset() {
       { code: '组合类型', refRelays: [], refRelaysCode: [], expanded: false },
     ],
   };
-  selectGraphic = [];
-  relayCabinetStore.getDrawApp().updateSelected();
+  clearAllSelectAtCanvas();
 }
 
 function goBack() {