diff --git a/packages/components/button/button.vue b/packages/components/button/button.vue index 4adbc9e..e5c7624 100644 --- a/packages/components/button/button.vue +++ b/packages/components/button/button.vue @@ -1,19 +1,12 @@ - - - - \ No newline at end of file diff --git a/packages/components/tree/tree.vue b/packages/components/tree/tree.vue index 4d920fc..1d3a1fa 100644 --- a/packages/components/tree/tree.vue +++ b/packages/components/tree/tree.vue @@ -7,11 +7,24 @@ #default="{ data, deep, dataSourceKey, status }: { data: INiuTreeData, deep: number, dataSourceKey: INiuTreeKey, status: ENiuTreeStatus }"> + - diff --git a/packages/components/tree/util.ts b/packages/components/tree/util.ts index 75dea1f..e9cf271 100644 --- a/packages/components/tree/util.ts +++ b/packages/components/tree/util.ts @@ -41,6 +41,8 @@ export function isChildOf( b_key: INiuTreeKey, treeData: INiuTreeData[] ) { + if (!a_key) return false + if (!b_key) return false if (a_key === b_key) return false let target_node = findByKey(b_key, treeData) diff --git a/packages/playground/components.d.ts b/packages/playground/components.d.ts index 16c12af..ba1a7bf 100644 --- a/packages/playground/components.d.ts +++ b/packages/playground/components.d.ts @@ -8,6 +8,7 @@ declare module '@vue/runtime-core' { Panel: typeof import('./src/components/Panel.vue')['default'] PsButton: typeof import('@princess-ui/components/button')['PsButton'] PsCaptcha: typeof import('@princess-ui/components/captcha')['PsCaptcha'] + PsTree: typeof import('@princess-ui/components/tree')['PsTree'] } } diff --git a/packages/playground/src/dev/captcha.vue b/packages/playground/src/dev/captcha.vue index c97e3dc..6179c36 100644 --- a/packages/playground/src/dev/captcha.vue +++ b/packages/playground/src/dev/captcha.vue @@ -21,7 +21,7 @@ function send(start: () => void, done: (isDone: boolean) => void) { sada - + diff --git a/packages/playground/src/dev/tree.vue b/packages/playground/src/dev/tree.vue index e62cac0..89fedc1 100644 --- a/packages/playground/src/dev/tree.vue +++ b/packages/playground/src/dev/tree.vue @@ -1,6 +1,6 @@