diff --git a/packages/editor/src/components/CodeBlockEditor.vue b/packages/editor/src/components/CodeBlockEditor.vue index f57109e3..665a06af 100644 --- a/packages/editor/src/components/CodeBlockEditor.vue +++ b/packages/editor/src/components/CodeBlockEditor.vue @@ -104,14 +104,14 @@ const { height: codeBlockEditorHeight } = useEditorContentHeight(); const difVisible = ref(false); const { rect: windowRect } = useWindowRect(); -const magicVsEditor = useTemplateRef>('magicVsEditor'); +const magicVsEditorRef = useTemplateRef>('magicVsEditor'); const diffChange = () => { - if (!magicVsEditor.value || !formBox.value?.form) { + if (!magicVsEditorRef.value || !formBox.value?.form) { return; } - formBox.value.form.values.content = magicVsEditor.value.getEditorValue(); + formBox.value.form.values.content = magicVsEditorRef.value.getEditorValue(); difVisible.value = false; }; diff --git a/packages/editor/src/components/CodeParams.vue b/packages/editor/src/components/CodeParams.vue index ddb0552f..2f095e8a 100644 --- a/packages/editor/src/components/CodeParams.vue +++ b/packages/editor/src/components/CodeParams.vue @@ -32,7 +32,7 @@ const props = defineProps<{ const emit = defineEmits(['change']); -const form = useTemplateRef>('form'); +const formRef = useTemplateRef>('form'); const getFormConfig = (items: FormConfig = []) => [ { @@ -61,7 +61,7 @@ const codeParamsConfig = computed(() => */ const onParamsChangeHandler = async (v: FormValue, eventData: ContainerChangeEventData) => { try { - const value = await form.value?.submitForm(true); + const value = await formRef.value?.submitForm(true); emit('change', value, eventData); } catch (e) { error(e); diff --git a/packages/editor/src/components/ContentMenu.vue b/packages/editor/src/components/ContentMenu.vue index fb0e8726..ee6bcb7d 100644 --- a/packages/editor/src/components/ContentMenu.vue +++ b/packages/editor/src/components/ContentMenu.vue @@ -69,9 +69,9 @@ const emit = defineEmits<{ mouseenter: []; }>(); -const menu = useTemplateRef('menu'); -const buttons = useTemplateRef[]>('buttons'); -const subMenu = useTemplateRef('subMenu'); +const menuEl = useTemplateRef('menu'); +const buttonRefs = useTemplateRef[]>('buttons'); +const subMenuRef = useTemplateRef('subMenu'); const visible = ref(false); const subMenuData = ref<(MenuButton | MenuComponent)[]>([]); const zIndex = useZIndex(); @@ -88,13 +88,13 @@ const menuStyle = computed(() => ({ zIndex: curZIndex.value, })); -const contains = (el: HTMLElement) => menu.value?.contains(el) || subMenu.value?.contains(el); +const contains = (el: HTMLElement) => menuEl.value?.contains(el) || subMenuRef.value?.contains(el); const hide = () => { if (!visible.value) return; visible.value = false; - subMenu.value?.hide(); + subMenuRef.value?.hide(); emit('hide'); }; @@ -121,7 +121,7 @@ const outsideClickHideHandler = (e: MouseEvent) => { }; const setPosition = (e: { clientY: number; clientX: number }) => { - const menuHeight = menu.value?.clientHeight || 0; + const menuHeight = menuEl.value?.clientHeight || 0; let top = e.clientY; if (menuHeight + e.clientY > document.body.clientHeight) { @@ -158,15 +158,15 @@ const showSubMenu = (item: MenuButton | MenuComponent, index: number) => { return; } - if (menu.value) { + if (menuEl.value) { // 将子菜单放置在按钮右侧,与按钮齐平 - let y = menu.value.offsetTop; - if (buttons.value?.[index].$el) { - const rect = buttons.value?.[index].$el.getBoundingClientRect(); + let y = menuEl.value.offsetTop; + if (buttonRefs.value?.[index].$el) { + const rect = buttonRefs.value?.[index].$el.getBoundingClientRect(); y = rect.top; } - subMenu.value?.show({ - clientX: menu.value.offsetLeft + menu.value.clientWidth - 2, + subMenuRef.value?.show({ + clientX: menuEl.value.offsetLeft + menuEl.value.clientWidth - 2, clientY: y, }); } @@ -190,7 +190,7 @@ onBeforeUnmount(() => { }); defineExpose({ - menu, + menu: menuEl, menuPosition, hide, show, diff --git a/packages/editor/src/components/FloatingBox.vue b/packages/editor/src/components/FloatingBox.vue index 0ba95ef3..0afc402d 100644 --- a/packages/editor/src/components/FloatingBox.vue +++ b/packages/editor/src/components/FloatingBox.vue @@ -1,7 +1,7 @@