From 0961df37dd4dbfeb437128242670646c9c60fcd3 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 25 Mar 2025 17:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=91IoT:=20=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E6=97=B6=E8=A7=A6=E5=8F=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/rule/scene/RuleSceneForm.vue    |   5 +-
 .../rule/scene/components/DeviceListener.vue  | 141 +++++++++++-------
 2 files changed, 86 insertions(+), 60 deletions(-)

diff --git a/src/views/iot/rule/scene/RuleSceneForm.vue b/src/views/iot/rule/scene/RuleSceneForm.vue
index e18834249..034c52549 100644
--- a/src/views/iot/rule/scene/RuleSceneForm.vue
+++ b/src/views/iot/rule/scene/RuleSceneForm.vue
@@ -44,8 +44,9 @@
               <Icon icon="ep:delete" />
             </el-button>
           </device-listener>
-          <!-- TODO @puhui999：可以使用 el-button，然后选个合适的样式哇 -->
-          <el-text class="ml-10px!" type="primary" @click="addTrigger">添加触发器</el-text>
+          <el-button class="ml-10px!" type="primary" size="small" @click="addTrigger">
+            添加触发器
+          </el-button>
         </el-col>
         <el-col :span="24">
           <el-divider content-position="left">执行动作配置</el-divider>
diff --git a/src/views/iot/rule/scene/components/DeviceListener.vue b/src/views/iot/rule/scene/components/DeviceListener.vue
index 5a3feb63b..1c5d32f45 100644
--- a/src/views/iot/rule/scene/components/DeviceListener.vue
+++ b/src/views/iot/rule/scene/components/DeviceListener.vue
@@ -17,13 +17,19 @@
           />
         </el-select>
       </div>
-      <div class="flex items-center mr-60px">
+      <div
+        v-if="triggerConfig.type === IotRuleSceneTriggerTypeEnum.DEVICE"
+        class="flex items-center mr-60px"
+      >
         <span class="mr-10px">产品</span>
         <el-button type="primary" @click="productTableSelectRef?.open()" size="small" plain>
           {{ product ? product.name : '选择产品' }}
         </el-button>
       </div>
-      <div class="flex items-center mr-60px">
+      <div
+        v-if="triggerConfig.type === IotRuleSceneTriggerTypeEnum.DEVICE"
+        class="flex items-center mr-60px"
+      >
         <span class="mr-10px">设备</span>
         <el-button type="primary" @click="openDeviceSelect" size="small" plain>
           {{ isEmpty(deviceList) ? '选择设备' : triggerConfig.deviceNames.join(',') }}
@@ -36,71 +42,89 @@
         </el-tooltip>
       </div>
     </div>
-    <!-- 触发器条件 -->
-    <div
-      class="bg-[#dbe5f6] flex p-10px"
-      v-for="(condition, index) in triggerConfig.conditions"
-      :key="index"
-    >
-      <div class="flex flex-col items-center justify-center mr-10px h-a">
-        <el-select
-          v-model="condition.type"
-          @change="condition.parameters = []"
-          class="!w-160px"
-          clearable
-          placeholder=""
-        >
-          <el-option label="属性" :value="IotDeviceMessageTypeEnum.PROPERTY" />
-          <el-option label="服务" :value="IotDeviceMessageTypeEnum.SERVICE" />
-          <el-option label="事件" :value="IotDeviceMessageTypeEnum.EVENT" />
-        </el-select>
-      </div>
-      <div class="">
-        <DeviceListenerCondition
-          v-for="(parameter, index2) in condition.parameters"
-          :key="index2"
-          :model-value="parameter"
-          :thingModels="thingModels(condition)"
-          @update:model-value="(val) => (condition.parameters[index2] = val)"
-          class="mb-10px last:mb-0"
-        >
-          <el-tooltip content="删除参数" placement="top">
+    <!-- 设备触发器条件 -->
+    <template v-if="triggerConfig.type === IotRuleSceneTriggerTypeEnum.DEVICE">
+      <div
+        class="bg-[#dbe5f6] flex p-10px"
+        v-for="(condition, index) in triggerConfig.conditions"
+        :key="index"
+      >
+        <div class="flex flex-col items-center justify-center mr-10px h-a">
+          <el-select
+            v-model="condition.type"
+            @change="condition.parameters = []"
+            class="!w-160px"
+            clearable
+            placeholder=""
+          >
+            <el-option label="属性" :value="IotDeviceMessageTypeEnum.PROPERTY" />
+            <el-option label="服务" :value="IotDeviceMessageTypeEnum.SERVICE" />
+            <el-option label="事件" :value="IotDeviceMessageTypeEnum.EVENT" />
+          </el-select>
+        </div>
+        <div class="">
+          <DeviceListenerCondition
+            v-for="(parameter, index2) in condition.parameters"
+            :key="index2"
+            :model-value="parameter"
+            :thingModels="thingModels(condition)"
+            @update:model-value="(val) => (condition.parameters[index2] = val)"
+            class="mb-10px last:mb-0"
+          >
+            <el-tooltip content="删除参数" placement="top">
+              <el-button
+                type="danger"
+                circle
+                size="small"
+                @click="removeConditionParameter(condition.parameters, index2)"
+              >
+                <Icon icon="ep:delete" />
+              </el-button>
+            </el-tooltip>
+          </DeviceListenerCondition>
+        </div>
+        <!-- 添加参数 -->
+        <div class="flex flex-1 flex-col items-center justify-center w-60px h-a">
+          <el-tooltip content="添加参数" placement="top">
             <el-button
-              type="danger"
+              type="primary"
               circle
               size="small"
-              @click="removeConditionParameter(condition.parameters, index2)"
+              @click="addConditionParameter(condition.parameters)"
             >
+              <Icon icon="ep:plus" />
+            </el-button>
+          </el-tooltip>
+        </div>
+        <!-- 删除条件 -->
+        <div
+          class="device-listener-condition flex flex-1 flex-col items-center justify-center w-a h-a"
+        >
+          <el-tooltip content="删除条件" placement="top">
+            <el-button type="danger" size="small" @click="removeCondition(index)">
               <Icon icon="ep:delete" />
             </el-button>
           </el-tooltip>
-        </DeviceListenerCondition>
-      </div>
-      <!-- 添加参数 -->
-      <div class="flex flex-1 flex-col items-center justify-center w-60px h-a">
-        <el-tooltip content="添加参数" placement="top">
-          <el-button
-            type="primary"
-            circle
-            size="small"
-            @click="addConditionParameter(condition.parameters)"
-          >
-            <Icon icon="ep:plus" />
-          </el-button>
-        </el-tooltip>
-      </div>
-      <!-- 删除条件 -->
-      <div
-        class="device-listener-condition flex flex-1 flex-col items-center justify-center w-a h-a"
-      >
-        <el-tooltip content="删除条件" placement="top">
-          <el-button type="danger" size="small" @click="removeCondition(index)">
-            <Icon icon="ep:delete" />
-          </el-button>
-        </el-tooltip>
+        </div>
       </div>
+    </template>
+    <!-- 定时触发 -->
+    <div
+      v-if="triggerConfig.type === IotRuleSceneTriggerTypeEnum.TIMER"
+      class="bg-[#dbe5f6] flex items-center justify-between p-10px"
+    >
+      <span class="w-120px">CRON 表达式</span>
+      <crontab v-model="triggerConfig.cronExpression" />
     </div>
-    <el-text class="ml-10px!" type="primary" @click="addCondition">添加触发条件</el-text>
+    <!-- 设备触发才可以设置多个触发条件 -->
+    <el-text
+      v-if="triggerConfig.type === IotRuleSceneTriggerTypeEnum.DEVICE"
+      class="ml-10px!"
+      type="primary"
+      @click="addCondition"
+    >
+      添加触发条件
+    </el-text>
   </div>
 
   <!-- 产品、设备的选择 -->
@@ -126,6 +150,7 @@ import { ThingModelApi } from '@/api/iot/thingmodel'
 import {
   IotDeviceMessageIdentifierEnum,
   IotDeviceMessageTypeEnum,
+  IotRuleSceneTriggerTypeEnum,
   TriggerCondition,
   TriggerConditionParameter,
   TriggerConfig