From b2c64d84047fe7bc5c6a448c1b400746d71931c2 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 27 Jun 2024 15:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=85=E5=A1=AB=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue        |  6 +++++-
 .../DesignForm/formControlAttr_2024024.vue           |  6 +++++-
 src/components/DesignForm/formControlAttres.vue      |  6 +++++-
 src/components/DesignForm/formControlPropertiNew.vue | 12 ++++++++++--
 src/components/DesignForm/formControlProperties.vue  |  6 +++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index b5b1a8e28..b116d9d6c 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 c8b5eedd4..169c7d561 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 = () => {
@@ -3310,13 +3316,14 @@ const disabledIstrue = (val:string) => {
                         >
                         
                             <!-- <div class="h3"><h3>校验设置</h3></div> -->
-                            <el-divider content-position="left">校验设置</el-divider>
+                            <el-divider content-position="left">校验1设置</el-divider>
                             <div v-if="showHide(['input', 'password', 'component'], true)">
                                 <el-form-item
                                     v-for="(item, index) in controlData.customRules"
                                     :key="item.type"
                                     class="form_cont"
                                 >
+								
                                     <el-input v-model="item.message" placeholder="校验提示信息">
                                         <template #prepend>
                                             <el-select
@@ -3367,6 +3374,7 @@ const disabledIstrue = (val:string) => {
                                 </el-form-item>
                             </div>
                             <el-form-item class="form_cont" v-else>
+							
                             <el-checkbox
                                 :model-value="checkboxRequired"
                                 @change="requiredChange"
diff --git a/src/components/DesignForm/formControlProperties.vue b/src/components/DesignForm/formControlProperties.vue
index 9b6b3c610..0c7be6ea3 100644
--- a/src/components/DesignForm/formControlProperties.vue
+++ b/src/components/DesignForm/formControlProperties.vue
@@ -1285,7 +1285,11 @@ const addRules = (tooltip: 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
+		}
     })
 /**
 @ 作者: 秦东