diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue index 3062a00..d148690 100644 --- a/src/widget/associatedforms/associatedForms.vue +++ b/src/widget/associatedforms/associatedForms.vue @@ -74,7 +74,7 @@ function getAsfDataTitles() { rangeString:props.data.control.dataRangeGongShi.mathsString, hideFormula:props.data.control.hideGongShi.mathsFormula, hideString:props.data.control.hideGongShi.mathsString, - + masterOnField:props.data.name, }, }); } diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue index 00708fb..205ece4 100644 --- a/src/widget/associatedforms/associatedFormsTinyaceRange.vue +++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue @@ -90,6 +90,8 @@ watch(()=>tinymceHtml.value, (val:any) => { }else if(checkEnding(gongShi.mathsFormula)){ errorCondition("不能以符号或关键字为结尾") + }else if(checkRoleStartAndOrgEnd(gongShi.mathsFormula)||checkFormFieldStartAndOrgEnd(gongShi.mathsFormula)||checkFormFieldStartAndOrgEnd2(gongShi.mathsFormula)){ + errorCondition("此条件无无实际意义") }else{ succCondition() } @@ -98,6 +100,30 @@ watch(()=>tinymceHtml.value, (val:any) => { }, { deep: true } ) + +function checkRoleStartAndOrgEnd(str: string) { + if (str.startsWith('roleid:') && str.endsWith('数据所属部门')) { + return true; + } else { + return false; + } +} +function checkFormFieldStartAndOrgEnd(str: string) { + if (str.startsWith('formField:') && str.endsWith('数据所属部门')) { + return true; + } else { + return false; + } +} + +function checkFormFieldStartAndOrgEnd2(str: string) { + if (str.startsWith('formField:') && str.endsWith('数据拥有者')) { + return true; + } else { + return false; + } +} + function containsSingleComparator(str: string) { // 定义需要检查的运算符 const comparators = ['==', '>=', '>', '<=', '<', '!='];