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

Table: fixed loading icon not display (#15868)

pull/16185/head
hetech 2019-06-06 17:43:33 +08:00 committed by island205
parent dc57a690eb
commit f1240ed001
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/table/src/store/tree.js
View File

@ -120,6 +120,7 @@ export default {
} else { } else {
const { loaded = false, loading = false } = oldValue || {}; const { loaded = false, loading = false } = oldValue || {};
newTreeData[key] = { newTreeData[key] = {
lazy: true,
loaded: !!loaded, loaded: !!loaded,
loading: !!loading, loading: !!loading,
expanded: getExpanded(oldValue, key), expanded: getExpanded(oldValue, key),

15
packages/table/src/table-body.js
View File

@ -351,7 +351,6 @@ export default {
indent: treeRowData.level * treeIndent, indent: treeRowData.level * treeIndent,
level: treeRowData.level level: treeRowData.level
}; };
// TODO: 优化这里的逻辑
if (typeof treeRowData.expanded === 'boolean') { if (typeof treeRowData.expanded === 'boolean') {
data.treeNode.expanded = treeRowData.expanded; data.treeNode.expanded = treeRowData.expanded;
// 表明是懒加载 // 表明是懒加载
@ -418,10 +417,10 @@ export default {
level: cur.level, level: cur.level,
display: true display: true
}; };
if (typeof cur.loaded === 'boolean' && cur.loaded) { if (typeof cur.lazy === 'boolean') {
treeRowData.noLazyChildren = !(cur.children && cur.children.length); if (typeof cur.loaded === 'boolean' && cur.loaded) {
} treeRowData.noLazyChildren = !(cur.children && cur.children.length);
if (typeof cur.loading === 'boolean') { }
treeRowData.loading = cur.loading; treeRowData.loading = cur.loading;
} }
} }
@ -451,10 +450,10 @@ export default {
// 懒加载的某些节点，level 未知 // 懒加载的某些节点，level 未知
cur.level = cur.level || innerTreeRowData.level; cur.level = cur.level || innerTreeRowData.level;
cur.display = !!(cur.expanded && innerTreeRowData.display); cur.display = !!(cur.expanded && innerTreeRowData.display);
if (typeof cur.loaded === 'boolean' && cur.loaded) {
innerTreeRowData.noLazyChildren = !(cur.children && cur.children.length);
}
if (typeof cur.lazy === 'boolean') { if (typeof cur.lazy === 'boolean') {
if (typeof cur.loaded === 'boolean' && cur.loaded) {
innerTreeRowData.noLazyChildren = !(cur.children && cur.children.length);
}
innerTreeRowData.loading = cur.loading; innerTreeRowData.loading = cur.loading;
} }
} }