From df3dc1bbc3f4fd5d53adb6e1bead5f11d9f20fc4 Mon Sep 17 00:00:00 2001
From: bemege <bemege@163.com>
Date: Tue, 29 Jun 2021 21:32:03 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B0=83=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/official/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/official/index.vue b/src/views/official/index.vue
index f3b7a5d..1618df6 100644
--- a/src/views/official/index.vue
+++ b/src/views/official/index.vue
@@ -643,7 +643,7 @@ export default {
     margin-top: 200px;
 
     img {
-      width: 100%;
+      width: 80%;
     }
   }
 }
@@ -800,6 +800,9 @@ export default {
   }
   .content-wrapper-company {
     margin-top: 80px !important;
+    img {
+      width: 100% !important;
+    }
   }
   .footer-page {
     text-align: center;

From e8c24f8d3ef818281e5c97ad0aca19ed2adb46f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E5=91=A8?=
 <8909799+daoist-philosopher-1st@user.noreply.gitee.com>
Date: Thu, 1 Jul 2021 11:08:03 +0000
Subject: [PATCH 02/18] =?UTF-8?q?=E5=85=88=E4=BB=8Eexcel=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=95=B0=E6=8D=AE=EF=BC=8C=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=B2=98=E8=B4=B4=E5=88=B0=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/editor/RightPanel.vue | 2822 +++++++++++++++-----------
 1 file changed, 1613 insertions(+), 1209 deletions(-)

diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index 4ee6816..9ac79d9 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -1,1275 +1,1679 @@
 <template>
-    <div class="right-board">
-        <el-tabs v-model="currentTab" class="center-tabs">
-            <el-tab-pane label="组件属性" name="field" />
-        </el-tabs>
-        <div class="field-box">
-            <el-scrollbar class="right-scrollbar">
-                <!-- 组件属性 -->
-                <el-form v-show="currentTab==='field' && showField" label-width="90px" size="small">
-                    <el-form-item v-if="activeData.__config__.changeTag" label="组件类型">
-                        <el-select
-                            v-model="activeData.__config__.tagIcon"
-                            :style="{width: '100%'}"
-                            placeholder="请选择组件类型"
-                            @change="tagChange"
-                        >
-                            <el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
-                                <el-option
-                                    v-for="item in group.options"
-                                    :key="item.__config__.label"
-                                    :label="item.__config__.label"
-                                    :value="item.__config__.tagIcon"
-                                >
-                                    <svg-icon :name="item.__config__.tagIcon" class="node-icon" />
-                                    <!--                    <svg-icon class="node-icon" :icon-class="item.__config__.tagIcon" />-->
-                                    <span> {{ item.__config__.label }}{{ item.__config__.tagIcon }}</span>
-                                </el-option>
-                            </el-option-group>
-                        </el-select>
-                    </el-form-item>
-                    <!--          <el-form-item v-if="activeData.__vModel__!==undefined" label="字段名">-->
-                    <!--            <el-input v-model="activeData.__vModel__" placeholder="请输入字段名（v-model）" />-->
-                    <!--          </el-form-item>-->
-                    <el-form-item v-if="activeData.__config__.componentName!==undefined" label="组件名">
-                        {{ activeData.__config__.componentName }}
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.__config__.label!==undefined&&activeData.__config__.showLabel!==false"
-                        label="标题"
-                    >
-                        <el-input v-model="activeData.__config__.label" placeholder="请输入标题" @input="changeRenderKey" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
-                        <el-input v-model="activeData.placeholder" placeholder="请输入占位提示" @input="changeRenderKey" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
-                        <el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
-                        <el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.span!==undefined" label="表单栅格">
-                        <el-slider v-model="activeData.__config__.span" :marks="{12:''}" :max="24" :min="1"
-                                   @change="spanChange"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.layout==='rowFormItem'&&activeData.gutter!==undefined"
-                                  label="栅格间隔"
-                    >
-                        <el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.layout==='rowFormItem'&&activeData.type!==undefined"
-                                  label="布局模式"
-                    >
-                        <el-radio-group v-model="activeData.type">
-                            <el-radio-button label="default" />
-                            <el-radio-button label="flex" />
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
-                        <el-select v-model="activeData.justify" :style="{width: '100%'}" placeholder="请选择水平排列">
-                            <el-option
-                                v-for="(item, index) in justifyOptions"
-                                :key="index"
-                                :label="item.label"
-                                :value="item.value"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
-                        <el-radio-group v-model="activeData.align">
-                            <el-radio-button label="top" />
-                            <el-radio-button label="middle" />
-                            <el-radio-button label="bottom" />
-                        </el-radio-group>
-                    </el-form-item>
-                    <!--                    <el-form-item v-if="activeData.__config__.labelWidth!==undefined" label="标签宽度">-->
-                    <!--                        <el-input v-model.number="activeData.__config__.labelWidth" type="number"-->
-                    <!--                                  placeholder="请输入标签宽度"/>-->
-                    <!--                    </el-form-item>-->
-                    <!--                    <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">-->
-                    <!--                        <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable/>-->
-                    <!--                    </el-form-item>-->
-                    <el-form-item
-                        v-if="activeData.__vModel__!==undefined&&activeData.__config__.showDefaultValue!==false"
-                        label="默认值"
-                    >
-                        <el-input
-                            :value="setDefaultValue(activeData.__config__.defaultValue)"
-                            placeholder="请输入默认值"
-                            @input="onDefaultValueInput"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag==='el-checkbox-group'" label="至少应选">
-                        <el-input-number
-                            :min="0"
-                            :value="activeData.min"
-                            placeholder="至少应选"
-                            @input="$set(activeData, 'min', $event?$event:undefined)"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag==='el-checkbox-group'" label="最多可选">
-                        <el-input-number
-                            :min="0"
-                            :value="activeData.max"
-                            placeholder="最多可选"
-                            @input="$set(activeData, 'max', $event?$event:undefined)"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__slot__&&activeData.__slot__.prepend!==undefined" label="前缀">
-                        <el-input v-model="activeData.__slot__.prepend" placeholder="请输入前缀" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__slot__&&activeData.__slot__.append!==undefined" label="后缀">
-                        <el-input v-model="activeData.__slot__.append" placeholder="请输入后缀" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
-                        <el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
-                            <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
-                                选择
-                            </el-button>
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
-                        <el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
-                            <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
-                                选择
-                            </el-button>
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData['icon']!==undefined && activeData.__config__.tag === 'el-button'"
-                        label="按钮图标"
-                    >
-                        <el-input v-model="activeData['icon']" placeholder="请输入按钮图标名称">
-                            <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('icon')">
-                                选择
-                            </el-button>
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-cascader'" label="选项分隔符">
-                        <el-input v-model="activeData.separator" placeholder="请输入选项分隔符" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
-                        <el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
-                        <el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数" />
-                    </el-form-item>
-                    <el-form-item v-if="isShowMin" label="最小值">
-                        <el-input-number v-model="activeData.min" placeholder="最小值" />
-                    </el-form-item>
-                    <el-form-item v-if="isShowMax" label="最大值">
-                        <el-input-number v-model="activeData.max" placeholder="最大值" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.height!==undefined" label="组件高度">
-                        <el-input-number v-model="activeData.height" placeholder="高度" @input="changeRenderKey" />
-                    </el-form-item>
-                    <el-form-item v-if="isShowStep" label="步长">
-                        <el-input-number v-model="activeData.step" placeholder="步数" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-input-number'" label="精度">
-                        <el-input-number v-model="activeData.precision" :min="0" placeholder="精度" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-input-number'" label="按钮位置">
-                        <el-radio-group v-model="activeData['controls-position']">
-                            <el-radio-button label="">
-                                默认
-                            </el-radio-button>
-                            <el-radio-button label="right">
-                                右侧
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
-                        <el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
-                            <template slot="append">
-                                个字符
-                            </template>
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
-                        <el-input v-model="activeData['active-text']" placeholder="请输入开启提示" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
-                        <el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
-                        <el-input
-                            :value="setDefaultValue(activeData['active-value'])"
-                            placeholder="请输入开启值"
-                            @input="onSwitchValueInput($event, 'active-value')"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
-                        <el-input
-                            :value="setDefaultValue(activeData['inactive-value'])"
-                            placeholder="请输入关闭值"
-                            @input="onSwitchValueInput($event, 'inactive-value')"
-                        />
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.type !== undefined && 'el-date-picker' === activeData.__config__.tag"
-                        label="时间类型"
-                    >
-                        <el-select
-                            v-model="activeData.type"
-                            :style="{ width: '100%' }"
-                            placeholder="请选择时间类型"
-                            @change="dateTypeChange"
-                        >
-                            <el-option
-                                v-for="(item, index) in dateOptions"
-                                :key="index"
-                                :label="item.label"
-                                :value="item.value"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <!--          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">-->
-                    <!--            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />-->
-                    <!--          </el-form-item>-->
-                    <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
-                        <el-select
-                            v-model="activeData.accept"
-                            :style="{ width: '100%' }"
-                            clearable
-                            placeholder="请选择文件类型"
-                        >
-                            <el-option label="图片" value="image/*" />
-                            <el-option label="视频" value="video/*" />
-                            <el-option label="音频" value="audio/*" />
-                            <el-option label="excel" value=".xls,.xlsx" />
-                            <el-option label="word" value=".doc,.docx" />
-                            <el-option label="pdf" value=".pdf" />
-                            <el-option label="txt" value=".txt" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.fileSize !== undefined" label="文件大小">
-                        <el-input v-model.number="activeData.__config__.fileSize" placeholder="请输入文件大小">
-                            <el-select slot="append" v-model="activeData.__config__.sizeUnit"
-                                       :style="{ width: '66px' }"
-                            >
-                                <el-option label="KB" value="KB" />
-                                <el-option label="MB" value="MB" />
-                                <el-option label="GB" value="GB" />
-                            </el-select>
-                        </el-input>
-                    </el-form-item>
-                    <!--          <el-form-item v-if="activeData.action !== undefined" label="上传地址">-->
-                    <!--            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />-->
-                    <!--          </el-form-item>-->
-                    <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
-                        <el-radio-group v-model="activeData['list-type']" size="small">
-                            <el-radio-button label="text">
-                                text
-                            </el-radio-button>
-                            <el-radio-button label="picture">
-                                picture
-                            </el-radio-button>
-                            <el-radio-button label="picture-card">
-                                picture-card
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.type !== undefined && activeData.__config__.tag === 'el-button'"
-                        label="按钮类型"
-                    >
-                        <el-select v-model="activeData.type" :style="{ width: '100%' }">
-                            <el-option label="primary" value="primary" />
-                            <el-option label="success" value="success" />
-                            <el-option label="warning" value="warning" />
-                            <el-option label="danger" value="danger" />
-                            <el-option label="info" value="info" />
-                            <el-option label="text" value="text" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.__config__.buttonText !== undefined"
-                        v-show="'picture-card' !== activeData['list-type']"
-                        label="按钮文字"
-                    >
-                        <el-input v-model="activeData.__config__.buttonText" placeholder="请输入按钮文字" />
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.__config__.tag === 'el-button'"
-                        label="按钮文字"
+  <div class="right-board">
+    <el-tabs v-model="currentTab" class="center-tabs">
+      <el-tab-pane label="组件属性" name="field" />
+    </el-tabs>
+    <div class="field-box">
+      <el-scrollbar class="right-scrollbar">
+        <!-- 组件属性 -->
+        <el-form
+          v-show="currentTab === 'field' && showField"
+          label-width="90px"
+          size="small"
+        >
+          <el-form-item v-if="activeData.__config__.changeTag" label="组件类型">
+            <el-select
+              v-model="activeData.__config__.tagIcon"
+              :style="{ width: '100%' }"
+              placeholder="请选择组件类型"
+              @change="tagChange"
+            >
+              <el-option-group
+                v-for="group in tagList"
+                :key="group.label"
+                :label="group.label"
+              >
+                <el-option
+                  v-for="item in group.options"
+                  :key="item.__config__.label"
+                  :label="item.__config__.label"
+                  :value="item.__config__.tagIcon"
+                >
+                  <svg-icon :name="item.__config__.tagIcon" class="node-icon" />
+                  <!--                    <svg-icon class="node-icon" :icon-class="item.__config__.tagIcon" />-->
+                  <span>
+                    {{ item.__config__.label
+                    }}{{ item.__config__.tagIcon }}</span
+                  >
+                </el-option>
+              </el-option-group>
+            </el-select>
+          </el-form-item>
+          <!--          <el-form-item v-if="activeData.__vModel__!==undefined" label="字段名">-->
+          <!--            <el-input v-model="activeData.__vModel__" placeholder="请输入字段名（v-model）" />-->
+          <!--          </el-form-item>-->
+          <el-form-item
+            v-if="activeData.__config__.componentName !== undefined"
+            label="组件名"
+          >
+            {{ activeData.__config__.componentName }}
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__config__.label !== undefined &&
+              activeData.__config__.showLabel !== false
+            "
+            label="标题"
+          >
+            <el-input
+              v-model="activeData.__config__.label"
+              placeholder="请输入标题"
+              @input="changeRenderKey"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.placeholder !== undefined"
+            label="占位提示"
+          >
+            <el-input
+              v-model="activeData.placeholder"
+              placeholder="请输入占位提示"
+              @input="changeRenderKey"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['start-placeholder'] !== undefined"
+            label="开始占位"
+          >
+            <el-input
+              v-model="activeData['start-placeholder']"
+              placeholder="请输入占位提示"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['end-placeholder'] !== undefined"
+            label="结束占位"
+          >
+            <el-input
+              v-model="activeData['end-placeholder']"
+              placeholder="请输入占位提示"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.span !== undefined"
+            label="表单栅格"
+          >
+            <el-slider
+              v-model="activeData.__config__.span"
+              :marks="{ 12: '' }"
+              :max="24"
+              :min="1"
+              @change="spanChange"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__config__.layout === 'rowFormItem' &&
+              activeData.gutter !== undefined
+            "
+            label="栅格间隔"
+          >
+            <el-input-number
+              v-model="activeData.gutter"
+              :min="0"
+              placeholder="栅格间隔"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__config__.layout === 'rowFormItem' &&
+              activeData.type !== undefined
+            "
+            label="布局模式"
+          >
+            <el-radio-group v-model="activeData.type">
+              <el-radio-button label="default" />
+              <el-radio-button label="flex" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.justify !== undefined && activeData.type === 'flex'
+            "
+            label="水平排列"
+          >
+            <el-select
+              v-model="activeData.justify"
+              :style="{ width: '100%' }"
+              placeholder="请选择水平排列"
+            >
+              <el-option
+                v-for="(item, index) in justifyOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.align !== undefined && activeData.type === 'flex'"
+            label="垂直排列"
+          >
+            <el-radio-group v-model="activeData.align">
+              <el-radio-button label="top" />
+              <el-radio-button label="middle" />
+              <el-radio-button label="bottom" />
+            </el-radio-group>
+          </el-form-item>
+          <!--                    <el-form-item v-if="activeData.__config__.labelWidth!==undefined" label="标签宽度">-->
+          <!--                        <el-input v-model.number="activeData.__config__.labelWidth" type="number"-->
+          <!--                                  placeholder="请输入标签宽度"/>-->
+          <!--                    </el-form-item>-->
+          <!--                    <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">-->
+          <!--                        <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable/>-->
+          <!--                    </el-form-item>-->
+          <el-form-item
+            v-if="
+              activeData.__vModel__ !== undefined &&
+              activeData.__config__.showDefaultValue !== false
+            "
+            label="默认值"
+          >
+            <el-input
+              :value="setDefaultValue(activeData.__config__.defaultValue)"
+              placeholder="请输入默认值"
+              @input="onDefaultValueInput"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-checkbox-group'"
+            label="至少应选"
+          >
+            <el-input-number
+              :min="0"
+              :value="activeData.min"
+              placeholder="至少应选"
+              @input="$set(activeData, 'min', $event ? $event : undefined)"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-checkbox-group'"
+            label="最多可选"
+          >
+            <el-input-number
+              :min="0"
+              :value="activeData.max"
+              placeholder="最多可选"
+              @input="$set(activeData, 'max', $event ? $event : undefined)"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__slot__ && activeData.__slot__.prepend !== undefined
+            "
+            label="前缀"
+          >
+            <el-input
+              v-model="activeData.__slot__.prepend"
+              placeholder="请输入前缀"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__slot__ && activeData.__slot__.append !== undefined
+            "
+            label="后缀"
+          >
+            <el-input
+              v-model="activeData.__slot__.append"
+              placeholder="请输入后缀"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['prefix-icon'] !== undefined"
+            label="前图标"
+          >
+            <el-input
+              v-model="activeData['prefix-icon']"
+              placeholder="请输入前图标名称"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-thumb"
+                @click="openIconsDialog('prefix-icon')"
+              >
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['suffix-icon'] !== undefined"
+            label="后图标"
+          >
+            <el-input
+              v-model="activeData['suffix-icon']"
+              placeholder="请输入后图标名称"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-thumb"
+                @click="openIconsDialog('suffix-icon')"
+              >
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData['icon'] !== undefined &&
+              activeData.__config__.tag === 'el-button'
+            "
+            label="按钮图标"
+          >
+            <el-input
+              v-model="activeData['icon']"
+              placeholder="请输入按钮图标名称"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-thumb"
+                @click="openIconsDialog('icon')"
+              >
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-cascader'"
+            label="选项分隔符"
+          >
+            <el-input
+              v-model="activeData.separator"
+              placeholder="请输入选项分隔符"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.autosize !== undefined"
+            label="最小行数"
+          >
+            <el-input-number
+              v-model="activeData.autosize.minRows"
+              :min="1"
+              placeholder="最小行数"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.autosize !== undefined"
+            label="最大行数"
+          >
+            <el-input-number
+              v-model="activeData.autosize.maxRows"
+              :min="1"
+              placeholder="最大行数"
+            />
+          </el-form-item>
+          <el-form-item v-if="isShowMin" label="最小值">
+            <el-input-number v-model="activeData.min" placeholder="最小值" />
+          </el-form-item>
+          <el-form-item v-if="isShowMax" label="最大值">
+            <el-input-number v-model="activeData.max" placeholder="最大值" />
+          </el-form-item>
+          <el-form-item v-if="activeData.height !== undefined" label="组件高度">
+            <el-input-number
+              v-model="activeData.height"
+              placeholder="高度"
+              @input="changeRenderKey"
+            />
+          </el-form-item>
+          <el-form-item v-if="isShowStep" label="步长">
+            <el-input-number v-model="activeData.step" placeholder="步数" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-input-number'"
+            label="精度"
+          >
+            <el-input-number
+              v-model="activeData.precision"
+              :min="0"
+              placeholder="精度"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-input-number'"
+            label="按钮位置"
+          >
+            <el-radio-group v-model="activeData['controls-position']">
+              <el-radio-button label=""> 默认 </el-radio-button>
+              <el-radio-button label="right"> 右侧 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.maxlength !== undefined"
+            label="最多输入"
+          >
+            <el-input
+              v-model="activeData.maxlength"
+              placeholder="请输入字符长度"
+            >
+              <template slot="append"> 个字符 </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['active-text'] !== undefined"
+            label="开启提示"
+          >
+            <el-input
+              v-model="activeData['active-text']"
+              placeholder="请输入开启提示"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['inactive-text'] !== undefined"
+            label="关闭提示"
+          >
+            <el-input
+              v-model="activeData['inactive-text']"
+              placeholder="请输入关闭提示"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['active-value'] !== undefined"
+            label="开启值"
+          >
+            <el-input
+              :value="setDefaultValue(activeData['active-value'])"
+              placeholder="请输入开启值"
+              @input="onSwitchValueInput($event, 'active-value')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['inactive-value'] !== undefined"
+            label="关闭值"
+          >
+            <el-input
+              :value="setDefaultValue(activeData['inactive-value'])"
+              placeholder="请输入关闭值"
+              @input="onSwitchValueInput($event, 'inactive-value')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.type !== undefined &&
+              'el-date-picker' === activeData.__config__.tag
+            "
+            label="时间类型"
+          >
+            <el-select
+              v-model="activeData.type"
+              :style="{ width: '100%' }"
+              placeholder="请选择时间类型"
+              @change="dateTypeChange"
+            >
+              <el-option
+                v-for="(item, index) in dateOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!--          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">-->
+          <!--            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />-->
+          <!--          </el-form-item>-->
+          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
+            <el-select
+              v-model="activeData.accept"
+              :style="{ width: '100%' }"
+              clearable
+              placeholder="请选择文件类型"
+            >
+              <el-option label="图片" value="image/*" />
+              <el-option label="视频" value="video/*" />
+              <el-option label="音频" value="audio/*" />
+              <el-option label="excel" value=".xls,.xlsx" />
+              <el-option label="word" value=".doc,.docx" />
+              <el-option label="pdf" value=".pdf" />
+              <el-option label="txt" value=".txt" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.fileSize !== undefined"
+            label="文件大小"
+          >
+            <el-input
+              v-model.number="activeData.__config__.fileSize"
+              placeholder="请输入文件大小"
+            >
+              <el-select
+                slot="append"
+                v-model="activeData.__config__.sizeUnit"
+                :style="{ width: '66px' }"
+              >
+                <el-option label="KB" value="KB" />
+                <el-option label="MB" value="MB" />
+                <el-option label="GB" value="GB" />
+              </el-select>
+            </el-input>
+          </el-form-item>
+          <!--          <el-form-item v-if="activeData.action !== undefined" label="上传地址">-->
+          <!--            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />-->
+          <!--          </el-form-item>-->
+          <el-form-item
+            v-if="activeData['list-type'] !== undefined"
+            label="列表类型"
+          >
+            <el-radio-group v-model="activeData['list-type']" size="small">
+              <el-radio-button label="text"> text </el-radio-button>
+              <el-radio-button label="picture"> picture </el-radio-button>
+              <el-radio-button label="picture-card">
+                picture-card
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.type !== undefined &&
+              activeData.__config__.tag === 'el-button'
+            "
+            label="按钮类型"
+          >
+            <el-select v-model="activeData.type" :style="{ width: '100%' }">
+              <el-option label="primary" value="primary" />
+              <el-option label="success" value="success" />
+              <el-option label="warning" value="warning" />
+              <el-option label="danger" value="danger" />
+              <el-option label="info" value="info" />
+              <el-option label="text" value="text" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.buttonText !== undefined"
+            v-show="'picture-card' !== activeData['list-type']"
+            label="按钮文字"
+          >
+            <el-input
+              v-model="activeData.__config__.buttonText"
+              placeholder="请输入按钮文字"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-button'"
+            label="按钮文字"
+          >
+            <el-input
+              v-model="activeData.__slot__.default"
+              placeholder="请输入按钮文字"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['range-separator'] !== undefined"
+            label="分隔符"
+          >
+            <el-input
+              v-model="activeData['range-separator']"
+              placeholder="请输入分隔符"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['picker-options'] !== undefined"
+            label="时间段"
+          >
+            <el-input
+              v-model="activeData['picker-options'].selectableRange"
+              placeholder="请输入时间段"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
+            <el-input
+              :value="activeData.format"
+              placeholder="请输入时间格式"
+              @input="setTimeValue($event)"
+            />
+          </el-form-item>
+          <template
+            v-if="
+              ['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(
+                activeData.__config__.tag
+              ) > -1
+            "
+          >
+            <el-divider>选项</el-divider>
+            <draggable
+              :animation="340"
+              :list="activeData.__slot__.options"
+              group="selectItem"
+              handle=".option-drag"
+            >
+              <div
+                v-for="(item, index) in activeData.__slot__.options"
+                :key="index"
+                class="select-item"
+              >
+                <div class="select-line-icon option-drag">
+                  <i class="el-icon-s-operation" />
+                </div>
+                <el-input
+                  v-model="item.label"
+                  placeholder="选项名"
+                  size="small"
+                />
+                <!--                <el-input-->
+                <!--                  placeholder="选项值"-->
+                <!--                  size="small"-->
+                <!--                  :value="item.value"-->
+                <!--                  @input="setOptionValue(item, $event)"-->
+                <!--                />-->
+                <div
+                  class="close-btn select-line-icon"
+                  @click="activeData.__slot__.options.splice(index, 1)"
+                >
+                  <i class="el-icon-remove-outline" />
+                </div>
+              </div>
+            </draggable>
+            <div style="margin-left: 20px">
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                style="padding-bottom: 0"
+                type="text"
+                @click="addSelectItem"
+              >
+                添加选项
+              </el-button>
+              <el-button
+                icon="el-icon-document-copy"
+                style="padding-bottom: 0"
+                type="text"
+                @click="blukAddSelectItems"
+              >
+                批量贴入
+              </el-button>
+              <el-button
+                v-if="
+                  ['el-checkbox-group', 'el-radio-group'].indexOf(
+                    activeData.__config__.tag
+                  ) > -1
+                "
+                icon="el-icon-circle-plus-outline"
+                style="padding-bottom: 0"
+                type="text"
+                @click="addSelectOtherItem"
+              >
+                添加其他
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+
+          <template
+            v-if="['el-carousel'].indexOf(activeData.__config__.tag) > -1"
+          >
+            <el-divider>选项</el-divider>
+            <draggable
+              :animation="340"
+              :list="activeData.__slot__.options"
+              group="selectItem"
+              handle=".option-drag"
+            >
+              <div
+                v-for="(item, index) in activeData.__slot__.options"
+                :key="index"
+                class="select-item"
+              >
+                <div class="select-line-icon option-drag">
+                  <i class="el-icon-s-operation" />
+                </div>
+                <div class="width-full">
+                  <div class="flex-row">
+                    <el-input
+                      v-model="item.label"
+                      placeholder="选项名"
+                      size="small"
+                    />
+                    <div
+                      class="close-btn select-line-icon"
+                      @click="activeData.__slot__.options.splice(index, 1)"
                     >
-                        <el-input v-model="activeData.__slot__.default" placeholder="请输入按钮文字" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
-                        <el-input v-model="activeData['range-separator']" placeholder="请输入分隔符" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
-                        <el-input
-                            v-model="activeData['picker-options'].selectableRange"
-                            placeholder="请输入时间段"
-                        />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.format !== undefined" label="时间格式">
-                        <el-input
-                            :value="activeData.format"
-                            placeholder="请输入时间格式"
-                            @input="setTimeValue($event)"
-                        />
-                    </el-form-item>
-                    <template
-                        v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.__config__.tag) > -1"
+                      <i class="el-icon-remove-outline" />
+                    </div>
+                  </div>
+                  <div class="flex-row">
+                    <el-input
+                      v-model="item.image"
+                      placeholder="图片"
+                      size="small"
+                    />
+                    <el-upload
+                      ref="logoUpload"
+                      :action="getUploadUrl"
+                      :headers="getUploadHeader"
+                      :on-progress="uploadProgressHandle"
+                      :on-success="
+                        (response, file, fileList) => {
+                          item.image = response.data;
+                          $set(activeData.__slot__.options, index, item);
+                          closeUploadProgressHandle();
+                        }
+                      "
+                      :show-file-list="false"
+                      accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
+                      style="text-align: center"
                     >
-                        <el-divider>选项</el-divider>
-                        <draggable
-                            :animation="340"
-                            :list="activeData.__slot__.options"
-                            group="selectItem"
-                            handle=".option-drag"
-                        >
-                            <div v-for="(item, index) in activeData.__slot__.options" :key="index" class="select-item">
-                                <div class="select-line-icon option-drag">
-                                    <i class="el-icon-s-operation" />
-                                </div>
-                                <el-input v-model="item.label" placeholder="选项名" size="small" />
-                                <!--                <el-input-->
-                                <!--                  placeholder="选项值"-->
-                                <!--                  size="small"-->
-                                <!--                  :value="item.value"-->
-                                <!--                  @input="setOptionValue(item, $event)"-->
-                                <!--                />-->
-                                <div class="close-btn select-line-icon"
-                                     @click="activeData.__slot__.options.splice(index, 1)"
-                                >
-                                    <i class="el-icon-remove-outline" />
-                                </div>
-                            </div>
-                        </draggable>
-                        <div style="margin-left: 20px;">
-                            <el-button
-                                icon="el-icon-circle-plus-outline"
-                                style="padding-bottom: 0;"
-                                type="text"
-                                @click="addSelectItem"
-                            >
-                                添加选项
-                            </el-button>
-                            <el-button
-                                v-if="['el-checkbox-group', 'el-radio-group'].indexOf(activeData.__config__.tag) > -1"
-                                icon="el-icon-circle-plus-outline"
-                                style="padding-bottom: 0;"
-                                type="text"
-                                @click="addSelectOtherItem"
-                            >
-                                添加其他
-                            </el-button>
-                        </div>
-                        <el-divider />
-                    </template>
-
-                    <template
-                        v-if="['el-carousel'].indexOf(activeData.__config__.tag) > -1"
+                      <div slot="trigger" class="select-line-icon">
+                        <i class="el-icon-upload" />
+                      </div>
+                    </el-upload>
+                  </div>
+                </div>
+              </div>
+            </draggable>
+            <div style="margin-left: 20px">
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                style="padding-bottom: 0"
+                type="text"
+                @click="addImageCarouselItem"
+              >
+                添加选项
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+          <template
+            v-if="['image-select'].indexOf(activeData.__config__.tag) > -1"
+          >
+            <el-divider>选项</el-divider>
+            <draggable
+              :animation="340"
+              :list="activeData.options"
+              group="selectItem"
+              handle=".option-drag"
+            >
+              <div
+                v-for="(item, index) in activeData.options"
+                :key="index"
+                class="select-item"
+              >
+                <div class="select-line-icon option-drag">
+                  <i class="el-icon-s-operation" />
+                </div>
+                <div class="width-full">
+                  <div class="flex-row">
+                    <el-input
+                      v-model="item.label"
+                      placeholder="选项名"
+                      size="small"
+                    />
+                    <div
+                      class="close-btn select-line-icon"
+                      @click="activeData.options.splice(index, 1)"
                     >
-                        <el-divider>选项</el-divider>
-                        <draggable
-                            :animation="340"
-                            :list="activeData.__slot__.options"
-                            group="selectItem"
-                            handle=".option-drag"
-                        >
-                            <div v-for="(item, index) in activeData.__slot__.options" :key="index" class="select-item">
-                                <div class="select-line-icon option-drag">
-                                    <i class="el-icon-s-operation" />
-                                </div>
-                                <div class="width-full">
-                                    <div class="flex-row">
-                                        <el-input v-model="item.label" placeholder="选项名" size="small" />
-                                        <div class="close-btn select-line-icon"
-                                             @click="activeData.__slot__.options.splice(index, 1)"
-                                        >
-                                            <i class="el-icon-remove-outline" />
-                                        </div>
-                                    </div>
-                                    <div class="flex-row">
-                                        <el-input v-model="item.image" placeholder="图片" size="small" />
-                                        <el-upload
-                                            ref="logoUpload"
-                                            :action="getUploadUrl"
-                                            :headers="getUploadHeader"
-                                            :on-progress="uploadProgressHandle"
-                                            :on-success="(response, file, fileList)=>{
-                                                item.image = response.data
-                                                $set(activeData.__slot__.options,index,item)
-                                                closeUploadProgressHandle()
-                                            }"
-                                            :show-file-list="false"
-                                            accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                                            style="text-align: center;"
-                                        >
-                                            <div slot="trigger" class=" select-line-icon">
-                                                <i class="el-icon-upload" />
-                                            </div>
-                                        </el-upload>
-                                    </div>
-                                </div>
-                            </div>
-                        </draggable>
-                        <div style="margin-left: 20px;">
-                            <el-button
-                                icon="el-icon-circle-plus-outline"
-                                style="padding-bottom: 0;"
-                                type="text"
-                                @click="addImageCarouselItem "
-                            >
-                                添加选项
-                            </el-button>
-                        </div>
-                        <el-divider />
-                    </template>
-                    <template
-                        v-if="['image-select'].indexOf(activeData.__config__.tag) > -1"
+                      <i class="el-icon-remove-outline" />
+                    </div>
+                  </div>
+                  <div class="flex-row">
+                    <el-input
+                      v-model="item.image"
+                      placeholder="图片"
+                      size="small"
+                    />
+                    <el-upload
+                      ref="logoUpload"
+                      :action="getUploadUrl"
+                      :headers="getUploadHeader"
+                      :on-progress="uploadProgressHandle"
+                      :on-success="
+                        (response, file, fileList) => {
+                          item.image = response.data;
+                          $set(activeData.options, index, item);
+                          closeUploadProgressHandle();
+                        }
+                      "
+                      :show-file-list="false"
+                      accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
+                      style="text-align: center"
                     >
-                        <el-divider>选项</el-divider>
-                        <draggable
-                            :animation="340"
-                            :list="activeData.options"
-                            group="selectItem"
-                            handle=".option-drag"
-                        >
-                            <div v-for="(item, index) in activeData.options" :key="index" class="select-item">
-                                <div class="select-line-icon option-drag">
-                                    <i class="el-icon-s-operation" />
-                                </div>
-                                <div class="width-full">
-                                    <div class="flex-row">
-                                        <el-input v-model="item.label" placeholder="选项名" size="small" />
-                                        <div class="close-btn select-line-icon"
-                                             @click="activeData.options.splice(index, 1)"
-                                        >
-                                            <i class="el-icon-remove-outline" />
-                                        </div>
-                                    </div>
-                                    <div class="flex-row">
-                                        <el-input v-model="item.image" placeholder="图片" size="small" />
-                                        <el-upload
-                                            ref="logoUpload"
-                                            :action="getUploadUrl"
-                                            :headers="getUploadHeader"
-                                            :on-progress="uploadProgressHandle"
-                                            :on-success="(response, file, fileList)=>{
-                                                item.image = response.data
-                                                $set(activeData.options,index,item)
-                                                closeUploadProgressHandle()
-                                            }"
-                                            :show-file-list="false"
-                                            accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                                            style="text-align: center;"
-                                        >
-                                            <div slot="trigger" class=" select-line-icon">
-                                                <i class="el-icon-upload" />
-                                            </div>
-                                        </el-upload>
-                                    </div>
-                                </div>
-                            </div>
-                        </draggable>
-                        <div style="margin-left: 20px;">
-                            <el-button
-                                icon="el-icon-circle-plus-outline"
-                                style="padding-bottom: 0;"
-                                type="text"
-                                @click="addImageSelectItem"
-                            >
-                                添加选项
-                            </el-button>
-                        </div>
-                        <el-divider />
-                    </template>
-                    <template v-if="['el-cascader'].indexOf(activeData.__config__.tag) > -1">
-                        <el-divider>选项</el-divider>
-                        <!--            <el-form-item label="数据类型">-->
-                        <!--              <el-radio-group v-model="activeData.__config__.dataType" size="small">-->
-                        <!--                <el-radio-button label="dynamic">-->
-                        <!--                  动态数据-->
-                        <!--                </el-radio-button>-->
-                        <!--                <el-radio-button label="static">-->
-                        <!--                  静态数据-->
-                        <!--                </el-radio-button>-->
-                        <!--              </el-radio-group>-->
-                        <!--            </el-form-item>-->
-
-                        <!--            <template v-if="activeData.__config__.dataType === 'dynamic'">-->
-                        <!--              <el-form-item label="接口地址">-->
-                        <!--                <el-input-->
-                        <!--                  v-model="activeData.__config__.url"-->
-                        <!--                  :title="activeData.__config__.url"-->
-                        <!--                  placeholder="请输入接口地址"-->
-                        <!--                  clearable-->
-                        <!--                >-->
-                        <!--                  <el-select-->
-                        <!--                    slot="prepend"-->
-                        <!--                    v-model="activeData.__config__.method"-->
-                        <!--                    :style="{width: '85px'}"-->
-                        <!--                  >-->
-                        <!--                    <el-option label="get" value="get" />-->
-                        <!--                    <el-option label="post" value="post" />-->
-                        <!--                    <el-option label="put" value="put" />-->
-                        <!--                    <el-option label="delete" value="delete" />-->
-                        <!--                  </el-select>-->
-                        <!--                </el-input>-->
-                        <!--              </el-form-item>-->
-                        <!--              <el-form-item label="数据位置">-->
-                        <!--                <el-input v-model="activeData.__config__.dataKey" placeholder="请输入标签键名" />-->
-                        <!--              </el-form-item>-->
-                        <!--              <el-form-item label="标签键名">-->
-                        <!--                <el-input v-model="activeData.props.props.label" placeholder="请输入标签键名" />-->
-                        <!--              </el-form-item>-->
-                        <!--              <el-form-item label="值键名">-->
-                        <!--                <el-input v-model="activeData.props.props.value" placeholder="请输入值键名" />-->
-                        <!--              </el-form-item>-->
-                        <!--              <el-form-item label="子级键名">-->
-                        <!--                <el-input v-model="activeData.props.props.children" placeholder="请输入子级键名" />-->
-                        <!--              </el-form-item>-->
-                        <!--            </template>-->
+                      <div slot="trigger" class="select-line-icon">
+                        <i class="el-icon-upload" />
+                      </div>
+                    </el-upload>
+                  </div>
+                </div>
+              </div>
+            </draggable>
+            <div style="margin-left: 20px">
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                style="padding-bottom: 0"
+                type="text"
+                @click="addImageSelectItem"
+              >
+                添加选项
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+          <template
+            v-if="['el-cascader'].indexOf(activeData.__config__.tag) > -1"
+          >
+            <el-divider>选项</el-divider>
+            <!--            <el-form-item label="数据类型">-->
+            <!--              <el-radio-group v-model="activeData.__config__.dataType" size="small">-->
+            <!--                <el-radio-button label="dynamic">-->
+            <!--                  动态数据-->
+            <!--                </el-radio-button>-->
+            <!--                <el-radio-button label="static">-->
+            <!--                  静态数据-->
+            <!--                </el-radio-button>-->
+            <!--              </el-radio-group>-->
+            <!--            </el-form-item>-->
 
-                        <!-- 级联选择静态树 -->
-                        <el-tree
-                            v-if="activeData.__config__.dataType === 'static'"
-                            :data="activeData.options"
-                            :expand-on-click-node="false"
-                            :render-content="renderContent"
-                            draggable="true"
-                            node-key="id"
-                        />
-                        <div v-if="activeData.__config__.dataType === 'static'" style="margin-left: 20px;">
-                            <el-button
-                                icon="el-icon-circle-plus-outline"
-                                style="padding-bottom: 0;"
-                                type="text"
-                                @click="addTreeItem"
-                            >
-                                添加父级
-                            </el-button>
-                        </div>
-                        <el-divider />
-                    </template>
+            <!--            <template v-if="activeData.__config__.dataType === 'dynamic'">-->
+            <!--              <el-form-item label="接口地址">-->
+            <!--                <el-input-->
+            <!--                  v-model="activeData.__config__.url"-->
+            <!--                  :title="activeData.__config__.url"-->
+            <!--                  placeholder="请输入接口地址"-->
+            <!--                  clearable-->
+            <!--                >-->
+            <!--                  <el-select-->
+            <!--                    slot="prepend"-->
+            <!--                    v-model="activeData.__config__.method"-->
+            <!--                    :style="{width: '85px'}"-->
+            <!--                  >-->
+            <!--                    <el-option label="get" value="get" />-->
+            <!--                    <el-option label="post" value="post" />-->
+            <!--                    <el-option label="put" value="put" />-->
+            <!--                    <el-option label="delete" value="delete" />-->
+            <!--                  </el-select>-->
+            <!--                </el-input>-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="数据位置">-->
+            <!--                <el-input v-model="activeData.__config__.dataKey" placeholder="请输入标签键名" />-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="标签键名">-->
+            <!--                <el-input v-model="activeData.props.props.label" placeholder="请输入标签键名" />-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="值键名">-->
+            <!--                <el-input v-model="activeData.props.props.value" placeholder="请输入值键名" />-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="子级键名">-->
+            <!--                <el-input v-model="activeData.props.props.children" placeholder="请输入子级键名" />-->
+            <!--              </el-form-item>-->
+            <!--            </template>-->
 
-                    <el-form-item v-if="activeData.__config__.optionType !== undefined" label="选项样式">
-                        <el-radio-group v-model="activeData.__config__.optionType">
-                            <el-radio-button label="default">
-                                默认
-                            </el-radio-button>
-                            <el-radio-button label="button">
-                                按钮
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
-                        <el-color-picker v-model="activeData['active-color']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
-                        <el-color-picker v-model="activeData['inactive-color']" />
-                    </el-form-item>
+            <!-- 级联选择静态树 -->
+            <el-tree
+              v-if="activeData.__config__.dataType === 'static'"
+              :data="activeData.options"
+              :expand-on-click-node="false"
+              :render-content="renderContent"
+              draggable="true"
+              node-key="id"
+            />
+            <div
+              v-if="activeData.__config__.dataType === 'static'"
+              style="margin-left: 20px"
+            >
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                style="padding-bottom: 0"
+                type="text"
+                @click="addTreeItem"
+              >
+                添加父级
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
 
-                    <el-form-item v-if="activeData.__config__.showLabel !== undefined
-                        && activeData.__config__.labelWidth !== undefined" label="显示标签"
-                    >
-                        <el-switch v-model="activeData.__config__.showLabel" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.branding !== undefined" label="品牌烙印">
-                        <el-switch v-model="activeData.branding" @input="changeRenderKey" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
-                        <el-switch v-model="activeData['allow-half']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
-                        <el-switch v-model="activeData['show-text']" @change="rateTextChange" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
-                        <el-switch v-model="activeData['show-score']" @change="rateScoreChange" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
-                        <el-switch v-model="activeData['show-stops']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.range !== undefined" label="范围选择">
-                        <el-switch v-model="activeData.range" @change="rangeChange" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-color-picker'" label="颜色格式">
-                        <el-select
-                            v-model="activeData['color-format']"
-                            :style="{ width: '100%' }"
-                            clearable
-                            placeholder="请选择颜色格式"
-                            @change="colorFormatChange"
-                        >
-                            <el-option
-                                v-for="(item, index) in colorFormatOptions"
-                                :key="index"
-                                :label="item.label"
-                                :value="item.value"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.size !== undefined &&
-                            (
-                                activeData.__config__.border ||
-                                activeData.__config__.tag === 'el-color-picker' ||
-                                activeData.__config__.tag === 'el-button')"
-                        label="组件尺寸"
-                    >
-                        <el-radio-group v-model="activeData.size">
-                            <el-radio-button label="medium">
-                                中等
-                            </el-radio-button>
-                            <el-radio-button label="small">
-                                较小
-                            </el-radio-button>
-                            <el-radio-button label="mini">
-                                迷你
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
-                        <el-switch v-model="activeData['show-word-limit']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-input-number'" label="严格步数">
-                        <el-switch v-model="activeData['step-strictly']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-cascader'" label="任选层级">
-                        <el-switch v-model="activeData.props.props.checkStrictly" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-cascader'" label="是否多选">
-                        <el-switch v-model="activeData.props.props.multiple" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-cascader'" label="展示全路径">
-                        <el-switch v-model="activeData['show-all-levels']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-cascader'" label="可否筛选">
-                        <el-switch v-model="activeData.filterable" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
-                        <el-switch v-model="activeData.clearable" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.showTip !== undefined" label="显示提示">
-                        <el-switch v-model="activeData.__config__.showTip" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-upload'" label="多选文件">
-                        <el-switch v-model="activeData.multiple" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-upload'" label="文件个数">
-                        <el-input-number v-model="activeData.limit" />
-                    </el-form-item>
-                    <!--          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">-->
-                    <!--            <el-switch v-model="activeData['auto-upload']" />-->
-                    <!--          </el-form-item>-->
-                    <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
-                        <el-switch v-model="activeData.readonly" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
-                        <el-switch v-model="activeData.disabled" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-select'" label="能否搜索">
-                        <el-switch v-model="activeData.filterable" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-select'" label="是否多选">
-                        <el-switch v-model="activeData.multiple" @change="multipleChange" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['color'] !== undefined" label="颜色">
-                        <el-color-picker v-model="activeData['color']" />
-                    </el-form-item>
-                    <el-form-item v-if="activeData['textAlign'] !== undefined" label="对齐方式">
-                        <el-radio-group v-model="activeData.textAlign">
-                            <el-radio-button label="left">
-                                左对齐
-                            </el-radio-button>
-                            <el-radio-button label="center">
-                                居中
-                            </el-radio-button>
-                            <el-radio-button label="right">
-                                右对齐
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item v-if="activeData.__config__.tag === 'el-image'" label="图片地址">
-                        <el-input v-model="activeData.src" placeholder="请输入图片url地址" />
-                        <el-upload
-                            ref="logoUpload"
-                            :action="getUploadUrl"
-                            :headers="getUploadHeader"
-                            :on-progress="uploadProgressHandle"
-                            :on-success="(response, file, fileList)=>{
-                                activeData.src = response.data
-                                closeUploadProgressHandle()
-                            }"
-                            :show-file-list="false"
-                            accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                            style="text-align: center;"
-                        >
-                            <el-button slot="trigger" size="small" type="text">点击上传图片 *</el-button>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item
-                        v-if="activeData.__config__.required !== undefined&&activeData.__config__.showRequired!==false"
-                        label="是否必填"
-                    >
-                        <el-switch v-model="activeData.__config__.required" />
-                    </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.optionType !== undefined"
+            label="选项样式"
+          >
+            <el-radio-group v-model="activeData.__config__.optionType">
+              <el-radio-button label="default"> 默认 </el-radio-button>
+              <el-radio-button label="button"> 按钮 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['active-color'] !== undefined"
+            label="开启颜色"
+          >
+            <el-color-picker v-model="activeData['active-color']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['inactive-color'] !== undefined"
+            label="关闭颜色"
+          >
+            <el-color-picker v-model="activeData['inactive-color']" />
+          </el-form-item>
 
-                    <template v-if="activeData.__config__.layoutTree">
-                        <el-divider>布局结构树</el-divider>
-                        <el-tree
-                            :data="[activeData.__config__]"
-                            :props="layoutTreeProps"
-                            default-expand-all
-                            draggable="true"
-                            node-key="renderKey"
-                        >
-                            <span slot-scope="{ node, data }">
-                                <span class="node-label">
-                                    <svg-icon :name="data.__config__?data.__config__.tagIcon:data.tagIcon"
-                                              class="node-icon"
-                                    />
-                                    {{ node.label }}
-                                </span>
-                            </span>
-                        </el-tree>
-                    </template>
+          <el-form-item
+            v-if="
+              activeData.__config__.showLabel !== undefined &&
+              activeData.__config__.labelWidth !== undefined
+            "
+            label="显示标签"
+          >
+            <el-switch v-model="activeData.__config__.showLabel" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.branding !== undefined"
+            label="品牌烙印"
+          >
+            <el-switch v-model="activeData.branding" @input="changeRenderKey" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['allow-half'] !== undefined"
+            label="允许半选"
+          >
+            <el-switch v-model="activeData['allow-half']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['show-text'] !== undefined"
+            label="辅助文字"
+          >
+            <el-switch
+              v-model="activeData['show-text']"
+              @change="rateTextChange"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['show-score'] !== undefined"
+            label="显示分数"
+          >
+            <el-switch
+              v-model="activeData['show-score']"
+              @change="rateScoreChange"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['show-stops'] !== undefined"
+            label="显示间断点"
+          >
+            <el-switch v-model="activeData['show-stops']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
+            <el-switch v-model="activeData.range" @change="rangeChange" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-color-picker'"
+            label="颜色格式"
+          >
+            <el-select
+              v-model="activeData['color-format']"
+              :style="{ width: '100%' }"
+              clearable
+              placeholder="请选择颜色格式"
+              @change="colorFormatChange"
+            >
+              <el-option
+                v-for="(item, index) in colorFormatOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.size !== undefined &&
+              (activeData.__config__.border ||
+                activeData.__config__.tag === 'el-color-picker' ||
+                activeData.__config__.tag === 'el-button')
+            "
+            label="组件尺寸"
+          >
+            <el-radio-group v-model="activeData.size">
+              <el-radio-button label="medium"> 中等 </el-radio-button>
+              <el-radio-button label="small"> 较小 </el-radio-button>
+              <el-radio-button label="mini"> 迷你 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['show-word-limit'] !== undefined"
+            label="输入统计"
+          >
+            <el-switch v-model="activeData['show-word-limit']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-input-number'"
+            label="严格步数"
+          >
+            <el-switch v-model="activeData['step-strictly']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-cascader'"
+            label="任选层级"
+          >
+            <el-switch v-model="activeData.props.props.checkStrictly" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-cascader'"
+            label="是否多选"
+          >
+            <el-switch v-model="activeData.props.props.multiple" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-cascader'"
+            label="展示全路径"
+          >
+            <el-switch v-model="activeData['show-all-levels']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-cascader'"
+            label="可否筛选"
+          >
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.clearable !== undefined"
+            label="能否清空"
+          >
+            <el-switch v-model="activeData.clearable" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.showTip !== undefined"
+            label="显示提示"
+          >
+            <el-switch v-model="activeData.__config__.showTip" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-upload'"
+            label="多选文件"
+          >
+            <el-switch v-model="activeData.multiple" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-upload'"
+            label="文件个数"
+          >
+            <el-input-number v-model="activeData.limit" />
+          </el-form-item>
+          <!--          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">-->
+          <!--            <el-switch v-model="activeData['auto-upload']" />-->
+          <!--          </el-form-item>-->
+          <el-form-item
+            v-if="activeData.readonly !== undefined"
+            label="是否只读"
+          >
+            <el-switch v-model="activeData.readonly" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.disabled !== undefined"
+            label="是否禁用"
+          >
+            <el-switch v-model="activeData.disabled" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-select'"
+            label="能否搜索"
+          >
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-select'"
+            label="是否多选"
+          >
+            <el-switch v-model="activeData.multiple" @change="multipleChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData['color'] !== undefined" label="颜色">
+            <el-color-picker v-model="activeData['color']" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData['textAlign'] !== undefined"
+            label="对齐方式"
+          >
+            <el-radio-group v-model="activeData.textAlign">
+              <el-radio-button label="left"> 左对齐 </el-radio-button>
+              <el-radio-button label="center"> 居中 </el-radio-button>
+              <el-radio-button label="right"> 右对齐 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.__config__.tag === 'el-image'"
+            label="图片地址"
+          >
+            <el-input
+              v-model="activeData.src"
+              placeholder="请输入图片url地址"
+            />
+            <el-upload
+              ref="logoUpload"
+              :action="getUploadUrl"
+              :headers="getUploadHeader"
+              :on-progress="uploadProgressHandle"
+              :on-success="
+                (response, file, fileList) => {
+                  activeData.src = response.data;
+                  closeUploadProgressHandle();
+                }
+              "
+              :show-file-list="false"
+              accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
+              style="text-align: center"
+            >
+              <el-button slot="trigger" size="small" type="text"
+                >点击上传图片 *</el-button
+              >
+            </el-upload>
+          </el-form-item>
+          <el-form-item
+            v-if="
+              activeData.__config__.required !== undefined &&
+              activeData.__config__.showRequired !== false
+            "
+            label="是否必填"
+          >
+            <el-switch v-model="activeData.__config__.required" />
+          </el-form-item>
 
-                    <template
-                        v-if="Array.isArray(activeData.__config__.regList)&&activeData.__config__.showRegList!==false"
-                    >
-                        <el-divider>正则校验</el-divider>
-                        <div
-                            v-for="(item, index) in activeData.__config__.regList"
-                            :key="index"
-                            class="reg-item"
-                        >
-                            <span class="close-btn" @click="activeData.__config__.regList.splice(index, 1)">
-                                <i class="el-icon-close" />
-                            </span>
-                            <el-form-item label="表达式">
-                                <el-input v-model="item.pattern" placeholder="请输入正则" />
-                            </el-form-item>
-                            <el-form-item label="错误提示" style="margin-bottom: 0;">
-                                <el-input v-model="item.message" placeholder="请输入错误提示" />
-                            </el-form-item>
-                        </div>
-                        <div style="margin-left: 20px;">
-                            <el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
-                                添加规则
-                            </el-button>
-                        </div>
-                    </template>
-                </el-form>
-                <el-form v-show="currentTab === 'form'" label-width="90px" size="small">
-                    <el-form-item label="表单名">
-                        <el-input v-model="formConf.formRef" placeholder="请输入表单名（ref）" />
-                    </el-form-item>
-                    <el-form-item label="表单模型">
-                        <el-input v-model="formConf.formModel" placeholder="请输入数据模型" />
-                    </el-form-item>
-                    <el-form-item label="校验模型">
-                        <el-input v-model="formConf.formRules" placeholder="请输入校验模型" />
-                    </el-form-item>
-                    <el-form-item label="表单尺寸">
-                        <el-radio-group v-model="formConf.size">
-                            <el-radio-button label="medium">
-                                中等
-                            </el-radio-button>
-                            <el-radio-button label="small">
-                                较小
-                            </el-radio-button>
-                            <el-radio-button label="mini">
-                                迷你
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="标签对齐">
-                        <el-radio-group v-model="formConf.labelPosition">
-                            <el-radio-button label="left">
-                                左对齐
-                            </el-radio-button>
-                            <el-radio-button label="right">
-                                右对齐
-                            </el-radio-button>
-                            <el-radio-button label="top">
-                                顶部对齐
-                            </el-radio-button>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="标签宽度">
-                        <el-input v-model.number="formConf.labelWidth" placeholder="请输入标签宽度" type="number" />
-                    </el-form-item>
-                    <el-form-item label="栅格间隔">
-                        <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
-                    </el-form-item>
-                    <el-form-item label="禁用表单">
-                        <el-switch v-model="formConf.disabled" />
-                    </el-form-item>
-                    <el-form-item label="表单按钮">
-                        <el-switch v-model="formConf.formBtns" />
-                    </el-form-item>
-                    <el-form-item label="显示未选中组件边框">
-                        <el-switch v-model="formConf.unFocusedComponentBorder" />
-                    </el-form-item>
-                </el-form>
-            </el-scrollbar>
-        </div>
+          <template v-if="activeData.__config__.layoutTree">
+            <el-divider>布局结构树</el-divider>
+            <el-tree
+              :data="[activeData.__config__]"
+              :props="layoutTreeProps"
+              default-expand-all
+              draggable="true"
+              node-key="renderKey"
+            >
+              <span slot-scope="{ node, data }">
+                <span class="node-label">
+                  <svg-icon
+                    :name="
+                      data.__config__ ? data.__config__.tagIcon : data.tagIcon
+                    "
+                    class="node-icon"
+                  />
+                  {{ node.label }}
+                </span>
+              </span>
+            </el-tree>
+          </template>
 
-        <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
-        <icons-dialog :current="activeData[currentIconModel]" :visible.sync="iconsVisible" @select="setIcon" />
+          <template
+            v-if="
+              Array.isArray(activeData.__config__.regList) &&
+              activeData.__config__.showRegList !== false
+            "
+          >
+            <el-divider>正则校验</el-divider>
+            <div
+              v-for="(item, index) in activeData.__config__.regList"
+              :key="index"
+              class="reg-item"
+            >
+              <span
+                class="close-btn"
+                @click="activeData.__config__.regList.splice(index, 1)"
+              >
+                <i class="el-icon-close" />
+              </span>
+              <el-form-item label="表达式">
+                <el-input v-model="item.pattern" placeholder="请输入正则" />
+              </el-form-item>
+              <el-form-item label="错误提示" style="margin-bottom: 0">
+                <el-input v-model="item.message" placeholder="请输入错误提示" />
+              </el-form-item>
+            </div>
+            <div style="margin-left: 20px">
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addReg"
+              >
+                添加规则
+              </el-button>
+            </div>
+          </template>
+        </el-form>
+        <el-form v-show="currentTab === 'form'" label-width="90px" size="small">
+          <el-form-item label="表单名">
+            <el-input
+              v-model="formConf.formRef"
+              placeholder="请输入表单名（ref）"
+            />
+          </el-form-item>
+          <el-form-item label="表单模型">
+            <el-input
+              v-model="formConf.formModel"
+              placeholder="请输入数据模型"
+            />
+          </el-form-item>
+          <el-form-item label="校验模型">
+            <el-input
+              v-model="formConf.formRules"
+              placeholder="请输入校验模型"
+            />
+          </el-form-item>
+          <el-form-item label="表单尺寸">
+            <el-radio-group v-model="formConf.size">
+              <el-radio-button label="medium"> 中等 </el-radio-button>
+              <el-radio-button label="small"> 较小 </el-radio-button>
+              <el-radio-button label="mini"> 迷你 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签对齐">
+            <el-radio-group v-model="formConf.labelPosition">
+              <el-radio-button label="left"> 左对齐 </el-radio-button>
+              <el-radio-button label="right"> 右对齐 </el-radio-button>
+              <el-radio-button label="top"> 顶部对齐 </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签宽度">
+            <el-input
+              v-model.number="formConf.labelWidth"
+              placeholder="请输入标签宽度"
+              type="number"
+            />
+          </el-form-item>
+          <el-form-item label="栅格间隔">
+            <el-input-number
+              v-model="formConf.gutter"
+              :min="0"
+              placeholder="栅格间隔"
+            />
+          </el-form-item>
+          <el-form-item label="禁用表单">
+            <el-switch v-model="formConf.disabled" />
+          </el-form-item>
+          <el-form-item label="表单按钮">
+            <el-switch v-model="formConf.formBtns" />
+          </el-form-item>
+          <el-form-item label="显示未选中组件边框">
+            <el-switch v-model="formConf.unFocusedComponentBorder" />
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
     </div>
+
+    <treeNode-dialog
+      :visible.sync="dialogVisible"
+      title="添加选项"
+      @commit="addNode"
+    />
+    <icons-dialog
+      :current="activeData[currentIconModel]"
+      :visible.sync="iconsVisible"
+      @select="setIcon"
+    />
+  </div>
 </template>
 
 <script>
-import {isArray} from 'util'
-import TreeNodeDialog from '@/views/form/editor/TreeNodeDialog'
-import {isNumberStr} from '@/utils'
-import IconsDialog from './IconsDialog'
-import {imageComponents, inputComponents, selectComponents} from '@/components/generator/config'
-import {saveFormConf} from '@/utils/db'
-import {debounce} from 'throttle-debounce'
-import draggable from 'vuedraggable'
-import _ from 'lodash'
+import { isArray } from "util";
+import TreeNodeDialog from "@/views/form/editor/TreeNodeDialog";
+import { isNumberStr } from "@/utils";
+import IconsDialog from "./IconsDialog";
+import {
+  imageComponents,
+  inputComponents,
+  selectComponents,
+} from "@/components/generator/config";
+import { saveFormConf } from "@/utils/db";
+import { debounce } from "throttle-debounce";
+import draggable from "vuedraggable";
+import _ from "lodash";
 
 const dateTimeFormat = {
-    date: 'yyyy-MM-dd',
-    week: 'yyyy 第 WW 周',
-    month: 'yyyy-MM',
-    year: 'yyyy',
-    datetime: 'yyyy-MM-dd HH:mm:ss',
-    daterange: 'yyyy-MM-dd',
-    monthrange: 'yyyy-MM',
-    datetimerange: 'yyyy-MM-dd HH:mm:ss'
-}
+  date: "yyyy-MM-dd",
+  week: "yyyy 第 WW 周",
+  month: "yyyy-MM",
+  year: "yyyy",
+  datetime: "yyyy-MM-dd HH:mm:ss",
+  daterange: "yyyy-MM-dd",
+  monthrange: "yyyy-MM",
+  datetimerange: "yyyy-MM-dd HH:mm:ss",
+};
 
 // 使changeRenderKey在目标组件改变时可用
-const needRerenderList = ['tinymce']
+const needRerenderList = ["tinymce"];
 
 export default {
-    components: {
-        TreeNodeDialog,
-        draggable,
-        IconsDialog
-    },
-    props: ['showField', 'activeData', 'formConf'],
-    data() {
-        return {
-            loading: null,
-            currentTab: 'field',
-            currentNode: null,
-            dialogVisible: false,
-            iconsVisible: false,
-            currentIconModel: null,
-            dateTypeOptions: [
-                {
-                    label: '日(date)',
-                    value: 'date'
-                },
-                {
-                    label: '周(week)',
-                    value: 'week'
-                },
-                {
-                    label: '月(month)',
-                    value: 'month'
-                },
-                {
-                    label: '年(year)',
-                    value: 'year'
-                },
-                {
-                    label: '日期时间(datetime)',
-                    value: 'datetime'
-                }
-            ],
-            dateRangeTypeOptions: [
-                {
-                    label: '日期范围(daterange)',
-                    value: 'daterange'
-                },
-                {
-                    label: '月范围(monthrange)',
-                    value: 'monthrange'
-                },
-                {
-                    label: '日期时间范围(datetimerange)',
-                    value: 'datetimerange'
-                }
-            ],
-            colorFormatOptions: [
-                {
-                    label: 'hex',
-                    value: 'hex'
-                },
-                {
-                    label: 'rgb',
-                    value: 'rgb'
-                },
-                {
-                    label: 'rgba',
-                    value: 'rgba'
-                },
-                {
-                    label: 'hsv',
-                    value: 'hsv'
-                },
-                {
-                    label: 'hsl',
-                    value: 'hsl'
-                }
-            ],
-            justifyOptions: [
-                {
-                    label: 'start',
-                    value: 'start'
-                },
-                {
-                    label: 'end',
-                    value: 'end'
-                },
-                {
-                    label: 'center',
-                    value: 'center'
-                },
-                {
-                    label: 'space-around',
-                    value: 'space-around'
-                },
-                {
-                    label: 'space-between',
-                    value: 'space-between'
-                }
-            ],
-            layoutTreeProps: {
-                label(data, node) {
-                    const config = data.__config__
-                    return data.componentName || `${config.label}: ${data.__vModel__}`
-                }
-            }
-        }
-    },
-    computed: {
-        dateOptions() {
-            if (
-                this.activeData.type !== undefined
-                && this.activeData.__config__.tag === 'el-date-picker'
-            ) {
-                if (this.activeData['start-placeholder'] === undefined) {
-                    return this.dateTypeOptions
-                }
-                return this.dateRangeTypeOptions
-            }
-            return []
-        },
-        tagList() {
-            return [
-                {
-                    label: '输入型组件',
-                    options: inputComponents
-                },
-                {
-                    label: '图片型组件',
-                    options: imageComponents
-                },
-                {
-                    label: '选择型组件',
-                    options: selectComponents
-                }
-            ]
+  components: {
+    TreeNodeDialog,
+    draggable,
+    IconsDialog,
+  },
+  props: ["showField", "activeData", "formConf"],
+  data() {
+    return {
+      loading: null,
+      currentTab: "field",
+      currentNode: null,
+      dialogVisible: false,
+      iconsVisible: false,
+      currentIconModel: null,
+      dateTypeOptions: [
+        {
+          label: "日(date)",
+          value: "date",
         },
-        activeTag() {
-            return this.activeData.__config__.tag
+        {
+          label: "周(week)",
+          value: "week",
         },
-        isShowMin() {
-            return ['el-input-number', 'el-slider'].indexOf(this.activeTag) > -1
+        {
+          label: "月(month)",
+          value: "month",
         },
-        isShowMax() {
-            return ['el-input-number', 'el-slider', 'el-rate'].indexOf(this.activeTag) > -1
+        {
+          label: "年(year)",
+          value: "year",
         },
-        isShowStep() {
-            return ['el-input-number', 'el-slider'].indexOf(this.activeTag) > -1
+        {
+          label: "日期时间(datetime)",
+          value: "datetime",
         },
-        getUploadHeader() {
-            return {
-                'token': this.$store.getters['user/isLogin']
-            }
+      ],
+      dateRangeTypeOptions: [
+        {
+          label: "日期范围(daterange)",
+          value: "daterange",
         },
-        getUploadUrl() {
-            return `${process.env.VUE_APP_API_ROOT}/user/file/upload`
-        }
-    },
-    watch: {
-        formConf: {
-            handler(val) {
-                saveFormConf(val)
-            },
-            deep: true
+        {
+          label: "月范围(monthrange)",
+          value: "monthrange",
         },
-        activeData: {
-            handler(newValue, oldValue) {
-                // 切换选中时不触发
-                if (newValue.__config__.formId === oldValue.__config__.formId) {
-                    if (newValue) {
-                        this.dataChange(newValue)
-                    }
-                }
-            },
-            deep: true
-        }
-    },
-    methods: {
-        addReg() {
-            this.activeData.__config__.regList.push({
-                pattern: '',
-                message: ''
-            })
-        },
-        addSelectItem() {
-            let lastItem = _.last(this.activeData.__slot__.options)
-            this.activeData.__slot__.options.push({
-                label: '',
-                value: lastItem ? lastItem.value + 1 : 1
-            })
-        },
-        addImageSelectItem() {
-            let lastItem = _.last(this.activeData.options)
-            this.activeData.options.push({
-                label: '',
-                image: '',
-                value: lastItem ? lastItem.value + 1 : 1
-            })
-        },
-        addImageCarouselItem() {
-            let lastItem = _.last(this.activeData.__slot__.options)
-            this.activeData.__slot__.options.push({
-                label: '',
-                image: '',
-                value: lastItem ? lastItem.value + 1 : 1
-            })
-        },
-        addSelectOtherItem() {
-            let item = this.activeData.__slot__.options.find(item => {
-                return item.value == 0
-            })
-            if (item) {
-                return
-            }
-            this.activeData.__slot__.options.push({
-                label: '其他',
-                value: 0
-            })
-        },
-        uploadProgressHandle() {
-            this.loading = this.$loading({
-                lock: true,
-                text: '上传中',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            })
-        },
-        closeUploadProgressHandle() {
-            setTimeout(() => {
-                this.loading.close()
-            }, 100)
-        },
-        addTreeItem() {
-            ++this.idGlobal
-            this.dialogVisible = true
-            this.currentNode = this.activeData.options
-        },
-        renderContent(h, {node, data, store}) {
-            return (
-                <div class="custom-tree-node">
-                    <span>{node.label}</span>
-                    <span class="node-operation">
-                        <i on-click={() => this.append(data)}
-                            class="el-icon-plus"
-                            title="添加"
-                        ></i>
-                        <i on-click={() => this.remove(node, data)}
-                            class="el-icon-delete"
-                            title="删除"
-                        ></i>
-                    </span>
-                </div>
-            )
+        {
+          label: "日期时间范围(datetimerange)",
+          value: "datetimerange",
         },
-        append(data) {
-            if (!data.children) {
-                this.$set(data, 'children', [])
-            }
-            this.dialogVisible = true
-            this.currentNode = data.children
+      ],
+      colorFormatOptions: [
+        {
+          label: "hex",
+          value: "hex",
         },
-        remove(node, data) {
-            this.activeData.__config__.defaultValue = [] // 避免删除时报错
-            const {parent} = node
-            const children = parent.data.children || parent.data
-            const index = children.findIndex(d => d.id === data.id)
-            children.splice(index, 1)
+        {
+          label: "rgb",
+          value: "rgb",
         },
-        addNode(data) {
-            this.currentNode.push(data)
+        {
+          label: "rgba",
+          value: "rgba",
         },
-        setOptionValue(item, val) {
-            item.value = isNumberStr(val) ? +val : val
+        {
+          label: "hsv",
+          value: "hsv",
         },
-        setDefaultValue(val) {
-            if (Array.isArray(val)) {
-                return val.join(',')
-            }
-            // if (['string', 'number'].indexOf(typeof val) > -1) {
-            //   return val
-            // }
-            if (typeof val === 'boolean') {
-                return `${val}`
-            }
-            return val
+        {
+          label: "hsl",
+          value: "hsl",
         },
-        onDefaultValueInput(str) {
-            if (isArray(this.activeData.__config__.defaultValue)) {
-                // 数组
-                this.$set(
-                    this.activeData.__config__,
-                    'defaultValue',
-                    str.split(',').map(val => (isNumberStr(val) ? +val : val))
-                )
-            } else if (['true', 'false'].indexOf(str) > -1) {
-                // 布尔
-                this.$set(this.activeData.__config__, 'defaultValue', JSON.parse(str))
-            } else {
-                // 字符串和数字
-                this.$set(
-                    this.activeData.__config__,
-                    'defaultValue',
-                    isNumberStr(str) ? +str : str
-                )
-            }
+      ],
+      justifyOptions: [
+        {
+          label: "start",
+          value: "start",
         },
-        onSwitchValueInput(val, name) {
-            if (['true', 'false'].indexOf(val) > -1) {
-                this.$set(this.activeData, name, JSON.parse(val))
-            } else {
-                this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
-            }
+        {
+          label: "end",
+          value: "end",
         },
-        setTimeValue(val, type) {
-            const valueFormat = type === 'week' ? dateTimeFormat.date : val
-            this.$set(this.activeData.__config__, 'defaultValue', null)
-            this.$set(this.activeData, 'value-format', valueFormat)
-            this.$set(this.activeData, 'format', val)
+        {
+          label: "center",
+          value: "center",
         },
-        spanChange(val) {
-            this.formConf.span = val
+        {
+          label: "space-around",
+          value: "space-around",
         },
-        multipleChange(val) {
-            this.$set(this.activeData.__config__, 'defaultValue', val ? [] : '')
+        {
+          label: "space-between",
+          value: "space-between",
         },
-        dateTypeChange(val) {
-            this.setTimeValue(dateTimeFormat[val], val)
+      ],
+      layoutTreeProps: {
+        label(data, node) {
+          const config = data.__config__;
+          return data.componentName || `${config.label}: ${data.__vModel__}`;
         },
-        rangeChange(val) {
-            this.$set(
-                this.activeData.__config__,
-                'defaultValue',
-                val ? [this.activeData.min, this.activeData.max] : this.activeData.min
-            )
-        },
-        rateTextChange(val) {
-            if (val) this.activeData['show-score'] = false
-        },
-        rateScoreChange(val) {
-            if (val) this.activeData['show-text'] = false
-        },
-        colorFormatChange(val) {
-            this.activeData.__config__.defaultValue = null
-            this.activeData['show-alpha'] = val.indexOf('a') > -1
-            this.activeData.__config__.renderKey = +new Date() // 更新renderKey,重新渲染该组件
-        },
-        openIconsDialog(model) {
-            this.iconsVisible = true
-            this.currentIconModel = model
+      },
+    };
+  },
+  computed: {
+    dateOptions() {
+      if (
+        this.activeData.type !== undefined &&
+        this.activeData.__config__.tag === "el-date-picker"
+      ) {
+        if (this.activeData["start-placeholder"] === undefined) {
+          return this.dateTypeOptions;
+        }
+        return this.dateRangeTypeOptions;
+      }
+      return [];
+    },
+    tagList() {
+      return [
+        {
+          label: "输入型组件",
+          options: inputComponents,
         },
-        setIcon(val) {
-            this.activeData[this.currentIconModel] = val
+        {
+          label: "图片型组件",
+          options: imageComponents,
         },
-        tagChange(tagIcon) {
-            let target = inputComponents.find(item => item.__config__.tagIcon === tagIcon)
-            if (!target) target = selectComponents.find(item => item.__config__.tagIcon === tagIcon)
-            this.$emit('tag-change', target)
+        {
+          label: "选择型组件",
+          options: selectComponents,
         },
-        dataChange: debounce(430, false, function(val) {
-            this.$emit('data-change', val)
-        }),
-        changeRenderKey() {
-            if (needRerenderList.includes(this.activeData.__config__.tag)) {
-                this.activeData.__config__.renderKey = +new Date()
-            }
+      ];
+    },
+    activeTag() {
+      return this.activeData.__config__.tag;
+    },
+    isShowMin() {
+      return ["el-input-number", "el-slider"].indexOf(this.activeTag) > -1;
+    },
+    isShowMax() {
+      return (
+        ["el-input-number", "el-slider", "el-rate"].indexOf(this.activeTag) > -1
+      );
+    },
+    isShowStep() {
+      return ["el-input-number", "el-slider"].indexOf(this.activeTag) > -1;
+    },
+    getUploadHeader() {
+      return {
+        token: this.$store.getters["user/isLogin"],
+      };
+    },
+    getUploadUrl() {
+      return `${process.env.VUE_APP_API_ROOT}/user/file/upload`;
+    },
+  },
+  watch: {
+    formConf: {
+      handler(val) {
+        saveFormConf(val);
+      },
+      deep: true,
+    },
+    activeData: {
+      handler(newValue, oldValue) {
+        // 切换选中时不触发
+        if (newValue.__config__.formId === oldValue.__config__.formId) {
+          if (newValue) {
+            this.dataChange(newValue);
+          }
         }
-    }
-}
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    addReg() {
+      this.activeData.__config__.regList.push({
+        pattern: "",
+        message: "",
+      });
+    },
+    addSelectItem() {
+      let lastItem = _.last(this.activeData.__slot__.options);
+      this.activeData.__slot__.options.push({
+        label: "",
+        value: lastItem ? lastItem.value + 1 : 1,
+      });
+    },
+    async blukAddSelectItems() {
+      var arrStrs = await navigator.clipboard.readText();
+      var arr = arrStrs.split("\n");
+      if (arr.length > 1) {
+        const options = [];
+        for (let index = 0; index < arr.length; index++) {
+          const element = arr[index];
+          if (element?.length > 0) {
+            options.push({
+              label: element,
+              value: index + 1,
+            });
+          }
+        }
+        this.activeData.__slot__.options = options;
+      }
+      //console.log(res);
+      console.log(this.activeData);
+    },
+    addImageSelectItem() {
+      let lastItem = _.last(this.activeData.options);
+      this.activeData.options.push({
+        label: "",
+        image: "",
+        value: lastItem ? lastItem.value + 1 : 1,
+      });
+    },
+    addImageCarouselItem() {
+      let lastItem = _.last(this.activeData.__slot__.options);
+      this.activeData.__slot__.options.push({
+        label: "",
+        image: "",
+        value: lastItem ? lastItem.value + 1 : 1,
+      });
+    },
+    addSelectOtherItem() {
+      let item = this.activeData.__slot__.options.find((item) => {
+        return item.value == 0;
+      });
+      if (item) {
+        return;
+      }
+      this.activeData.__slot__.options.push({
+        label: "其他",
+        value: 0,
+      });
+    },
+    uploadProgressHandle() {
+      this.loading = this.$loading({
+        lock: true,
+        text: "上传中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    closeUploadProgressHandle() {
+      setTimeout(() => {
+        this.loading.close();
+      }, 100);
+    },
+    addTreeItem() {
+      ++this.idGlobal;
+      this.dialogVisible = true;
+      this.currentNode = this.activeData.options;
+    },
+    renderContent(h, { node, data, store }) {
+      return (
+        <div class="custom-tree-node">
+          <span>{node.label}</span>
+          <span class="node-operation">
+            <i
+              on-click={() => this.append(data)}
+              class="el-icon-plus"
+              title="添加"
+            ></i>
+            <i
+              on-click={() => this.remove(node, data)}
+              class="el-icon-delete"
+              title="删除"
+            ></i>
+          </span>
+        </div>
+      );
+    },
+    append(data) {
+      if (!data.children) {
+        this.$set(data, "children", []);
+      }
+      this.dialogVisible = true;
+      this.currentNode = data.children;
+    },
+    remove(node, data) {
+      this.activeData.__config__.defaultValue = []; // 避免删除时报错
+      const { parent } = node;
+      const children = parent.data.children || parent.data;
+      const index = children.findIndex((d) => d.id === data.id);
+      children.splice(index, 1);
+    },
+    addNode(data) {
+      this.currentNode.push(data);
+    },
+    setOptionValue(item, val) {
+      item.value = isNumberStr(val) ? +val : val;
+    },
+    setDefaultValue(val) {
+      if (Array.isArray(val)) {
+        return val.join(",");
+      }
+      // if (['string', 'number'].indexOf(typeof val) > -1) {
+      //   return val
+      // }
+      if (typeof val === "boolean") {
+        return `${val}`;
+      }
+      return val;
+    },
+    onDefaultValueInput(str) {
+      if (isArray(this.activeData.__config__.defaultValue)) {
+        // 数组
+        this.$set(
+          this.activeData.__config__,
+          "defaultValue",
+          str.split(",").map((val) => (isNumberStr(val) ? +val : val))
+        );
+      } else if (["true", "false"].indexOf(str) > -1) {
+        // 布尔
+        this.$set(this.activeData.__config__, "defaultValue", JSON.parse(str));
+      } else {
+        // 字符串和数字
+        this.$set(
+          this.activeData.__config__,
+          "defaultValue",
+          isNumberStr(str) ? +str : str
+        );
+      }
+    },
+    onSwitchValueInput(val, name) {
+      if (["true", "false"].indexOf(val) > -1) {
+        this.$set(this.activeData, name, JSON.parse(val));
+      } else {
+        this.$set(this.activeData, name, isNumberStr(val) ? +val : val);
+      }
+    },
+    setTimeValue(val, type) {
+      const valueFormat = type === "week" ? dateTimeFormat.date : val;
+      this.$set(this.activeData.__config__, "defaultValue", null);
+      this.$set(this.activeData, "value-format", valueFormat);
+      this.$set(this.activeData, "format", val);
+    },
+    spanChange(val) {
+      this.formConf.span = val;
+    },
+    multipleChange(val) {
+      this.$set(this.activeData.__config__, "defaultValue", val ? [] : "");
+    },
+    dateTypeChange(val) {
+      this.setTimeValue(dateTimeFormat[val], val);
+    },
+    rangeChange(val) {
+      this.$set(
+        this.activeData.__config__,
+        "defaultValue",
+        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
+      );
+    },
+    rateTextChange(val) {
+      if (val) this.activeData["show-score"] = false;
+    },
+    rateScoreChange(val) {
+      if (val) this.activeData["show-text"] = false;
+    },
+    colorFormatChange(val) {
+      this.activeData.__config__.defaultValue = null;
+      this.activeData["show-alpha"] = val.indexOf("a") > -1;
+      this.activeData.__config__.renderKey = +new Date(); // 更新renderKey,重新渲染该组件
+    },
+    openIconsDialog(model) {
+      this.iconsVisible = true;
+      this.currentIconModel = model;
+    },
+    setIcon(val) {
+      this.activeData[this.currentIconModel] = val;
+    },
+    tagChange(tagIcon) {
+      let target = inputComponents.find(
+        (item) => item.__config__.tagIcon === tagIcon
+      );
+      if (!target)
+        target = selectComponents.find(
+          (item) => item.__config__.tagIcon === tagIcon
+        );
+      this.$emit("tag-change", target);
+    },
+    dataChange: debounce(430, false, function (val) {
+      this.$emit("data-change", val);
+    }),
+    changeRenderKey() {
+      if (needRerenderList.includes(this.activeData.__config__.tag)) {
+        this.activeData.__config__.renderKey = +new Date();
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/styles/form/index';
+@import "@/assets/styles/form/index";
 .right-board {
-    width: 350px;
-    position: absolute;
-    right: 17px;
-    top: 0;
-    padding-top: 3px;
-    background-color: #fff;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-    .field-box {
-        position: relative;
-        height: calc(100vh - 70px);
-        box-sizing: border-box;
-        overflow: hidden;
-    }
-    .el-scrollbar {
-        height: 100%;
-        padding-bottom: 50px;
-    }
+  width: 350px;
+  position: absolute;
+  right: 17px;
+  top: 0;
+  padding-top: 3px;
+  background-color: #fff;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  .field-box {
+    position: relative;
+    height: calc(100vh - 70px);
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+  .el-scrollbar {
+    height: 100%;
+    padding-bottom: 50px;
+  }
 }
 .select-item {
-    display: flex;
-    border: 1px dashed #fff;
-    box-sizing: border-box;
-    align-items: center;
-    & .close-btn {
-        cursor: pointer;
-        color: #f56c6c;
-    }
-    & .el-input + .el-input {
-        margin-left: 4px;
-    }
+  display: flex;
+  border: 1px dashed #fff;
+  box-sizing: border-box;
+  align-items: center;
+  & .close-btn {
+    cursor: pointer;
+    color: #f56c6c;
+  }
+  & .el-input + .el-input {
+    margin-left: 4px;
+  }
 }
 .select-item + .select-item {
-    margin-top: 4px;
+  margin-top: 4px;
 }
 .select-item.sortable-chosen {
-    border: 1px dashed #409eff;
+  border: 1px dashed #409eff;
 }
 .select-line-icon {
-    line-height: 32px;
-    font-size: 22px;
-    padding: 0 4px;
-    color: #777;
+  line-height: 32px;
+  font-size: 22px;
+  padding: 0 4px;
+  color: #777;
 }
 .option-drag {
-    cursor: move;
+  cursor: move;
 }
 .time-range {
-    .el-date-editor {
-        width: 227px;
-    }
-    ::v-deep .el-icon-time {
-        display: none;
-    }
+  .el-date-editor {
+    width: 227px;
+  }
+  ::v-deep .el-icon-time {
+    display: none;
+  }
 }
 .node-label {
-    font-size: 14px;
+  font-size: 14px;
 }
 .node-icon {
-    color: #bebfc3;
+  color: #bebfc3;
 }
 </style>

From 6442392983c65964f372bfeeab93a298c6d1d032 Mon Sep 17 00:00:00 2001
From: Bemege <bemege@163.com>
Date: Fri, 2 Jul 2021 17:58:06 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/statistics/analysis.vue | 211 +++++++++++++++++++++++++
 src/views/form/statistics/index.vue    |   7 +-
 2 files changed, 217 insertions(+), 1 deletion(-)
 create mode 100644 src/views/form/statistics/analysis.vue

diff --git a/src/views/form/statistics/analysis.vue b/src/views/form/statistics/analysis.vue
new file mode 100644
index 0000000..526d6ae
--- /dev/null
+++ b/src/views/form/statistics/analysis.vue
@@ -0,0 +1,211 @@
+<template>
+    <div class="analysis">
+        <div v-for="(item, index) in list" :key="index">
+            <div class="content">
+                <div class="title">
+                    <span style="font-size: 16px">Q：{{ item.label }}（{{ item.type }}）</span>
+
+                    <div>
+                        <span>图表类型：</span>
+                        <el-select v-model="item.chartType" placeholder="请选择">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </div>
+                </div>
+                <line-chart
+                    class="chart"
+                    :chart-option="getCharData(item)"
+                    :width="'90vw'"
+                />
+            </div>
+            <el-divider />
+        </div>
+    </div>
+</template>
+
+<script>
+import LineChart from '@/components/echarts/LineChart'
+export default {
+    components: {
+        LineChart
+    },
+    data() {
+        return {
+            barChartOptionData: {
+                tooltip: {
+                    trigger: 'axis',
+                    backgroundColor: 'rgba(255,255,255,0.8)', // 通过设置rgba调节背景颜色与透明度
+                    color: 'black',
+                    borderWidth: '1',
+                    borderColor: 'rgb(156,209,255)',
+                    textStyle: {
+                        color: 'black'
+                    },
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                        axisTick: {
+                            alignWithLabel: true
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value'
+                    }
+                ],
+                series: [
+                    {
+                        name: '数量',
+                        type: 'line',
+                        barWidth: '40%',
+                        data: [10, 52, 200, 334, 390, 330, 220]
+                    }
+                ]
+            },
+            list: [],
+            options: [
+                {
+                    value: 'pie',
+                    label: '饼图'
+                },
+                /* {
+          value: "ring",
+          label: "环形图",
+        }, */
+                {
+                    value: 'bar',
+                    label: '柱状图'
+                },
+                {
+                    value: 'line',
+                    label: '折线图'
+                }
+            ]
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        getData() {
+            this.$api
+                .get('/user/project/report/analysis', {
+                    params: { projectKey: this.$route.query.key }
+                })
+                .then(res => {
+                    this.list = res.data
+                })
+        },
+        getCharData(data) {
+            const config = {
+                tooltip: {
+                    backgroundColor: 'rgba(255,255,255,0.8)', // 通过设置rgba调节背景颜色与透明度
+                    color: 'black',
+                    borderWidth: '1',
+                    borderColor: 'rgb(156,209,255)',
+                    textStyle: {
+                        color: 'black'
+                    }
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        axisTick: {
+                            alignWithLabel: true
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value'
+                    }
+                ],
+                series: [
+                    {
+                        name: '数量',
+                        type: 'pie',
+                        barWidth: '40%'
+                    }
+                ]
+            }
+            if (['bar', 'line'].includes(data.chartType)) {
+                config.tooltip.axisPointer = {
+                    type: 'line'
+                }
+                config.tooltip.trigger = 'axis'
+                config.xAxis[0].data = data.fieldName
+                config.series[0].data = data.data
+                config.series[0].type = data.chartType
+            } else {
+                // 环形图暂时不用   无法切换到饼图
+                /* if ("ring" === data.chartType) {
+          config.series[0].radius = ["40%", "70%"];
+          
+          config.series[0].emphasis = {
+                label: {
+                    show: true,
+                    fontSize: '25',
+                    fontWeight: 'bold'
+                }
+            }
+        }else{
+          delete config.series[0].radius
+          delete config.series[0].label
+        } */
+                config.series[0].data = []
+                Object.keys(data.map).forEach(key => {
+                    config.series[0].data.push({ name: key, value: data.map[key] })
+                })
+                // config.series[0].data = data.map
+            }
+            return config
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.analysis {
+  width: 100%;
+  // padding: 20px;
+  .content {
+    padding: 20px;
+    width: 100%;
+    .title {
+      font-size: 14px;
+      padding: 0 30px;
+      height: 54px;
+      line-height: 54px;
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      .select {
+        float: right;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/form/statistics/index.vue b/src/views/form/statistics/index.vue
index 179bd32..b67fcf7 100644
--- a/src/views/form/statistics/index.vue
+++ b/src/views/form/statistics/index.vue
@@ -7,6 +7,9 @@
             <el-tab-pane label="统计视图" name="chart">
                 <chart />
             </el-tab-pane>
+            <el-tab-pane label="数据分析" name="analysis">
+                <analysis />
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
@@ -14,12 +17,14 @@
 <script>
 import list from './list'
 import chart from './chart'
+import analysis from './analysis'
 
 export default {
     name: 'ProjectStatistics',
     components: {
         list,
-        chart
+        chart,
+        analysis
     },
     data() {
         return {

From 5bbe0d07ed44fe6abe34773b204a9a63dd866a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=93=A5?= <2310732606@qq.com>
Date: Fri, 2 Jul 2021 10:10:14 +0000
Subject: [PATCH 04/18] update README.md.

---
 README.md | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a3b3421..335df7b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,110 @@
-# Tduck-WEB
+<p></p>
+<p></p>
+<p align="left">
+  <img alt="logo" src="https://doc.tduckapp.com/img/banner.png" style="margin-bottom: 0px;">
+</p>
+<h2 align="left">Tduck 填鸭 —— 表单收集器</h2>
+
+
+### 平台简介
+
+Tduck,  Form collection system
+
+Tduck 填鸭：是基于B/S架构的一款开源的表单在线收集系统，为企业构建自己的信息反馈系统的综合解决方案，助力企业提高反馈收集客户服务效率。
+
+
+### 应用场景
+
+主要应用与泛零售、电商、金融、调研、资料收集等行业用户，提供多种工具、多渠道、多方式收集有效信息，更好的提升客户服务，增加客户满意度。
+
+
+### 功能特性
+##### 界面美观，全新element-ui支持，使用流畅
+- 以一种全新的设计体验，告别繁琐的设计流程
+- 通过简单有趣的方式，轻轻松松完成表单设计
+- 支持表单样式模板选择，只为显现更精美的表单
+
+##### 三大模块助力企业能力升级：
+- 新建表单：自定义可拖拽式表单设计
+- 表单设置：支持多种收集方式设置
+- 反馈统计：多维度统计收集的反馈数据
+
+
+## 在线体验
+![首页](https://images.gitee.com/uploads/images/2021/0624/103418_43f3b04e_1495174.png "屏幕截图.png")
+
+### 演示环境&详细文档👮‍♀️
+- 演示地址：http://demo.tduckapp.com/
+- 演示账号/密码：扫码注册登录
+- 文档地址：http://demo.tduckapp.com/
+- V2更新日志：https://doc.tduckapp.com/log/
+- 部署默认账号： test@tduck.com/12345678
+- 获取《使用Docker运行Tduck》教程请加入社群获取
+- 获取《tduck-纯小白部署教程》请加入社群获取
+- 开源不易如果喜欢请给作者 Star 鼓励
+
+### 加入社群
+  <img alt="logo" src="https://images.gitee.com/uploads/images/2021/0625/000242_95748ea0_1674451.png" style="margin-bottom: 0px;" width="230px">
+
+#### 项目源码
+
+|   后端源码  |   前端源码  |
+|--- | --- |
+|  https://gitee.com/TDuckApp/tduck-platform   |  https://gitee.com/TDuckApp/tduck-front   |
+|  https://github.com/TDuckCloud/tduck-platform   |  https://github.com/TDuckCloud/tduck-platform   |
+
+感谢：<img alt="logo" src="https://images.gitee.com/uploads/images/2021/0624/105039_de3beb64_1495174.png" style="margin-bottom: 0px;" width="230px">
+提供云服务器资源！
+
+### “项目背景”
+目前市面上的表单平台虽然功能强大，但是部分业务组件或者额外收取存储等费用，且费用较高，在数据隐私性较强且有特殊表单需求的场景下无法满足业务需求，
+目前国内的的开源平台表单问卷平台比较少，tduck表单平台应运而生。让中小公司拥有独立自定义表单问卷，快速赋能业务。
+
+### “新特性”
+
+- 【表单逻辑】支持对单选，多选框，下拉框等组件进行逻辑设置，目前仅支持选中 未选中等逻辑关系
+- 【表单分页】支持对问卷问题较多时，进行分页
+- 【手写签名】支持手写签名保存上传
+- 【位置选择】支持高德地图进行地理位置选择
+- 【手机验证】支持对输入手机号进行短信验证 验证通过则能保存
+- 【省市联动】支持省市县联动选择输入
+- 【图形选择】图片选择组件，支持单选多选
+- 【图片展示】图片展示组件，展示二维码引流等
+- 【图片轮播】图片轮播组件，图片和文字轮播显示
+- 【文字描述】文件描述组件，支持颜色，位置设置
+- 【分割线】 内容分割线
+- 【联系人】 手机号，邮箱，身份证输入 格式校验
+- 【公开反馈结果】 公开反馈结果设置，开启后填写完成将看到他人填写结果
+- 【附件导出】填写完成后可对收集的附件进行导出zip下载
+- 【统计筛选】可对填写完的结果进行筛选查询 支持模糊等
+- 【表单预览】添加预览按钮，实时预览内容，预览二维码
+- 【另存为模板】添加另存为模板按钮，保存项目为模板
+- 【UI重构】项目整体UI全面重构，更美观，更简洁
+- 【验证码】验证逻辑重构，支持验证码开关
+- 【微信功能】 微信功能增加开关配置，可配置关闭微信功能
+- 【代码优化】对前后端代码进行部分优化，结构调整
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0625/000932_eb5728c8_1674451.png "屏幕截图.png")
+### “文档支持”
+新的文档平台，后续会不断完善文档，有需要完善的内容可以在GItee提issues反馈，收到反馈我们将第一时间调整，当然有想共享文档的也欢迎提Pr。
+
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0625/001013_eb945bce_1674451.png "屏幕截图.png")
+
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0625/001053_f3c320c4_1674451.png "屏幕截图.png")
+
+### “项目规划”
+“让每个企业轻松拥有自己的问卷系统”是Tduck团队不变的初衷；v2版本的开发工作目前算是暂时结束，经过团队内部自测推出，同时欢迎大家进行测试，对存在的问题在Gitee提issues,社群内反馈可能无法及时解决，后续可能会遗忘。我们会定期对issues问题修复和做一些优化，竭力维护一个稳定的v2版本。
+
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0625/001803_d0b579e3_1674451.png "屏幕截图.png")
+
+###  :heart: 致谢 ！
+
+Tduck诞生非常有趣，不经意之间的一个想法，一步步实现至今。在v2开发期间，团队成员非全职开发，都是业余时间进行打码，所以迭代时间较长，期间群中反馈的问题没有及时给予反馈（深感抱歉）。
+
+Tduck永远珍惜每一位用户，重视每一个issues。
+感谢对Tduck团队的支持，以及大家对v2期盼与鼓励。
+
+
 
-![s8sdOO.png](https://s3.ax1x.com/2021/01/11/s8sdOO.png)
 TDuck 前端源码
 
 #### 项目源码
@@ -53,7 +157,7 @@ https://www.ydyno.com/archives/1219.html
 - views 页面
 
 
-#### 特别鸣谢
+## 特别鸣谢
 
 
 - 感谢 (https://gitee.com/eoner/vue-automation) 前端脚手架
@@ -62,5 +166,9 @@ https://www.ydyno.com/archives/1219.html
 
 
 
+### ChangeLog 持续更新中 :sparkles: 
+
+增加单选/多选题型统计图 2021-07-02
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0702/180333_6991a4bf_1674451.png "屏幕截图.png")
 
 

From 943397fb83049281070ea1fbdc0a673b656a9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=93=A5?= <2310732606@qq.com>
Date: Fri, 2 Jul 2021 10:11:52 +0000
Subject: [PATCH 05/18] update README.md.

---
 README.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 335df7b..b8913e3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,13 @@
 <h2 align="left">Tduck 填鸭 —— 表单收集器</h2>
 
 
+## 特别鸣谢 :heart: 
+
+### 感谢 (https://gitee.com/eoner/vue-automation) 前端脚手架
+
+### 感谢 (https://gitee.com/mrhj/form-generator) 表单生成器
+
+
 ### 平台简介
 
 Tduck,  Form collection system
@@ -157,15 +164,6 @@ https://www.ydyno.com/archives/1219.html
 - views 页面
 
 
-## 特别鸣谢
-
-
-- 感谢 (https://gitee.com/eoner/vue-automation) 前端脚手架
-
-- 感谢 (https://gitee.com/mrhj/form-generator) 表单生成器
-
-
-
 ### ChangeLog 持续更新中 :sparkles: 
 
 增加单选/多选题型统计图 2021-07-02

From be47b4964ea93edcca851fa2fc62873b9d90c4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=93=A5?= <2310732606@qq.com>
Date: Fri, 2 Jul 2021 10:12:48 +0000
Subject: [PATCH 06/18] update README.md.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b8913e3..18337b6 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@
 <h2 align="left">Tduck 填鸭 —— 表单收集器</h2>
 
 
-## 特别鸣谢 :heart: 
+### 特别鸣谢 :heart: 
 
-### 感谢 (https://gitee.com/eoner/vue-automation) 前端脚手架
+#### 感谢 (https://gitee.com/eoner/vue-automation) 前端脚手架
 
-### 感谢 (https://gitee.com/mrhj/form-generator) 表单生成器
+#### 感谢 (https://gitee.com/mrhj/form-generator) 表单生成器
 
 
 ### 平台简介

From 62f20e3fd8c0e1dd4ddbfb38fa9da7f604befc99 Mon Sep 17 00:00:00 2001
From: Bemege <bemege@163.com>
Date: Fri, 2 Jul 2021 18:14:31 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/statistics/analysis.vue | 43 ++++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/form/statistics/analysis.vue b/src/views/form/statistics/analysis.vue
index 526d6ae..9ff7605 100644
--- a/src/views/form/statistics/analysis.vue
+++ b/src/views/form/statistics/analysis.vue
@@ -1,30 +1,33 @@
 <template>
     <div class="analysis">
-        <div v-for="(item, index) in list" :key="index">
-            <div class="content">
-                <div class="title">
-                    <span style="font-size: 16px">Q：{{ item.label }}（{{ item.type }}）</span>
+        <div v-if="list.length && list.length !== 0">
+            <div v-for="(item, index) in list" :key="index">
+                <div class="content">
+                    <div class="title">
+                        <span style="font-size: 16px">Q：{{ item.label }}（{{ item.type }}）</span>
 
-                    <div>
-                        <span>图表类型：</span>
-                        <el-select v-model="item.chartType" placeholder="请选择">
-                            <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            />
-                        </el-select>
+                        <div>
+                            <span>图表类型：</span>
+                            <el-select v-model="item.chartType" placeholder="请选择">
+                                <el-option
+                                    v-for="item in options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </div>
                     </div>
+                    <line-chart
+                        class="chart"
+                        :chart-option="getCharData(item)"
+                        :width="'90vw'"
+                    />
                 </div>
-                <line-chart
-                    class="chart"
-                    :chart-option="getCharData(item)"
-                    :width="'90vw'"
-                />
+                <el-divider />
             </div>
-            <el-divider />
         </div>
+        <data-empty v-else style="padding: 20px" desc="只有单选、多选、下拉框组件可以生成图表" />
     </div>
 </template>
 

From eb7aa386e9afc9d3bbece923f0a74458bdc3d531 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Fri, 2 Jul 2021 21:53:56 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E7=BD=91=E9=A1=B5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/setting/index.vue |  1 +
 src/views/form/write/index.vue   | 61 ++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/form/setting/index.vue b/src/views/form/setting/index.vue
index 12b7585..d3e59e2 100644
--- a/src/views/form/setting/index.vue
+++ b/src/views/form/setting/index.vue
@@ -80,6 +80,7 @@
                     <el-col :span="20" class="setting-input">
                         <el-input
                             v-model="userProjectSettingData.submitJumpUrl"
+                            placeholder="https://demo.tduckapp.com"
                             :show-word-limit="true"
                             :maxlength="50"
                             @change="saveUserProjectSetting"
diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue
index 7e5c8cf..b4a7ce0 100644
--- a/src/views/form/write/index.vue
+++ b/src/views/form/write/index.vue
@@ -174,8 +174,8 @@ export default {
             })
         },
         /**
-         * 微信分享
-         */
+     * 微信分享
+     */
         setWxProjectShare(wx) {
             let {shareImg, shareTitle, shareDesc} = this.userProjectSetting
             wx.updateAppMessageShareData({
@@ -243,8 +243,8 @@ export default {
             })
         },
         /**
-         * 仅在微信打开
-         */
+     * 仅在微信打开
+     */
         onlyWxOpenHandle() {
             let wxUa = navigator.userAgent.toLowerCase()
             let isWeixin = wxUa.indexOf('micromessenger') != -1
@@ -270,6 +270,12 @@ export default {
                 'processData': data.labelFormModel
             }).then(() => {
                 this.writeStatus = 2
+                if (this.userProjectSetting.submitJumpUrl) {
+                    setTimeout(() => {
+                        window.location.replace(this.userProjectSetting.submitJumpUrl)
+                    }, 1000)
+                }
+
             })
         }
     }
@@ -278,33 +284,36 @@ export default {
 
 <style lang="scss" scoped>
 .write-container {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    width: 100%;
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  width: 100%;
 }
+
 .title-icon-view {
-    display: flex;
-    align-items: center;
-    align-content: center;
-    justify-content: center;
-    flex-direction: column;
-    height: 100%;
-    width: 100%;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  justify-content: center;
+  flex-direction: column;
+  height: 100%;
+  width: 100%;
 }
+
 .icon-view {
-    width: 59px;
-    height: 59px;
-    border-radius: 100px;
-    background-color: #0076ff;
-    display: flex;
-    align-content: center;
-    align-items: center;
-    justify-content: center;
+  width: 59px;
+  height: 59px;
+  border-radius: 100px;
+  background-color: #0076ff;
+  display: flex;
+  align-content: center;
+  align-items: center;
+  justify-content: center;
 }
+
 .success-icon {
-    text-align: center;
-    color: white;
-    font-size: 30px;
+  text-align: center;
+  color: white;
+  font-size: 30px;
 }
 </style>

From a064dc83f3a64719381ccb4314fae53e2bed7cc5 Mon Sep 17 00:00:00 2001
From: Jimi <viidream@163.com>
Date: Fri, 2 Jul 2021 21:56:18 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E7=9A=84=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/editor/RightPanel.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index 9ac79d9..2c673ee 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -1404,8 +1404,9 @@ export default {
     addSelectItem() {
       let lastItem = _.last(this.activeData.__slot__.options);
       this.activeData.__slot__.options.push({
-        label: "",
-        value: lastItem ? lastItem.value + 1 : 1,
+        label: '',
+        value: lastItem ? lastItem.value === 0 ? _.max(_.values(this.activeData.__slot__.options.map(item =>
+          item.value))) + 1 : lastItem.value + 1 : 1
       });
     },
     async blukAddSelectItems() {

From 4f60a82ebccfa5a1eb98c6fb4b234dbfdde7fb4a Mon Sep 17 00:00:00 2001
From: Jimi <viidream@163.com>
Date: Fri, 2 Jul 2021 14:38:58 +0000
Subject: [PATCH 10/18] =?UTF-8?q?!5=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E7=9A=84=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20*=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E7=9A=84=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/editor/RightPanel.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index 9ac79d9..2c673ee 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -1404,8 +1404,9 @@ export default {
     addSelectItem() {
       let lastItem = _.last(this.activeData.__slot__.options);
       this.activeData.__slot__.options.push({
-        label: "",
-        value: lastItem ? lastItem.value + 1 : 1,
+        label: '',
+        value: lastItem ? lastItem.value === 0 ? _.max(_.values(this.activeData.__slot__.options.map(item =>
+          item.value))) + 1 : lastItem.value + 1 : 1
       });
     },
     async blukAddSelectItems() {

From 720730601b4e93bccae381bd39badf925e911126 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Tue, 6 Jul 2021 21:35:46 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/generator/config.js   | 2 +-
 src/components/parser/Parser.vue     | 6 ++++--
 src/views/form/editor/RightPanel.vue | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/generator/config.js b/src/components/generator/config.js
index 4cf21f3..d3a6974 100644
--- a/src/components/generator/config.js
+++ b/src/components/generator/config.js
@@ -602,7 +602,7 @@ export const assistComponents = [
         typeId: 'DIVIDER',
         __config__: {
             label: '分割线',
-            defaultValue: '分割线',
+            defaultValue: '',
             displayType: true,
             showLabel: false,
             showDefaultValue: false,
diff --git a/src/components/parser/Parser.vue b/src/components/parser/Parser.vue
index 5fe8817..cbd1e93 100644
--- a/src/components/parser/Parser.vue
+++ b/src/components/parser/Parser.vue
@@ -361,8 +361,10 @@ export default {
                         if (defaultValue instanceof Array) {
                             defaultValue.forEach(item => {
                                 if (item) {
-                                    let {label} = getObject(_.get(cur, tagOptionKey), 'value', item)
-                                    labelStr += label + ','
+                                    let labelItem = getObject(_.get(cur, tagOptionKey), 'value', item)
+                                    if (labelItem) {
+                                        labelStr += labelItem.label + ','
+                                    }
                                 }
                             })
                             formData[cur.__vModel__] = labelStr
diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index 9ac79d9..0d5465d 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -1409,8 +1409,8 @@ export default {
       });
     },
     async blukAddSelectItems() {
-      var arrStrs = await navigator.clipboard.readText();
-      var arr = arrStrs.split("\n");
+      let arrStrs = await navigator.clipboard.readText();
+      let arr = arrStrs.split("\n");
       if (arr.length > 1) {
         const options = [];
         for (let index = 0; index < arr.length; index++) {
@@ -1424,8 +1424,6 @@ export default {
         }
         this.activeData.__slot__.options = options;
       }
-      //console.log(res);
-      console.log(this.activeData);
     },
     addImageSelectItem() {
       let lastItem = _.last(this.activeData.options);

From d971bac82009e62edfbef3a08b02484c5f37bcad Mon Sep 17 00:00:00 2001
From: Jimi <viidream@163.com>
Date: Wed, 7 Jul 2021 10:49:18 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/my/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project/my/index.vue b/src/views/project/my/index.vue
index d7ffddb..5997e39 100644
--- a/src/views/project/my/index.vue
+++ b/src/views/project/my/index.vue
@@ -280,7 +280,7 @@ export default {
             this.dataShowType = type
         },
         toProjectHandle(key, type) {
-            this.$router.push({path: '/project/form', query: {key: key, active: type}})
+            this.$router.push({path: `/project/form/${type}`, query: {key: key, active: type}})
         },
         deleteProject(key) {
             this.$api.post('/user/project/delete', {'key': key}).then(res => {

From c597c94fc6bbde0b04a66ec231d8d0454a3650a5 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Thu, 8 Jul 2021 16:29:38 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E7=BA=A7=E8=81=94=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=89=E9=A1=B9=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/convert.js                 |  1 +
 src/views/form/editor/RightPanel.vue | 24 ++++++++++++------------
 src/views/form/index.vue             |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/utils/convert.js b/src/utils/convert.js
index 6a360d1..4973d88 100644
--- a/src/utils/convert.js
+++ b/src/utils/convert.js
@@ -136,6 +136,7 @@ const dataParams = {
     'CASCADER': {
         'options': 'options',
         'filterable': 'filterable',
+        'show-all-levels': 'showAllLevels',
         'multiple': 'props.props.multiple'
     },
     // 单选框组
diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue
index 0a8274b..df21fa4 100644
--- a/src/views/form/editor/RightPanel.vue
+++ b/src/views/form/editor/RightPanel.vue
@@ -933,12 +933,12 @@
           >
             <el-switch v-model="activeData['step-strictly']" />
           </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-cascader'"
-            label="任选层级"
-          >
-            <el-switch v-model="activeData.props.props.checkStrictly" />
-          </el-form-item>
+<!--          <el-form-item-->
+<!--            v-if="activeData.__config__.tag === 'el-cascader'"-->
+<!--            label="任选层级"-->
+<!--          >-->
+<!--            <el-switch v-model="activeData.props.props.checkStrictly" />-->
+<!--          </el-form-item>-->
           <el-form-item
             v-if="activeData.__config__.tag === 'el-cascader'"
             label="是否多选"
@@ -990,12 +990,12 @@
           >
             <el-switch v-model="activeData.readonly" />
           </el-form-item>
-          <el-form-item
-            v-if="activeData.disabled !== undefined"
-            label="是否禁用"
-          >
-            <el-switch v-model="activeData.disabled" />
-          </el-form-item>
+<!--          <el-form-item-->
+<!--            v-if="activeData.disabled !== undefined"-->
+<!--            label="是否禁用"-->
+<!--          >-->
+<!--            <el-switch v-model="activeData.disabled" />-->
+<!--          </el-form-item>-->
           <el-form-item
             v-if="activeData.__config__.tag === 'el-select'"
             label="能否搜索"
diff --git a/src/views/form/index.vue b/src/views/form/index.vue
index 8bb8609..4def0cb 100644
--- a/src/views/form/index.vue
+++ b/src/views/form/index.vue
@@ -5,15 +5,15 @@
                 <el-col :span="2">
                     <i class="el-icon-back" @click="$router.back(-1)" />
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="3" :md="6">
                     <img class="header-logo" src="@/assets/images/indexLogo.svg" @click="$router.push({path:'/home'})">
                 </el-col>
-                <el-col :span="1">
+                <el-col :span="1" :md="3">
                     <el-button type="primary" icon="el-icon-view" @click="previewDialogVisible=true">
                         预览
                     </el-button>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="2" :md="3">
                     <el-button type="success" icon="el-icon-folder-add" @click="saveProjectAsTemplateHandle">
                         保存为模板
                     </el-button>

From 186a3ff580f60a405afbc6799e96398e08a36225 Mon Sep 17 00:00:00 2001
From: zhongjm <zhongjm@augurit.com>
Date: Mon, 12 Jul 2021 09:53:02 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E7=BB=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/expression.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/expression.js b/src/utils/expression.js
index 5b37f88..a6bd6a6 100644
--- a/src/utils/expression.js
+++ b/src/utils/expression.js
@@ -8,7 +8,8 @@ const expressionOperator = {
         if (!v1) {
             return false
         }
-        return v1 == v2
+        // 当type=CHECK_BOX时此处应为包含关系
+        return v1.includes(+v2)
     },
     ne: function(v1, v2) {
         if (!v1) {

From 128e55d20135ec911ee83d83840e5e872fdcd423 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Mon, 12 Jul 2021 22:26:33 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AE=BD=E5=BA=A6=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/preview/ProjectForm.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue
index c551721..1cbe99e 100644
--- a/src/views/form/preview/ProjectForm.vue
+++ b/src/views/form/preview/ProjectForm.vue
@@ -20,7 +20,7 @@
             </h4>
             <div
                 v-show="projectTheme.showDescribe"
-                class="form-name-text" v-html="formConf.description"
+                class="form-name-text describe-html" v-html="formConf.description"
             />
             <el-divider />
             <parser v-if="startParser"
@@ -291,6 +291,10 @@ export default {
   background-repeat: repeat;
   background-color: rgba(229, 239, 247, 0.87);
 }
+.project-form .describe-html img{
+  max-width: 780px;
+  margin: 0px;
+}
 
 .project-body::-webkit-scrollbar {
   width: 0 !important;

From 8dabd23725fad474ffe6cab31c898f9fbdfa4b7f Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Mon, 12 Jul 2021 22:31:34 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=8F=8F=E8=BF=B0=E5=9B=BE=E7=89=87=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/preview/ProjectForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue
index 1cbe99e..1bb5d34 100644
--- a/src/views/form/preview/ProjectForm.vue
+++ b/src/views/form/preview/ProjectForm.vue
@@ -333,5 +333,8 @@ export default {
   .submit-btn-form-item button {
     width: 80%;
   }
+  .project-form .describe-html img{
+    width: 95vw!important;
+  }
 }
 </style>

From a46c2321a77364016b1a6dbd291d9bcc2e9bfad4 Mon Sep 17 00:00:00 2001
From: Jimi <viidream@163.com>
Date: Tue, 13 Jul 2021 03:24:12 +0000
Subject: [PATCH 17/18] =?UTF-8?q?!8=20=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=20*=20=E4=BF=AE=E5=A4=8D=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=BB=84=E4=BB=B6=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/InputMap/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/form/InputMap/index.vue b/src/components/form/InputMap/index.vue
index fe37058..6a545bf 100644
--- a/src/components/form/InputMap/index.vue
+++ b/src/components/form/InputMap/index.vue
@@ -319,4 +319,7 @@ export default {
     margin-bottom: 10px;
 }
 
+::v-deep .el-dialog__headerbtn {
+  z-index: 999;
+}
 </style>

From c8f1c5b024fb668bcf9af704803a0b3814221b74 Mon Sep 17 00:00:00 2001
From: jinming <1564805451@qq.com>
Date: Wed, 14 Jul 2021 06:16:28 +0000
Subject: [PATCH 18/18] =?UTF-8?q?!10=20fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E7=BB=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?bug=20*=20fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E7=BB=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/expression.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/expression.js b/src/utils/expression.js
index a6bd6a6..526a0e0 100644
--- a/src/utils/expression.js
+++ b/src/utils/expression.js
@@ -9,7 +9,8 @@ const expressionOperator = {
             return false
         }
         // 当type=CHECK_BOX时此处应为包含关系
-        return v1.includes(+v2)
+        return  Array.isArray(v1) ? v1.includes(+v2) : v1 == v2
+
     },
     ne: function(v1, v2) {
         if (!v1) {