Merge pull request #2262 from dataease/pr@dev@refactor_button-style

frontend/src/views/chart/view/ChartEdit.vue

@@ -1018,11 +1018,9 @@ import ValueFormatterEdit from '@/views/chart/components/value-formatter/ValueFo
 import ChartStyle from '@/views/chart/view/ChartStyle'
 import CustomSortEdit from '@/views/chart/components/compare/CustomSortEdit'
 import { TYPE_CONFIGS } from '@/views/chart/chart/util'
-import ChartStyleBack from '@/views/chart/view/ChartStyleBack'
 export default {
   name: 'ChartEdit',
   components: {
-    ChartStyleBack,
     CustomSortEdit,
     ChartStyle,
     ValueFormatterEdit,
@@ -1062,6 +1060,11 @@ export default {
       type: String,
       required: false,
       default: 'view'
+    },
+    editStatue: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -1196,10 +1199,17 @@ export default {
     } */
   },
   watch: {
+    'editStatue': function(val) {
+      if (val && this.param.id !== this.preChartId) {
+        this.preChartId = this.param.id
+        this.chartInit()
+        // console.log('fromwatch:' + JSON.stringify(val))
+      }
+    },
     'param': function(val) {
       if (this.param.optType === 'new') {
         //
-      } else if (this.param.id !== this.preChartId) {
+      } else if (this.param.id !== this.preChartId && this.editStatue) {
         this.preChartId = this.param.id
         this.chartInit()
         // console.log('fromwatch:' + JSON.stringify(val))

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

@@ -24,7 +24,7 @@
     </el-header>
     <de-container>
       <de-aside-container class="ms-aside-container">
-        <div v-if="showAside" style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute">
+        <div v-show="showAside" style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute">
           <div
             style="width: 60px;height: 100%;overflow: hidden auto;position: relative;margin: 0px auto; font-size: 14px"
           >
@@ -228,7 +228,7 @@
 
       <div v-show="!mobileLayoutStatus&&rightDrawOpen" class="tools-window-main">
         <div v-show="showViewToolsAside">
-          <chart-edit ref="chartEditRef" :edit-from="'panel'" :param="chartEditParam" />
+          <chart-edit ref="chartEditRef" :edit-statue="showViewToolsAside&&!mobileLayoutStatus&&rightDrawOpen" :edit-from="'panel'" :param="chartEditParam" />
         </div>
         <div v-show="showBatchViewToolsAside">
           <chart-style-batch-set />
@@ -305,7 +305,7 @@
     >
 
     <!--矩形样式组件-->
-    <TextAttr v-if="showAttr" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
+    <TextAttr v-show="showAttr" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
     <!--复用ChartGroup组件 不做显示-->
     <ChartGroup
       ref="chartGroup"