From 39f7b6f09fb18f186c950b84072016ada10dd1c4 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Thu, 29 Jul 2021 18:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=8A=A8=E6=8E=92=E7=89=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=9D=E5=AD=98=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/configtable/list-field.html     | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 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 d4b282b..37aa492 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
@@ -116,7 +116,21 @@
                     <input type="text" id="configTableFieldDefault" name="configTableFieldDefault" class="layui-input" placeholder="请输入默认值" >
                 </div>
             </div>
-            <div class="layui-form-item" id="configTableFieldModeDiv" style="display: none;">
+        <!--    <div class="layui-form-item" >
+                <label class="layui-form-label">宽度</label>
+                <div class="layui-collapse layui-input-block" lay-accordion id="widthChange">
+                    <div class="layui-input-block">
+                        <div style="margin-left:-35px;padding-top: 50px;width:100%;" id="widthChangeDiv"></div>
+                    </div>
+                </div>
+            </div>-->
+            <div class="layui-form-item" pane>
+                <label class="layui-form-label">宽度比</label>
+                <div class="layui-input-block">
+                    <div lay-accordion class="layui-collapse" style="padding: 20px 10px 0 10px; width:100%;box-sizing: border-box" id="widthChangeDiv"></div>
+                </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">
@@ -139,17 +153,17 @@
                         {{# } }}
                     </select>
                 </script>
-            </div>
+            </div>-->
             <iframe src="" id="attribute" style="width: 100%;" frameborder="0" ></iframe>
         </div>
     </div>
 </form>
-
+<!--
 <div class="layui-collapse" lay-accordion style="display: none" id="widthChange">
     <div class="layui-input-block">
         <div style="margin-left:-35px;padding-top: 50px;width:250px;" id="widthChangeDiv"></div>
     </div>
-</div>
+</div>-->
 
 <script id="type1" type="text/html">
     <div row-col="{{ d.configTableFieldRowCol }}"  class="{{ d.configTableFieldRow ? 'clearOut' : '' }} layui-col-lg{{ d.configTableFieldRowCol }} layui-col-md{{ d.configTableFieldRowCol }} layui-col-sm{{ d.configTableFieldRowCol }} layui-form-item module1 js_module_{{ d.configTableFieldId }}" id="{{ d.configTableFieldId }}" >
@@ -488,7 +502,7 @@
             $(".js_module_" + data.configTableFieldId).moduleSet({
                 background:'rgba(0, 0, 0, 0.7)',
                 button:[
-                    {text:'调整', value:data.configTableFieldId, callback:function(data){
+                    /*{text:'调整', value:data.configTableFieldId, callback:function(data){
                         layer.open({
                             type: 1,
                             title: false,
@@ -502,7 +516,7 @@
                                 widthChange(getField(data.value));
                             }
                         });
-                    },iconfont:'fa-arrows-h'},
+                    },iconfont:'fa-arrows-h'},*/
                     {text:'合并', value:data.configTableFieldId, callback:function(data){
                         // 开启合并
                         if(!$("#" + data.value).hasClass("clearOut")) {
@@ -582,6 +596,7 @@
                         var dataFormData = getMapBaseConfig(evt.item.id);
                         dataFormData.configTableFieldMust  = dataFormData.configTableFieldMust == 1 ?  true : false;
                         dataFormData.configTableFieldDisplay = dataFormData.configTableFieldDisplay == 1 ?  true : false;
+                        widthChange(getField(evt.item.id));
                         form.val('dataForm', getMapBaseConfig(evt.item.id));
                         form.render(null, 'dataForm');
                     },