From 4bcfe77b2b190ae0ec2533eacaee12c72fa33c2a Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 9 Jul 2024 11:57:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9D=A1=E4=BB=B6=E7=BC=96=E8=BE=91=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/assembly/index.ts | 10 ++++++++++ src/components/DesignForm/formControlAttr.vue | 15 +++++++++++++-- .../DesignForm/formControlPropertiNew.vue | 15 +++++++++++++-- .../associatedforms/associatedFormsTinyace.vue | 4 ++-- .../associatedFormsTinyaceRange.vue | 4 ++-- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts index 01ff738ea..2be3f7ac8 100644 --- a/src/components/DesignForm/assembly/index.ts +++ b/src/components/DesignForm/assembly/index.ts @@ -712,9 +712,19 @@ export default [ modelValue: '', hideConditionHtml: '', hideConditionHtmlCopy: '', + hideGongShi:{ + formulaHtml:'', + mathsFormula:'', + mathsString:'', + }, formid: '', dataRangeConditionHtml: '', dataRangeConditionHtmlCopy: '', + dataRangeGongShi:{ + formulaHtml:'', + mathsFormula:'', + mathsString:'', + }, saveFlag: false, asfasfLabel:'', fillRoles: [ diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index c87dc3524..38941689c 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -2263,9 +2263,20 @@ function aftTextChanged(str:string){ controlData.value.control.hideConditionHtml = str } +function aftGongshiChanged(gongshi:any){ + controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml + controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula + controlData.value.control.hideGongShi.mathsString = gongshi.mathsString +} + function aftTextChangedRange(str:string){ controlData.value.control.dataRangeConditionHtml = str } +function aftGongshiChangedRange(gongshi:any){ + controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml + controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula + controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString +} //asf隐藏条件取消编辑 function asfhTextCancel(){ determine.value = false @@ -3837,7 +3848,7 @@ const disabledIstrue = (val:string) => {
当满足以下条件时此控件隐藏
- + @@ -3947,7 +3958,7 @@ const disabledIstrue = (val:string) => {
仅可选择符合以下条件的数据
- + diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 261dbfe88..36800720a 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2298,9 +2298,20 @@ function aftTextChanged(str:string){ controlData.value.control.hideConditionHtml = str } +function aftGongshiChanged(gongshi:any){ + controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml + controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula + controlData.value.control.hideGongShi.mathsString = gongshi.mathsString +} + function aftTextChangedRange(str:string){ controlData.value.control.dataRangeConditionHtml = str } +function aftGongshiChangedRange(gongshi:any){ + controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml + controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula + controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString +} //asf隐藏条件取消编辑 function asfhTextCancel(){ determine.value = false @@ -3870,7 +3881,7 @@ const disabledIstrue = (val:string) => {
当满足以下条件时此控件隐藏
- + @@ -3980,7 +3991,7 @@ const disabledIstrue = (val:string) => {
仅可选择符合以下条件的数据
- + diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue index 4815b4aa6..8976cc6bf 100644 --- a/src/widget/associatedforms/associatedFormsTinyace.vue +++ b/src/widget/associatedforms/associatedFormsTinyace.vue @@ -43,7 +43,7 @@ const props = defineProps({ }, }) -let $emit = defineEmits(["textChange"]); +let $emit = defineEmits(["textChange","gongshiChange"]); const tinymceHtml = ref("") tinymceHtml.value = props.aftText @@ -75,7 +75,7 @@ watch(()=>tinymceHtml.value, (val:any) => { mathsString:tinymceBox.value.innerText, mathsFormula:suanShitwo, } - + $emit('gongshiChange',gongShi); if(containsNewline(gongShi.mathsString)){ errorCondition("条件不允许换行") diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue index a37af4251..b7ae7e02b 100644 --- a/src/widget/associatedforms/associatedFormsTinyaceRange.vue +++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue @@ -42,7 +42,7 @@ const props = defineProps({ }, }) -let $emit = defineEmits(["textChange"]); +let $emit = defineEmits(["textChange","gongshiChange"]); const tinymceHtml = ref("") tinymceHtml.value = props.aftText @@ -75,7 +75,7 @@ watch(()=>tinymceHtml.value, (val:any) => { mathsFormula:suanShitwo, } - + $emit('gongshiChange',gongShi); if(containsNewline(gongShi.mathsString)){ errorCondition("条件不允许换行") }else if(!gongShi.formulaHtml.startsWith("