diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 15a9183f51..bea4ff28f1 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -1352,7 +1352,7 @@ export default { this.dragComponentInfo.shadowStyle.y = e.pageY - 90 this.dragComponentInfo.style.left = this.dragComponentInfo.shadowStyle.x / this.scalePointWidth this.dragComponentInfo.style.top = this.dragComponentInfo.shadowStyle.y / this.scalePointHeight - if (this.canvasStyleData.auxiliaryMatrix) { + if (this.dragComponentInfo.auxiliaryMatrix) { this.onDragging(e, this.dragComponentInfo) } }, @@ -1668,10 +1668,12 @@ export default { }, removeLastItem() { // console.log('rlI:' + JSON.stringify(this.yourList)) - this.removeItem(this.yourList.length - 1) + if (this.canvasStyleData.auxiliaryMatrix) { + this.removeItem(this.yourList.length - 1) + } }, startMoveIn() { - if (this.canvasStyleData.auxiliaryMatrix) { + if (this.dragComponentInfo.auxiliaryMatrix) { const moveInItemInfo = this.$store.state.dragComponentInfo this.addItemBox(moveInItemInfo) // console.log('startMoveIn:') diff --git a/frontend/src/views/panel/AssistComponent/index.vue b/frontend/src/views/panel/AssistComponent/index.vue index 79f7e31389..c37451808e 100644 --- a/frontend/src/views/panel/AssistComponent/index.vue +++ b/frontend/src/views/panel/AssistComponent/index.vue @@ -141,7 +141,13 @@ export default { component = deepCopy(componentTemp) } }) - component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix + // 图片移入是 不支持矩阵 暂时无法监听窗口取消事件 + if (component.type !== 'picture-add') { + component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix + } else { + component.auxiliaryMatrix = false + } + component.moveStatus = 'start' return component }, handleDragEnd(ev) { diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 1c4d88c4dd..8e25d43c81 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -607,6 +607,7 @@ export default { this.filterVisible = false this.currentWidget = null this.clearCurrentInfo() + bus.$emit('onRemoveLastItem') }, sureFilter() { this.currentFilterCom.options.value = [] diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue index 6a45b30ecf..116a5b187f 100644 --- a/frontend/src/views/panel/filter/index.vue +++ b/frontend/src/views/panel/filter/index.vue @@ -97,7 +97,7 @@ export default { dragComponentInfo.sizex = Math.round(dragComponentInfo.style.width / this.curCanvasScale.matrixStyleOriginWidth) dragComponentInfo.sizey = Math.round(dragComponentInfo.style.height / this.curCanvasScale.matrixStyleOriginHeight) dragComponentInfo.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix - + dragComponentInfo.moveStatus = 'start' this.$store.commit('setDragComponentInfo', dragComponentInfo) ev.dataTransfer.effectAllowed = 'copy' const dataTrans = {