From 19a6503383bb4e00042f8e1a386b8c64926e4f50 Mon Sep 17 00:00:00 2001 From: Kagol Date: Tue, 18 Jun 2024 15:42:33 +0800 Subject: [PATCH] refactor(tree-select): obtain updateSelectedData/hidePanel from baseSelectRef --- packages/renderless/src/tree-select/index.ts | 12 ++++++------ packages/renderless/src/tree-select/vue.ts | 2 +- packages/vue/src/tree-select/src/pc.vue | 15 ++++----------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/packages/renderless/src/tree-select/index.ts b/packages/renderless/src/tree-select/index.ts index fd75805eaa..3e39cc6288 100644 --- a/packages/renderless/src/tree-select/index.ts +++ b/packages/renderless/src/tree-select/index.ts @@ -5,10 +5,10 @@ export const filter = } export const nodeClick = - ({ props }) => - (data, { updateSelectedData, hidePanel }) => { + ({ props, vm }) => + (data) => { if (!props.multiple) { - updateSelectedData({ + vm.$refs.baseSelectRef.updateSelectedData({ ...data, currentLabel: data[props.textField], value: data[props.valueField], @@ -17,15 +17,15 @@ export const nodeClick = } }) - hidePanel() + vm.$refs.baseSelectRef.hidePanel() } } export const check = ({ props }) => - (checkedNodes, { updateSelectedData }) => { + (data, { checkedNodes }) => { if (props.multiple) { - updateSelectedData( + vm.$refs.baseSelectRef.updateSelectedData( checkedNodes.map((node) => { return { ...node, diff --git a/packages/renderless/src/tree-select/vue.ts b/packages/renderless/src/tree-select/vue.ts index bc9c2a6576..426a8fddea 100644 --- a/packages/renderless/src/tree-select/vue.ts +++ b/packages/renderless/src/tree-select/vue.ts @@ -13,7 +13,7 @@ export const renderless = (props, { reactive }, { vm }) => { Object.assign(api, { state, filter: filter({ vm }), - nodeClick: nodeClick({ props }), + nodeClick: nodeClick({ props, vm }), check: check({ props }) }) diff --git a/packages/vue/src/tree-select/src/pc.vue b/packages/vue/src/tree-select/src/pc.vue index 6908d2bfab..5f4f279262 100644 --- a/packages/vue/src/tree-select/src/pc.vue +++ b/packages/vue/src/tree-select/src/pc.vue @@ -1,5 +1,6 @@