From 0356e31db40effaaea9aad46d069577740c2aa21 Mon Sep 17 00:00:00 2001 From: yaoyun8 Date: Sun, 7 Jan 2024 22:33:10 -0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=8F=92=E4=BB=B6=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=9B=BA=E5=AE=9A=E5=90=8E=E7=94=BB=E5=B8=83=E6=9C=AA?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/container/CanvasResize.vue | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasResize.vue b/packages/canvas/src/components/container/CanvasResize.vue index f2a2e0fe7..1611e722f 100644 --- a/packages/canvas/src/components/container/CanvasResize.vue +++ b/packages/canvas/src/components/container/CanvasResize.vue @@ -30,6 +30,13 @@ export default { const mouseDown = ref(false) const resizeDom = ref(null) + const onMouseMove = (event) => { + if (mouseDown.value) { + event.preventDefault() + calculateSize(event) + } + } + const calculateSize = ({ movementX }) => { const dimension = useLayout().getDimension() const { maxWidth, minWidth, width } = dimension @@ -41,13 +48,6 @@ export default { }) } - const onMouseMove = (event) => { - if (mouseDown.value) { - event.preventDefault() - calculateSize(event) - } - } - const onMouseDown = () => { const iframe = canvasState.iframe @@ -95,7 +95,13 @@ export default { watch( () => useLayout().getPluginState().render, - (value) => !value && setScale(), + (value) => { + const currentFixed = useLayout().getPluginState().fixedPanels.includes(value) + + if (!value || currentFixed) { + setScale() + } + }, { flush: 'post' } )