From c4be8125317b2722c25186d36a20f7a7ab4e7636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Wed, 24 Aug 2022 11:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20table=20=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/table-test.html | 19 +++++++++++++++----
 examples/table.html      | 21 +++++++++++++--------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/examples/table-test.html b/examples/table-test.html
index 6f2498c4..f588def8 100644
--- a/examples/table-test.html
+++ b/examples/table-test.html
@@ -70,9 +70,9 @@
   </div>
 </script>
 
-<table id="test" lay-filter="test"></table>
+<table id="test"></table>
 
-<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.6.13/layui.js"></script>
+<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.7.6/layui.js"></script>
 <script>
 (function(off){
   if(!off) return;
@@ -130,7 +130,7 @@ layui.use(['table', 'dropdown'], function(){
     ].join('')
     //,className: '.demo-table-view'
 
-    //,size: 'lg'
+    //,size: 'sm'
     //,skin: 'line'
     //,loading: false
 
@@ -148,6 +148,7 @@ layui.use(['table', 'dropdown'], function(){
     }]
     //,escape: false
     ,editTrigger: 'dblclick'
+    //,cellMaxWidth: 320
     ,cols: !1 ? test_cols : [[
       {type: 'checkbox', fixed: 'left'}
       //,{type: 'numbers', fixed: 'left'}
@@ -155,7 +156,7 @@ layui.use(['table', 'dropdown'], function(){
       ,{field:'username', title:'用户名', width:120, edit: function(d){
         return !d.LAY_DISABLED;
       }, templet: '#usernameTpl'}
-      ,{field:'email', minWidth: 160, title:'邮箱 <i class="layui-icon layui-icon-email"></i>', hide: 0, edit: 'text', templet: function(d){
+      ,{field:'email', minWidth: 160, maxWidth: 320, title:'邮箱 <i class="layui-icon layui-icon-email"></i>', hide: 0, edit: 'text', templet: function(d){
         return '<em>'+ layui.util.escape(d.email) +'</em>'
       }}
       ,{field:'sex', title:'性别', width:80, edit: 'text', sort: true, escape: false}
@@ -453,6 +454,16 @@ layui.use(['table', 'dropdown'], function(){
     update[field] = value;
     obj.update(update, true); // 参数 true 为新版新增功能，详见文档
   });
+
+  // 列拖拽宽度后的事件 -- v2.8.0 新增
+  table.on('colResized(test)', function(obj){
+    console.log(obj);
+  });
+
+  // 列拖拽宽度后的事件 -- v2.8.0 新增
+  table.on('colToggled(test)', function(obj){
+    console.log(obj);
+  });
 });
 </script>
 </body>
diff --git a/examples/table.html b/examples/table.html
index 37f655cf..49d6d5d8 100644
--- a/examples/table.html
+++ b/examples/table.html
@@ -23,8 +23,8 @@
   <thead>
     <tr>
       <th lay-data="{checkbox:true, fixed:'left'}" rowspan="2"></th>
-      <th lay-data="{field:'username', width:80}" rowspan="2">联系人</th>
-      <th lay-data="{field:'amount', width:120}" rowspan="2">金额</th>
+      <th lay-data="{field:'username', width:100}" rowspan="2">联系人</th>
+      <th lay-data="{field:'amount', width:100}" rowspan="2">金额</th>
     </tr>
   </thead>
 </table>
@@ -61,19 +61,24 @@
 <table id="test2" lay-filter="test2"></table>
 
 <div style="display: none1;">
+
+  <table id="demo"></table>
+
   <table class="layui-table" lay-data="{width:800, height: 300, url:'json/table/demo2.json', page: true, limit: 6, toolbar: true}">
     <thead>
       <tr>
         <th lay-data="{checkbox:true, fixed:'left'}" rowspan="2"></th>
         <th lay-data="{field:'username', width:80}" rowspan="2">联系人</th>
         <th lay-data="{field:'amount', width:120}" rowspan="2">金额</th>
-        <th lay-data="{align:'center'}" colspan="3">地址</th>
+        <th lay-data="{align:'center'}" colspan="5">地址</th>
         <th lay-data="{fixed: 'right', width: 155, align: 'center', toolbar: '#barDemo'}" rowspan="2">操作</th>
       </tr>
       <tr>
         <th lay-data="{field:'province', width:130}">省</th>
         <th lay-data="{field:'city', width:130}">市</th>
         <th lay-data="{field:'zone', width:200}">区</th>
+        <th lay-data="{field:'address', width:120}">小区</th>
+        <th lay-data="{field:'house', width:150}">单元</th>
       </tr>
     </thead>
   </table>
@@ -102,9 +107,6 @@
     </thead>
   </table>
 
-  <table id="demo"></table>
-
-
   <div class="layui-btn-group">
     <button class="layui-btn" data-type="parseTable">转化为数据表格</button>
   </div>
@@ -180,7 +182,7 @@
   </table>
 </div>
 
-<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.6.13/layui.js"></script>
+<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.7.6/layui.js"></script>
 <script>
 layui.use('table', function(){
   var $ = layui.$;
@@ -227,6 +229,7 @@ layui.use('table', function(){
     elem: '#demo'
     //,width: 900
     //,height: 274
+    ,toolbar: true
     ,cols: [[ //标题栏
       //{type: 'space'},
       {type: 'checkbox', LAY_CHECKED: true},
@@ -239,6 +242,9 @@ layui.use('table', function(){
       {field: 'city', title: '城市', width: 100},
       //{field: 'experience', title: '积分', width: 80, sort: true},
       {field: 'experience', title: '积分', width: 80, sort: true, totalRow: '{{= parseInt(d.TOTAL_NUMS) }}'}
+      ,{field:'ip', title:'IP', width: 120, align: 'right'}
+      ,{field:'checkin', title:'打卡', width: 100, sort: true, totalRow: '{{= parseInt(d.TOTAL_NUMS) }} 次'}
+      ,{field:'joinTime', title:'加入时间', width: 120}
     ]]
     ,data: [{
       "id": "10001"
@@ -342,7 +348,6 @@ layui.use('table', function(){
     //,loading: false //请求数据时，是否显示loading
   });
   
-  
   var $ = layui.jquery, active = {
     parseTable: function(){
       table.init('parse-table-demo', {