From 1da46e8dc5e40f85e02f00f9b1f871d2e634e55d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 29 Mar 2025 21:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E6=8E=92=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=8E=A7=E5=88=B6=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E7=9A=84=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=90=8C=E5=88=86=E6=94=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandHead.vue  | 24 ++++++++++++++-----
 .../composer/control/ControlCommand.vue       | 10 ++++++--
 src/js/composer/commands/controlCommands.js   | 20 ++++++++--------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 6d45e36..38505db 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -16,16 +16,16 @@
       <q-icon name="linear_scale" size="xs" />
     </div>
     <div v-else class="chain-icon">
-      <q-icon name="fork_left" size="xs" />
+      <q-icon :name="getChianIcon()" size="xs" />
     </div>
 
     <!-- 标题 -->
-    <div class="command-label">
+    <div class="command-label" v-if="!isControlFlow">
       <div class="drag-handle text-subtitle2 command-label-text">
         {{ command.label }}
       </div>
       <div
-        v-if="isCollapsed && !isControlFlow"
+        v-if="isCollapsed"
         class="summary-container"
         @click.stop="isEditingSummary = true"
       >
@@ -135,6 +135,15 @@ export default {
       return this.command.userComments || this.command.summary;
     },
   },
+  methods: {
+    getChianIcon() {
+      return (
+        this.command?.subCommands?.find(
+          (command) => command.value === this.command.commandType
+        )?.icon || "fork_left"
+      );
+    },
+  },
 };
 </script>
 
@@ -163,15 +172,18 @@ export default {
 .command-label {
   user-select: none;
   pointer-events: all;
-  cursor: grab;
-  transition: all 0.3s ease;
   display: flex;
   align-items: center;
   gap: 8px;
   margin-right: 8px;
 }
 
-.command-label:hover {
+.command-label-text {
+  cursor: grab;
+  transition: all 0.3s ease;
+}
+
+.command-label-text:hover {
   color: var(--q-primary);
   transition: all 0.3s ease;
 }
diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
index 208209c..98e3778 100644
--- a/src/components/composer/control/ControlCommand.vue
+++ b/src/components/composer/control/ControlCommand.vue
@@ -2,7 +2,7 @@
   <div class="control-command-wrapper">
     <div class="control-command">
       <!-- 类型标签 -->
-      <div class="control-type-label">
+      <div class="control-type-label drag-handle">
         {{ currentFunction?.label || modelValue.commandType }}
       </div>
 
@@ -25,7 +25,7 @@
         no-icon-animation
         class="control-btn"
       >
-        <q-list>
+        <q-list dense>
           <q-item
             v-for="func in branchOptions"
             :key="func.value"
@@ -168,6 +168,12 @@ export default defineComponent({
   opacity: 0.9;
   user-select: none;
   flex-shrink: 0;
+  transition: all 0.3s ease;
+}
+
+.control-type-label:hover {
+  color: var(--q-primary) !important;
+  transition: all 0.3s ease;
 }
 
 .control-settings {
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 65b1187..1cb4f83 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -23,16 +23,10 @@ export const controlCommands = {
             },
           ],
         },
-        {
-          label: "否则",
-          value: "else",
-          icon: "fork_left",
-          codeTemplate: "} else {",
-        },
         {
           label: "否则满足",
           value: "else if",
-          icon: "fork_left",
+          icon: "fork_right",
           codeTemplate: "} else if (${condition}) {",
           config: [
             {
@@ -43,6 +37,12 @@ export const controlCommands = {
             },
           ],
         },
+        {
+          label: "否则",
+          value: "else",
+          icon: "airline_stops",
+          codeTemplate: "} else {",
+        },
         {
           label: "结束",
           value: "end",
@@ -295,7 +295,7 @@ export const controlCommands = {
         {
           label: "匹配分支",
           value: "case",
-          icon: "check",
+          icon: "fork_right",
           codeTemplate: "case ${value}:",
           config: [
             {
@@ -314,7 +314,7 @@ export const controlCommands = {
         {
           label: "默认分支",
           value: "default",
-          icon: "last_page",
+          icon: "airline_stops",
           codeTemplate: "default:",
         },
         {
@@ -340,7 +340,7 @@ export const controlCommands = {
         {
           label: "捕获异常",
           value: "catch",
-          icon: "error",
+          icon: "priority_high",
           codeTemplate: "} catch (${errorVar}) {",
           config: [
             {