Browse Source

Merge branch 'lwx_v5'

lwx_v6
超级管理员 1 year ago
parent
commit
3dd90cd3a9
  1. 48
      src/components/DesignForm/formControlPropertiNew.vue

48
src/components/DesignForm/formControlPropertiNew.vue

@ -30,6 +30,8 @@ import LayoutPage from '@/components/DesignForm/layoutPage/index.vue'
import { Plus } from '@element-plus/icons-vue' import { Plus } from '@element-plus/icons-vue'
import Draggable from 'vuedraggable-es'
@ -1264,6 +1266,14 @@ const delSelectOption = (index: number, type?: string) => {
let delflag = true let delflag = true
let breakFlag = 0 let breakFlag = 0
if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){ if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){
//,indexvalue,index liwenxuan 20240815 start
for(let i = 0;i<controlData.value.options.length;i++){
if(controlData.value.options[i].value==index){
index = i
break
}
}
//,indexvalue,index liwenxuan 20240815 end
for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){ for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
if(breakFlag>0){ if(breakFlag>0){
break break
@ -3482,7 +3492,7 @@ const radioChangeSet = (val:any) => {
</el-select> </el-select>
</el-form-item> </el-form-item>
<template v-if="controlData.config.optionsType === 0"> <template v-if="controlData.config.optionsType === 0">
<div v-if="controlData.type !== 'cascader'"> <div v-if="controlData.type !== 'cascader'&&controlData.type !== 'checkbox'">
<el-form-item <el-form-item
v-for="(item, index) in controlData.options" v-for="(item, index) in controlData.options"
:key="index" :key="index"
@ -3503,6 +3513,42 @@ const radioChangeSet = (val:any) => {
</el-col> </el-col>
</el-form-item> </el-form-item>
</div> </div>
<!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
<div v-if="controlData.type !== 'cascader'&&controlData.type == 'checkbox'">
<draggable
:list="controlData.options"
:force-fallback="true"
chosen-class="chosenClass"
animation="300"
>
<template #item="{ element }">
<div class="item form_cont">
<el-form-item>
<el-col :span="2" style="padding-top:4px;cursor: move;color: #66B1FF">
<i class="icon-move" ></i>
</el-col>
<el-col :span="6" style="cursor: move;">
选项标签
</el-col>
<el-col :span="10">
<el-input v-model="element.label" placeholder="选项标签" />
</el-col>
<el-col :span="2" :offset="1">
<i
class="icon-del"
@click="delSelectOption(element.value as number)"
></i>
</el-col>
</el-form-item>
</div>
</template>
</draggable>
</div>
<!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
<el-form-item class="form_cont"> <el-form-item class="form_cont">
<el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button> <el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
</el-form-item> </el-form-item>

Loading…
Cancel
Save