文档

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "svn.ignoreMissingSvnWarning": true
+}

README.md

@@ -73,3 +73,34 @@ layui 原官网已于2021年10月13日下线。详见：
 
 鉴于 Layui 相对庞大的受众群体，从此 Github 和 Gitee 平台将支撑起 Layui 的后续。<br>
 **Layui 将继续陪伴着所有为之热爱的人们，共同去探索和论证「Layui 开发模式的可行性」**
+
+## 维护修改问题
+
+1. table排序后多选无法选中
+2. table合计将统计所有数据而不是当前页
+3. longing修改动画效果
+4. 修改结合soultable重载后高度问题
+5. 修正table窗口变更大小可能出现内存泄漏问题
+
+## 维护增加功能
+
+1. table 增加`getData()`函数，方便获取当前table所有数据，包括行内输入之后的值
+2. table 增加`onColumnsWidth()`函数，可以让table列宽手动调整后返回调整后的cols，方便保存手动调整后的状态
+3. table 增加`sortCallback`属性，用于排序后回调函数，方便获取排序后处理下拉等
+
+## 使用示例
+
+```javascript
+// getData()
+layui.table.getData('tableId')
+// onColumnsWidth
+let tab = table.render(config)
+tab.onColumnsWidth(callback)
+// 视情况添加layui.table.onColumnsWidth 暂时没有用到
+
+table.render({
+  ...,
+  sortCallback: function (res, curr, count) {
+  }
+})
+```

examples/json/table/demo1.json

@@ -3,7 +3,7 @@
   ,"msg": ""
   ,"count": 3000000
   ,"totalRow": {
-    "experience": "777"
+    "checkin": "777"
   }
   ,"data": [{
     "id": "10001"
@@ -11,11 +11,12 @@
     ,"email": "test1@email.com"
     ,"sex": "<strong>男</strong>"
     ,"city": "浙江杭州"
-    ,"sign": "鼠标移动到此处，可以通过点击单元格右侧的下拉图标，查看到被隐藏的全部内容。"
+    ,"sign": "舍南舍北皆春水，但见群鸥日日来。花径不曾缘客扫，蓬门今始为君开。盘飧市远无兼味，樽酒家贫只旧醅。肯与邻翁相对饮，隔篱呼取尽余杯。"
     ,"experience": 7
     ,"ip": "192.168.0.8"
-    ,"logins": 0
+    ,"checkin": 0
     ,"joinTime": "2016-10-14"
+    ,"LAY_DISABLED": true
   }, {
     "id": "10002"
     ,"username": "李白"
@@ -25,7 +26,7 @@
     ,"sign": "君不见，黄河之水天上来，奔流到海不复回。 君不见，高堂明镜悲白发，朝如青丝暮成雪。 人生得意须尽欢，莫使金樽空对月。 天生我材必有用，千金散尽还复来。 烹羊宰牛且为乐，会须一饮三百杯。 岑夫子，丹丘生，将进酒，杯莫停。 与君歌一曲，请君为我倾耳听。(倾耳听 一作：侧耳听) 钟鼓馔玉不足贵，但愿长醉不复醒。(不足贵 一作：何足贵；不复醒 一作：不愿醒/不用醒) 古来圣贤皆寂寞，惟有饮者留其名。(古来 一作：自古；惟 通：唯) 陈王昔时宴平乐，斗酒十千恣欢谑。 主人何为言少钱，径须沽取对君酌。 五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。"
     ,"experience": 9
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
     ,"LAY_CHECKED": true
   }, {
@@ -34,10 +35,10 @@
     ,"email": "test3@email.com"
     ,"sex": "男"
     ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
+    ,"sign": "大江东去，浪淘尽，千古风流人物。故垒西边，人道是，三国周郎赤壁。乱石穿空，惊涛拍岸，卷起千堆雪。江山如画，一时多少豪杰。遥想公瑾当年，小乔初嫁了，雄姿英发。羽扇纶巾，谈笑间，樯橹灰飞烟灭。故国神游，多情应笑我，早生华发。人生如梦，一尊还酹江月。"
     ,"experience": 8
     ,"ip": "192.168.0.8"
-    ,"logins": null
+    ,"checkin": null
     ,"joinTime": "2016-10-14"
   }, {
     "id": "10004"
@@ -48,7 +49,7 @@
     ,"sign": "人生恰似一场修行"
     ,"experience": 6
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
   }, {
     "id": "10005"
@@ -59,7 +60,7 @@
     ,"sign": "人生恰似一场修行"
     ,"experience": 64
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
   }, {
     "id": "10006"
@@ -70,7 +71,7 @@
     ,"sign": "人生恰似一场修行"
     ,"experience": 65
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
   }, {
     "id": "10007"
@@ -81,7 +82,7 @@
     ,"sign": "人生恰似一场修行"
     ,"experience": 49
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
   }, {
     "id": "10008"
@@ -92,7 +93,7 @@
     ,"sign": "人生恰似一场修行"
     ,"experience": 5
     ,"ip": "192.168.0.8"
-    ,"logins": "106"
+    ,"checkin": "106"
     ,"joinTime": "2016-10-14"
   }]
 }  

examples/table-test.html

@@ -21,7 +21,6 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <button class="layui-btn layui-btn-sm" lay-event="getCheckData">获取选中行数据</button>
-    <button class="layui-btn layui-btn-sm" lay-event="getCheckLength">获取选中数目</button>
     <button class="layui-btn layui-btn-sm" lay-event="getData">获取当前页数据</button>
     <button class="layui-btn layui-btn-sm" lay-event="isAll">是否全选</button>
 
@@ -86,6 +85,20 @@ layui.use(['table', 'dropdown'], function(){
   var dropdown = layui.dropdown;
   var form = layui.form;
 
+
+  // 仅用于各类测试的表头
+  var test_cols = [[
+    {type: 'checkbox', fixed: 'left'}
+    ,{field:'id', title:'ID', width:80, fixed: 'left', unresize: true, sort: true, totalRowText: '合计：'}
+    ,{field:'username', title:'用户名', width:120, edit: 'text'}
+    ,{field:'email', title:'邮箱 <i class="layui-icon layui-icon-email"></i>', hide: 0, width:150, edit: 'text'}
+    ,{field:'sex', title:'性别', width:80, edit: 'text', sort: true}
+    ,{field:'city', title:'城市', width: 120}
+    ,{field:'sign', title:'签名'}
+    ,{field: 'experience', title: '积分', width:80, sort: true, align:'center', totalRow: '{{ d.TOTAL_NUMS }} 😊'}
+    ,{fixed: 'right', title:'操作', toolbar: '#barDemo', width:150}
+  ]];
+
   // 全局设定某参数
   table.set({
     where: {
@@ -97,9 +110,6 @@ layui.use(['table', 'dropdown'], function(){
     //,height: 300
   });
   
-  $('#appendtest').append($('#TPL_appendtest').html())
-  table.init('appendtest');
-  
   //渲染
   window.ins1 = table.render({
     elem: '#test'
@@ -109,7 +119,7 @@ layui.use(['table', 'dropdown'], function(){
     ,url: 'json/table/demo1.json'
 
     ,pagebar: '#pagebarDemo' // 分页栏模板
-    ,lineStyle: 'height: 100px;' // 行样式
+    ,lineStyle: 'height: 95px;' // 行样式
     ,css: [ // 自定义样式
       '.layui-table-page{text-align: right;}'
       ,'.layui-table-pagebar{float: left;}'
@@ -120,7 +130,9 @@ layui.use(['table', 'dropdown'], function(){
     //,autoSort: false //是否自动排序。如果否，则由服务端排序
     //,loading: false
     ,totalRow: true
-    ,page: true
+    ,page: {
+      // curr: layui.data('tableCache').curr || 1 // 读取记录中的页码，赋值给起始页
+    }
     ,limit: 30
     ,toolbar: '#toolbarDemo'
     ,defaultToolbar: ['filter', 'exports', 'print', {
@@ -129,17 +141,7 @@ layui.use(['table', 'dropdown'], function(){
       ,icon: 'layui-icon-tips'
     }]
     //,escape: false
-    ,cols: !1 ? [[ //仅用于测试
+    ,cols: !1 ? test_cols : [[
-      {type: 'checkbox', fixed: 'left'}
-      ,{field:'id', title:'ID', width:80, fixed: 'left', unresize: true, sort: true, totalRowText: '合计：'}
-      ,{field:'username', title:'用户名', width:120, edit: 'text'}
-      ,{field:'email', title:'邮箱 <i class="layui-icon layui-icon-email"></i>', hide: 0, width:150, edit: 'text'}
-      ,{field:'sex', title:'性别', width:80, edit: 'text', sort: true}
-      ,{field:'city', title:'城市', width:120}
-      ,{field:'sign', title:'签名'}
-      ,{field: 'experience', title: '积分', width:80, sort: true, align:'center', totalRow: '{{ d.TOTAL_NUMS }} 😊'}
-      ,{fixed: 'right', title:'操作', toolbar: '#barDemo', width:150}
-    ]] : [[
       {type: 'checkbox', fixed: 'left'}
       ,{field:'id', title:'ID', width:80, fixed: 'left', unresize: true, sort: true, totalRowText: '合计：'}
       ,{field:'username', title:'用户名', width:120, edit: 'text', templet: '#usernameTpl'}
@@ -152,15 +154,16 @@ layui.use(['table', 'dropdown'], function(){
         var td = obj.td(this.field); //获取当前 td
         return td.find('select').val();
       }}
-      ,{field:'sign', title:'签名', edit: 'textarea'}
+      ,{field:'sign', title:'签名', minWidth: 200, style:'color: #5FB878', edit: 'textarea'}
-      ,{field: 'experience', title: '积分', width:80, sort: true, align:'center', totalRow: '{{ d.TOTAL_NUMS }} 😊', templet: '<div>{{ d.experience }} 分</div>'}
+      ,{field: 'experience', title: '积分', width: 100, sort: true, align:'center', totalRow: !1 || '{{= d.TOTAL_NUMS }} 分 😊', templet: '<div><a href="" class="layui-table-link">{{ d.experience }}</a> 分</div>'}
-      ,{field:'ip', title:'IP', width: 120}
+      ,{field:'ip', title:'IP', width: 120, align: 'right'}
-      ,{field:'logins', title:'登入次数', width: 100, sort: true, totalRow: '{{ parseInt(d.TOTAL_NUMS) }} 次'}
+      ,{field:'checkin', title:'打卡', width: 100, sort: true, totalRow: '{{= parseInt(d.TOTAL_NUMS) }} 次'}
       ,{field:'joinTime', title:'加入时间', width: 120}
       ,{fixed: 'right', title:'操作', toolbar: '#barDemo', width: 180}
     ]]
     
-    ,initSort1: {
+    //,autoSort: false // 禁用前端自动排序
+    ,initSort11111: { // 初始排序状态
       field: 'experience' //排序字段，对应 cols 设定的各字段名
       ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
     }
@@ -172,9 +175,17 @@ layui.use(['table', 'dropdown'], function(){
       ,key: 'experience'
       ,order: 'asc'
     }
-    ,done: function(){
+    ,done: function(res, curr, count){
       var id = this.id;
 
+      // 记录当前页码
+      /*
+      layui.data('tableCache', {
+        key: 'curr',
+        value: curr
+      });
+      */
+
       // 重载测试
       dropdown.render({
         elem: '#reloadTest' //可绑定在任意元素中，此处以上述按钮为例
@@ -326,19 +337,20 @@ layui.use(['table', 'dropdown'], function(){
   
   //排序事件
   table.on('sort(test)', function(obj){
-    console.log(obj);
+    //console.log(obj);
 
-    return;
+    //return;
     layer.msg('服务端排序。order by '+ obj.field + ' ' + obj.type);
+
     //服务端排序
-    table.reload('test', {
+    table.reloadData('test', {
-      initSort: obj
+      //initSort: obj,
-      //,page: {curr: 1} //重新从第一页开始
+      //page: {curr: 1}, //重新从第一页开始
-      ,where: { //重新请求服务端
+      where: { // 向服务端传入排序参数
-        key: obj.field //排序字段
+        key: obj.field, //排序字段
-        ,order: obj.type //排序方式
+        order: obj.type //排序方式
       }
-    }, true);
+    });
   });
   
   // 工具栏事件
@@ -351,10 +363,6 @@ layui.use(['table', 'dropdown'], function(){
         var data = checkStatus.data;
         layer.alert(layui.util.escape(JSON.stringify(data)));
       break;
-      case 'getCheckLength':
-        var data = checkStatus.data;
-        layer.msg('选中了：'+ data.length + ' 个');
-      break;
       case 'getData':
         var getData = table.getData(id);
         console.log(getData);

examples/table.html

@@ -201,6 +201,7 @@ layui.use('table', function(){
     //,height: 300
     ,cellMinWidth: 80
     //,skin: 'line'
+    //,size: 'lg'
     ,toolbar: true
     ,cols: [[
       {field: 'id', hide: true}
@@ -236,7 +237,7 @@ layui.use('table', function(){
       ,{field: 'sex', title: '性别', width: 80}
       ,{field: 'city', title: '城市', width: 100}
       // ,{field: 'experience', title: '积分', width: 80, sort: true}
-      ,{field: 'experience', title: '积分', width: 80, sort: true, totalRow: true, totalRowDecimals: 3}
+      ,{field: 'experience', title: '积分', width: 80, sort: true, totalRow: '{{= parseInt(d.TOTAL_NUMS) }}'}
     ]]
     ,data: [{
       "id": "10001"

gulpfile.js

@@ -49,12 +49,7 @@ const js = () => {
   let src = [
     './src/**/{layui,layui.all,'+ config.modules +'}.js'
   ];
-  return gulp.src(src).pipe(uglify({
+  return gulp.src(src).pipe(concat('layui.js', {newLine: ''}))
-    output: {
-      ascii_only: true //escape Unicode characters in strings and regexps
-    },
-    ie: true
-  })).pipe(concat('layui.js', {newLine: ''}))
   .pipe(header.apply(null, config.comment))
   .pipe(gulp.dest(dest));
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "layui",
   "realname": "layui",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Classic modular Front-End UI library",
   "main": "dist/layui.js",
   "license": "MIT",
@@ -12,21 +12,23 @@
   },
   "homepage": "https://github.com/layui/layui/",
   "devDependencies": {
+    "del": "^2.2.2",
     "gulp": "^4.0.2",
-    "gulp-uglify": "^3.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
-    "gulp-replace": "^1.1.3",
-    "gulp-rename": "^2.0.0",
-    "gulp-header": "^2.0.9",
     "gulp-footer": "^2.1.0",
-    "del": "^2.2.2",
+    "gulp-header": "^2.0.9",
+    "gulp-rename": "^2.0.0",
+    "gulp-replace": "^1.1.3",
+    "gulp-uglify": "^3.0.2",
     "minimist": "^1.2.5"
   },
   "bugs": {
     "url": "https://gitee.com/sentsin/layui/issues"
   },
-  "dependencies": {},
+  "dependencies": {
+    "layui": "file:"
+  },
   "keywords": [
     "layui",
     "ui",

src/css/layui.css

@@ -723,6 +723,7 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-form-checkbox[lay-skin="primary"]:hover i{border-color: #5FB878; color: #fff;}
 .layui-form-checked[lay-skin="primary"] i{border-color: #5FB878 !important; background-color: #5FB878; color: #fff;}
 .layui-checkbox-disabled[lay-skin="primary"] span{background: none!important; color: #c2c2c2!important;}
+.layui-form-checked.layui-checkbox-disabled[lay-skin="primary"] i{background: #eee!important; border-color: #eee!important;}
 .layui-checkbox-disabled[lay-skin="primary"]:hover i{border-color: #d2d2d2;}
 .layui-form-item .layui-form-checkbox[lay-skin="primary"]{margin-top: 10px;}
 
@@ -950,6 +951,8 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-table-cell{height: 38px; line-height: 28px; padding: 6px 15px; position: relative; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; box-sizing: border-box;}
 .layui-table-cell .layui-form-checkbox[lay-skin="primary"]{top: -1px; padding: 0;}
 .layui-table-cell .layui-table-link{color: #01AAED;}
+.layui-table-cell[align="center"]{-webkit-box-pack: center;}
+.layui-table-cell[align="right"]{-webkit-box-pack: end;}
 
 .laytable-cell-checkbox,
 .laytable-cell-radio,
@@ -991,7 +994,7 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-table-view select[lay-ignore]{display: inline-block;}
 .layui-table-patch .layui-table-cell{padding: 0; width: 30px;}
 
-.layui-table-edit{position: absolute; left: 0; top: 0; z-index: 900; min-width: 100%; min-height: 100%; padding: 0 14px 1px; border-radius: 0; box-shadow: 1px 1px 20px rgba(0,0,0,.15); background-color: #fff;}
+.layui-table-edit{position: absolute; left: 0; top: 0; z-index: 900; min-width: 100%; min-height: 100%; padding: 5px 14px; border-radius: 0; box-shadow: 1px 1px 20px rgba(0,0,0,.15); background-color: #fff;}
 .layui-table-edit:focus{border-color: #5FB878!important;}
 select.layui-table-edit{padding: 0 0 0 10px; border-color: #d2d2d2;}
 .layui-table-view .layui-form-switch,

src/css/modules/layer/default/layer.css

@@ -177,3 +177,49 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 }
 
 
+/* 下面是添加的新的加载动画 */
+.loading {
+  width: 83px;
+  height: 83px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  -webkit-filter: url("#goo");
+  filter: url("#goo");
+}
+.loading span {
+  width: 100%;
+  text-align: center;
+  color: linear-gradient(to right, #92fe9d 0%, #00c9ff 100%);
+  font-weight: bold;
+  text-transform: uppercase;
+  font-size: 15px;
+  letter-spacing: 1px;
+  position: absolute;
+  left: 1px;
+  top: 46%;
+}
+.loading:before, .loading:after {
+  content: '';
+  border-radius: 50%;
+  background-color: rgb(22, 120, 160);
+  width: 26px;
+  height: 26px;
+  position: absolute;
+  left: 72px;
+  top: 8px;
+  animation: rotate 6s linear;
+  animation-iteration-count: infinite;
+  transform-origin: 12px 76px;
+}
+.loading:before {
+  box-shadow: 45px 19px 0px 0px rgb(22, 120, 160), 62px 63px 0px 0px rgb(22, 120, 160), 45px 107px 0px 0px rgb(22, 120, 160), 0px 126px 0px 0px rgb(22, 120, 160), -46px 107px 0px 0px rgb(22, 120, 160), -63px 63px 0px 0px rgb(22, 120, 160), -46px 19px 0px 0px rgb(22, 120, 160);
+}
+.loading:after {
+  animation-direction: reverse;
+}
+@keyframes rotate {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(-360deg); }
+}

src/layui.js

@@ -15,7 +15,7 @@
   }
 
   ,Layui = function(){
-    this.v = '2.7.0'; // layui 版本号
+    this.v = '2.7.1'; // layui 版本号
   }
   
   //识别预先可能定义的指定全局对象
@@ -701,6 +701,93 @@
     desc && clone.reverse(); // 倒序
     return clone;
   };
+    // 不复制 将数组中的成员对象按照某个 key 的 value 值进行排序
+    Layui.prototype.thissort = function(arr, key, desc){
+      var that = this
+      ,clone = (arr || []);
+      
+      // 若未传入 key，则直接返回原对象
+      if(that.type(arr) === 'object' && !key){
+        return clone;
+      } else if(typeof arr !== 'object'){ //若 arr 非对象
+        return [clone];
+      }
+      
+      // 开始排序
+      clone.sort(function(o1, o2){
+        var v1 = o1[key]
+        ,v2 = o2[key];
+        
+        /*
+         * 特殊数据
+         * 若比较的成员均非对象
+         */
+  
+        // 若比较的成员均为数字
+        if(!isNaN(o1) && !isNaN(o2)) return o1 - o2;
+        // 若比较的成员只存在某一个非对象
+        if(!isNaN(o1) && isNaN(o2)){
+          if(key && typeof o2 === 'object'){
+            v1 = o1;
+          } else {
+            return -1;
+          }
+        } else if (isNaN(o1) && !isNaN(o2)){
+          if(key && typeof o1 === 'object'){
+            v2 = o2;
+          } else {
+            return 1;
+          }
+        }
+  
+        /*
+         * 正常数据
+         * 即成员均为对象，也传入了对比依据： key
+         * 若 value 为数字，按「大小」排序；若 value 非数字，则按「字典序」排序
+         */
+  
+        // value 是否为数字
+        var isNum = [!isNaN(v1), !isNaN(v2)];
+  
+        // 若为数字比较
+        if(isNum[0] && isNum[1]){
+          if(v1 && (!v2 && v2 !== 0)){ //数字 vs 空
+            return 1;
+          } else if((!v1 && v1 !== 0) && v2){ //空 vs 数字
+            return -1;
+          } else { //数字 vs 数字
+            return v1 - v2;
+          }
+        };
+        
+        /**
+         * 字典序排序
+         */
+         
+        // 若为非数字比较
+        if(!isNum[0] && !isNum[1]){
+          // 字典序比较
+          if(v1 > v2){
+            return 1;
+          } else if (v1 < v2) {
+            return -1;
+          } else {
+            return 0;
+          }
+        }
+        
+        // 若为混合比较
+        if(isNum[0] || !isNum[1]){ //数字 vs 非数字
+          return -1;
+        } else if(!isNum[0] || isNum[1]) { //非数字 vs 数字
+          return 1;
+        }
+  
+      });
+  
+      desc && clone.reverse(); // 倒序
+      return clone;
+    };
 
   //阻止事件冒泡
   Layui.prototype.stope = function(thisEvent){

src/modules/form.js

@@ -450,7 +450,12 @@ layui.define('layer', function(exports){
             hideDown(true);
             return false;
           });
-          
+          dds.on('mousedown',(events)=>{
+            events.stopPropagation()
+          });
+          dds.on('mouseup',(events)=>{
+            events.stopPropagation()
+          });
           reElem.find('dl>dt').on('click', function(e){
             return false;
           });

src/modules/layer.js

@@ -205,6 +205,7 @@ var Class = function(setings){
   var that = this, creat = function(){
     that.creat();
   };
+  that.yesStatus = true
   that.index = ++layer.index;
   that.config.maxWidth = $(win).width() - 15*2; //初始最大宽度：当前屏幕宽，左右留 15px 边距
   that.config = $.extend({}, that.config, ready.config, setings);
@@ -253,7 +254,13 @@ Class.pt.vessel = function(conType, callback){
   var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">' 
     + (titype ? config.title[0] : config.title) 
   + '</div>' : '');
-  
+  var lodingf = function (){
+    if(config.type != 3){
+      return '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
+    }else{
+      return `<div id="${config.id||''}" style="scale: 0.5"><div class="loading"> </div> <svg xmlns="http://www.w3.org/2000/svg" version="1.1"> <defs> <filter id="goo"> <feGaussianBlur in="SourceGraphic" stdDeviation="6.3" result="blur" /> <feColorMatrix in="blur" mode="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 14 -4" result="goo" /> <feBlend in="SourceGraphic" in2="goo" /> </filter> </defs> </svg>`
+    }
+  }
   config.zIndex = zIndex;
   callback([
     //遮罩
@@ -262,7 +269,7 @@ Class.pt.vessel = function(conType, callback){
     //主体
     '<div class="'+ doms[0] + (' layui-layer-'+ready.type[config.type]) + (((config.type == 0 || config.type == 2) && !config.shade) ? ' layui-layer-border' : '') + ' ' + (config.skin||'') +'" id="'+ doms[0] + times +'" type="'+ ready.type[config.type] +'" times="'+ times +'" showtime="'+ config.time +'" conType="'+ (conType ? 'object' : 'string') +'" style="z-index: '+ zIndex +'; width:'+ config.area[0] + ';height:' + config.area[1] + ';position:'+ (config.fixed ? 'fixed;' : 'absolute;') +'">'
       + (conType && config.type != 2 ? '' : titleHTML)
-      + '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
+      + lodingf() // 这行是中间加载
         + (config.type == 0 && config.icon !== -1 ? '<i class="layui-layer-ico layui-layer-ico'+ config.icon +'"></i>' : '')
         + (config.type == 1 && conType ? '' : (config.content||''))
       + '</div>'
@@ -677,11 +684,21 @@ Class.pt.callback = function(){
     }
   }
   layer.ie == 6 && that.IE6(layero);
+  // 节流函数
  
   //按钮
+  // 按钮的事件在这里
   layero.find('.'+ doms[6]).children('a').on('click', function(){
     var index = $(this).index();
     if(index === 0){
+      if(that.yesStatus){
+        that.yesStatus = false
+        setTimeout(()=>{
+          that.yesStatus = true
+        },1000)
+      }else{
+        return
+      }
       if(config.yes){
         config.yes(that.index, layero)
       } else if(config['btn1']){

src/modules/slider.js

@@ -30,9 +30,9 @@ layui.define('jquery', function(exports){
     ,options = that.config;
 
     return {
-      setValue: function(value, index){ //设置值
+      setValue: function(value, index,s){ //设置值
         options.value = value;
-        return that.slide('set', value, index || 0);
+        return that.slide('set', value, index || 0,s);
       }
       ,config: options
     }
@@ -47,6 +47,7 @@ layui.define('jquery', function(exports){
     that.index = ++slider.index;
     that.config = $.extend({}, that.config, slider.config, options);
     that.render();
+    that.anxia = false;
   };
 
   //默认配置
@@ -206,7 +207,7 @@ layui.define('jquery', function(exports){
   };
 
   //滑块滑动
-  Class.prototype.slide = function(setValue, value, i){
+  Class.prototype.slide = function(setValue, value, i,s){
     var that = this
     ,options = that.config
     ,sliderAct = that.elemTemp
@@ -217,7 +218,7 @@ layui.define('jquery', function(exports){
     ,sliderTxt = sliderAct.next('.' + SLIDER_INPUT)
     ,inputValue = sliderTxt.children('.' + SLIDER_INPUT_TXT).children('input').val()
     ,step = 100 / ((options.max - options.min) / Math.ceil(options.step))
-    ,change = function(offsetValue, index){
+    ,change = function(offsetValue, index,s){
       if(Math.ceil(offsetValue) * step > 100){
         offsetValue = Math.ceil(offsetValue) * step
       }else{
@@ -259,7 +260,7 @@ layui.define('jquery', function(exports){
       }
       
        //回调
-      options.change && options.change(options.range ? arrValue : selfValue);
+      options.change && options.change(options.range ? arrValue : selfValue,selfValue,s);
     }
     ,valueTo = function(value){
       var oldLeft = value / sliderWidth() * 100 / step
@@ -283,7 +284,7 @@ layui.define('jquery', function(exports){
     };
     
     //动态赋值
-    if(setValue === 'set') return change(value, i);
+    if(setValue === 'set') return change(value, i,s);
 
     //滑块滑动
     sliderAct.find('.' + SLIDER_WRAP_BTN).each(function(index){
@@ -304,7 +305,7 @@ layui.define('jquery', function(exports){
           if(left < 0)left = 0;
           if(left > sliderWidth())left = sliderWidth();
           var reaLeft = left / sliderWidth() * 100 / step;
-          change(reaLeft, index);
+          change(reaLeft, index,2);
           othis.addClass(ELEM_HOVER);
           sliderAct.find('.' + SLIDER_TIPS).show();
           e.preventDefault();
@@ -336,11 +337,46 @@ layui.define('jquery', function(exports){
         }else{
           index = 0;
         };
-        change(reaLeft, index);
+        // console.log(reaLeft,left,step)
+        change(reaLeft, index,true);
         e.preventDefault();
       }
     });
-    
+    // 拖动滑块
+    sliderAct.find('.' + SLIDER_BAR).on("mousemove",function (e){
+      if(!that.anxia){
+        return
+      }
+      return
+      var main = $('.' + SLIDER_WRAP_BTN);
+      if(!main.is(event.target) && main.has(event.target).length === 0 && main.length){
+        var left = options.type === 'vertical' ? (sliderWidth() - e.clientY + $(this).offset().top):(e.clientX - $(this).offset().left), index;
+        if(left < 0)left = 0;
+        if(left > sliderWidth())left = sliderWidth();
+        var reaLeft = left / sliderWidth() * 100 / step;
+        if(options.range){
+          if(options.type === 'vertical'){
+            index = Math.abs(left - parseInt($(sliderWrap[0]).css('bottom'))) > Math.abs(left -  parseInt($(sliderWrap[1]).css('bottom'))) ? 1 : 0;
+          }else{
+            index = Math.abs(left - sliderWrap[0].offsetLeft) > Math.abs(left - sliderWrap[1].offsetLeft) ? 1 : 0;
+          }
+        }else{
+          index = 0;
+        };
+        console.log(reaLeft,left,step)
+        change(reaLeft, index);
+        e.preventDefault();
+      }
+    })
+    sliderAct.find('.' + SLIDER_BAR).on("mousedown",function (){
+      that.anxia = true
+    })
+    sliderAct.find('.' + SLIDER_BAR).on("mouseup",function (){
+      that.anxia = false
+    })
+    sliderAct.find('.' + SLIDER_BAR).on("click",function (e){
+      e.preventDefault();
+    })
     //点击加减输入框
     sliderTxt.children('.' + SLIDER_INPUT_BTN).children('i').each(function(index){
       $(this).on('click', function(){

src/modules/table.js

@@ -20,10 +20,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     config: {
       checkName: 'LAY_CHECKED' //是否选中状态的字段名
       ,indexName: 'LAY_TABLE_INDEX' //初始下标索引名，用于恢复排序
+      ,disabledName: 'LAY_DISABLED'
     } //全局配置项
     ,cache: {} //数据缓存
+    ,allData:[] // 全部数据
     ,index: layui.table ? (layui.table.index + 10000) : 0
-    
+    ,winResiz:[]
     //设置全局项
     ,set: function(options){
       var that = this;
@@ -42,7 +44,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     var that = this
     ,options = that.config
     ,id = options.id || options.index;
-    
     if(id){
       thisTable.that[id] = that; //记录当前实例对象
       thisTable.config[id] = options; //记录当前实例配置项
@@ -61,6 +62,17 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       }
       ,resize: function(){ //重置表格尺寸/结构
         that.resize.call(that);
+      },
+      getData: function(){
+        // return  JSON.parse(JSON.stringify(that.config.data))
+        return that.config.data
+      },
+      mergeData:function(id,data,index){
+        table.mergeData(id,data,index)
+      },
+      // 设置列宽调整后的回调
+      onColumnsWidth: function(fun){
+        that.config.onColumnsWidth = fun;
       }
     }
   }
@@ -233,11 +245,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
         ,' }'
       ,'{{# });'
     ,'}); }}'
-    ,'{{# if(d.data.lineStyle){ }}'
+    ,'{{# if(d.data.lineStyle){' 
-      ,'.layui-table-view-{{= d.index }} .layui-table-body .layui-table .layui-table-cell{'
+      ,'var cellClassName = ".layui-table-view-"+ d.index +" .layui-table-body .layui-table .layui-table-cell";'
-        ,' display: -webkit-box; -webkit-box-align: center; display: -moz-box; -moz-box-align: center; white-space: normal; {{- d.data.lineStyle }} '
+    ,'}}'
+      ,'{{= cellClassName }}{'
+        ,'display: -webkit-box; -webkit-box-align: center; white-space: normal; {{- d.data.lineStyle }} '
       ,'}'
-      ,'.layui-table-view-{{= d.index }} .layui-table-body .layui-table .layui-table-cell:hover{overflow: auto;}'
+      ,'{{= cellClassName }}:hover{overflow: auto;}'
     ,'{{# } }}'
     ,'{{# if(d.data.css){ }}'
       ,'{{- d.data.css }}'
@@ -250,7 +264,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
   
   //构造器
   ,Class = function(options){
+    
     var that = this;
+    that.reanderTime = new Date().getTime()
     that.index = ++table.index;
     that.config = $.extend({}, that.config, table.config, options);
     that.render();
@@ -265,6 +281,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,editTrigger: 'click' //单元格编辑的事件触发方式
     ,defaultToolbar: ['filter', 'exports', 'print'] //工具栏右侧图标
     ,autoSort: true //是否前端自动排序。如果否，则需自主排序（通常为服务端处理好排序）
+    ,sortCallback:function(){}
     ,text: {
       none: '无数据'
     }
@@ -347,13 +364,18 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     
     options.index = that.index;
     that.key = options.id || options.index;
+    table.allData[that.key] = options.data
     
+    // 添加到全局渲染中，为了全局resize防止内存泄漏 
+    table.winResiz[that.key] = that
     //生成替代元素
     hasRender[0] && hasRender.remove(); //如果已经渲染，则Rerender
     othis.after(reElem);
     
     //各级容器
+    
     that.layTool = reElem.find(ELEM_TOOL);
+    that.layBorderBox = reElem;
     that.layBox = reElem.find(ELEM_BOX);
     that.layHeader = reElem.find(ELEM_HEADER);
     that.layMain = reElem.find(ELEM_MAIN);
@@ -429,7 +451,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     if(type === 'width') return options.clientWidth;
 
     // 初始化 css 参数
-    if(options.css){
+    if(options.css && options.css.indexOf(ELEM_VIEW) === -1){
       var css = options.css.split('}');
       layui.each(css, function(index, value){
         if(value){
@@ -734,7 +756,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     
     //对参数进行深度或浅扩展
     that.config = $.extend(deep, {}, that.config, options);
-
+    table.allData[that.key] = that.config.data
     //执行渲染
     that.render(type);
   };
@@ -756,13 +778,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     that.layMain.append(that.layNone = layNone);
 
     // 异常情况下对page和total的内容处理
-    that.layPage && that.layPage.addClass(HIDE).find('>div').html('');
+    that.layPage && that.layPage.addClass(HIDE_V).find('>div').html('');
-    that.layTotal && that.layTotal.addClass(HIDE).find('tbody').html('');
+    that.layTotal && that.layTotal.addClass(HIDE_V).find('tbody').html('');
 
     table.cache[that.key] = []; //格式化缓存数据
   };
   
-  //页码
+  // 初始页码
   Class.prototype.page = 1;
   
   //获得数据
@@ -896,7 +918,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
             if(item3.templet) attr.push('data-content="'+ content +'"'); //自定义模板
             if(item3.toolbar) attr.push('data-off="true"'); //行工具列关闭单元格事件
             if(item3.event) attr.push('lay-event="'+ item3.event +'"'); //自定义事件
-            if(item3.style) attr.push('style="'+ item3.style +'"'); //自定义样式
             if(item3.minWidth) attr.push('data-minwidth="'+ item3.minWidth +'"'); //单元格最小宽度
             return attr.join(' ');
           }() +' class="'+ function(){ //追加样式
@@ -908,31 +929,52 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
             ,'<div class="layui-table-cell laytable-cell-'+ function(){ //返回对应的CSS类标识
               return item3.type === 'normal' ? key 
               : (key + ' laytable-cell-' + item3.type);
-            }() +'"'+ (item3.align ? ' align="'+ item3.align +'"' : '') +'>' + function(){
+            }() +'"'
+            + (item3.align ? ' align="'+ item3.align +'"' : '') 
+            + function(){
+              var attr = [];
+              if(item3.style) attr.push('style="'+ item3.style +'"'); //自定义单元格样式
+              return attr.join(' ');
+            }() +'>' 
+            + function(){
               var tplData = $.extend(true, {
                 LAY_INDEX: numbers
                 ,LAY_COL: item3
               }, item1)
-              ,checkName = table.config.checkName;
+              ,checkName = table.config.checkName
+              ,disabledName = table.config.disabledName;
               
               //渲染不同风格的列
               switch(item3.type){
-                case 'checkbox':
+                case 'checkbox': // 复选
                   return '<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+ function(){
+                    // 其他属性
+                    var arr = [];
+
                     //如果是全选
                     if(item3[checkName]){
                       item1[checkName] = item3[checkName];
-                      return item3[checkName] ? 'checked' : '';
+                      if(item3[checkName]) arr[0] = 'checked';
                     }
-                    return tplData[checkName] ? 'checked' : '';
+                    if(tplData[checkName]) arr[0] = 'checked';
+
+                    // 禁选
+                    if(tplData[disabledName]) arr.push('disabled');
+
+                    return arr.join(' ');
                   }() +'>';
                 break;
-                case 'radio':
+                case 'radio': // 单选
                   if(tplData[checkName]){
                     thisCheckedRowIndex = i1;
                   }
                   return '<input type="radio" name="layTableRadio_'+ options.index +'" '
-                  + (tplData[checkName] ? 'checked' : '') +' lay-type="layTableRadio">';
+                  + function(){
+                    var arr = [];
+                    if(tplData[checkName]) arr[0] = 'checked';
+                    if(tplData[disabledName]) arr.push('disabled');
+                    return arr.join(' ');
+                  }() +' lay-type="layTableRadio">';
                 break;
                 case 'numbers':
                   return numbers;
@@ -961,7 +1003,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
         trs_fixed_r.push('<tr data-index="'+ i1 +'">'+ tds_fixed_r.join('') + '</tr>');
       });
 
+      // 容器的滚动条位置复位
       that.layBody.scrollTop(0);
+      if(options.resetScrollbar){
+        that.layBody.scrollLeft(0);
+      }
+
       that.layMain.find('.'+ NONE).remove();
       that.layMain.find('tbody').html(trs.join(''));
       that.layFixLeft.find('tbody').html(trs_fixed.join(''));
@@ -982,6 +1029,14 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       //同步表头父列的相关值
       options.HAS_SET_COLS_PATCH || that.setColsPatch();
       options.HAS_SET_COLS_PATCH = true;
+      // 判断是否需要执行排序回调
+      if(sort){
+        try{
+          that.config.sortCallback.call(that.config,res, curr, count, sort)
+        }catch (e) {
+          console.error(e)
+        }
+      }
     };
     
     table.cache[that.key] = data; //记录数据
@@ -990,7 +1045,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     //that.layPage[(count == 0 || (data.length === 0 && curr == 1)) ? 'addClass' : 'removeClass'](HIDE);
 
     //显示隐藏合计栏
-    that.layTotal[data.length == 0 ? 'addClass' : 'removeClass'](HIDE_V);;
+    that.layTotal[data.length == 0 ? 'addClass' : 'removeClass'](HIDE_V);
 
     //显示隐藏分页栏
     if(!options.pagebar){
@@ -1011,12 +1066,14 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     
     //如果执行初始排序
     if(sort){
+  
       return render();
     }
     
     //正常初始化数据渲染
     render(); //渲染数据
-    that.renderTotal(data, totalRowData); //数据合计
+    // 传data 合计当前页 传 全部data 合计全部页
+    that.renderTotal(that.config.data, totalRowData); //数据合计
     that.layTotal && that.layTotal.removeClass(HIDE);
 
     //同步分页状态
@@ -1077,7 +1134,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       //td 内容
       var content = function(){
         var text = item3.totalRowText || ''
-        ,decimals = item3.totalRowDecimals || 2
+        ,decimals = 'totalRowDecimals' in item3 ? item3.totalRowDecimals : 2
         ,thisTotalNum = parseFloat(totalNums[field]).toFixed(decimals)
         ,tplData = {}
         ,getContent;
@@ -1097,7 +1154,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       ,td = ['<td data-field="'+ field +'" data-key="'+ options.index + '-'+ item3.key +'" '+ function(){
         var attr = [];
         if(item3.align) attr.push('align="'+ item3.align +'"'); //对齐方式
-        if(item3.style) attr.push('style="'+ item3.style +'"'); //自定义样式
         if(item3.minWidth) attr.push('data-minwidth="'+ item3.minWidth +'"'); //单元格最小宽度
         return attr.join(' ');
       }() +' class="'+ function(){ //追加样式
@@ -1110,13 +1166,18 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
           var str = (options.index + '-' + item3.key);
           return item3.type === 'normal' ? str 
           : (str + ' laytable-cell-' + item3.type);
-        }() +'">' + function(){
+        }() +'"'+ function(){
+        var attr = [];
+        if(item3.style) attr.push('style="'+ item3.style +'"'); //自定义单元格样式
+        return attr.join(' ');
+      }() +'>' + function(){
           var totalRow = item3.totalRow || options.totalRow;
+
           //如果 totalRow 参数为字符类型，则解析为自定义模版
           if(typeof totalRow === 'string'){
             return laytpl(totalRow).render($.extend({
-              TOTAL_NUMS: content
+              TOTAL_NUMS: totalNums[field]
-            }, item3))
+            }, item3));
           }
           return content;
         }()
@@ -1205,24 +1266,27 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     //默认为前端自动排序。如果否，则需自主排序（通常为服务端处理好排序）
     if(options.autoSort){
       if(type === 'asc'){ //升序
-        thisData = layui.sort(data, field);
+        thisData = layui.thissort(data, field);
       } else if(type === 'desc'){ //降序
-        thisData = layui.sort(data, field, true);
+        thisData = layui.thissort(data, field, true);
       } else { //清除排序
-        thisData = layui.sort(data, table.config.indexName);
+        thisData = layui.thissort(data, table.config.indexName);
         delete that.sortKey;
       }
     }
     
     res[options.response.dataName] = thisData || data;
     that.renderData(res, that.page, that.count, true);
-    
+    // table.cache[that.key] = thisData
     if(formEvent){
-      layui.event.call(th, MOD_NAME, 'sort('+ filter +')', {
+      options.initSort = {
         field: field
         ,type: type
-      });
+      };
+      layui.event.call(th, MOD_NAME, 'sort('+ filter +')', options.initSort);
     }
+    // if(this)
+    this.config.afterSort && this.config.afterSort()
   };
   
   //请求loading
@@ -1253,7 +1317,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     thisData[index][options.checkName] = checked;
   };
   
-  //同步全选按钮状态
+  // 同步全选按钮状态
   Class.prototype.syncCheckAll = function(){
     var that = this
     ,options = that.config
@@ -1303,7 +1367,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,options = that.config
     ,height = options.height
     ,bodyHeight;
-
     if(that.fullHeightGap){
       height = _WIN.height() - that.fullHeightGap;
       if(height < 135) height = 135;
@@ -1329,6 +1392,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     if(options.page){
       bodyHeight -= (that.layPage.outerHeight() || 41);
     }
+    // 减去筛选插件高度
+    if(this.layBorderBox.find(".soul-bottom-contion")[0]){
+      bodyHeight -= (this.layBorderBox.find(".soul-bottom-contion")[0].offsetHeight || 31);
+    }
+    let h = bodyHeight - 2 - parseFloat(that.layMain.css('height'));
+    // that.layBody.css("height",  parseFloat(that.layBody.css("height")) + h);
+    // that.layBorderBox.css("height",  parseFloat(that.layBorderBox.css("height")) + h);
     
     that.layMain.css('height', bodyHeight - 2);
   };
@@ -1559,12 +1629,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
         e.preventDefault();
         dict.resizeStart = true; //开始拖拽
         dict.offset = [e.clientX, e.clientY]; //记录初始坐标
-        
         that.getCssRule(key, function(item){
           var width = item.style.width || othis.outerWidth();
           dict.rule = item;
           dict.ruleWidth = parseFloat(width);
           dict.minWidth = othis.data('minwidth') || options.cellMinWidth;
+          dict.target = othis[0]
         });
       }
     });
@@ -1583,6 +1653,16 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       }
     }).on('mouseup', function(e){
       if(dict.resizeStart){
+        // 处理宽度
+        for(let j of that.config.cols){
+          for(let i of j){
+            if(i.field == dict.target.dataset.field){
+              i.width = dict.target.clientWidth
+            }
+          }
+        }
+        that.config.onColumnsWidth && that.config.onColumnsWidth(that.config.cols)
+        if (layui.soulTable) { layui.soulTable.fixTableRemember(that.config, dict) } //拖动列宽 记忆开启
         dict = {};
         _BODY.css('cursor', '');
         that.scrollPatch();
@@ -1683,6 +1763,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       ,checked = checkbox[0].checked
       ,isAll = checkbox.attr('lay-filter') === 'layTableAllChoose';
 
+      if(checkbox[0].disabled) return;
+
       //全选
       if(isAll){
         childs.each(function(i, item){
@@ -1696,10 +1778,15 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
         that.syncCheckAll();
       }
       
-      layui.event.call(checkbox[0], MOD_NAME, 'checkbox('+ filter +')', commonMember.call(checkbox[0], {
+      // 事件
-        checked: checked
+      layui.event.call(
-        ,type: isAll ? 'all' : 'one'
+        checkbox[0], 
-      }));
+        MOD_NAME, 'checkbox('+ filter +')', 
+        commonMember.call(checkbox[0], {
+          checked: checked,
+          type: isAll ? 'all' : 'one'
+        })
+      );
     });
     
     //单选框选择
@@ -1912,10 +1999,10 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       layer.close(that.tipsIndex);
     });
 
-    //自适应
+    // //自适应 
-    _WIN.on('resize', function(){
+    // _WIN.on('resize', function(){
-      that.resize();
+    //   that.resize();
-    });
+    // });
   };
   
   //一次性事件
@@ -2067,6 +2154,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,invalidNum = 0
     ,arr = []
     ,data = table.cache[id] || [];
+
     //计算全选个数
     layui.each(data, function(i, item){
       if(layui.type(item) === 'array'){
@@ -2075,8 +2163,10 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       }
       if(item[table.config.checkName]){
         nums++;
+        if(!item[table.config.disabledName]){
           arr.push(table.clearCacheKey(item));
         }
+      }
     });
     return {
       data: arr //选中的数据
@@ -2212,12 +2302,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     args[3] = 'reloadData';
 
     // 过滤与数据无关的参数
-    var dataParams = [
+    var dataParams = new RegExp('^('+ [
       'data', 'url', 'where', 'page', 'limit',
       'request', 'response', 'parseData'
-    ];
+    ].join('|') + ')$');
+
     layui.each(args[1], function (key, value) {
-      if(dataParams.indexOf(key) === -1){
+      if(!dataParams.test(key)){
         delete args[1][key];
       }
     });
@@ -2225,6 +2316,50 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     return table.reload.apply(null, args);
   };
 
+  // 仅仅合并数据
+  table.mergeData = function(id,data,index){
+    var config = getThisTableConfig(id); //获取当前实例配置项
+    if(!config) return;
+    var that = thisTable.that[id];
+    let arr = []
+    for(let i in data){
+      if(table.cache[that.key][i]){
+        arr.push({...table.cache[that.key][i],...data[i]})
+      }
+    }
+
+    let tr = $(that.layMain).find(`tr[data-index=${index}]`)
+    layui.each(data[index], function(key, value){
+      var td = tr.children('td[data-field="'+ key +'"]')
+      ,cell = td.children('.layui-table-cell'); //获取当前修改的列
+      let d = data[index]
+      //更新缓存中的数据      
+      that.eachCols(function(i, item3){
+        //更新相应列视图
+        if(item3.field == key){
+          cell.html(parseTempData.call(that, {
+            item3: item3
+            ,content: value
+            ,tplData: d
+          }));
+          td.data('content', value);
+        } else if(item3.templet || item3.toolbar){ //更新所有其他列的模板
+          var thisTd = tr.children('td[data-field="'+ (item3.field || i) +'"]')
+          ,content = d[item3.field];
+          thisTd.children('.layui-table-cell').html(parseTempData.call(that, {
+            item3: item3
+            ,content: content
+            ,tplData: d
+          }));
+          thisTd.data('content', content);
+        }
+      });
+    });
+
+    table.cache[that.key] = arr
+    config.data = arr
+  }
+
   // 核心入口
   table.render = function(options){
     var inst = new Class(options);
@@ -2236,6 +2371,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     data = $.extend({}, data);
     delete data[table.config.checkName];
     delete data[table.config.indexName];
+    delete data[table.config.disabledName];
     return data;
   };
   
@@ -2244,6 +2380,17 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     table.init();
   });
 
+  $(function (){
+     //自适应
+    _WIN.on('resize', function(){
+      // that.resize();
+      for(let i in table.winResiz){
+        table.winResiz[i].resize()
+      }
+    })
+  })
+
+  
   exports(MOD_NAME, table);
 });
 

src/modules/transfer.js

@@ -68,7 +68,7 @@ layui.define(['laytpl', 'form'], function(exports){
     obj = obj || {};
     return ['<div class="layui-transfer-box" data-index="'+ obj.index +'">'
       ,'<div class="layui-transfer-header">'
-        ,'<input type="checkbox" name="'+ obj.checkAllName +'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+ obj.index +'] || \'list'+ (obj.index + 1) +'\' }}">'
+        ,'<input type="checkbox"' + (obj.disAll && obj.disAll.includes(obj.index) ? ' disabled' : '') + ' name="'+ obj.checkAllName +'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+ obj.index +'] || \'list'+ (obj.index + 1) +'\' }}">'
       ,'</div>'
       ,'{{# if(d.data.showSearch){ }}'
       ,'<div class="layui-transfer-search">'
@@ -81,10 +81,11 @@ layui.define(['laytpl', 'form'], function(exports){
   }
   
   //主模板
-  ,TPL_MAIN = ['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">'
+  ,TPL_MAIN = function(option){ return ['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">'
     ,TPL_BOX({
       index: 0
-      ,checkAllName: 'layTransferLeftCheckAll'
+      ,checkAllName: 'layTransferLeftCheckAll',
+      disAll: option.disAll
     })
     ,'<div class="layui-transfer-active">'
       ,'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">'
@@ -98,7 +99,7 @@ layui.define(['laytpl', 'form'], function(exports){
       index: 1
       ,checkAllName: 'layTransferRightCheckAll'
     })
-  ,'</div>'].join('')
+  ,'</div>'].join('')}
 
   //构造器
   ,Class = function(options){
@@ -136,7 +137,7 @@ layui.define(['laytpl', 'form'], function(exports){
     ,options = that.config;
     
     //解析模板
-    var thisElem = that.elem = $(laytpl(TPL_MAIN).render({
+    var thisElem = that.elem = $(laytpl(TPL_MAIN(options)).render({
       data: options
       ,index: that.index //索引
     }));

src/modules/tree.js

@@ -195,9 +195,9 @@ layui.define('form', function(exports){
             //节点
             ,function(){
               if(options.isJump && item.href){
-                return '<a href="'+ item.href +'" target="_blank" class="'+ ELEM_TEXT +'">'+ (item.title || item.label || options.text.defaultNodeName) +'</a>';
+                return '<a href="'+ item.href +'" target="_blank" class="'+ ELEM_TEXT +'"' +` style="${item.fontColor && 'color: ' + item.fontColor}"` + '>'+ (item.title || item.label || options.text.defaultNodeName) +'</a>';
               }else{
-                return '<span class="'+ ELEM_TEXT + (item.disabled ? ' '+ DISABLED : '') +'">'+ (item.title || item.label || options.text.defaultNodeName) +'</span>';
+                return '<span class="'+ ELEM_TEXT + (item.disabled ? ' '+ DISABLED : '') + '"' +` style="${item.fontColor && 'color: ' + item.fontColor}"` + '>'+ (item.title || item.label || options.text.defaultNodeName) +'</span>';
               }
             }()
       ,'</div>'

src/modules/upload.js

@@ -210,6 +210,7 @@ layui.define('layer' , function(exports){
           ,contentType: false 
           ,processData: false
           ,dataType: 'json'
+          ,async: false
           ,headers: options.headers || {}
           //成功回调
           ,success: function(res){