diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 825ad531a2..8ada2505de 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -595,14 +595,14 @@ export default { return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0 }, miniWidth() { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 4) : 0 }, miniHeight() { if (this.element.auxiliaryMatrix) { if (this.element.component === 'de-number-range') { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 } else { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 } } else { return 0 diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 747f8dd7fb..c9db10aaf4 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -151,14 +151,10 @@ export default { return this.targetLinkageInfo[this.element.propValue.viewId] }, miniHeight() { - let miniHeight = 4 - if (this.element.component === 'de-number-range') { - miniHeight = 4 - } - return miniHeight + return this.mobileLayoutStatus ? 1 : 4 }, miniWidth() { - return 4 + return this.mobileLayoutStatus ? 1 : 4 }, ...mapState([ 'menuTop', @@ -172,6 +168,7 @@ export default { 'curLinkageView', 'curCanvasScale', 'batchOptStatus', + 'mobileLayoutStatus', 'curBatchOptComponents' ]) }, diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 9017d3415c..f3eeea879a 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -561,23 +561,23 @@ export default { color: #9ea6b2; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; } - .mobile-dialog-css > > > .el-dialog__headerbtn { + .mobile-dialog-css ::v-deep .el-dialog__headerbtn { top: 7px } - .mobile-dialog-css > > > .el-dialog__body { + .mobile-dialog-css ::v-deep .el-dialog__body { padding: 0px; } ::-webkit-scrollbar { diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue index 9d0f22024b..5e3195d1e8 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue @@ -285,15 +285,15 @@ export default { padding: 5px; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; } diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 037c82ccb9..430c5cc8b5 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -1843,15 +1843,15 @@ export default { height: 1px; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; }