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

修复 treeTable 折叠叶子节点没有折叠图标没有变化的问题

pull/1260/head
sunxiaobin89 2023-05-24 15:02:34 +08:00
parent 1b31ba87fc
commit 394f34efce
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/treeTable.js
View File

@ -453,9 +453,6 @@ layui.define(['table'], function (exports) {
var isToggle = layui.type(expandFlag) !== 'boolean'; var isToggle = layui.type(expandFlag) !== 'boolean';
var trExpand = isToggle ? !trData[LAY_EXPAND] : expandFlag; var trExpand = isToggle ? !trData[LAY_EXPAND] : expandFlag;
var retValue = trData[isParentKey] ? trExpand : null; var retValue = trData[isParentKey] ? trExpand : null;
if (retValue === null) {
return retValue;
}
if (callbackFlag && trExpand != trData[LAY_EXPAND] && (!trData[LAY_ASYNC_STATUS] || trData[LAY_ASYNC_STATUS] === 'local')) { if (callbackFlag && trExpand != trData[LAY_EXPAND] && (!trData[LAY_ASYNC_STATUS] || trData[LAY_ASYNC_STATUS] === 'local')) {
var beforeExpand = treeOptions.callback.beforeExpand; var beforeExpand = treeOptions.callback.beforeExpand;
@ -580,7 +577,6 @@ layui.define(['table'], function (exports) {
}); });
return retValue; return retValue;
} }
trData[LAY_EXPAND] = trExpand;
trExpanded = trData[LAY_HAS_EXPANDED] = true; trExpanded = trData[LAY_HAS_EXPANDED] = true;
if (childNodes.length) { if (childNodes.length) {
// 判断是否需要排序 // 判断是否需要排序
@ -646,7 +642,6 @@ layui.define(['table'], function (exports) {
} }
} }
} else { } else {
trData[LAY_EXPAND] = trExpand;
// 关闭 // 关闭
if (sonSign && !isToggle) { // 非状态切换的情况下 if (sonSign && !isToggle) { // 非状态切换的情况下
layui.each(childNodes, function (i1, item1) { layui.each(childNodes, function (i1, item1) {
@ -740,7 +735,9 @@ layui.define(['table'], function (exports) {
tableView.find('.layui-table-box tbody tr[data-level!="0"]').addClass(HIDE); tableView.find('.layui-table-box tbody tr[data-level!="0"]').addClass(HIDE);
tableView.find('.layui-table-tree-flexIcon').html(treeOptions.view.flexIconClose); tableView.find('.layui-table-tree-flexIcon').html(treeOptions.view.flexIconClose);
treeOptions.view.showIcon && tableView.find('.layui-table-tree-nodeIcon:not(.layui-table-tree-iconCustom,.layui-table-tree-iconLeaf)').html(treeOptions.view.iconClose); treeOptions.view.showIcon && tableView
.find('.layui-table-tree-nodeIcon:not(.layui-table-tree-iconCustom,.layui-table-tree-iconLeaf)')
.html(treeOptions.view.iconClose);
} else { } else {
var tableDataFlat = treeTable.getData(id, true); var tableDataFlat = treeTable.getData(id, true);
// 展开所有 // 展开所有