Commit 5bbfc25f34e350a23b4daf63f0a9ba3a672ca7db

Authored by fengtao
1 parent 3e2002bd

fix:修改场景联动 移除父页面 执行条件验证和获取表单值函数给map加可选链

@@ -586,10 +586,10 @@ @@ -586,10 +586,10 @@
586 getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) => 586 getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) =>
587 genTriggerOrConditionData(item.getFieldsValueFunc()) 587 genTriggerOrConditionData(item.getFieldsValueFunc())
588 ); 588 );
589 - getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs).map((item) => 589 + getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs)?.map((item) =>
590 genTriggerOrConditionData(item.getFieldsValueFunc()) 590 genTriggerOrConditionData(item.getFieldsValueFunc())
591 ); 591 );
592 - getActionFormValue.value = unref(skipUnwrap.actionItemRefs).map((item) => 592 + getActionFormValue.value = unref(skipUnwrap.actionItemRefs)?.map((item) =>
593 genActionData(item.getFieldsValueFunc()) 593 genActionData(item.getFieldsValueFunc())
594 ); 594 );
595 }; 595 };
@@ -611,21 +611,6 @@ @@ -611,21 +611,6 @@
611 id: unref(id), 611 id: unref(id),
612 tenantId: unref(tenantId), 612 tenantId: unref(tenantId),
613 }; 613 };
614 - //TODO fengtao---修改之前如果是新增,如果条件筛选页面打开,但没填值,还是可以新增成功  
615 - const typeBoolean = postAddOrEditData?.triggers?.some((f) => {  
616 - let type = false;  
617 - f?.triggerCondition?.condition?.condition?.some((s) => {  
618 - if (s?.predicate?.value?.defaultValue == undefined) {  
619 - type = true;  
620 - } else {  
621 - type = false;  
622 - }  
623 - });  
624 - return type;  
625 - });  
626 - if (typeBoolean) return createMessage.error('请填写条件筛选');  
627 - //TODO 先暂时不加验证--设备-属性-填了加验证  
628 - //TODO fengtao  
629 await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate)); 614 await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
630 createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`); 615 createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
631 closeDrawer(); 616 closeDrawer();