Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
40946e12
Commit
40946e12
authored
Jul 09, 2019
by
Zhi Cun
Committed by
hetech
Jul 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Table: Fix tree table when updating data (#16481)
parent
6f51ad81
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
78 additions
and
60 deletions
+78
-60
packages/table/src/store/tree.js
packages/table/src/store/tree.js
+78
-60
No files found.
packages/table/src/store/tree.js
View file @
40946e12
...
@@ -59,9 +59,16 @@ export default {
...
@@ -59,9 +59,16 @@ export default {
methods
:
{
methods
:
{
normalize
(
data
)
{
normalize
(
data
)
{
const
{
childrenColumnName
,
lazyColumnIdentifier
,
rowKey
,
lazy
}
=
this
.
states
;
const
{
childrenColumnName
,
lazyColumnIdentifier
,
rowKey
,
lazy
}
=
this
.
states
;
const
res
=
{};
const
res
=
{};
walkTreeNode
(
data
,
(
parent
,
children
,
level
)
=>
{
walkTreeNode
(
data
,
(
parent
,
children
,
level
)
=>
{
const
parentId
=
getRowIdentity
(
parent
,
rowKey
);
const
parentId
=
getRowIdentity
(
parent
,
rowKey
);
if
(
Array
.
isArray
(
children
))
{
if
(
Array
.
isArray
(
children
))
{
res
[
parentId
]
=
{
res
[
parentId
]
=
{
...
@@ -76,7 +83,10 @@ export default {
...
@@ -76,7 +83,10 @@ export default {
level
level
};
};
}
}
},
childrenColumnName
,
lazyColumnIdentifier
);
},
childrenColumnName
,
lazyColumnIdentifier
);
return
res
;
return
res
;
},
},
...
@@ -84,12 +94,19 @@ export default {
...
@@ -84,12 +94,19 @@ export default {
const
nested
=
this
.
normalizedData
;
const
nested
=
this
.
normalizedData
;
const
normalizedLazyNode
=
this
.
normalizedLazyNode
;
const
normalizedLazyNode
=
this
.
normalizedLazyNode
;
const
keys
=
Object
.
keys
(
nested
);
const
keys
=
Object
.
keys
(
nested
);
if
(
!
keys
.
length
)
return
;
const
{
treeData
:
oldTreeData
,
defaultExpandAll
,
expandRowKeys
,
lazy
}
=
this
.
states
;
const
newTreeData
=
{};
const
newTreeData
=
{};
if
(
keys
.
length
)
{
const
{
treeData
:
oldTreeData
,
defaultExpandAll
,
expandRowKeys
,
lazy
}
=
this
.
states
;
const
rootLazyRowKeys
=
[];
const
rootLazyRowKeys
=
[];
const
getExpanded
=
(
oldValue
,
key
)
=>
{
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
);
return
!!
((
oldValue
&&
oldValue
.
expanded
)
||
included
);
};
};
// 合并 expanded 与 display,确保数据刷新后,状态不变
// 合并 expanded 与 display,确保数据刷新后,状态不变
...
@@ -130,6 +147,7 @@ export default {
...
@@ -130,6 +147,7 @@ export default {
}
}
});
});
}
}
}
this
.
states
.
treeData
=
newTreeData
;
this
.
states
.
treeData
=
newTreeData
;
this
.
updateTableScrollY
();
this
.
updateTableScrollY
();
},
},
...
@@ -149,7 +167,7 @@ export default {
...
@@ -149,7 +167,7 @@ export default {
const
id
=
getRowIdentity
(
row
,
rowKey
);
const
id
=
getRowIdentity
(
row
,
rowKey
);
const
data
=
id
&&
treeData
[
id
];
const
data
=
id
&&
treeData
[
id
];
const
oldExpanded
=
treeData
[
id
].
expanded
;
const
oldExpanded
=
treeData
[
id
].
expanded
;
if
(
id
&&
data
&&
(
'
expanded
'
in
data
)
)
{
if
(
id
&&
data
&&
'
expanded
'
in
data
)
{
expanded
=
typeof
expanded
===
'
undefined
'
?
!
data
.
expanded
:
expanded
;
expanded
=
typeof
expanded
===
'
undefined
'
?
!
data
.
expanded
:
expanded
;
treeData
[
id
].
expanded
=
expanded
;
treeData
[
id
].
expanded
=
expanded
;
if
(
oldExpanded
!==
expanded
)
{
if
(
oldExpanded
!==
expanded
)
{
...
@@ -164,7 +182,7 @@ export default {
...
@@ -164,7 +182,7 @@ export default {
const
{
lazy
,
treeData
,
rowKey
}
=
this
.
states
;
const
{
lazy
,
treeData
,
rowKey
}
=
this
.
states
;
const
id
=
getRowIdentity
(
row
,
rowKey
);
const
id
=
getRowIdentity
(
row
,
rowKey
);
const
data
=
treeData
[
id
];
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
);
this
.
loadData
(
row
,
id
,
data
);
}
else
{
}
else
{
this
.
toggleTreeExpansion
(
row
);
this
.
toggleTreeExpansion
(
row
);
...
@@ -176,7 +194,7 @@ export default {
...
@@ -176,7 +194,7 @@ export default {
const
{
lazyTreeNodeMap
,
treeData
}
=
this
.
states
;
const
{
lazyTreeNodeMap
,
treeData
}
=
this
.
states
;
if
(
load
&&
!
treeData
[
key
].
loaded
)
{
if
(
load
&&
!
treeData
[
key
].
loaded
)
{
treeData
[
key
].
loading
=
true
;
treeData
[
key
].
loading
=
true
;
load
(
row
,
treeNode
,
(
data
)
=>
{
load
(
row
,
treeNode
,
data
=>
{
if
(
!
Array
.
isArray
(
data
))
{
if
(
!
Array
.
isArray
(
data
))
{
throw
new
Error
(
'
[ElTable] data must be an array
'
);
throw
new
Error
(
'
[ElTable] data must be an array
'
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment