diff --git a/packages/common/component/PluginPanel.vue b/packages/common/component/PluginPanel.vue index 871f29dd8..53f975808 100644 --- a/packages/common/component/PluginPanel.vue +++ b/packages/common/component/PluginPanel.vue @@ -70,7 +70,7 @@ export default { }, emits: ['close'], setup(props, { emit }) { - const { getPluginWidth, changePluginWidth, getPluginByLayout } = useLayout() + const { getPluginWidth, changePluginWidth, getPluginByLayout, changeMoveDragBarState } = useLayout() const panelState = inject('panelState') const closePanel = () => { useLayout().closePlugin() @@ -129,16 +129,19 @@ export default { const throttledMouseMoveLeft = throttle(onMouseMoveLeft, 50) const onMouseUpRight = () => { + changeMoveDragBarState(false) document.removeEventListener('mousemove', throttledMouseMoveRight) document.removeEventListener('mouseup', onMouseUpRight) } const onMouseUpLeft = () => { + changeMoveDragBarState(false) document.removeEventListener('mousemove', throttledMouseMoveLeft) document.removeEventListener('mouseup', onMouseUpLeft) } const onMouseDownRight = (event) => { + changeMoveDragBarState(true) startX = event.clientX startWidth = panel.value.offsetWidth document.addEventListener('mousemove', throttledMouseMoveRight) @@ -146,6 +149,7 @@ export default { } const onMouseDownLeft = (event) => { + changeMoveDragBarState(true) startX = event.clientX startWidth = panel.value.offsetWidth document.addEventListener('mousemove', throttledMouseMoveLeft) diff --git a/packages/controller/src/useLayout.js b/packages/controller/src/useLayout.js index 8c87566e8..ca25fc95a 100644 --- a/packages/controller/src/useLayout.js +++ b/packages/controller/src/useLayout.js @@ -51,6 +51,7 @@ const pluginState = reactive({ }) const layoutState = reactive({ + isMoveDragBar: false, deviceType: 'desktop', iframeWidth: '1200px', dimension: { @@ -82,6 +83,12 @@ const layoutState = reactive({ }, pageStatus: '' }) +const getMoveDragBarState = () => { + return layoutState.isMoveDragBar +} +const changeMoveDragBarState = (state) => { + layoutState.isMoveDragBar = state +} const leftMenuShownStorage = useStorage('leftMenuShown', layoutState.plugins.isShow) const rightMenuShownStorage = useStorage('rightMenuShown', layoutState.settings.isShow) const changeMenuShown = (menuName) => { @@ -312,6 +319,8 @@ export default () => { isSameSide, getPluginShown, changePluginShown, - changeMenuShown + changeMenuShown, + getMoveDragBarState, + changeMoveDragBarState } } diff --git a/packages/design-core/src/DesignCanvas.vue b/packages/design-core/src/DesignCanvas.vue index 7deb14638..68723dbc8 100644 --- a/packages/design-core/src/DesignCanvas.vue +++ b/packages/design-core/src/DesignCanvas.vue @@ -1,6 +1,11 @@