Commit 5d87251b251b413ff45ca0b3d0397cef28fbcc4e
1 parent
37257bbf
fix:DEFECT-778 修改场景联动属性未填,界面提示框弹出后端信息框问题
Showing
1 changed file
with
4 additions
and
2 deletions
| ... | ... | @@ -638,15 +638,16 @@ |
| 638 | 638 | tenantId: unref(tenantId), |
| 639 | 639 | }; |
| 640 | 640 | //FT change |
| 641 | + let mustTriggerCondition = false; | |
| 641 | 642 | let mustCondition = false; |
| 642 | 643 | if (postAddOrEditData?.triggers !== null && postAddOrEditData?.triggers.length > 0) { |
| 643 | 644 | postAddOrEditData?.triggers.some((s) => { |
| 644 | 645 | if (s.triggerCondition?.condition?.condition == undefined) { |
| 645 | - mustCondition = true; | |
| 646 | + mustTriggerCondition = true; | |
| 646 | 647 | } |
| 647 | 648 | }); |
| 648 | 649 | } else { |
| 649 | - mustCondition = false; | |
| 650 | + mustTriggerCondition = false; | |
| 650 | 651 | } |
| 651 | 652 | if (postAddOrEditData?.doConditions !== null && postAddOrEditData?.doConditions.length > 0) { |
| 652 | 653 | postAddOrEditData?.doConditions.some((s) => { |
| ... | ... | @@ -657,6 +658,7 @@ |
| 657 | 658 | } else { |
| 658 | 659 | mustCondition = false; |
| 659 | 660 | } |
| 661 | + if (mustTriggerCondition) return; | |
| 660 | 662 | if (mustCondition) return; |
| 661 | 663 | //FT change |
| 662 | 664 | await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate)); | ... | ... |