From 2f964837b93e8985512f119a049817bda219786c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 15 Mar 2023 11:40:20 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=E6=89=A7=E8=A1=8C=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rule-engine/Scene/Save/Device/index.vue   |  1 -
 .../Scene/Save/components/Terms/Branchs.vue   | 24 +++++++++++++++--
 .../Scene/Save/components/Terms/Terms.vue     | 26 ++++++-------------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/Device/index.vue b/src/views/rule-engine/Scene/Save/Device/index.vue
index 2ad65263..b291d9fc 100644
--- a/src/views/rule-engine/Scene/Save/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/Device/index.vue
@@ -15,7 +15,6 @@
       </AddButton>
     </a-form-item>
     <Terms />
-    <Action />
     <AddModel v-if='visible' @cancel='visible = false' @save='save' :value='data.trigger.device' :options='data.options.trigger' />
   </div>
 </template>
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 1a35c083..130824ad 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue
@@ -49,9 +49,16 @@
         </div>
       </div>
       <div class='actions-branches'>
-        <j-form-item></j-form-item>
+        <j-form-item
+          :name='["branches", name, "then"]'
+          :rules='rules'
+        >
+          <Action
+            :openShakeLimit="true"
+            :thenOptions='FormModel.branches[name].then'
+          />
+        </j-form-item>
       </div>
-
     </div>
   </div>
 </template>
@@ -62,6 +69,7 @@ import type { ActionBranchesProps } from '@/views/rule-engine/Scene/typings'
 import TermsItem from './TermsItem.vue'
 import { storeToRefs } from 'pinia';
 import { useSceneStore } from 'store/scene'
+import Action from '../../action/index.vue'
 
 const sceneStore = useSceneStore()
 const { data: FormModel } = storeToRefs(sceneStore)
@@ -149,6 +157,18 @@ const optionsClass = computed(() => {
   }
 })
 
+const rules = [{
+  validator(_: string, value: any) {
+    if (!value || (value && !value.length)) {
+      return Promise.reject('至少配置一个执行动作')
+    } else {
+      const isActions = value.some((item: any) => item.actions && item.actions.length)
+      return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作');
+    }
+    return Promise.resolve();
+  }
+}]
+
 </script>
 
 <style scoped lang='less'>
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 006e9263..7ee8db37 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,13 @@
         </div>
       </template>
     </template>
-    <j-form-item
-      v-else
-      :name='["branches", 0, "then"]'
-      :rules='rules'
-    >
-
-    </j-form-item>
+<!--    <j-form-item-->
+<!--      v-else-->
+<!--      :name='["branches", 0, "then"]'-->
+<!--      :rules='rules'-->
+<!--    >-->
+<!--      -->
+<!--    </j-form-item>-->
   </div>
 </template>
 
@@ -65,17 +65,7 @@ const change = (e: boolean) => {
   open.value = e
 }
 
-const rules = [{
-  validator(_: string, value: any) {
-    if (!value || (value && !value.length)) {
-      return Promise.reject('至少配置一个执行动作')
-    } else {
-      const isActions = value.some((item: any) => item.actions && item.actions.length)
-      return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作');
-    }
-    return Promise.resolve();
-  }
-}]
+
 
 const handleParamsData = (data: any[]): any[] => {
   return data?.map(item => {