diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 46cbe2e68a..eb3c142c43 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -6,30 +6,31 @@ @mousedown="elementMouseDown" > - - - + + + diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index e06c1ef7e8..f3b09c3441 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -37,6 +37,17 @@ + + + + + @@ -53,9 +64,10 @@ import eventBus from '@/components/canvas/utils/eventBus' import elementResizeDetectorMaker from 'element-resize-detector' import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog' import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar' +import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog' export default { - components: { ComponentWrapper, UserViewDialog, CanvasOptBar }, + components: { UserViewMobileDialog, ComponentWrapper, UserViewDialog, CanvasOptBar }, model: { prop: 'show', event: 'change' @@ -103,6 +115,7 @@ export default { mainHeight: '100%', searchCount: 0, chartDetailsVisible: false, + mobileChartDetailsVisible: false, showChartInfo: {}, showChartTableInfo: {}, // 布局展示 1.pc pc端布局 2.mobile 移动端布局 @@ -249,7 +262,11 @@ export default { openChartDetailsDialog(chartInfo) { this.showChartInfo = chartInfo.chart this.showChartTableInfo = chartInfo.tableChart - this.chartDetailsVisible = true + if (this.terminal === 'pc') { + this.chartDetailsVisible = true + } else { + this.mobileChartDetailsVisible + } }, exportExcel() { this.$refs['userViewDialog'].exportExcel() @@ -309,6 +326,9 @@ export default { padding: 10px 20px 20px; } + .mobile-dialog-css > > > .el-dialog__body { + padding: 0px; + } ::-webkit-scrollbar { width: 0px!important; height: 0px!important; diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index b67fa6a5a0..85b770d1cd 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -80,6 +80,7 @@ :element="item" :out-style="getShapeStyleInt(item.style)" :active="item === curComponent" + :h="getShapeStyleIntDeDrag(item.style,'height')" /> - + @@ -16,14 +16,14 @@ import ChartComponent from '@/views/chart/components/ChartComponent.vue' import TableNormal from '@/views/chart/components/table/TableNormal' import LabelNormal from '@/views/chart/components/normal/LabelNormal' -import DeMainContainer from '@/components/dataease/DeMainContainer' -import DeContainer from '@/components/dataease/DeContainer' import { mapState } from 'vuex' import ChartComponentG2 from '@/views/chart/components/ChartComponentG2' +import DeMainContainer from '@/components/dataease/DeMainContainer' +import DeContainer from '@/components/dataease/DeContainer' export default { name: 'UserViewMobileDialog', - components: { ChartComponentG2, DeMainContainer, DeContainer, ChartComponent, TableNormal, LabelNormal }, + components: { DeContainer, DeMainContainer, ChartComponentG2, ChartComponent, TableNormal, LabelNormal }, props: { chart: { type: Object, @@ -78,16 +78,8 @@ export default {