fix(comp:tree-select): async loading is invalid when getKey is set (#…

…1541)
IDuxFE · Apr 24, 2023 · 6cd6155 · 6cd6155
1 parent 40d25f5
commit 6cd6155
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/packages/components/tree-select/src/content/Content.tsx b/packages/components/tree-select/src/content/Content.tsx
@@ -105,20 +105,15 @@ export default defineComponent({
     }
 
     const onLoaded = async (loadedKeys: VKey[], node: TreeSelectNode) => {
-      const childrenNodes = node.children ?? []
-      const key = node.key!
+      const childrenKey = mergedChildrenKey.value
+      const labelKey = mergedLabelKey.value
+      const getKey = mergedGetKey.value
+      const childrenNodes = node[childrenKey] as TreeSelectNode[]
+      const key = getKey(node)
       const nodeMap = mergedNodeMap.value
       const currNode = nodeMap.get(key)
       if (childrenNodes.length && currNode) {
-        const childrenKey = mergedChildrenKey.value
-        const mergedChildren = convertMergeNodes(
-          props,
-          childrenNodes,
-          childrenKey,
-          mergedGetKey.value,
-          mergedLabelKey.value,
-          key,
-        )
+        const mergedChildren = convertMergeNodes(props, childrenNodes, childrenKey, getKey, labelKey, key)
         convertMergedNodeMap(mergedChildren, nodeMap)
         currNode.rawData[childrenKey] = childrenNodes
         currNode.children = mergedChildren