From e9201fa819489e60eccf6f53552f1b026fa9ba5d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 13 Nov 2024 08:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E5=92=8C=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E9=80=89=E9=A1=B9=E6=8B=96=E5=8A=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 3083826..addbb75 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1282,7 +1282,7 @@ const delSelectOption = (index: number, type?: string) => {
         //liwenxuan 20240508 checkbox 删除选项时提醒  start
         let delflag = true
         let breakFlag = 0
-        if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){
+        if((controlData.value.type === 'checkbox'||controlData.value.type === 'radio'||controlData.value.type === 'select')&& controlData.value.config.optionsType==0){
             //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start 
             for(let i = 0;i<controlData.value.options.length;i++){
                 if(controlData.value.options[i].value==index){
@@ -1291,26 +1291,29 @@ const delSelectOption = (index: number, type?: string) => {
                 }
             }
             //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
-            for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                if(breakFlag>0){
-                    break
-                }
-                for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                    if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                        let del =confirm("您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？");
-                        if (del==true){
-                            breakFlag++
-                            break
-                        }else{
-                            delflag = false
-                            breakFlag++
-                            break
+            if(controlData.value.type === 'checkbox'){
+                for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
+                    if(breakFlag>0){
+                        break
+                    }
+                    for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
+                        if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
+                            let del =confirm("您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？");
+                            if (del==true){
+                                breakFlag++
+                                break
+                            }else{
+                                delflag = false
+                                breakFlag++
+                                break
+                            }
                         }
                     }
-                }
 
-                
+                    
+                }
             }
+            
         }
         if(delflag === true){
             //删除相关关联选项设置
@@ -3973,7 +3976,7 @@ const radioChangeSet = (val:any) => {
                                 </el-select>
                             </el-form-item>
                             <template v-if="controlData.config.optionsType === 0">
-                                <div v-if="controlData.type !== 'cascader'&&controlData.type !== 'checkbox'">
+                                <div v-if="controlData.type !== 'cascader'&&controlData.type !== 'checkbox'&&controlData.type !== 'radio'&&controlData.type !== 'select'">
                                     <el-form-item
                                         v-for="(item, index) in controlData.options"
                                         :key="index"
@@ -3995,7 +3998,7 @@ const radioChangeSet = (val:any) => {
                                     </el-form-item>
                                 </div>
                                 <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
-                                <div v-if="controlData.type !== 'cascader'&&controlData.type == 'checkbox'">
+                                <div v-if="controlData.type !== 'cascader'&&(controlData.type == 'checkbox'||controlData.type == 'radio'||controlData.type == 'select')">
                                     <draggable
                                         :list="controlData.options" 
                                         :force-fallback="true"