Commit afd510116a789f5178fd94c8a301273f9985df8f
1 parent
cca2a651
fix: DEFECT-1031 sometimes tirgger action can not echo data
Showing
2 changed files
with
4 additions
and
7 deletions
... | ... | @@ -389,7 +389,6 @@ |
389 | 389 | nextTick(() => { |
390 | 390 | const selectProductId = ref(''); |
391 | 391 | // 设置执行动作外层值 |
392 | - console.log(skipUnwrap.actionItemRefs); | |
393 | 392 | unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({ |
394 | 393 | ...action, |
395 | 394 | outTarget: action.outTarget, |
... | ... | @@ -567,10 +566,10 @@ |
567 | 566 | //TODO fengtao |
568 | 567 | setFields(skipUnwrap.triggerItemRefs, true); |
569 | 568 | setFields(skipUnwrap.conditionItemRefs, true); |
570 | - // setFields(skipUnwrap.actionItemRefs, true); | |
569 | + setFields(skipUnwrap.actionItemRefs, true); | |
571 | 570 | const data = await getOrganizationAlarmConfig({ organizationId: newValue }); |
572 | 571 | alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id })); |
573 | - setFields(skipUnwrap.actionItemRefs, true); | |
572 | + // setFields(skipUnwrap.actionItemRefs, true); | |
574 | 573 | // console.log(unref(organizationIdRef)); |
575 | 574 | // setAlarmConfig(skipUnwrap.actionItemRefs, true); |
576 | 575 | }); | ... | ... |
... | ... | @@ -250,8 +250,7 @@ export const trigger_condition_schema: FormSchema[] = [ |
250 | 250 | getPopupContainer: () => document.body, |
251 | 251 | onChange: async (e) => { |
252 | 252 | if (e) { |
253 | - setFieldsValue({ type2: '' }); | |
254 | - setFieldsValue({ entityId: [] }); | |
253 | + setFieldsValue({ type2: '', entityId: [] }); | |
255 | 254 | const res = await getAttribute(e); |
256 | 255 | const options = ref<TOption[]>([]); |
257 | 256 | useByProductGetAttribute(res, updateSchema, options); |
... | ... | @@ -456,8 +455,7 @@ export const actionSchema: FormSchema[] = [ |
456 | 455 | valueField: 'id', |
457 | 456 | getPopupContainer: () => document.body, |
458 | 457 | onChange: () => { |
459 | - setFieldsValue({ deviceId: [] }); | |
460 | - setFieldsValue({ thingsModelId: '' }); | |
458 | + setFieldsValue({ thingsModelId: '', deviceId: [] }); | |
461 | 459 | }, |
462 | 460 | }; |
463 | 461 | }, | ... | ... |