diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 38593ef59..e9871969a 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -358,8 +358,8 @@ const confirmEvent = (val:any) => { .then((data)=>{ console.log('cancel!',data) ElNotification({ - title: '温馨提示!', - message: data.mag, + title: '系统提示!', + message: data.mag?data.mag:"删除成功", type: 'success', }) getPageData() diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 59f5eef4d..dd938747d 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -1348,7 +1348,11 @@ // 校验规则必填勾选设置,存在校验规则时勾选 const checkboxRequired = computed(() => { const val = controlData.value && controlData.value.item?.rules - return val && val.length > 0 + if(val && val.length > 0){ + return true + }else{ + return false + } }) // 快速添加一条校验规则 const addRulesFast = () => { diff --git a/src/components/DesignForm/formControlAttr_2024024.vue b/src/components/DesignForm/formControlAttr_2024024.vue index bce9f04f2..703eaceec 100644 --- a/src/components/DesignForm/formControlAttr_2024024.vue +++ b/src/components/DesignForm/formControlAttr_2024024.vue @@ -1148,7 +1148,11 @@ const tableColumnAdd = (val: string) => { // 校验规则必填勾选设置,存在校验规则时勾选 const checkboxRequired = computed(() => { const val = controlData.value && controlData.value.item?.rules - return val && val.length > 0 + if(val && val.length > 0){ + return true + }else{ + return false + } }) // 快速添加一条校验规则 const addRulesFast = () => { diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue index 67bf990a6..4b0631fe4 100644 --- a/src/components/DesignForm/formControlAttres.vue +++ b/src/components/DesignForm/formControlAttres.vue @@ -988,7 +988,11 @@ const tableColumnAdd = (val: string) => { // 校验规则必填勾选设置,存在校验规则时勾选 const checkboxRequired = computed(() => { const val = controlData.value && controlData.value.item?.rules - return val && val.length > 0 + if(val && val.length > 0){ + return true + }else{ + return false + } }) // 快速添加一条校验规则 const addRulesFast = () => { diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 107ac521f..9fcec388a 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -1387,7 +1387,13 @@ const tableColumnAdd = (val: string) => { // 校验规则必填勾选设置,存在校验规则时勾选 const checkboxRequired = computed(() => { const val = controlData.value && controlData.value.item?.rules - return val && val.length > 0 + console.log("校验规则必填勾选设置",val && val.length > 0) + if(val && val.length > 0){ + return true + }else{ + return false + } + // return val && val.length > 0 }) // 快速添加一条校验规则 const addRulesFast = () => { @@ -3323,13 +3329,14 @@ const disabledIstrue = (val:string) => { > - 校验设置 + 校验1设置
+