diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 0440f50e0e..276a746f31 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -1007,7 +1007,7 @@ export default { handler(newVal, oldVla) { // console.log('newVal:' + JSON.stringify(newVal) + ';oldVla:' + JSON.stringify(oldVla)) // 初始化时componentData 加载可能出现慢的情况 此时重新初始化一下matrix - if (this.lastComponentDataLength === 0 && newVal.length > 0) { + if (newVal.length !== this.lastComponentDataLength) { this.lastComponentDataLength = newVal.length this.initMatrix() } @@ -1676,23 +1676,25 @@ export default { }) }, startMoveIn() { - const moveInItemInfo = this.$store.state.dragComponentInfo - this.addItemBox(moveInItemInfo) - // console.log('startMoveIn:') - const vm = this - // e.preventDefault(); - if (!this.infoBox) { - this.infoBox = {} + if (this.canvasStyleData.auxiliaryMatrix) { + const moveInItemInfo = this.$store.state.dragComponentInfo + this.addItemBox(moveInItemInfo) + console.log('startMoveIn:') + const vm = this + // e.preventDefault(); + if (!this.infoBox) { + this.infoBox = {} + } + const infoBox = this.infoBox + + infoBox.moveItem = moveInItemInfo + infoBox.moveItemIndex = this.yourList.length - 1 + + infoBox.oldX = 1 // 实际对象原始X位置 + infoBox.oldY = 1 + infoBox.oldSizeX = moveInItemInfo.sizex + infoBox.oldSizeY = moveInItemInfo.sizey } - const infoBox = this.infoBox - - infoBox.moveItem = moveInItemInfo - infoBox.moveItemIndex = this.yourList.length - 1 - - infoBox.oldX = 1 // 实际对象原始X位置 - infoBox.oldY = 1 - infoBox.oldSizeX = moveInItemInfo.sizex - infoBox.oldSizeY = moveInItemInfo.sizey } } } diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 37a74de395..c400d1f7cc 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -13,10 +13,21 @@
- - - - + + + + + + + + + + + +
+ + {{ $t('panel.matrix_design') }} +
@@ -371,7 +382,7 @@ export default { float: right; height: 35px; line-height: 35px; - min-width: 400px; + min-width: 500px; /*background: #fff;*/ /*border-bottom: 1px solid #ddd;*/ diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue index 5f45741582..64841972f4 100644 --- a/frontend/src/views/panel/SubjectSetting/index.vue +++ b/frontend/src/views/panel/SubjectSetting/index.vue @@ -9,18 +9,18 @@
- - {{ $t('panel.new_element_distribution') }}: - - - - {{ $t('panel.matrix') }} - - - {{ $t('panel.suspension') }} - - - + + + + + + + + + + + +