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