From 8b9330a58d6dbaeec10172d31c99791d3566e61a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Mon, 27 Mar 2023 13:39:46 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=9B=9E=E6=98=BE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/action/ListItem/CheckItem.vue       | 14 ++++++++------
 .../Scene/Save/action/ListItem/FilterGroup.vue     | 10 ++++++++--
 .../Scene/Save/components/Terms/ParamsItem.vue     |  2 +-
 .../Scene/Save/components/Terms/util.ts            |  4 +++-
 yarn.lock                                          |  4 ++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
index 9f18ab54..47e1c542 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
@@ -58,12 +58,14 @@ const checkDeviceDelete = async () => {
     formTouchOff()
     return
   }
-  const deviceList = item!.selectorValues?.map(item => item.value) || []
-  const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
-  if (deviceResp.success && (deviceResp.result as any)?.total < (item!.selectorValues?.length || 0)) { // 某一个设备被删除
-    _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.selectorValues = undefined
-    formTouchOff()
-    return
+  if (item?.selector === 'fixed') {
+    const deviceList = item!.selectorValues?.map(item => item.value) || []
+    const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
+    if (deviceResp.success && (deviceResp.result as any)?.total < (item!.selectorValues?.length || 0)) { // 某一个设备被删除
+      _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.selectorValues = undefined
+      formTouchOff()
+      return
+    }
   }
 }
 
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
index 48542851..3e7c95c7 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
@@ -107,9 +107,11 @@ const onKeys: string[] = EventSubscribeKeys({
   action: props.actionName
 })
 
-EventEmitter.subscribe(onKeys, (d: any) => {
+const handleRequest = () => {
   columnRequest()
-})
+}
+
+EventEmitter.subscribe(onKeys, handleRequest)
 
 provide('filter-params', columnOptions)
 
@@ -241,6 +243,10 @@ nextTick(() => {
   columnRequest()
 })
 
+onUnmounted(() => {
+  EventEmitter.unSubscribe(onKeys, handleRequest)
+})
+
 </script>
 
 <style scoped>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index 5f6e210a..fd2eb8fd 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -221,7 +221,7 @@ const showDouble = computed(() => {
   } else {
     metricOption.value = []
   }
-  return isRange && !isMetric
+  return isRange && !isMetric.value
 })
 
 const mouseover = () => {
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/util.ts b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
index 39a80135..fe34cea8 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
@@ -1,3 +1,5 @@
+import { BranchesThen } from '@/views/rule-engine/Scene/typings'
+
 export const ContextKey = 'columnOptions'
 
 export const handleParamsData = (data: any[], key: string = 'column'): any[] => {
@@ -12,7 +14,7 @@ export const handleParamsData = (data: any[], key: string = 'column'): any[] =>
 }
 
 export const thenRules = [{
-  validator(_: string, value: any) {
+  validator(_: string, value: BranchesThen[]) {
     if (!value || (value && !value.length) || !value.some(item => item.actions && item.actions.length)) {
       return Promise.reject('至少配置一个执行动作')
     }
diff --git a/yarn.lock b/yarn.lock
index 35ef0063..cd047e8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#593185f6313895485b59e9a79bc920c63374d84d"
-  integrity sha512-dkSOmatSPLHlV91YdTcHWO2wfwriUIZKEuLd5bJF2GsO9SvDMyJ2YJ4n/3fkklOoL5albhY37iX2Ot3A+7QYwA==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#6a3cc76cd6d98319e070da597bfcf146fa12d375"
+  integrity sha512-ASPqiWprK2v4/zQIYxOytjkVFgx+AkBaD5Klg2ik88y9uDAW/Ylvqa91v149znihU1y8Q2Nm2PXvUSJFD7HPpw==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"