Merge remote-tracking branch 'origin/dev' into dev

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

@@ -25,7 +25,7 @@
         />
         <!--视图详情-->
         <el-dialog
-          :title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
+          :title="$t('chart.chart_details')"
           :visible.sync="chartDetailsVisible"
           width="70%"
           class="dialog-css"

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

@@ -22,7 +22,7 @@
         />
         <!--视图详情-->
         <el-dialog
-          :title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
+          :title="$t('chart.chart_details')"
           :visible.sync="chartDetailsVisible"
           width="70%"
           class="dialog-css"

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

@@ -143,7 +143,7 @@
 
     <!--视图详情-->
     <el-dialog
-      :title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
+      :title="$t('chart.chart_details')"
       :visible.sync="chartDetailsVisible"
       width="70%"
       class="dialog-css"

frontend/src/views/chart/chart/gauge/gauge.js

@@ -87,17 +87,24 @@ export function baseGaugeOption(chart_option, chart) {
             show: false
           }
           chart_option.series[0].axisTick = {
+            splitNumber: 5, // TODO 刻度间隔数
+            length: 10, // TODO 子刻度线长度
             lineStyle: {
-              color: 'auto'
+              color: 'auto',
+              width: 2// TODO 子刻度线宽度
             }
           }
           chart_option.series[0].splitLine = {
+            length: 18, // TODO 刻度线长度
             lineStyle: {
-              color: 'auto'
+              color: 'auto',
+              width: 2// TODO 刻度线宽度
             }
           }
           chart_option.series[0].axisLabel = {
-            color: 'auto'
+            color: 'auto',
+            distance: 20, // TODO 刻度值文字里刻度线距离
+            fontSize: 20// TODO 刻度值字体大小
           }
         }
       }

frontend/src/views/chart/chart/gauge/gauge_antv.js

@@ -72,6 +72,26 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
     // indicator: null,
     statistic: {
       content: labelContent
+    },
+    axis: {
+      label: {
+        style: {
+          fontSize: 14// TODO 刻度值字体大小
+        }
+      },
+      tickLine: {
+        length: -12, // TODO 刻度线长度
+        style: {
+          lineWidth: 1// TODO 刻度线宽度
+        }
+      },
+      subTickLine: {
+        count: 4, // TODO 子刻度数
+        length: -6, // TODO 子刻度线长度
+        style: {
+          lineWidth: 1// TODO 子刻度线宽度
+        }
+      }
     }
     // range: {
     //   width: 12

frontend/src/views/panel/list/EditPanel/TemplateAllList.vue

@@ -29,7 +29,7 @@
               <span v-if="data.nodeType==='folder'">
                 <i class="el-icon-folder" />
               </span>
-              <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+              <span :title="data.name" style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
             </span>
           </span>
         </el-tree>