mirror of https://github.com/ElemeFE/element
Table: Fix tree table when updating data (#16481)
parent
6f51ad81fb
commit
40946e1230
|
@ -59,9 +59,16 @@ export default {
|
|||
|
||||
methods: {
|
||||
normalize(data) {
|
||||
const { childrenColumnName, lazyColumnIdentifier, rowKey, lazy } = this.states;
|
||||
const {
|
||||
childrenColumnName,
|
||||
lazyColumnIdentifier,
|
||||
rowKey,
|
||||
lazy
|
||||
} = this.states;
|
||||
const res = {};
|
||||
walkTreeNode(data, (parent, children, level) => {
|
||||
walkTreeNode(
|
||||
data,
|
||||
(parent, children, level) => {
|
||||
const parentId = getRowIdentity(parent, rowKey);
|
||||
if (Array.isArray(children)) {
|
||||
res[parentId] = {
|
||||
|
@ -76,7 +83,10 @@ export default {
|
|||
level
|
||||
};
|
||||
}
|
||||
}, childrenColumnName, lazyColumnIdentifier);
|
||||
},
|
||||
childrenColumnName,
|
||||
lazyColumnIdentifier
|
||||
);
|
||||
return res;
|
||||
},
|
||||
|
||||
|
@ -84,12 +94,19 @@ export default {
|
|||
const nested = this.normalizedData;
|
||||
const normalizedLazyNode = this.normalizedLazyNode;
|
||||
const keys = Object.keys(nested);
|
||||
if (!keys.length) return;
|
||||
const { treeData: oldTreeData, defaultExpandAll, expandRowKeys, lazy } = this.states;
|
||||
const newTreeData = {};
|
||||
if (keys.length) {
|
||||
const {
|
||||
treeData: oldTreeData,
|
||||
defaultExpandAll,
|
||||
expandRowKeys,
|
||||
lazy
|
||||
} = this.states;
|
||||
const rootLazyRowKeys = [];
|
||||
const getExpanded = (oldValue, key) => {
|
||||
const included = defaultExpandAll || (expandRowKeys && expandRowKeys.indexOf(key) !== -1);
|
||||
const included =
|
||||
defaultExpandAll ||
|
||||
(expandRowKeys && expandRowKeys.indexOf(key) !== -1);
|
||||
return !!((oldValue && oldValue.expanded) || included);
|
||||
};
|
||||
// 合并 expanded 与 display,确保数据刷新后,状态不变
|
||||
|
@ -130,6 +147,7 @@ export default {
|
|||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
this.states.treeData = newTreeData;
|
||||
this.updateTableScrollY();
|
||||
},
|
||||
|
@ -149,7 +167,7 @@ export default {
|
|||
const id = getRowIdentity(row, rowKey);
|
||||
const data = id && treeData[id];
|
||||
const oldExpanded = treeData[id].expanded;
|
||||
if (id && data && ('expanded' in data)) {
|
||||
if (id && data && 'expanded' in data) {
|
||||
expanded = typeof expanded === 'undefined' ? !data.expanded : expanded;
|
||||
treeData[id].expanded = expanded;
|
||||
if (oldExpanded !== expanded) {
|
||||
|
@ -164,7 +182,7 @@ export default {
|
|||
const { lazy, treeData, rowKey } = this.states;
|
||||
const id = getRowIdentity(row, rowKey);
|
||||
const data = treeData[id];
|
||||
if (lazy && data && ('loaded' in data) && !data.loaded) {
|
||||
if (lazy && data && 'loaded' in data && !data.loaded) {
|
||||
this.loadData(row, id, data);
|
||||
} else {
|
||||
this.toggleTreeExpansion(row);
|
||||
|
@ -176,7 +194,7 @@ export default {
|
|||
const { lazyTreeNodeMap, treeData } = this.states;
|
||||
if (load && !treeData[key].loaded) {
|
||||
treeData[key].loading = true;
|
||||
load(row, treeNode, (data) => {
|
||||
load(row, treeNode, data => {
|
||||
if (!Array.isArray(data)) {
|
||||
throw new Error('[ElTable] data must be an array');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue