diff --git a/src/views/chart/ContentEdit/hooks/useLayout.hook.ts b/src/views/chart/ContentEdit/hooks/useLayout.hook.ts index 1da17d5c..4fb3fb76 100644 --- a/src/views/chart/ContentEdit/hooks/useLayout.hook.ts +++ b/src/views/chart/ContentEdit/hooks/useLayout.hook.ts @@ -5,8 +5,9 @@ import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStor const chartEditStore = useChartEditStore() // 布局处理 -export const useLayout = () => { - onMounted(() => { +export const useLayout = (fn: () => Promise) => { + let removeScale: Function = () => { } + onMounted(async () => { // 设置 Dom 值(ref 不生效先用 document) chartEditStore.setEditCanvas( EditCanvasTypeEnum.EDIT_LAYOUT_DOM, @@ -17,13 +18,16 @@ export const useLayout = () => { document.getElementById('go-chart-edit-content') ) + // 获取数据 + await fn() // 监听初始化 - const removeScale = chartEditStore.listenerScale() + removeScale = chartEditStore.listenerScale() - onUnmounted(() => { - chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_LAYOUT_DOM, null) - chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_CONTENT_DOM, null) - removeScale() - }) + }) + + onUnmounted(() => { + chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_LAYOUT_DOM, null) + chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_CONTENT_DOM, null) + removeScale() }) } \ No newline at end of file diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue index 34b7122a..f3820290 100644 --- a/src/views/chart/ContentEdit/index.vue +++ b/src/views/chart/ContentEdit/index.vue @@ -109,10 +109,10 @@ const chartEditStore = useChartEditStore() const { handleContextMenu } = useContextMenu() // 编辑时注入scale变量,消除警告 -provide(SCALE_KEY, null); +provide(SCALE_KEY, null) // 布局处理 -useLayout() +useLayout(async () => {}) // 点击事件 const { mouseenterHandle, mouseleaveHandle, mousedownHandle, mouseClickHandle } = useMouseHandle()