From 77db760939b3b151a42b86835c7f49570637d276 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 23 Dec 2021 18:15:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E5=88=86=E7=BB=84=E4=BB=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/MobileCheckBar.vue | 2 +- frontend/src/store/index.js | 2 ++ frontend/src/views/panel/edit/index.vue | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue index 9e9b10f45d..623f315283 100644 --- a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue +++ b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue @@ -70,7 +70,7 @@ export default { .bar-main{ position: absolute; float:right; - z-index: 2; + z-index: 10000; border-radius:2px; padding-left: 1px; padding-right: 1px; diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 3ddfc261d3..8d71afdb3f 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -28,6 +28,7 @@ import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' import bus from '@/utils/bus' +import { BASE_MOBILE_STYLE } from '@/components/canvas/custom-component/component-list' Vue.use(Vuex) @@ -352,6 +353,7 @@ const data = { const mainComponentData = [] // 移动端布局转换 state.componentData.forEach(item => { + item.mobileStyle = (item.mobileStyle || BASE_MOBILE_STYLE) if (item.mobileSelected) { item.style.width = item.mobileStyle.style.width item.style.height = item.mobileStyle.style.height diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index a29fc85b2c..a8b2f605ab 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -220,8 +220,8 @@ import ViewSelect from '../ViewSelect' import SubjectSetting from '../SubjectSetting' import bus from '@/utils/bus' import Editor from '@/components/canvas/components/Editor/index' -import {deepCopy, panelInit} from '@/components/canvas/utils/utils' -import componentList, { BASE_MOBILE_STYLE ,HYPERLINKS} from '@/components/canvas/custom-component/component-list' // 左侧列表数据 +import { deepCopy, panelInit } from '@/components/canvas/utils/utils' +import componentList, { BASE_MOBILE_STYLE, HYPERLINKS } from '@/components/canvas/custom-component/component-list' // 左侧列表数据 import { mapState } from 'vuex' import { uuid } from 'vue-uuid' import Toolbar from '@/components/canvas/components/Toolbar' @@ -764,6 +764,7 @@ export default { label: '图片', icon: '', hyperlinks: HYPERLINKS, + mobileStyle: BASE_MOBILE_STYLE, propValue: fileResult, style: { ...commonStyle