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

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

@@ -2,8 +2,8 @@ export const DEFAULT_COLOR_CASE = {
   value: 'default',
   colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
   alpha: 100,
-  tableHeaderBgColor: '#4e81bb',
-  tableItemBgColor: '#c6d9f0',
+  tableHeaderBgColor: '#c1d1f6',
+  tableItemBgColor: '#e2eafe',
   tableFontColor: '#000000',
   tableStripe: true,
   dimensionColor: '#000000',
@@ -31,7 +31,7 @@ export const DEFAULT_SIZE = {
   tableTitleHeight: 36,
   tableItemHeight: 36,
   tablePageSize: '20',
-  tableColumnMode: 'adapt',
+  tableColumnMode: 'custom',
   tableColumnWidth: 100,
   gaugeMin: 0,
   gaugeMax: 100,

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

@@ -223,7 +223,6 @@
                   <plugin-com v-if="isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
                   <div v-else>
 
-
                     <el-row v-if="view.type ==='map'" class="padding-lr">
                       <span style="width: 80px;text-align: right;">
                         <span>{{ $t('chart.map_range') }}</span>