@handaotech-design/bom 0.0.52 → 0.0.54

package/README.md

@@ -51,6 +51,8 @@ app.use(HdBomWorkbench);
 |------------------------------|---------------|---------------------------------------------|
 | updateTreeWithPreservedState | 更新树数据，并保持树状态  | (updateDataFn: () => Promise<void>) => void |
 | getParentKeys                | 获取节点所有父节点的key | (key: string): string[]                     | undefined |
+| getParentNodes               | 获取节点所有父节点  | (key: string): TreeNodeWithMeta[]           |
+| getPath                      | 获取从根到当前节点的完整路径（包含自身） | (key: string): TreeNodeWithMeta[] |
 | getDepth                     | 获取节点在树中的深度    | getDepth(key: string)                       | number                      |
 
 具体交互参考 HdBomTree 组件

package/dist/es/components/bom-tree/index.vue

@@ -101,17 +101,18 @@ const getParentKeys = (key: string): string[] | undefined => {
   return treeNode?.parentKeys || []
 }
 
-const selectFirstSelectableNode = (preserveExpanded = false) => {
-  if (!firstSelectableKey.value) {
-    return
-  }
-  nextTick(() => {
+const selectFirstSelectableNode = async (preserveExpanded = false) => {
+  await nextTick()
+  if (firstSelectableKey.value) {
     const parentKeys = getParentKeys(firstSelectableKey.value!) as string[]
     expandedKeys.value = preserveExpanded
-      ? Array.from(new Set([...expandedKeys.value, ...parentKeys])) // 取并集
+      ? Array.from(new Set([...expandedKeys.value, ...parentKeys]))
       : parentKeys
     selectedKeys.value = [firstSelectableKey.value!]
-  })
+  }
+  else {
+    await expandToFirstSelectable(treeData.value)
+  }
 }
 
 const canLoadMoreRoot = computed(() => currentRootSize.value < filteredData.value.length)
@@ -276,9 +277,28 @@ function getDepth(key: string): number {
   return parentKeys!.length + 1
 }
 
+function getParentNodes(key: string): TreeNodeWithMeta[] {
+  const parentKeys = getParentKeys(key)
+  if (!parentKeys?.length) {
+    return []
+  }
+  return parentKeys.map(k => keyToNodeMap.value.get(k)).filter(Boolean) as TreeNodeWithMeta[]
+}
+
+function getPath(key: string): TreeNodeWithMeta[] {
+  const node = keyToNodeMap.value.get(key)
+  if (!node) {
+    return []
+  }
+  const parents = getParentNodes(key)
+  return [...parents, node]
+}
+
 defineExpose({
   updateTreeWithPreservedState,
   getParentKeys,
+  getParentNodes,
+  getPath,
   getDepth,
 })
 
@@ -303,11 +323,36 @@ async function _loadData(node: EventDataNode) {
     })
 
     node.dataRef!.children = treeData
+
+    await expandToFirstSelectable(treeData)
   }
   else {
     node.isLeaf = true
   }
 }
+
+async function expandToFirstSelectable(nodes: DataNode[]) {
+  if (_.isEmpty(nodes)) {
+    return
+  }
+  for (const child of nodes) {
+    if ((child as any).selectable) {
+      selectedKeys.value = [child.key as string]
+      const parentKeys = getParentKeys(child.key as string) || []
+      expandedKeys.value = Array.from(new Set([...expandedKeys.value, ...parentKeys]))
+      return
+    }
+    if (!(child as any).isLeaf && !(child as any).children?.length) {
+      expandedKeys.value = Array.from(new Set([...expandedKeys.value, child.key as string | number]))
+      // _loadData 会被 ant-tree 的 expand 自动触发
+      return
+    }
+    if ((child as any).children?.length) {
+      await expandToFirstSelectable((child as any).children)
+      return
+    }
+  }
+}
 </script>
 
 <template>

package/dist/es/components/bom-workbench/index.vue

@@ -8,6 +8,7 @@ import HdLeftRight from '../left-right/index'
 import HdBomTree from '../bom-tree/index'
 
 const props = defineProps<Props>()
+const emit = defineEmits(['select'])
 const COMPONENT_NAME = 'HdBomWorkbench'
 const treeRef = ref()
 defineOptions({
@@ -24,9 +25,9 @@ interface Props {
   loadData?: (node: BomNode, eventNode?: EventDataNode) => Promise<BomNode[]>
 }
 const selectedNode = ref<BomNode>()
-
 async function onSelected(data: BomNode) {
   selectedNode.value = data
+  emit('select', data)
 }
 
 watch(

package/dist/lib/components/bom-tree/index.vue

@@ -101,17 +101,18 @@ const getParentKeys = (key: string): string[] | undefined => {
   return treeNode?.parentKeys || []
 }
 
-const selectFirstSelectableNode = (preserveExpanded = false) => {
-  if (!firstSelectableKey.value) {
-    return
-  }
-  nextTick(() => {
+const selectFirstSelectableNode = async (preserveExpanded = false) => {
+  await nextTick()
+  if (firstSelectableKey.value) {
     const parentKeys = getParentKeys(firstSelectableKey.value!) as string[]
     expandedKeys.value = preserveExpanded
-      ? Array.from(new Set([...expandedKeys.value, ...parentKeys])) // 取并集
+      ? Array.from(new Set([...expandedKeys.value, ...parentKeys]))
       : parentKeys
     selectedKeys.value = [firstSelectableKey.value!]
-  })
+  }
+  else {
+    await expandToFirstSelectable(treeData.value)
+  }
 }
 
 const canLoadMoreRoot = computed(() => currentRootSize.value < filteredData.value.length)
@@ -276,9 +277,28 @@ function getDepth(key: string): number {
   return parentKeys!.length + 1
 }
 
+function getParentNodes(key: string): TreeNodeWithMeta[] {
+  const parentKeys = getParentKeys(key)
+  if (!parentKeys?.length) {
+    return []
+  }
+  return parentKeys.map(k => keyToNodeMap.value.get(k)).filter(Boolean) as TreeNodeWithMeta[]
+}
+
+function getPath(key: string): TreeNodeWithMeta[] {
+  const node = keyToNodeMap.value.get(key)
+  if (!node) {
+    return []
+  }
+  const parents = getParentNodes(key)
+  return [...parents, node]
+}
+
 defineExpose({
   updateTreeWithPreservedState,
   getParentKeys,
+  getParentNodes,
+  getPath,
   getDepth,
 })
 
@@ -303,11 +323,36 @@ async function _loadData(node: EventDataNode) {
     })
 
     node.dataRef!.children = treeData
+
+    await expandToFirstSelectable(treeData)
   }
   else {
     node.isLeaf = true
   }
 }
+
+async function expandToFirstSelectable(nodes: DataNode[]) {
+  if (_.isEmpty(nodes)) {
+    return
+  }
+  for (const child of nodes) {
+    if ((child as any).selectable) {
+      selectedKeys.value = [child.key as string]
+      const parentKeys = getParentKeys(child.key as string) || []
+      expandedKeys.value = Array.from(new Set([...expandedKeys.value, ...parentKeys]))
+      return
+    }
+    if (!(child as any).isLeaf && !(child as any).children?.length) {
+      expandedKeys.value = Array.from(new Set([...expandedKeys.value, child.key as string | number]))
+      // _loadData 会被 ant-tree 的 expand 自动触发
+      return
+    }
+    if ((child as any).children?.length) {
+      await expandToFirstSelectable((child as any).children)
+      return
+    }
+  }
+}
 </script>
 
 <template>

package/dist/lib/components/bom-workbench/index.vue

@@ -8,6 +8,7 @@ import HdLeftRight from '../left-right/index'
 import HdBomTree from '../bom-tree/index'
 
 const props = defineProps<Props>()
+const emit = defineEmits(['select'])
 const COMPONENT_NAME = 'HdBomWorkbench'
 const treeRef = ref()
 defineOptions({
@@ -24,9 +25,9 @@ interface Props {
   loadData?: (node: BomNode, eventNode?: EventDataNode) => Promise<BomNode[]>
 }
 const selectedNode = ref<BomNode>()
-
 async function onSelected(data: BomNode) {
   selectedNode.value = data
+  emit('select', data)
 }
 
 watch(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@handaotech-design/bom",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "license": "MIT",
   "sideEffects": false,
   "exports": {