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 { } } //多选删除时,当前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) => {