diff --git a/examples/json/table/demo1.json b/examples/json/table/demo1.json index e53682f6..ae07a368 100644 --- a/examples/json/table/demo1.json +++ b/examples/json/table/demo1.json @@ -29,7 +29,8 @@ ,"checkin": "106" ,"joinTime": "2016-10-14" ,"LAY_CHECKED": true - }, { + ,"LAY_DISABLED": true +}, { "id": "10003" ,"username": "苏轼" ,"email": "test3@email.com" diff --git a/src/modules/table.js b/src/modules/table.js index dd6a1ccc..d3eea9cf 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -1724,8 +1724,10 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){ //全选 if(isAll){ childs.each(function(i, item){ - item.checked = checked; - that.setCheckData(i, checked); + if (!item.disabled) { + item.checked = checked; + that.setCheckData(i, checked); + } }); that.syncCheckAll(); that.renderForm('checkbox'); @@ -2113,14 +2115,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){ //计算全选个数 layui.each(data, function(i, item){ - if(layui.type(item) === 'array'){ + if(layui.type(item) === 'array' || item[table.config.disabledName]){ // 不可操作的节点对于统计来说也属于无效 invalidNum++; //无效数据,或已删除的 - return; } if(item[table.config.checkName]){ - nums++; + arr.push(table.clearCacheKey(item)); if(!item[table.config.disabledName]){ - arr.push(table.clearCacheKey(item)); + nums++; } } });