Merge branch 'dev' into pr@dev@style_panel_filter

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{

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'

frontend/src/components/canvas/custom-component/VText.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="editMode == 'edit'" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
+  <div v-if="editStatus" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
     <!-- tabindex >= 0 使得双击时聚集该元素 -->
     <div
       v-if="canEdit"
@@ -33,6 +33,7 @@
 
 <script>
 import { keycodes } from '@/components/canvas/utils/shortcutKey.js'
+import { mapState } from 'vuex'
 
 export default {
   props: {
@@ -65,13 +66,19 @@ export default {
     }
   },
   computed: {
+    editStatus() {
+      return this.editMode === 'edit' && !this.mobileLayoutStatus
+    },
     textInfo() {
       if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) {
         return "<a title='" + this.element.hyperlinks.content + "' target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>'
       } else {
         return this.element.propValue
       }
-    }
+    },
+    ...mapState([
+      'mobileLayoutStatus'
+    ])
   },
 
   watch: {

frontend/src/components/widget/DeWidget/DeTabs.vue

@@ -10,7 +10,7 @@
         <span slot="label">
           <span>{{ item.title }}</span>
 
-          <el-dropdown v-if="isEdit" slot="label" class="de-tab-drop" trigger="click" @command="handleCommand">
+          <el-dropdown v-if="dropdownShow" slot="label" class="de-tab-drop" trigger="click" @command="handleCommand">
             <span class="el-dropdown-link">
 
               <!-- <span>{{ item.title }}</span> -->
@@ -135,8 +135,12 @@ export default {
     }
   },
   computed: {
+    dropdownShow() {
+      return this.isEdit && !this.mobileLayoutStatus
+    },
     ...mapState([
-      'curComponent'
+      'curComponent',
+      'mobileLayoutStatus'
     ])
   },
   watch: {

frontend/src/views/chart/components/ChartComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex;">
+  <div style="display: flex;position:relative">
     <view-track-bar
       ref="viewTrack"
       :track-menu="trackMenu"
@@ -368,10 +368,10 @@ export default {
     position: absolute;
     z-index: 999;
     left: 2%;
-    bottom: 3%;
+    bottom: 30px;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     text-align: center;
-    padding: 5px;
+    padding: 2px;
     border-radius: 5px
   }
 

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 {

frontend/src/views/panel/edit/ComponentWaitItem.vue

@@ -70,7 +70,7 @@ export default {
     componentItemStyle() {
       return {
         padding: '5px',
-        display: 'inline-block',
+        float: 'left',
         width: '33%'
       }
     },