From 3d0b88708edac78f9d263b22ac6bddbe2266cc42 Mon Sep 17 00:00:00 2001 From: invalid w Date: Fri, 20 Oct 2023 16:47:03 +0800 Subject: [PATCH] chore(BasicTree): Resolve ts type error --- src/components/Tree/src/BasicTree.vue | 3 ++- src/components/Tree/src/TreeIcon.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue index 008b247e..a9d3fad4 100644 --- a/src/components/Tree/src/BasicTree.vue +++ b/src/components/Tree/src/BasicTree.vue @@ -33,6 +33,7 @@ import { CreateContextOptions } from '/@/components/ContextMenu'; import { treeEmits, treeProps } from './types/tree'; import { createBEM } from '/@/utils/bem'; + import type { TreeProps } from 'ant-design-vue/es/tree/Tree'; export default defineComponent({ name: 'BasicTree', @@ -106,7 +107,7 @@ }, onRightClick: handleRightClick, }; - return omit(propsData, 'treeData', 'class'); + return omit(propsData, 'treeData', 'class') as TreeProps; }); const getTreeData = computed((): TreeItem[] => diff --git a/src/components/Tree/src/TreeIcon.ts b/src/components/Tree/src/TreeIcon.ts index 67e2e7b1..24280827 100644 --- a/src/components/Tree/src/TreeIcon.ts +++ b/src/components/Tree/src/TreeIcon.ts @@ -8,5 +8,5 @@ export const TreeIcon = ({ icon }: { icon: VNode | string }) => { if (isString(icon)) { return h(Icon, { icon, class: 'mr-1' }); } - return Icon; + return h(Icon); };