Commit b8ce90255ef8127e6d47c86d5869952e2a438eea

Authored by xp.Huang
2 parents 29c9a2a6 985c05c9

Merge branch 'sqy_dev' into 'main'

'fix:[DEFECT-320]:去掉告警输出只能选择一次的问题'

See merge request huang/yun-teng-iot-front!186
@@ -228,7 +228,6 @@ @@ -228,7 +228,6 @@
228 }); 228 });
229 ConditionScreeningForm.value[index].setFieldsValue(formItem); 229 ConditionScreeningForm.value[index].setFieldsValue(formItem);
230 }); 230 });
231 -  
232 unref(skipUnwrap.triggerItemRefs)[index].setRichText(richTextList); 231 unref(skipUnwrap.triggerItemRefs)[index].setRichText(richTextList);
233 }); 232 });
234 }); 233 });
@@ -298,6 +297,8 @@ @@ -298,6 +297,8 @@
298 // 如果是设备输出设置脚本值 297 // 如果是设备输出设置脚本值
299 if (action.outTarget === 'DEVICE_OUT') { 298 if (action.outTarget === 'DEVICE_OUT') {
300 unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params); 299 unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
  300 + } else {
  301 + userStore.setOutTarget(action.outTarget);
301 } 302 }
302 // 清除告警有值?{数组} 303 // 清除告警有值?{数组}
303 if (action?.doContext?.clearRule?.length) { 304 if (action?.doContext?.clearRule?.length) {
@@ -168,5 +168,6 @@ @@ -168,5 +168,6 @@
168 getRefItemConditionScreeningRefs, 168 getRefItemConditionScreeningRefs,
169 setConditionScreeningList, 169 setConditionScreeningList,
170 setRichText, 170 setRichText,
  171 + setFormList,
171 }); 172 });
172 </script> 173 </script>
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 @change="changeOutTarget" 18 @change="changeOutTarget"
19 placeholder="请选择执行动作" 19 placeholder="请选择执行动作"
20 allowClear 20 allowClear
21 - :disabled="hasDisabled"  
22 /></template> 21 /></template>
23 <template #doContext> 22 <template #doContext>
24 <div class="flex"> 23 <div class="flex">
@@ -103,12 +102,12 @@ @@ -103,12 +102,12 @@
103 disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length, 102 disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length,
104 }, 103 },
105 ]); 104 ]);
106 - const hasDisabled = ref(false);  
107 const outTarget = ref(''); 105 const outTarget = ref('');
108 - const changeOutTarget = (value: string) => { 106 +
  107 + // TODO:此处有个小Bug,日后在调试。
  108 + const changeOutTarget = (value: 'DEVICE_OUT' | 'MSG_NOTIFY') => {
109 outTarget.value = value; 109 outTarget.value = value;
110 - if (value === 'MSG_NOTIFY') {  
111 - hasDisabled.value = true; 110 + if (userStore.getOutTarget === 'DEVICE_OUT') {
112 userStore.setOutTarget(value); 111 userStore.setOutTarget(value);
113 } 112 }
114 }; 113 };