From 8b1203510f6a9e885473213b0dd2e46ffb5d491e Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Wed, 28 Jul 2021 15:06:04 +0800
Subject: [PATCH] =?UTF-8?q?building-pictures=20=20=E5=A5=97=E7=89=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A8=A1=E5=9D=97=20config-column=20=20=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=A0=8F=E7=9B=AE=E6=A8=A1=E5=9D=97=20config?=
 =?UTF-8?q?-table=20=20=20=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20bigdata=20=20=20=20=E5=9B=BE=E6=A0=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=A8=A1=E5=9D=97=20freemarker=20?=
 =?UTF-8?q?=20=20=20=E5=8A=A8=E6=80=81=E6=A8=A1=E6=9D=BF=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/configtable/list-field.html     | 85 +++++++++++++++++--
 .../resources/templates/configtable/list.html |  4 +-
 2 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/module-config-table/src/main/resources/templates/configtable/list-field.html b/module-config-table/src/main/resources/templates/configtable/list-field.html
index e6fe938..5ea7677 100644
--- a/module-config-table/src/main/resources/templates/configtable/list-field.html
+++ b/module-config-table/src/main/resources/templates/configtable/list-field.html
@@ -34,6 +34,10 @@
         #container{
             float:left;
             width:100%;
+            border-right:1px dashed #000;
+        }
+        #rightContainer {
+            border-left:1px dashed #000;
         }
         .module1:hover{
             border:2px solid  rgba(153, 153, 153, 0.7);
@@ -64,11 +68,78 @@
             </button>
         </div>
     </div>
-
-    <div class="layui-row layui-container"  id="container">
-      <!--  <div class="layui-col-lg12" id="container">
-        </div>-->
-       <!-- <div class="layui-col-lg4" >
+    <div class="layui-row" >
+        <div class="layui-col-lg9">
+            <div class="layui-row layui-container"  id="container">
+            </div>
+        </div>
+        <div class="layui-col-lg3" id="rightContainer">
+            <div class="layui-form-item"  pane >
+                <label class="layui-form-label">字段列名<span style="color: red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" id="configTableFieldCode" name="configTableFieldCode" class="layui-input" value="" placeholder="请输入字段列名"  maxlength="500">
+                </div>
+            </div>
+            <div class="layui-form-item"  pane >
+                <label class="layui-form-label">字段名称<span style="color: red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" id="configTableFieldName" name="configTableFieldName" class="layui-input" value="" placeholder="请输入字段名称"  maxlength="500">
+                </div>
+            </div>
+            <div class="layui-form-item"  pane >
+                <label class="layui-form-label">是否必填<span style="color: red">*</span></label>
+                <div class="layui-input-block">
+                    <input  type="checkbox" value="1" id="configTableFieldMust" name="configTableFieldMust" checked lay-skin="switch" lay-text="必填|非必填">
+                </div>
+            </div>
+  <!--          <div class="layui-form-item"  pane >
+                <label class="layui-form-label">列表显示<span style="color: red">*</span></label>
+                <div class="layui-input-block">
+                    <input  type="checkbox" value="1" id="configTableFieldDisplay" name="configTableFieldDisplay" checked lay-skin="switch" lay-text="显示|不显示">
+                </div>
+            </div>-->
+            <div class="layui-form-item" >
+                <label class="layui-form-label">提示引导<span style="color: red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" id="configTableFieldPlaceholder" name="configTableFieldPlaceholder" class="layui-input" placeholder="输入提示引导" value="请输入" lay-verify="required">
+                </div>
+            </div>
+            <div class="layui-form-item" >
+                <label class="layui-form-label">默认值</label>
+                <div class="layui-input-block">
+                    <input type="text" id="configTableFieldDefault" name="configTableFieldDefault" class="layui-input" placeholder="请输入默认值" >
+                </div>
+            </div>
+            <div class="layui-form-item" id="configTableFieldModeDiv" style="display: none;">
+                <label class="layui-form-label">展示方式<span style="color: red">*</span></label>
+                <div class="layui-input-block layui-form" id="configTableFieldModeSelectTemplateBox" lay-filter="configTableFieldModeSelectTemplateBox"></div>
+                <script id="configTableFieldModeSelectTemplate" type="text/html">
+                    <select id="configTableFieldMode" name="configTableFieldMode">
+                        <option value="">请选择展示方式</option>
+                        {{# for(var i = 0, item; item = d[i++];) { }}
+                        <option value="{{item.dataId}}">{{item.dataName}}</option>
+                        {{# } }}
+                    </select>
+                </script>
+            </div>
+            <div class="layui-form-item" id="configTableFieldDictionariesDiv" style="display: none;">
+                <label class="layui-form-label">选项字典<span style="color: red">*</span></label>
+                <div class="layui-input-block layui-form" id="configTableFieldDictionariesSelectTemplateBox" lay-filter="configTableFieldDictionariesSelectTemplateBox"></div>
+                <script id="configTableFieldDictionariesSelectTemplate" type="text/html">
+                    <select id="configTableFieldDictionaries" name="configTableFieldDictionaries">
+                        <option value="">请选择选项字典</option>
+                        {{# for(var i = 0, item; item = d[i++];) { }}
+                        <option value="{{item.dataId}}">{{item.dataName}}</option>
+                        {{# } }}
+                    </select>
+                </script>
+            </div>
+        </div>
+    </div>
+    <!--<div class="layui-row layui-container"  id="container">
+      &lt;!&ndash;  <div class="layui-col-lg12" id="container">
+        </div>&ndash;&gt;
+       &lt;!&ndash; <div class="layui-col-lg4" >
             <div class="layui-form-item"  pane >
                 <label class="layui-form-label">是否必填<span style="color: red">*</span></label>
                 <div class="layui-input-block">
@@ -77,8 +148,8 @@
                 </div>
             </div>
 
-        </div>-->
-    </div>
+        </div>&ndash;&gt;
+    </div>-->
 </form>
 
 <div class="layui-collapse" lay-accordion style="display: none" id="widthChange">
diff --git a/module-config-table/src/main/resources/templates/configtable/list.html b/module-config-table/src/main/resources/templates/configtable/list.html
index 96d2643..a270fcf 100644
--- a/module-config-table/src/main/resources/templates/configtable/list.html
+++ b/module-config-table/src/main/resources/templates/configtable/list.html
@@ -401,8 +401,8 @@
                         top.layer.open({
                             type: 2,
                             title: false,
-                            closeBtn: 0,
-                            area: ["80%" , "80%"],
+                            closeBtn: 1,
+                            area: ["95%" , "95%"],
                             shadeClose: true,
                             anim: 2,
                             content: top.restAjax.path('route/configtable/listfield?configTableId={configTableId}', [checkDatas[0].configTableId]),