fix(视图): 修复指标卡数值格式化无效的问题

merge dev

frontend/src/components/DeDrag/index.vue

@@ -64,7 +64,7 @@
         @mousedown.stop.prevent="handleDown(handlei, $event)"
         @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
       >
-        <slot :name="handlei" />
+        <slot :name="handlei"/>
       </div>
       <div
         :id="componentCanvasId"
@@ -77,7 +77,7 @@
           class="svg-background"
           :icon-class="mainSlotSvgInner"
         />
-        <slot />
+        <slot/>
       </div>
     </div>
   </div>
@@ -1930,6 +1930,7 @@ export default {
         const nodes = this.$el.parentNode.childNodes // 获取当前父节点下所有子节点
         for (const item of nodes) {
           if (
+            item.tagName !== 'svg' &&
             item.className !== undefined &&
             !item.className.split(' ').includes(this.classNameActive) &&
             item.getAttribute('tab-is-check') !== null &&

frontend/src/components/canvas/DeCanvas.vue

@@ -287,6 +287,7 @@ export default {
       }
     },
     canvasScroll(e) {
+      this.scrollTop = e.target.scrollTop
       this.$emit('canvasScroll', { scrollLeft: e.target.scrollLeft, scrollTop: e.target.scrollTop })
       bus.$emit('onScroll')
     },

frontend/src/components/canvas/components/Editor/DeEditor.vue

@@ -120,7 +120,7 @@
       :canvas-id="canvasId"
     />
     <!-- 右击菜单 -->
-    <ContextMenu />
+    <ContextMenu/>
 
     <!-- 对齐标线 -->
     <span
@@ -931,7 +931,7 @@ export default {
       return !this.linkageSettingStatus && !this.batchOptStatus
     },
     showGrid() {
-      if (this.canvasStyleData && this.canvasStyleData.aidedDesign) {
+      if (this.canvasStyleData && this.canvasStyleData.aidedDesign && this.canvasId === 'canvas-main') {
         return this.canvasStyleData.aidedDesign.showGrid
       } else {
         return false

frontend/src/lang/en.js

@@ -2501,6 +2501,7 @@ export default {
     start_time: 'Start time',
     end_time: 'End time',
     chart_data: 'View data',
+    panel_preview: 'Preview panel',
     preview: 'Preview',
     emial_preview: 'Emial preview',
     chart_data_range: 'View data range',

frontend/src/lang/tw.js

@@ -2502,6 +2502,7 @@ export default {
     start_time: '開始時間',
     end_time: '結束時間',
     chart_data: '視圖數據',
+    panel_preview: '預覽儀表板',
     preview: '預覽',
     emial_preview: '郵件預覽',
     chart_data_range: '視圖數據範圍',

frontend/src/lang/zh.js

@@ -2502,6 +2502,7 @@ export default {
     start_time: '开始时间',
     end_time: '结束时间',
     chart_data: '视图数据',
+    panel_preview: '预览仪表板',
     preview: '预览',
     emial_preview: '邮件预览',
     chart_data_range: '视图数据范围',

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

@@ -1589,7 +1589,6 @@ import ScrollCfg from '@/views/chart/components/senior/ScrollCfg'
 import ChartFieldEdit from '@/views/chart/view/ChartFieldEdit'
 import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit'
 import { equalsAny } from '@/utils/StringUtils'
-import { quotaViews } from '@/views/chart/chart/util'
 
 export default {
   name: 'ChartEdit',
@@ -2096,10 +2095,6 @@ export default {
         if (!ele.compareCalc) {
           ele.compareCalc = compareItem
         }
-        if (quotaViews.indexOf(view.type) > -1) {
-          ele.compareCalc = compareItem
-          ele.formatterCfg.type = 'auto'
-        }
       })
       if (view.type === 'chart-mix') {
         view.yaxisExt.forEach(function(ele) {
@@ -2127,10 +2122,6 @@ export default {
           if (!ele.compareCalc) {
             ele.compareCalc = compareItem
           }
-          if (quotaViews.indexOf(view.type) > -1) {
-            ele.compareCalc = compareItem
-            ele.formatterCfg.type = 'auto'
-          }
         })
       }
       view.extStack.forEach(function(ele) {