github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1273 from sunxiaobin89/2.x 

修复一些问题和新增一些内容
pull/1275/head
贤心 2023-06-08 10:01:19 +08:00 committed by GitHub
parent 53b93440d2 3fecf6dcc9
commit af28e963ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/table.js
View File

@ -686,7 +686,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
});
// 给组合表头赋值最大宽度
if(maxWidth) othis.css('max-width', maxWidth);
if(maxWidth) othis.css('max-width', maxWidth - 1);
// 若当前活动的组合表头仍存在上级，则继续向上设置
if(th && othis.parent().data('parentkey')){
@ -938,7 +938,29 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
);
that.startTime = new Date().getTime(); // 渲染开始时间
if(options.url){ // Ajax请求
if (opts.renderData) { // 将 cache 信息重新渲染
var res = {};
res[response.dataName] = table.cache[that.key];
res[response.countName] = options.url ? (layui.type(options.page) === 'object' ? options.page.count : res[response.dataName].length) : options.data.length;
//记录合计行数据
if(typeof options.totalRow === 'object'){
res[response.totalRowName] = $.extend({}, that.totalRow);
}
that.renderData({
res: res,
curr: curr,
count: res[response.countName],
type: opts.type,
}), sort();
that.setColsWidth();
typeof options.done === 'function' && options.done(
res, curr, res[response.countName]
);
} else if(options.url){ // Ajax请求
var params = {};
// 当 page 开启，默认自动传递 page、limit 参数
if(options.page){
@ -974,6 +996,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
('返回的数据不符合规范，正确的成功状态码应为："'+ response.statusName +'": '+ response.statusCode)
);
} else {
that.totalRow = res[response.totalRowName];
that.renderData({
res: res,
curr: curr,
@ -1008,6 +1031,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
if(typeof options.totalRow === 'object'){
res[response.totalRowName] = $.extend({}, options.totalRow);
}
that.totalRow = res[response.totalRowName];
that.renderData({
res: res,
@ -1186,7 +1210,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
// 返回行节点代码
table.getTrHtml = function (id, data) {
var that = getThisTable(id);
return that.getTrHtml(data);
return that.getTrHtml(data, null, that.page);
}
// 数据渲染
@ -1196,7 +1220,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
var res = opts.res;
var curr = opts.curr;
var count = opts.count;
var count = that.count = opts.count;
var sort = opts.sort;
var data = res[options.response.dataName] || []; //列表数据
@ -1318,6 +1342,19 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
}
};
// 重新渲染数据
table.renderData = function (id) {
var that = getThisTable(id);
if (!that) {
return;
}
that.pullData(that.page, {
renderData: true,
type: 'reloadData'
});
}
// 数据合计行
Class.prototype.renderTotal = function(data, totalRowData){
var that = this;
@ -1454,7 +1491,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
}, opts);
// 标注当前行选中样式
if(opts.type !== 'checkbox' && opts.index !== 'all'){
if(opts.index !== 'all'){
tr.addClass(ELEM_CLICK).siblings('tr').removeClass(ELEM_CLICK);
}

36
src/modules/treeTable.js
View File

@ -26,7 +26,8 @@ layui.define(['table'], function (exports) {
},
resize: table.resize,
getOptions: table.getOptions,
hideCol: table.hideCol
hideCol: table.hideCol,
renderData: table.renderData
};
// 操作当前实例
@ -146,7 +147,7 @@ layui.define(['table'], function (exports) {
}
// 处理节点状态
updateStatus(retData[dataName], function (item) {
item[LAY_EXPAND] = that.status.expand[item[idKey]]
item[LAY_EXPAND] = LAY_EXPAND in item ? item[LAY_EXPAND] : (item[idKey] !== undefined && that.status.expand[item[idKey]])
}, childrenKey);
if (parseDataThat.autoSort && parseDataThat.initSort && parseDataThat.initSort.type) {
@ -561,8 +562,9 @@ layui.define(['table'], function (exports) {
treeOptions.view.showIcon && trsElem
.find('.layui-table-tree-nodeIcon:not(.layui-table-tree-iconCustom,.layui-table-tree-iconLeaf)')
.html(trExpand ? treeOptions.view.iconOpen : treeOptions.view.iconClose);
treeTableThat.status.expand[trData[customName.id]] = trData[LAY_EXPAND] = trExpand;
trData[LAY_EXPAND] = trExpand;
var trDataId = trData[customName.id];
trDataId !== undefined && (treeTableThat.status.expand[trDataId] = trExpand);
if (retValue === null) {
return retValue;
}
@ -816,15 +818,18 @@ layui.define(['table'], function (exports) {
var treeOptions = options.tree;
var tableView = options.elem.next();
var isParentKey = treeOptions.customName.isParent;
var idKey = treeOptions.customName.id;
var showFlexIconIfNotParent = treeOptions.view.showFlexIconIfNotParent;
if (!expandFlag) {
// 关闭所有
// 将所有已经打开的节点的状态设置为关闭，
that.updateStatus(null, function (d) {
if (d[isParentKey]) {
if (d[isParentKey] || showFlexIconIfNotParent) {
d[LAY_EXPAND] = false;
d[idKey] !== undefined && (that.status.expand[d[idKey]] = false);
}
}) // {LAY_EXPAND: false}); // 只处理当前页，如果需要处理全部表格，需要用treeTable.updateStatus
}) // 只处理当前页，如果需要处理全部表格，需要用treeTable.updateStatus
// 隐藏所有非顶层的节点
tableView.find('.layui-table-box tbody tr[data-level!="0"]').addClass(HIDE);
@ -862,7 +867,7 @@ layui.define(['table'], function (exports) {
// 先判断是否全部打开过了
var isAllExpanded = true;
layui.each(tableDataFlat, function (i1, item1) {
if (!item1[LAY_HAS_EXPANDED]) {
if (item1[isParentKey] && !item1[LAY_HAS_EXPANDED]) {
isAllExpanded = false;
return true;
}
@ -870,8 +875,9 @@ layui.define(['table'], function (exports) {
// 如果全部节点已经都打开过，就可以简单处理跟隐藏所有节点反操作
if (isAllExpanded) {
that.updateStatus(null, function (d) {
if (d[isParentKey]) {
if (d[isParentKey] || showFlexIconIfNotParent) {
d[LAY_EXPAND] = true;
d[idKey] !== undefined && (that.status.expand[d[idKey]] = true);
}
});
// 显示所有子节点
@ -884,9 +890,10 @@ layui.define(['table'], function (exports) {
} else {
// 如果有未打开过的父节点，将 tr 内容全部重新生成
that.updateStatus(null, function (d) {
if (d[isParentKey]) {
if (d[isParentKey] || showFlexIconIfNotParent) {
d[LAY_EXPAND] = true;
d[LAY_HAS_EXPANDED] = true;
d[idKey] !== undefined && (that.status.expand[d[idKey]] = true);
}
});
if (options.initSort && options.initSort.type && (!options.url || options.autoSort)) {
@ -964,7 +971,7 @@ layui.define(['table'], function (exports) {
trElem = tableViewElem.find('tr[lay-data-index="' + trIndex + '"]');
var trData = treeTableThat.getNodeDataByIndex(trIndex);
if (trData[LAY_EXPAND]) {
if (trData[LAY_EXPAND] && trData[isParentKey]) {
// 需要展开
dataExpand = dataExpand || {};
dataExpand[trIndex] = true;
@ -1015,7 +1022,7 @@ layui.define(['table'], function (exports) {
} else {
debounceFn('renderTreeTable-' + tableId, function () {
options.hasNumberCol && formatNumber(that);
form.render(null, tableFilterId);
form.render(options.elem.next());
}, 0)();
}
}
@ -1296,6 +1303,11 @@ layui.define(['table'], function (exports) {
// 将新节点添加到页面
tableData = that.initData();
if (tableViewElem.find('.layui-none').length) {
table.renderData(id);
return newNodes;
}
var newNodesHtml = table.getTrHtml(id, newNodes);
var newNodesHtmlObj = {
trs: $(newNodesHtml.trs.join('')),
@ -1360,7 +1372,7 @@ layui.define(['table'], function (exports) {
}
// 删除已经存在的同级节点以及他们的子节点，并且把中间节点的已展开过的状态设置为false
that.updateStatus(childrenNodes, function (d) {
if (d[isParentKey]) {
if (d[isParentKey] || treeOptions.view.showFlexIconIfNotParent) {
d[LAY_HAS_EXPANDED] = false;
}
});