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

修复 treeTable `reload` 和 `reloadData` 传参中带了 parseData 和 done 回调的时候渲染异常问题

pull/1247/head
sunxiaobin89 2023-04-28 18:10:44 +08:00
parent ab16f47dd1
commit 221009ee51
1 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/modules/treeTable.js
View File

@ -111,34 +111,21 @@ layui.define(['table'], function (exports) {
})
}
Class.prototype.init = function () {
var that = this;
var options = that.config;
// 先初始一个空的表格以便拿到对应的表格实例信息
var tableIns = table.render($.extend({}, options, {
data: [],
url: '',
done: null
}))
var id = tableIns.config.id;
thisTreeTable.that[id] = that; // 记录当前实例对象
that.tableIns = tableIns;
var treeOptions = options.tree;
var customName = treeOptions.customName;
var isParentKey = customName.isParent;
var childrenKey = customName.children;
var updateOptions = function (id, options, reload) {
var that = getThisTable(id);
var thatOptionsTemp = $.extend(true, {} , that.getOptions(), options);
var treeOptions = thatOptionsTemp.tree;
var childrenKey = treeOptions.customName.children;
// 处理属性
var parseData = options.parseData;
var done = options.done;
if (options.url) {
if (thatOptionsTemp.url) {
// 异步加载的时候需要处理parseData进行转换
options.parseData = function () {
var parseDataThat = this;
var args = arguments;
if (!reload || (reload && parseData && !parseData.mod)) {
options.parseData = function () {
var parseDataThat = this;
var args = arguments;
var retData = args[0];
if (layui.type(parseData) === 'function') {
retData = parseData.apply(parseDataThat, args) || args[0];
@ -151,7 +138,9 @@ layui.define(['table'], function (exports) {
that.initData(retData[dataName]);
return retData;
return retData;
}
options.parseData.mod = true
}
} else {
options.data = options.data || [];
@ -165,9 +154,10 @@ layui.define(['table'], function (exports) {
that.initData(options.data);
}
options.done = function () {
var args = arguments;
var doneThat = this;
if (!reload || (reload && done && !done.mod)) {
options.done = function () {
var args = arguments;
var doneThat = this;
var tableView = this.elem.next();
that.updateStatus(null, {
@ -188,11 +178,35 @@ layui.define(['table'], function (exports) {
that.renderTreeTable(tableView);
if (layui.type(done) === 'function') {
return done.apply(doneThat, args);
return done.apply(doneThat, args);
}
}
options.done.mod = true;
}
}
Class.prototype.init = function () {
var that = this;
var options = that.config;
// 先初始一个空的表格以便拿到对应的表格实例信息
var tableIns = table.render($.extend({}, options, {
data: [],
url: '',
done: null
}))
var id = tableIns.config.id;
thisTreeTable.that[id] = that; // 记录当前实例对象
that.tableIns = tableIns;
// var treeOptions = options.tree;
// var customName = treeOptions.customName;
// var isParentKey = customName.isParent;
// var childrenKey = customName.children;
updateOptions(id, options);
}
// 初始默认配置
Class.prototype.config = {
tree: {
@ -819,6 +833,9 @@ layui.define(['table'], function (exports) {
if (layui.type(item) === 'array') delete that.config[key];
});
// 根据需要处理options中的一些参数
updateOptions(that.config.id, options, true);
// 对参数进行深度或浅扩展
that.config = $.extend(deep, {}, that.config, options);