2.1.4

examples/json/table/demo2.json

@@ -7,36 +7,54 @@
     ,"amount": 18
     ,"province": "浙江"
     ,"city": "杭州"
-    ,"county": "文一西路西溪园区"
+    ,"zone": "西湖区"
+    ,"street": "西溪街道"
+    ,"address": "西溪花园"
+    ,"house": "30栋1单元"
   }, {
     "username": "李小四"
     ,"amount": 39
     ,"province": "江苏"
     ,"city": "苏州"
-    ,"county": "丝绸路368号"
+    ,"zone": "姑苏区"
+    ,"street": "丝绸路"
+    ,"address": "天墅之城"
+    ,"house": "9幢2单元"
   }, {
     "username": "王小四"
     ,"amount": 8
     ,"province": "江西"
     ,"city": "南昌"
-    ,"county": "艾溪湖一号楼"
+    ,"zone": "青山湖区"
+    ,"street": "艾溪湖办事处"
+    ,"address": "中兴和园"
+    ,"house": "1幢3单元"
   }, {
     "username": "赵小六"
     ,"amount": 16
     ,"province": "福建"
     ,"city": "泉州"
-    ,"county": "晋江市南洋村"
+    ,"zone": "丰泽区"
+    ,"street": "南洋街道"
+    ,"address": "南洋村"
+    ,"house": "6幢1单元"
   }, {
     "username": "孙小七"
     ,"amount": 12
     ,"province": "湖北"
     ,"city": "武汉"
-    ,"county": "武昌大道19号"
+    ,"zone": "武昌区"
+    ,"street": "武昌大道"
+    ,"address": "两湖花园"
+    ,"house": "16幢2单元"
   }, {
     "username": "周小八"
     ,"amount": 11
     ,"province": "安徽"
     ,"city": "黄山"
-    ,"county": "汤口镇66号"
+    ,"zone": "黄山区"
+    ,"street": "汤口镇"
+    ,"address": "温泉村"
+    ,"house": "21号"
   }]
 }  

examples/table.html

@@ -74,44 +74,47 @@ body{padding: 20px;}
 </script>
 
 
-<table class="layui-table" lay-data="{width:723, height:235, url:'json/table/demo2.json', page: true, limit: 6}">
+<table class="layui-table" lay-data="{width:800, height:235, url:'json/table/demo2.json', page: true, limit: 6}">
   <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="{fixed: 'right', width: 155, align: 'center', toolbar: '#barDemo'}" rowspan="2">操作</th>
     </tr>
     <tr>
-      <th lay-data="{field:'province', width:80}">省</th>
-      <th lay-data="{field:'city', width:120}">市</th>
-      <th lay-data="{field:'county', width:300}">详细</th>
-      <th lay-data="{fixed: 'right', width: 120, align: 'center'}" rowspan="2">操作</th>
+      <th lay-data="{field:'province', width:130}">省</th>
+      <th lay-data="{field:'city', width:130}">市</th>
+      <th lay-data="{field:'zone', width:200}">区</th>
     </tr>
   </thead>
 </table>
 
-<!--
-<table class="layui-table" lay-data="{width:1200, height:300}">
+<table class="layui-table" lay-data="{height:315, url:'json/table/demo2.json', page: true, limit: 6}">
   <thead>
     <tr>
       <th lay-data="{field:'username', width:80}" rowspan="3">联系人</th>
-      <th lay-data="{field:'mobile', width:120}" rowspan="3">金额</th>
-      <th colspan="5">地址</th>
+      <th lay-data="{field:'amount', width:120}" rowspan="3">金额</th>
+      <th lay-data="{align:'center'}" colspan="5">地址1</th>
+      <th lay-data="{align:'center'}" colspan="2">地址2</th>
+      <th lay-data="{fixed: 'right', width: 120, align: 'center', toolbar: '#barDemo'}" rowspan="3">操作</th>
     </tr>
     <tr>
       <th lay-data="{field:'province', width:80}" rowspan="2">省</th>
-      <th lay-data="{field:'city', width:120}" rowspan="2">市</th>
-      <th lay-data="{field:'county', width:150}" rowspan="2">区</th>
-      <th colspan="2">其它</th>
+      <th lay-data="{field:'city', width:80}" rowspan="2">市</th>
+      <th lay-data="{align:'center'}" colspan="2">详细</th>
+      <th lay-data="{field:'zone', width:80}" rowspan="2">区</th>
+      <th lay-data="{field:'province', width:80}" rowspan="2">省</th>
+      <th lay-data="{field:'city', width:80}" rowspan="2">市</th>
     </tr>
     <tr>
-      <th lay-data="{field:'street', width:80}">街道</th>
-      <th lay-data="{field:'detailAdress', width:200}">详细</th>
+      <th lay-data="{field:'address', width:120}">小区</th>
+      <th lay-data="{field:'house', width:120}">单元</th>
     </tr>
   </thead>
 </table>
--->
+
 
 <div class="layui-btn-group">
   <button class="layui-btn" data-type="parseTable">转化为数据表格</button>
@@ -120,6 +123,7 @@ body{padding: 20px;}
 <table class="layui-table" lay-skin="line" lay-filter="parse-table-demo">
   <thead>
     <tr>
+      <th lay-data="{checkbox:true}"></th>
       <th lay-data="{field:'username', width:200}">昵称</th>
       <th lay-data="{field:'joinTime', width:150}">加入时间</th>
       <th lay-data="{field:'sign', width:300}">签名</th>
@@ -127,16 +131,19 @@ body{padding: 20px;}
   </thead>
   <tbody>
     <tr>
+      <td></td>
       <td>贤心1</td>
       <td>2016-11-28</td>
       <td>人生就像是一场修行a</td>
     </tr>
     <tr>
+      <td></td>
       <td>贤心2</td>
       <td>2016-11-29</td>
       <td>人生就像是一场修行b</td>
     </tr>
     <tr>
+      <td></td>
       <td>贤心3</td>
       <td>2016-11-30</td>
       <td>人生就像是一场修行c</td>
@@ -347,7 +354,7 @@ layui.use('table', function(){
   table.on('sort(test)', function(obj){
     console.log(this, obj.field, obj.type)
     
-    return
+    return;
     table.reload('test', {
       initSort: obj
       ,where: { //重新请求服务端