From 7593e5c0eea617d467b9a9e1bdc554092419e464 Mon Sep 17 00:00:00 2001
From: a123456 <1209165801@qq.com>
Date: Fri, 15 Feb 2019 16:14:35 +0800
Subject: [PATCH] Signed-off-by: a123456 <1209165801@qq.com>

---
 .../WEB-INF/manager/mdiy/diy-model/form.ftl   | 308 +++++++++---------
 .../WEB-INF/manager/mdiy/diy-model/index.ftl  |   2 +-
 .../webapp/static/mdiy/css/model-form.css     |  10 +-
 .../webapp/static/mdiy/less/model-form.less   |  10 +-
 4 files changed, 173 insertions(+), 157 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
index f1aa09c9..e48d0e14 100644
--- a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
@@ -11,7 +11,7 @@
          <el-aside class="ms-editor-type-layout">
             <div class="ms-header-title">自定义表单项</div>
             <div id="ms-type-list" class="ms-type-list">
-               <li v-for="type in typeList" :data-id="type.id" :data-title="type.title">
+               <li v-for="type in typeList" :data-id="type.id" :data-title="type.title" @click="formItemList.push({id: type.id,title: type.title,downList: [],downActiveList: [],set: [],unit: '',fieldType: ''})">
                   <i class="iconfont" :class="type.icon"></i>
                   <span v-text="type.title"></span>
                </li>
@@ -20,192 +20,191 @@
          <el-main class="ms-editor-body-layout">
             <el-form id="ms-input-list" size="mini" class="form">
                <!--控件类型下拉-->
-               <el-form-item @click.native="controlTypeActive = selected" class="ms-form-item" :class="{'active':controlTypeActive == selected}" :label="selected.title" :label-width="'90px'" v-for="(selected,index) in selectedList">
+               <el-form-item @click.native="formItemActive = formItem;formItemActive.index = index" class="ms-form-item" :class="{'active':formItemActive == formItem}" :label="formItem.title" :label-width="'90px'" v-for="(formItem,index) in formItemList">
                   <!--单行-->
-                  <el-input v-if="selected.id == '1' && selected.fieldType != '1-2' && selected.fieldType != '1-3'" maxlength="20" type="text" v-model="selected.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
+                  <el-input v-if="formItem.id == '1' && formItem.fieldType != '1-2' && formItem.fieldType != '1-3'" maxlength="20" type="text" v-model="formItem.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
                   <!--多行-->
-                  <el-input v-if="selected.fieldType == '1-2'" maxlength="20" type="textarea" :rows="4" v-model="selected.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
-                  <div v-show="selected.fieldType == '1-3'" style="width: 100%;">
-                     <script id="ms-ueditor" type="text/plain" name="taskDescription"></script>
+                  <el-input v-if="formItem.fieldType == '1-2'" maxlength="20" type="textarea" :rows="4" v-model="formItem.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
+                  <div v-show="formItem.fieldType == '1-3'" style="width: 100%;">
+                     <script :id="'ms-ueditor-'+index" type="text/plain" name="taskDescription"></script>
                   </div>
                   <!--号码-->
-                  <el-input v-if="selected.id == '2'" maxlength="11" type="text" v-model="selected.default" placeholder="选填，1-11，数字" autocomplete="off"></el-input>
+                  <el-input v-if="formItem.id == '2'" maxlength="11" type="text" v-model="formItem.default" placeholder="选填，1-11，数字" autocomplete="off"></el-input>
                   <!--金额-->
-                  <el-input class="unit-input" v-if="selected.id == '3'" maxlength="20" type="number" v-model="selected.default" placeholder="选填" autocomplete="off">
-                     <template :slot="selected.fieldType == '3-1'?'prepend':'append'">{{selected.unit}}</template>
+                  <el-input class="unit-input" v-if="formItem.id == '3'" maxlength="20" type="number" v-model="formItem.default" placeholder="选填" autocomplete="off">
+                     <template :slot="formItem.fieldType == '3-1'?'prepend':'append'">{{formItem.unit}}</template>
                   </el-input>
 
                   <!--数值-->
-                  <el-input v-if="selected.id == '4'" max="9999" type="number" v-model="selected.default" placeholder="选填，数字" autocomplete="off"></el-input>
+                  <el-input v-if="formItem.id == '4'" max="9999" type="number" v-model="formItem.default" placeholder="选填，数字" autocomplete="off"></el-input>
 
                   <!--日期和时间-->
-                  <el-date-picker v-if="selected.id == '5' && selected.fieldType != '5-2' && selected.fieldType != '5-3'" style="width: 100%;" v-model="selected.default" type="datetime" placeholder="选择日期时间">
+                  <el-date-picker v-if="formItem.id == '5' && formItem.fieldType != '5-2' && formItem.fieldType != '5-3'" style="width: 100%;" v-model="formItem.default" type="datetime" placeholder="选择日期时间">
                   </el-date-picker>
                   <!--仅日期-->
-                  <el-date-picker v-if="selected.fieldType == '5-2'" style="width: 100%;" v-model="selected.default" type="date" placeholder="选择日期">
+                  <el-date-picker v-if="formItem.fieldType == '5-2'" style="width: 100%;" v-model="formItem.default" type="date" placeholder="选择日期">
                   </el-date-picker>
                   <!--仅时间-->
-                  <el-time-picker v-if="selected.fieldType == '5-3'" style="width: 100%;" v-model="selected.default" placeholder="选择时间">
+                  <el-time-picker v-if="formItem.fieldType == '5-3'" style="width: 100%;" v-model="formItem.default" placeholder="选择时间">
                   </el-time-picker>
 
                   <!--选项-->
                   <!--单选-->
-                  <template v-if="selected.id == '6' && selected.fieldType != '6-2'">
-                     <el-radio v-for="(down,index) in selected.downList" v-model="selected.downActive" :label="index">{{down.value}}</el-radio>
+                  <template v-if="formItem.id == '6' && formItem.fieldType != '6-2'">
+                     <el-radio v-for="(down,index) in formItem.downList" v-model="formItem.downActive" :label="index">{{down.value}}</el-radio>
                   </template>
 
                   <!--多选-->
-                  <el-checkbox-group v-model="selected.downActiveList" v-if="selected.fieldType == '6-2'">
-                     <el-checkbox v-for="(down,index) in selected.downList" :label="index">{{down.value}}</el-checkbox>
+                  <el-checkbox-group v-model="formItem.downActiveList" v-if="formItem.fieldType == '6-2'">
+                     <el-checkbox v-for="(down,index) in formItem.downList" :label="index">{{down.value}}</el-checkbox>
                   </el-checkbox-group>
                   <!--下拉菜单-->
                   <!--单选-->
-                  <el-select style="width: 100%;" v-model="selected.downActive" placeholder="请选择" v-if="selected.id == '7' && selected.fieldType != '7-2'">
-                     <el-option v-for="(down,index) in selected.downList" :value="index" :label="down.value">
+                  <el-select style="width: 100%;" v-model="formItem.downActive" placeholder="请选择" v-if="formItem.id == '7' && formItem.fieldType != '7-2'">
+                     <el-option v-for="(down,index) in formItem.downList" :value="index" :label="down.value">
                      </el-option>
                   </el-select>
 
                   <!--多选-->
-                  <el-select style="width: 100%;" multiple v-model="selected.downActiveList" placeholder="请选择" v-if="selected.fieldType == '7-2'">
-                     <el-option v-for="(down,index) in selected.downList" :value="index" :label="down.value">
+                  <el-select style="width: 100%;" multiple v-model="formItem.downActiveList" placeholder="请选择" v-if="formItem.fieldType == '7-2'">
+                     <el-option v-for="(down,index) in formItem.downList" :value="index" :label="down.value">
                      </el-option>
                   </el-select>
 
                   <!--上传图片-->
-                  <el-upload v-if="selected.id == '8'" action="https://jsonplaceholder.typicode.com/posts/" multiple>
+                  <el-upload v-if="formItem.id == '8'" action="https://jsonplaceholder.typicode.com/posts/" multiple>
                      <el-button icon="el-icon-upload">上传附件</el-button>
                   </el-upload>
 
                   <!--上传附件-->
-                  <el-upload v-if="selected.id == '9'" action="https://jsonplaceholder.typicode.com/posts/" multiple list-type="picture-card">
+                  <el-upload v-if="formItem.id == '9'" action="https://jsonplaceholder.typicode.com/posts/" multiple list-type="picture-card">
                      <i class="el-icon-plus"></i>
                   </el-upload>
                   <!--删除按钮-->
-                  <el-button class="del-but" type="text" @click.stop="selectedList.splice(index,1)">删除</el-button>
+                  <el-button class="del-but" type="text" @click.stop="formItemList.splice(index,1)">删除</el-button>
                </el-form-item>
             </el-form>
          </el-main>
          <el-aside class="ms-editor-attr-layout">
-            <div class="ms-header-title">属性</div>
             <div id="ms-editor-attr" class="ms-editor-attr">
                <el-form label-position="top" size="mini" class="form">
                   <!--字段名-->
                   <el-form-item label="标题" :label-width="'70px'">
-                     <el-input maxlength="5" v-model="controlTypeActive.title" placeholder="选填，1-5，字符" autocomplete="off"></el-input>
+                     <el-input maxlength="5" v-model="formItemActive.title" placeholder="选填，1-5，字符" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--数字类型-->
                   <!--数值-->
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.id === '4'">
-                     <el-input max="9999" type="number" v-model="controlTypeActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.id === '4'">
+                     <el-input max="9999" type="number" v-model="formItemActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--时间类型-->
-                  <el-form-item label="字段类型" :label-width="'70px'" v-if="controlTypeActive.id === '5'">
-                     <el-radio v-model="controlTypeActive.fieldType" label="5-1">日期和时间</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" label="5-2">仅日期</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" label="5-3">仅时间</el-radio>
+                  <el-form-item label="字段类型" :label-width="'70px'" v-if="formItemActive.id === '5'">
+                     <el-radio v-model="formItemActive.fieldType" label="5-1">日期和时间</el-radio>
+                     <el-radio v-model="formItemActive.fieldType" label="5-2">仅日期</el-radio>
+                     <el-radio v-model="formItemActive.fieldType" label="5-3">仅时间</el-radio>
                   </el-form-item>
                   <!--日期和时间-->
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.id === '5' && controlTypeActive.fieldType != '5-2' && controlTypeActive.fieldType != '5-3'">
-                     <el-date-picker style="width: 100%;" v-model="controlTypeActive.default" type="datetime" placeholder="选择日期时间">
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.id === '5' && formItemActive.fieldType != '5-2' && formItemActive.fieldType != '5-3'">
+                     <el-date-picker style="width: 100%;" v-model="formItemActive.default" type="datetime" placeholder="选择日期时间">
                      </el-date-picker>
                   </el-form-item>
                   <!--仅日期-->
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.fieldType == '5-2'">
-                     <el-date-picker style="width: 100%;" v-model="controlTypeActive.default" type="date" placeholder="选择日期">
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.fieldType == '5-2'">
+                     <el-date-picker style="width: 100%;" v-model="formItemActive.default" type="date" placeholder="选择日期">
                      </el-date-picker>
                   </el-form-item>
                   <!--仅时间-->
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.fieldType == '5-3'">
-                     <el-time-picker style="width: 100%;" v-model="controlTypeActive.default" placeholder="选择时间">
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.fieldType == '5-3'">
+                     <el-time-picker style="width: 100%;" v-model="formItemActive.default" placeholder="选择时间">
                      </el-time-picker>
                   </el-form-item>
 
                   <!--字符串类型-->
                   <!--文本-->
-                  <el-form-item label="字段类型" :label-width="'70px'" v-if="controlTypeActive.id === '1'">
-                     <el-radio v-model="controlTypeActive.fieldType" label="1-1">单行</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" label="1-2">多行</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" label="1-3">带格式</el-radio>
+                  <el-form-item label="字段类型" :label-width="'70px'" v-if="formItemActive.id === '1'">
+                     <el-radio v-model="formItemActive.fieldType" label="1-1">单行</el-radio>
+                     <el-radio v-model="formItemActive.fieldType" label="1-2">多行</el-radio>
+                     <el-radio v-model="formItemActive.fieldType" label="1-3">带格式</el-radio>
                   </el-form-item>
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.id === '1'">
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.id === '1'">
                      <!--输入框判断选中的是多行还是单行-->
-                     <el-input v-if="controlTypeActive.fieldType != '1-2' && controlTypeActive.fieldType != '1-3'" maxlength="20" type="text" v-model="controlTypeActive.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
-                     <el-input v-if="controlTypeActive.fieldType == '1-2' || controlTypeActive.fieldType == '1-3'" maxlength="20" type="textarea" :rows="4" v-model="controlTypeActive.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
+                     <el-input v-if="formItemActive.fieldType != '1-2' && formItemActive.fieldType != '1-3'" maxlength="20" type="text" v-model="formItemActive.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
+                     <el-input v-if="formItemActive.fieldType == '1-2' || formItemActive.fieldType == '1-3'" maxlength="20" type="textarea" :rows="4" v-model="formItemActive.default" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--号码-->
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.id === '2'">
-                     <el-input maxlength="11" type="text" v-model="controlTypeActive.default" placeholder="选填，1-11，数字" autocomplete="off"></el-input>
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.id === '2'">
+                     <el-input maxlength="11" type="text" v-model="formItemActive.default" placeholder="选填，1-11，数字" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--金额-->
-                  <el-form-item label="单位" :label-width="'70px'" v-if="controlTypeActive.id === '3'">
-                     <el-input autocomplete="off" placeholder="选填" maxlength="20" type="text" v-model="controlTypeActive.unit" class="input-with-select">
-                        <el-select v-model="controlTypeActive.fieldType" slot="append" placeholder="请选择">
+                  <el-form-item label="单位" :label-width="'70px'" v-if="formItemActive.id === '3'">
+                     <el-input autocomplete="off" placeholder="选填" maxlength="20" type="text" v-model="formItemActive.unit" class="input-with-select">
+                        <el-select v-model="formItemActive.fieldType" slot="append" placeholder="请选择">
                            <el-option label="前缀" value="3-1"></el-option>
                            <el-option label="后缀" value="3-2"></el-option>
                         </el-select>
                      </el-input>
                   </el-form-item>
-                  <el-form-item label="保留几位小数" :label-width="'70px'" v-if="controlTypeActive.id === '3'">
-                     <el-input min="0" max="9" type="number" v-model="controlTypeActive.data4" placeholder="选填，数字" autocomplete="off"></el-input>
+                  <el-form-item label="保留几位小数" :label-width="'70px'" v-if="formItemActive.id === '3'">
+                     <el-input min="0" max="9" type="number" v-model="formItemActive.data4" placeholder="选填，数字" autocomplete="off"></el-input>
                   </el-form-item>
-                  <el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive.id === '3'">
-                     <el-input max="9999" type="number" v-model="controlTypeActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
+                  <el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive.id === '3'">
+                     <el-input max="9999" type="number" v-model="formItemActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--选项和下拉菜单-->
-                  <el-form-item label="字段类型" :label-width="'70px'" v-if="controlTypeActive.id === '6' || controlTypeActive.id === '7'">
-                     <el-radio v-model="controlTypeActive.fieldType" :label="controlTypeActive.id+'-1'">单选</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" :label="controlTypeActive.id+'-2'">多选</el-radio>
+                  <el-form-item label="字段类型" :label-width="'70px'" v-if="formItemActive.id === '6' || formItemActive.id === '7'">
+                     <el-radio v-model="formItemActive.fieldType" :label="formItemActive.id+'-1'">单选</el-radio>
+                     <el-radio v-model="formItemActive.fieldType" :label="formItemActive.id+'-2'">多选</el-radio>
                   </el-form-item>
 
-                  <el-form-item label="添加选项" :label-width="'70px'" v-show="(controlTypeActive.id === '6' || controlTypeActive.id === '7') && (controlTypeActive.fieldType == controlTypeActive.id+'-1' || controlTypeActive.fieldType == controlTypeActive.id+'-2')">
+                  <el-form-item label="添加选项" :label-width="'70px'" v-show="(formItemActive.id === '6' || formItemActive.id === '7') && (formItemActive.fieldType == formItemActive.id+'-1' || formItemActive.fieldType == formItemActive.id+'-2')">
                      <ul class="ms-down-list" id="ms-down-list">
                         <!--单选-->
-                        <li class="ms-down-item" v-for="(down,index) in controlTypeActive.downList" v-show="controlTypeActive.fieldType == controlTypeActive.id+'-1'">
+                        <li class="ms-down-item" v-for="(down,index) in formItemActive.downList" v-show="formItemActive.fieldType == formItemActive.id+'-1'">
                            <i class="iconfont icon-tuodong"></i>
-                           <el-radio class="ms-radio" v-model="controlTypeActive.downActive" :label="index">默认</el-radio>
+                           <el-radio class="ms-radio" v-model="formItemActive.downActive" :label="index">默认</el-radio>
                            <el-input maxlength="20" class="ms-input" v-model="down.value" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
-                           <i class="el-icon-delete" @click="controlTypeActive.downList.splice(index,1)"></i>
+                           <i class="el-icon-delete" @click="formItemActive.downList.splice(index,1)"></i>
                         </li>
                         <!--多选-->
-                        <el-checkbox-group id="ms-down-checkbox-list" v-model="controlTypeActive.downActiveList" v-show="controlTypeActive.fieldType == controlTypeActive.id+'-2'">
-                           <li class="ms-down-item" v-for="(down,index) in controlTypeActive.downList">
+                        <el-checkbox-group id="ms-down-checkbox-list" v-model="formItemActive.downActiveList" v-show="formItemActive.fieldType == formItemActive.id+'-2'">
+                           <li class="ms-down-item" v-for="(down,index) in formItemActive.downList">
                               <i class="iconfont icon-tuodong"></i>
                               <el-checkbox class="ms-radio" :label="index">默认</el-checkbox>
                               <el-input maxlength="20" class="ms-input" v-model="down.value" placeholder="选填，1-20，字符" autocomplete="off"></el-input>
-                              <i class="el-icon-delete" @click="controlTypeActive.downList.splice(index,1)"></i>
+                              <i class="el-icon-delete" @click="formItemActive.downList.splice(index,1)"></i>
                            </li>
                         </el-checkbox-group>
-                        <div class="ms-plus" @click="controlTypeActive.downList.push({})" v-if="controlTypeActive.fieldType == controlTypeActive.id+'-1' || controlTypeActive.fieldType == controlTypeActive.id+'-2'">
+                        <div class="ms-plus" @click="formItemActive.downList.push({})" v-if="formItemActive.fieldType == formItemActive.id+'-1' || formItemActive.fieldType == formItemActive.id+'-2'">
                            <i class="el-icon-plus"></i>添加
                         </div>
                      </ul>
                   </el-form-item>
 
                   <!--上传图片-->
-                  <el-form-item label="图片数量限制" :label-width="'70px'" v-if="controlTypeActive.id === '9'">
-                     <el-input max="9" type="number" v-model="controlTypeActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
+                  <el-form-item label="图片数量限制" :label-width="'70px'" v-if="formItemActive.id === '9'">
+                     <el-input max="9" type="number" v-model="formItemActive.default" placeholder="选填，数字" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <!--上传附件-->
-                  <!--<el-form-item label="默认值" :label-width="'70px'" v-if="controlTypeActive === '3-7'">
+                  <!--<el-form-item label="默认值" :label-width="'70px'" v-if="formItemActive === '3-7'">
             </el-form-item>-->
 
                   <!--设置-->
                   <el-form-item label="设置" :label-width="'70px'">
-                     <el-checkbox-group v-model="controlTypeActive.set">
+                     <el-checkbox-group v-model="formItemActive.set">
                         <el-checkbox label="必填"></el-checkbox>
-                        <el-checkbox label="唯一" v-if="controlTypeActive.id != 5"></el-checkbox>
+                        <el-checkbox label="唯一" v-if="formItemActive.id != 5"></el-checkbox>
                      </el-checkbox-group>
                   </el-form-item>
 
                   <!--说明-->
                   <el-form-item label="填写说明" :label-width="'70px'">
-                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="controlTypeActive.explain">
+                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="formItemActive.explain">
                      </el-input>
                   </el-form-item>
                </el-form>
@@ -260,7 +259,7 @@
             icon: "icon-tupian",
             id: "9",
          }],
-         selectedList: [{
+         formItemList: [{
             title: "文本",
             value: "",
             id: "1",
@@ -273,112 +272,101 @@
             title: "号码",
             value: "",
             id: "2",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "金额",
             value: "",
             id: "3",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "数值",
             value: "",
             id: "4",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "日期和时间",
             value: "",
             id: "5",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "选项",
             value: "",
             id: "6",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "下拉菜单",
             value: "",
             id: "7",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "附件",
             value: "",
             id: "8",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
          }, {
             title: "图片",
             value: "",
             id: "9",
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
-         }], //选中的
-         controlTypeActive: {
-            downList: [], //下拉列表
-            downActiveList: [], //多选列表
-            set: [], //设置
-            unit: '', //金额单位
-            fieldType: '', //字段类型
-         }, //选中类型
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
+         }], //表单项列表
+         formItemActive: {
+            downList: [],
+            downActiveList: [],
+            set: [],
+            unit: '',
+            fieldType: '',
+         }, //选中表单项
+      },
+
+      computed: {
+         //辅助监听对象的属性
+         fieldType() {　　　　
+            return this.formItemActive.fieldType;
+         }
       },
+
       watch: {
-         controlTypeActive: function(data) {
-            //切换控件类型时
-            if(data.id == '6' || data.id == '7') {
-               this.$nextTick(function() {
-                  if(this.downListSortable == null) {
-                     this.downListSortable = new Sortable(document.getElementById("ms-down-list"), {
-                        animation: 150,
-                        draggable: '.ms-down-item',
-                        handle: '.icon-tuodong', //设置只有小图标可以拖动
-                        ghostClass: 'sortable-ghost', //设置拖动时候显示的样式
-                     });
-                  }
-                  if(this.downListCheckboxSortable == null) {
-                     this.downListCheckboxSortable = new Sortable(document.getElementById("ms-down-checkbox-list"), {
-                        animation: 150,
-                        draggable: '.ms-down-item',
-                        handle: '.icon-tuodong', //设置只有小图标可以拖动
-                        ghostClass: 'sortable-ghost', //设置拖动时候显示的样式
-                     });
-                  }
-               })
-            }
-            if(data.id == '1') {
+         //监听切换表单字段类型
+         fieldType: function(data) {
+            //监听如果切换到发布选项卡
+            if(data == '1-3') {
                let that = this;
                //富文本加载
                var URL = window.UEDITOR_HOME_URL || "http://mpm.mingsoft.net/static/plugins/ueditor/1.4.3.1/";
-               if(this.editor == null) {
-                  this.editor = UE.getEditor('ms-ueditor', {
+               if(this.formItemActive.editor == null) {
+                  this.formItemActive.editor = UE.getEditor('ms-ueditor-' + this.formItemActive.index, {
                      toolbars: [
                         ['fullscreen', 'undo', 'redo', '|', 'bold', 'italic', 'underline', 'strikethrough',
                            'removeformat', 'blockquote',
@@ -398,14 +386,34 @@
                      elementPathEnabled: false,
                      wordCount: false,
                      initialFrameWidth: '100%',
-                     initialFrameHeight: 200,
-                  });
-                  this.editor.ready(function() {
-                     var a = $("#ueditor_0").contents()[0].activeElement;
-                     $(a).addClass("ms-webkit-scrollbar").before("<style>.ms-webkit-scrollbar::-webkit-scrollbar,::-webkit-scrollbar{width:10px;/*滚动条宽度*/height:1.5%;/*滚动条高度*/}/*定义滚动条轨道内阴影+圆角*/.ms-webkit-scrollbar::-webkit-scrollbar-track,::-webkit-scrollbar-track{border-radius:10px;/*滚动条的背景区域的圆角*/background-color:#eeeeee;/*滚动条的背景颜色*/}.ms-task-content::-webkit-scrollbar-track{border-radius:10px;background-color:#FFFFFF;}/*定义滑块内阴影+圆角*/.ms-webkit-scrollbar::-webkit-scrollbar-thumb,::-webkit-scrollbar-thumb{border-radius:10px;/*滚动条的圆角*/background-color:#dddddd;/*滚动条的背景颜色*/}</style>");
+                     initialFrameHeight: 160,
                   });
                }
             }
+         },
+         //监听切换表单元素
+         formItemActive: function(data) {
+            //切换控件类型时
+            if(data.id == '6' || data.id == '7') {
+               this.$nextTick(function() {
+                  if(this.downListSortable == null) {
+                     this.downListSortable = new Sortable(document.getElementById("ms-down-list"), {
+                        animation: 150,
+                        draggable: '.ms-down-item',
+                        handle: '.icon-tuodong', //设置只有小图标可以拖动
+                        ghostClass: 'sortable-ghost', //设置拖动时候显示的样式
+                     });
+                  }
+                  if(this.downListCheckboxSortable == null) {
+                     this.downListCheckboxSortable = new Sortable(document.getElementById("ms-down-checkbox-list"), {
+                        animation: 150,
+                        draggable: '.ms-down-item',
+                        handle: '.icon-tuodong', //设置只有小图标可以拖动
+                        ghostClass: 'sortable-ghost', //设置拖动时候显示的样式
+                     });
+                  }
+               })
+            }
          }
       },
       methods: {},
diff --git a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/index.ftl b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/index.ftl
index 7aeca70d..b0a9ace9 100644
--- a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/index.ftl
@@ -88,7 +88,7 @@
                         //拖动成功后删除拖动过来的元素
                         event.item.parentNode.removeChild(event.item);
                         //想素组添加拖动过来的选项选项
-                        modelFormVue.selectedList.splice(event.newIndex, 0, that.addInputType);
+                        modelFormVue.formItemList.splice(event.newIndex, 0, that.addInputType);
                      },
                   });
                })
diff --git a/src/main/webapp/static/mdiy/css/model-form.css b/src/main/webapp/static/mdiy/css/model-form.css
index 7e1ca972..b654c3e9 100644
--- a/src/main/webapp/static/mdiy/css/model-form.css
+++ b/src/main/webapp/static/mdiy/css/model-form.css
@@ -196,7 +196,7 @@ textarea::-webkit-input-placeholder {
   margin: 8px;
 }
 .ms-mdiy-model-form .ms-editor-body-layout .ms-form-item {
-  padding: 6px 15px 6px 30px;
+  padding: 6px 20px 6px 20px;
   border: 1px solid transparent;
 }
 .ms-mdiy-model-form .ms-editor-body-layout .ms-form-item .unit-input {
@@ -208,7 +208,7 @@ textarea::-webkit-input-placeholder {
 }
 .ms-mdiy-model-form .ms-editor-body-layout .ms-form-item .el-form-item__content .del-but {
   visibility: hidden;
-  padding-left: 15px;
+  padding-left: 20px;
   margin-left: auto;
 }
 .ms-mdiy-model-form .ms-editor-body-layout .ms-form-item .el-radio {
@@ -226,16 +226,20 @@ textarea::-webkit-input-placeholder {
 .ms-mdiy-model-form .ms-editor-attr-layout {
   background: #fff;
   min-width: 20%;
-  padding: 20px;
+  display: flex;
+  flex-wrap: wrap;
 }
 .ms-mdiy-model-form .ms-editor-attr-layout .ms-header-title {
   border-left: 1px solid #e6e6e6;
+  width: 100%;
 }
 .ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr {
+  width: 100%;
   display: flex;
   flex-direction: column;
 }
 .ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr .form {
+  padding: 15px;
   height: calc(100vh - 200px);
   overflow: auto;
 }
diff --git a/src/main/webapp/static/mdiy/less/model-form.less b/src/main/webapp/static/mdiy/less/model-form.less
index 4aca3b65..a9aa6d86 100644
--- a/src/main/webapp/static/mdiy/less/model-form.less
+++ b/src/main/webapp/static/mdiy/less/model-form.less
@@ -45,7 +45,7 @@
         background: #fff;
         margin: 8px;
         .ms-form-item {
-            padding: 6px 15px 6px 30px;
+            padding: 6px 20px 6px 20px;
             border: 1px solid transparent;
             //单位输入框
             .unit-input {
@@ -56,7 +56,7 @@
                 align-items: flex-start;
                 .del-but {
                     visibility: hidden;
-                    padding-left: 15px;
+                    padding-left: 20px;
                     margin-left: auto;
                 }
             }
@@ -80,14 +80,18 @@
     .ms-editor-attr-layout {
         background: #fff;
         min-width: 20%;
-        padding: 20px;
+        display: flex;
+        flex-wrap: wrap;
         .ms-header-title {
             border-left: 1px solid @borderColor;
+            width: 100%;
         }
         .ms-editor-attr {
+            width: 100%;
             display: flex;
             flex-direction: column;
             .form {
+                padding: 15px;
                 height: ~'calc(100vh - 200px)';
                 overflow: auto;
                 .el-form-item__label {