diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 2c51cb80d0..b5087c6f46 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -1603,7 +1603,7 @@ export default { style.height = height style.rotate = this.rotate // this.hasMove = true - // console.log('recordMatrixCurShadowStyle:t1:' + t1 + ';mw:' + this.curCanvasScale.matrixStyleWidth + ';width:' + width) + console.log('recordMatrixCurShadowStyle:t1:' + JSON.stringify(style)) this.$store.commit('setShapeStyle', style) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index e890b44cc4..d5ce8a86b5 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -51,7 +51,7 @@ @onResizing="onResizing" @elementMouseDown="containerMouseDown" @amRemoveItem="removeItem(item._dragId)" - @amAddItme="addItemBox(item)" + @amAddItem="addItemBox(item)" @linkJumpSet="linkJumpSet(item)" > @@ -338,6 +338,7 @@ function recalcCellWidth() { } function init() { + console.log('init') this.cellWidth = this.baseWidth + this.baseMarginLeft this.cellHeight = this.baseHeight + this.baseMarginTop this.yourList = this.getList() @@ -357,7 +358,6 @@ function init() { recalcCellWidth.call(this) resetPositionBox.call(this) - let i = 0 // console.log('initList:' + JSON.stringify(vm.yourList)) const timeid = setInterval(function() { @@ -376,6 +376,7 @@ function init() { } function resizePlayer(item, newSize) { + // console.log('resizePlayer') const vm = this removeItemFromPositionBox(item) @@ -424,6 +425,7 @@ function resizePlayer(item, newSize) { * @param {any} position */ function checkItemPosition(item, position) { + // console.log('checkItemPosition-info' + JSON.stringify(item)) position = position || {} position.x = position.x || item.x position.y = position.y || item.y @@ -469,6 +471,7 @@ function checkItemPosition(item, position) { * @param {any} position */ function movePlayer(item, position) { + // console.log('movePlayer') const vm = this removeItemFromPositionBox(item) @@ -483,7 +486,7 @@ function movePlayer(item, position) { item.x = position.x item.y = position.y - + // console.log('checkItemPosition3') checkItemPosition.call(this, item, position) emptyTargetCell.call(this, item) @@ -520,11 +523,13 @@ function removeItem(index) { } function addItem(item, index) { + // console.log('addItem') if (index < 0) { index = this.yourList.length } item._dragId = index + // console.log('checkItemPosition4') checkItemPosition.call(this, item, { x: item.x, y: item.y @@ -652,6 +657,7 @@ function changeItemCoord(item) { * @param {any} item */ function emptyTargetCell(item) { + // console.log('emptyTargetCell') const vm = this const belowItems = findBelowItems(item) @@ -708,6 +714,7 @@ function moveItemDown(item, size) { y: item.y + size } setPlayerPosition.call(this, item, targetPosition) + // console.log('checkItemPosition1') checkItemPosition.call(this, item, targetPosition) addItemToPositionBox.call(this, item) @@ -1458,6 +1465,7 @@ export default { infoBox.oldSizeY = item.sizey }, onMouseUp(e) { + // console.log('onMouseUp') const vm = this if (_.isEmpty(vm.infoBox)) return if (vm.infoBox.cloneItem) { @@ -1626,6 +1634,7 @@ export default { }, 100) }, addItemBox(item) { + // console.log('addItemBox:' + JSON.stringify(item)) this.yourList.push(item) this.$nextTick(function() { diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js index c79d7a9b5b..80decf5614 100644 --- a/frontend/src/components/canvas/store/copy.js +++ b/frontend/src/components/canvas/store/copy.js @@ -3,6 +3,7 @@ import toast from '@/components/canvas/utils/toast' import generateID from '@/components/canvas/utils/generateID' import { deepCopy } from '@/components/canvas/utils/utils' import { chartCopy } from '@/api/chart/chart' +import { uuid } from 'vue-uuid' export default { state: { @@ -46,11 +47,14 @@ export default { if (data.type === 'view') { chartCopy(data.propValue.viewId).then(res => { const newView = deepCopy(data) + newView.id = uuid.v1() newView.propValue.viewId = res.data store.commit('addComponent', { component: newView }) }) } else { - store.commit('addComponent', { component: deepCopy(data) }) + const newCop = deepCopy(data) + newCop.id = uuid.v1() + store.commit('addComponent', { component: newCop }) } if (state.isCut) { state.copyData = null diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index e6fd6daf46..0af8fe5e24 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -813,7 +813,7 @@ export default { } }, canvasScroll(event) { - console.log('testTop' + event.target.scrollTop) + // console.log('testTop' + event.target.scrollTop) this.scrollLeft = event.target.scrollLeft this.scrollTop = event.target.scrollTop },