From 22410cc35075e37e9306e79466fcea4789b41f3d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 15 Aug 2024 11:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=A1=86=E7=BB=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8B=96=E5=8A=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index cd5a008..e389955 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -28,6 +28,8 @@ import LayoutPage from '@/components/DesignForm/layoutPage/index.vue'
 
 import { Plus } from '@element-plus/icons-vue'
 
+import Draggable from 'vuedraggable-es'
+
 
 	
     
@@ -1218,6 +1220,14 @@ const delSelectOption = (index: number, type?: string) => {
         let delflag = true
         let breakFlag = 0
         if(controlData.value.type === 'checkbox'&& 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){
+                    index = i
+                    break
+                }
+            }
+            //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
             for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
                 if(breakFlag>0){
                     break
@@ -3304,7 +3314,7 @@ watch(()=>controlData.value.customRules,(val:any) => {
                                 </el-select>
                             </el-form-item>
                             <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
                                         v-for="(item, index) in controlData.options"
                                         :key="index"
@@ -3325,6 +3335,42 @@ watch(()=>controlData.value.customRules,(val:any) => {
                                         </el-col>
                                     </el-form-item>
                                 </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-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
                                 </el-form-item>