From 0c8454323a461651c8f2c77bb9b034e4b09517a6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 27 Dec 2021 12:06:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=BB=84=E4=BB=B6=E7=AD=89=E5=BE=85=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E9=9D=A0=E5=B7=A6=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/MobileCheckBar.vue | 1 + .../src/components/canvas/custom-component/UserView.vue | 2 +- frontend/src/components/widget/DeWidget/DeTabs.vue | 8 ++++++-- frontend/src/views/panel/edit/ComponentWait.vue | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue index 623f315283..cb511a2cbf 100644 --- a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue +++ b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue @@ -75,6 +75,7 @@ export default { padding-left: 1px; padding-right: 1px; cursor:pointer!important; + text-align: center; background-color: #0a7be0; } .bar-main i{ diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index d9b2216b9b..a0b1ad9fe7 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -156,7 +156,7 @@ export default { } }, editBarViewShowFlag() { - return this.active && this.inTab + return this.active && this.inTab && !this.mobileLayoutStatus }, charViewShowFlag() { return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.renderComponent() === 'echarts' diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 65a84e3e67..98f1f3521e 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -10,7 +10,7 @@ {{ item.title }} - + @@ -135,8 +135,12 @@ export default { } }, computed: { + dropdownShow() { + return this.isEdit && !this.mobileLayoutStatus + }, ...mapState([ - 'curComponent' + 'curComponent', + 'mobileLayoutStatus' ]) }, watch: { diff --git a/frontend/src/views/panel/edit/ComponentWait.vue b/frontend/src/views/panel/edit/ComponentWait.vue index bff2b46bb7..9dd2301140 100644 --- a/frontend/src/views/panel/edit/ComponentWait.vue +++ b/frontend/src/views/panel/edit/ComponentWait.vue @@ -81,6 +81,7 @@ export default { .component-wait-main { width: 100%; height: calc(100% - 30px); + text-align: left; overflow-y: auto; } .component-custom {