From ce6d2684b73d503b1aec0b656262bda35e4cfe29 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Fri, 21 Jul 2023 19:36:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E6=B5=81=E5=BC=8F=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E4=B8=8B=E9=80=9A=E8=BF=87=E7=BB=84=E4=BB=B6=E6=A0=91?= =?UTF-8?q?=E6=8B=96=E5=8A=A8layout=E5=88=A4=E6=96=AD=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor/src/layouts/sidebar/LayerPanel.vue | 2 +- packages/editor/src/services/editor.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/layouts/sidebar/LayerPanel.vue b/packages/editor/src/layouts/sidebar/LayerPanel.vue index ea8676ea..23497986 100644 --- a/packages/editor/src/layouts/sidebar/LayerPanel.vue +++ b/packages/editor/src/layouts/sidebar/LayerPanel.vue @@ -156,7 +156,7 @@ const handleDragEnd = async (e: any) => { if (!tree.value) return; const { data: node } = e; const parent = editorService?.getParentById(node.id, false) as MContainer; - const layout = await editorService?.getLayout(parent); + const layout = await editorService?.getLayout(parent, node); node.style.position = layout; if (layout === Layout.RELATIVE) { node.style.top = 0; diff --git a/packages/editor/src/services/editor.ts b/packages/editor/src/services/editor.ts index 545f6bdc..ac4a11fe 100644 --- a/packages/editor/src/services/editor.ts +++ b/packages/editor/src/services/editor.ts @@ -193,7 +193,7 @@ class Editor extends BaseService { /** * 只有容器拥有布局 */ - public async getLayout(parent: MNode, node?: MNode): Promise { + public async getLayout(parent: MNode, node?: MNode | null): Promise { if (node && typeof node !== 'function' && isFixed(node)) return Layout.FIXED; if (parent.layout) {