From 819b987a88df796b3966b7e56f77cc03246f9366 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 3 Jan 2023 21:48:21 +0800 Subject: [PATCH 1/2] update provide key --- packages/opendesign/src/components/_shared/constant.ts | 3 ++- packages/opendesign/src/components/select/OSelect.vue | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/opendesign/src/components/_shared/constant.ts b/packages/opendesign/src/components/_shared/constant.ts index 8f26d900..b27e0fad 100644 --- a/packages/opendesign/src/components/_shared/constant.ts +++ b/packages/opendesign/src/components/_shared/constant.ts @@ -1 +1,2 @@ -export const ProvideOptionKey = Symbol('option-provide'); +export const ProvideKeyOptionUpdate = Symbol('provide-option/update'); +export const ProvideKeyOptionValue = Symbol('provide-option/value'); diff --git a/packages/opendesign/src/components/select/OSelect.vue b/packages/opendesign/src/components/select/OSelect.vue index 7093cbbc..31200e99 100644 --- a/packages/opendesign/src/components/select/OSelect.vue +++ b/packages/opendesign/src/components/select/OSelect.vue @@ -2,7 +2,7 @@ import { provide, ref } from 'vue'; import { defaultSize, defaultShape } from '../_shared/global'; import type { SizeT, ShapeT } from '../_shared/global'; -import { ProvideOptionKey } from '../_shared/constant'; +import { ProvideKeyOptionUpdate, ProvideKeyOptionValue } from '../_shared/constant'; import type { OptionValueT } from '../_shared/global'; import { IconArrowTraingleDown } from '../icons'; import { OPopup, PopupPositionT } from '../popup'; @@ -33,7 +33,7 @@ const emits = defineEmits(['update:modelValue']); const selectRef = ref(); const showOption = ref(false); -provide(`${OptionProvideKey}/update`, (val: OptionValueT, emit?: boolean) => { +provide(ProvideKeyOptionUpdate, (val: OptionValueT, emit?: boolean) => { activeLabel.value = val.label; if (emit) { emits('update:modelValue', val.value); @@ -42,7 +42,7 @@ provide(`${OptionProvideKey}/update`, (val: OptionValueT, emit?: boolean) => { } }); -provide(`${OptionProvideKey}/value`, activeVal); +provide(ProvideKeyOptionValue, activeVal); const onOptionChange = (visible: boolean) => { if (visible) { console.log(selectRef.value?.clientWidth); -- Gitee From 83a1c8c18b43772904ab838b766ff35e0f1a2d53 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 3 Jan 2023 21:49:19 +0800 Subject: [PATCH 2/2] update key --- packages/opendesign/src/components/_shared/constant.ts | 4 ++-- packages/opendesign/src/components/select/OSelect.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/opendesign/src/components/_shared/constant.ts b/packages/opendesign/src/components/_shared/constant.ts index b27e0fad..814b4a97 100644 --- a/packages/opendesign/src/components/_shared/constant.ts +++ b/packages/opendesign/src/components/_shared/constant.ts @@ -1,2 +1,2 @@ -export const ProvideKeyOptionUpdate = Symbol('provide-option/update'); -export const ProvideKeyOptionValue = Symbol('provide-option/value'); +export const PROVIDE_KEY_UPTION_UPDATE = Symbol('provide-option/update'); +export const PROVIDE_KEY_UPTION_VALUE = Symbol('provide-option/value'); diff --git a/packages/opendesign/src/components/select/OSelect.vue b/packages/opendesign/src/components/select/OSelect.vue index 31200e99..e6dc56e8 100644 --- a/packages/opendesign/src/components/select/OSelect.vue +++ b/packages/opendesign/src/components/select/OSelect.vue @@ -2,7 +2,7 @@ import { provide, ref } from 'vue'; import { defaultSize, defaultShape } from '../_shared/global'; import type { SizeT, ShapeT } from '../_shared/global'; -import { ProvideKeyOptionUpdate, ProvideKeyOptionValue } from '../_shared/constant'; +import { PROVIDE_KEY_UPTION_UPDATE, PROVIDE_KEY_UPTION_VALUE } from '../_shared/constant'; import type { OptionValueT } from '../_shared/global'; import { IconArrowTraingleDown } from '../icons'; import { OPopup, PopupPositionT } from '../popup'; @@ -33,7 +33,7 @@ const emits = defineEmits(['update:modelValue']); const selectRef = ref(); const showOption = ref(false); -provide(ProvideKeyOptionUpdate, (val: OptionValueT, emit?: boolean) => { +provide(PROVIDE_KEY_UPTION_UPDATE, (val: OptionValueT, emit?: boolean) => { activeLabel.value = val.label; if (emit) { emits('update:modelValue', val.value); @@ -42,7 +42,7 @@ provide(ProvideKeyOptionUpdate, (val: OptionValueT, emit?: boolean) => { } }); -provide(ProvideKeyOptionValue, activeVal); +provide(PROVIDE_KEY_UPTION_VALUE, activeVal); const onOptionChange = (visible: boolean) => { if (visible) { console.log(selectRef.value?.clientWidth); -- Gitee