From e9e7431dd86ac3a3e14c49bc5eb7a4909943c6c2 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 17 Mar 2023 09:37:37 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E8=87=AA=E9=80=82=E5=BA=94=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rule-engine/Scene/Save/action/index.vue   | 116 +++++++++---------
 .../Scene/Save/components/Terms/Branchs.vue   |   2 +-
 .../Scene/Save/components/Terms/Terms.vue     |   7 --
 .../Scene/Save/components/Terms/index.less    |  25 ++--
 4 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/index.vue b/src/views/rule-engine/Scene/Save/action/index.vue
index 25af9501..7a8269e8 100644
--- a/src/views/rule-engine/Scene/Save/action/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/index.vue
@@ -1,63 +1,63 @@
 <template>
-    <div class="actions">
-        <div class="actions-title">
-            <span>执行</span>
-            <ShakeLimit
-                v-if="props.openShakeLimit"
-                v-model:value="FormModel.branches[name].shakeLimit"
-            />
-        </div>
-        <div class="actions-warp">
-            <j-collapse v-model:activeKey="activeKeys">
-                <j-collapse-panel key="1">
-                    <template #header>
-                        <span>
-                            串行
-                            <span class="panel-tip">
-                                按顺序依次执行动作，适用于基于动作输出参数，判断是否执行后续动作的场景
-                            </span>
-                        </span>
-                    </template>
-                    <div class="actions-list">
-                        <List
-                            type="serial"
-                            :branchesName="name"
-                            :parallel="false"
-                            :actions="
-                                serialArray.length ? serialArray[0].actions : []
-                            "
-                            @add="(_item) => onAdd(_item, false)"
-                            @delete="(_key) => onDelete(_key, false)"
-                        />
-                    </div>
-                </j-collapse-panel>
-                <j-collapse-panel key="2">
-                    <template #header>
-                        <span>
-                            并行
-                            <span class="panel-tip">
-                                同时执行所有动作，适用于不需要关注执行动作先后顺序和结果的场景
-                            </span>
-                        </span>
-                    </template>
-                    <div class="actions-list">
-                        <List
-                            type="parallel"
-                            :branchesName="name"
-                            :parallel="true"
-                            :actions="
-                                parallelArray.length
-                                    ? parallelArray[0].actions
-                                    : []
-                            "
-                            @add="(_item) => onAdd(_item, true)"
-                            @delete="(_key) => onDelete(_key, true)"
-                        />
-                    </div>
-                </j-collapse-panel>
-            </j-collapse>
-        </div>
+  <div class="actions">
+    <div class="actions-title">
+      <span>执行</span>
+      <ShakeLimit
+        v-if="props.openShakeLimit"
+        v-model:value="FormModel.branches[name].shakeLimit"
+      />
     </div>
+    <div class="actions-warp">
+      <j-collapse v-model:activeKey="activeKeys">
+        <j-collapse-panel key="1">
+          <template #header>
+                          <span>
+                              串行
+                              <span class="panel-tip">
+                                  按顺序依次执行动作，适用于基于动作输出参数，判断是否执行后续动作的场景
+                              </span>
+                          </span>
+          </template>
+          <div class="actions-list">
+            <List
+              type="serial"
+              :branchesName="name"
+              :parallel="false"
+              :actions="
+                                  serialArray.length ? serialArray[0].actions : []
+                              "
+              @add="(_item) => onAdd(_item, false)"
+              @delete="(_key) => onDelete(_key, false)"
+            />
+          </div>
+        </j-collapse-panel>
+        <j-collapse-panel key="2">
+          <template #header>
+                          <span>
+                              并行
+                              <span class="panel-tip">
+                                  同时执行所有动作，适用于不需要关注执行动作先后顺序和结果的场景
+                              </span>
+                          </span>
+          </template>
+          <div class="actions-list">
+            <List
+              type="parallel"
+              :branchesName="name"
+              :parallel="true"
+              :actions="
+                                  parallelArray.length
+                                      ? parallelArray[0].actions
+                                      : []
+                              "
+              @add="(_item) => onAdd(_item, true)"
+              @delete="(_key) => onDelete(_key, true)"
+            />
+          </div>
+        </j-collapse-panel>
+      </j-collapse>
+    </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue b/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue
index 63c89948..a88fdce9 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class='["actions-terms-warp", props.class]'>
+  <div :class='["actions-terms-warp", isFirst ? "first-children" : ""]'>
     <div class='actions-terms-title'>
       {{ isFirst ? '当' : '否则' }}
     </div>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
index 29c65d65..1eccdad2 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
@@ -32,13 +32,6 @@
         </div>
       </template>
     </template>
-<!--    <j-form-item-->
-<!--      v-else-->
-<!--      :name='["branches", 0, "then"]'-->
-<!--      :rules='rules'-->
-<!--    >-->
-<!--      -->
-<!--    </j-form-item>-->
   </div>
 </template>
 
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/index.less b/src/views/rule-engine/Scene/Save/components/Terms/index.less
index ea9a009a..fa3c7b43 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/index.less
+++ b/src/views/rule-engine/Scene/Save/components/Terms/index.less
@@ -49,16 +49,8 @@
 .actions-terms {
   .actions-terms-warp {
     display: flex;
-    //width: 66.66%;
     margin-bottom: 24px;
 
-    &.first-children {
-      width: 100%;
-      .actions-branches {
-        width: 66.66%;
-      }
-    }
-
     &.first-children,
     &:last-child {
       margin-bottom: 0;
@@ -212,4 +204,21 @@
   }
 }
 
+@minWidth: 75%;
+
+@media (min-width: 1600px) {
+  .actions-terms {
+    .actions-terms-warp {
+      width: @minWidth;
+
+      &.first-children {
+        width: 100%;
+
+        .actions-branches {
+          width: calc(@minWidth - 12px);
+        }
+      }
+    }
+  }
+}