From 9e5ce3ed517779254eaedaa4465020936c647e55 Mon Sep 17 00:00:00 2001 From: vxhly Date: Sun, 20 Sep 2020 18:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20a-directory-tree=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tree/DirectoryTree.jsx | 2 +- components/tree/util.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index deed450a4f..34f5c50071 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -66,7 +66,7 @@ export default { // Expanded keys if (defaultExpandAll) { if (props.treeData) { - state._expandedKeys = getFullKeyListByTreeData(props.treeData); + state._expandedKeys = getFullKeyListByTreeData(props.treeData,props.replaceFields); } else { state._expandedKeys = getFullKeyList(children); } diff --git a/components/tree/util.js b/components/tree/util.js index 4244d7ae32..fd0a970516 100644 --- a/components/tree/util.js +++ b/components/tree/util.js @@ -88,13 +88,14 @@ export function convertDirectoryKeysToNodes(rootChildren, keys) { return nodes; } -export function getFullKeyListByTreeData(treeData) { +export function getFullKeyListByTreeData(treeData,replaceFields) { let keys = []; + const {key='key',children='children'} = replaceFields (treeData || []).forEach(item => { - keys.push(item.key); - if (item.children) { - keys = [...keys, ...getFullKeyListByTreeData(item.children)]; + keys.push(item[key]); + if (item[children]) { + keys = [...keys, ...getFullKeyListByTreeData(item[children],replaceFields)]; } }); return keys;