Commit b8ce90255ef8127e6d47c86d5869952e2a438eea
Merge branch 'sqy_dev' into 'main'
'fix:[DEFECT-320]:去掉告警输出只能选择一次的问题' See merge request huang/yun-teng-iot-front!186
Showing
3 changed files
with
7 additions
and
6 deletions
| ... | ... | @@ -228,7 +228,6 @@ |
| 228 | 228 | }); |
| 229 | 229 | ConditionScreeningForm.value[index].setFieldsValue(formItem); |
| 230 | 230 | }); |
| 231 | - | |
| 232 | 231 | unref(skipUnwrap.triggerItemRefs)[index].setRichText(richTextList); |
| 233 | 232 | }); |
| 234 | 233 | }); |
| ... | ... | @@ -298,6 +297,8 @@ |
| 298 | 297 | // 如果是设备输出设置脚本值 |
| 299 | 298 | if (action.outTarget === 'DEVICE_OUT') { |
| 300 | 299 | unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params); |
| 300 | + } else { | |
| 301 | + userStore.setOutTarget(action.outTarget); | |
| 301 | 302 | } |
| 302 | 303 | // 清除告警有值?{数组} |
| 303 | 304 | if (action?.doContext?.clearRule?.length) { | ... | ... |
| ... | ... | @@ -18,7 +18,6 @@ |
| 18 | 18 | @change="changeOutTarget" |
| 19 | 19 | placeholder="请选择执行动作" |
| 20 | 20 | allowClear |
| 21 | - :disabled="hasDisabled" | |
| 22 | 21 | /></template> |
| 23 | 22 | <template #doContext> |
| 24 | 23 | <div class="flex"> |
| ... | ... | @@ -103,12 +102,12 @@ |
| 103 | 102 | disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length, |
| 104 | 103 | }, |
| 105 | 104 | ]); |
| 106 | - const hasDisabled = ref(false); | |
| 107 | 105 | const outTarget = ref(''); |
| 108 | - const changeOutTarget = (value: string) => { | |
| 106 | + | |
| 107 | + // TODO:此处有个小Bug,日后在调试。 | |
| 108 | + const changeOutTarget = (value: 'DEVICE_OUT' | 'MSG_NOTIFY') => { | |
| 109 | 109 | outTarget.value = value; |
| 110 | - if (value === 'MSG_NOTIFY') { | |
| 111 | - hasDisabled.value = true; | |
| 110 | + if (userStore.getOutTarget === 'DEVICE_OUT') { | |
| 112 | 111 | userStore.setOutTarget(value); |
| 113 | 112 | } |
| 114 | 113 | }; | ... | ... |