diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 08b51318b8..17feeae9fd 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -52,7 +52,7 @@ import EditBar from '@/components/canvas/components/Editor/EditBar' export default { replace: true, - name: 'VueDragResizeRotate', + name: 'Dedrag', components: { EditBar }, props: { className: { @@ -1572,6 +1572,10 @@ export default { addEvent(document.documentElement, 'touchend touchcancel', this.deselect) // 窗口变化时,检查容器大小 addEvent(window, 'resize', this.checkParentSize) + + // private 记录当前组件的操作状态 + this.curComponent.optStatus.resizing = this.resizing + this.curComponent.optStatus.dragging = this.dragging }, createdFunction() { // minWidth不能大于maxWidth diff --git a/frontend/src/components/DeDrag/shadow.vue b/frontend/src/components/DeDrag/shadow.vue new file mode 100644 index 0000000000..e35a5376ce --- /dev/null +++ b/frontend/src/components/DeDrag/shadow.vue @@ -0,0 +1,47 @@ + + + + diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 33fc9af320..c14151c562 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -104,9 +104,8 @@ :active="item === curComponent" /> - - + @@ -169,9 +168,10 @@ import { deepCopy } from '@/components/canvas/utils/utils' import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog' import DeOutWidget from '@/components/dataease/DeOutWidget' import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar' +import DragShadow from '@/components/DeDrag/shadow' export default { - components: { Shape, ContextMenu, MarkLine, Area, Grid, DeDrag, UserViewDialog, DeOutWidget, CanvasOptBar }, + components: { Shape, ContextMenu, MarkLine, Area, Grid, DeDrag, UserViewDialog, DeOutWidget, CanvasOptBar, DragShadow }, props: { isEdit: { type: Boolean, diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index ae045bcd1c..b11a051fd8 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -86,6 +86,11 @@ const data = { }, setCurComponent(state, { component, index }) { + // 当前视图操作状态置空 + component['optStatus'] = { + dragging: false, + resizing: false + } state.styleChangeTimes = 0 state.curComponent = component state.curComponentIndex = index