feat(图表): 在线地图支持控制标签显隐

core/core-frontend/src/locales/zh-CN.ts

@@ -1541,7 +1541,8 @@ export default {
     map_symbol_octagon: '八角形',
     map_symbol_hexagram: '菱形',
     tip: '提示',
-    hide: '隐藏'
+    hide: '隐藏',
+    show_label: '显示标签'
   },
   dataset: {
     scope_edit: '仅编辑时生效',

core/core-frontend/src/models/chart/chart-attr.d.ts

@@ -289,6 +289,10 @@ declare interface ChartBasicStyle {
    * 符号地图符号大小最大值
    */
   mapSymbolSizeMax: number
+  /**
+   * 显示标签
+   */
+  showLabel: boolean
 }
 /**
  * 表头属性

core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue

@@ -603,12 +603,21 @@ onMounted(() => {
         </el-form-item>
       </el-col>
     </el-row>
+    <el-form-item class="form-item" :class="'form-item-' + themes" v-if="showProperty('showLabel')">
+      <el-checkbox
+        size="small"
+        :effect="themes"
+        v-model="state.basicStyleForm.showLabel"
+        @change="changeBasicStyle('showLabel')"
+      >
+        {{ t('chart.show_label') }}
+      </el-checkbox>
+    </el-form-item>
     <el-form-item class="form-item" :class="'form-item-' + themes" v-if="showProperty('zoom')">
       <el-checkbox
         size="small"
         :effect="themes"
         v-model="state.basicStyleForm.showZoom"
-        :predefine="predefineColors"
         @change="changeBasicStyle('showZoom')"
       >
         {{ t('chart.show_zoom') }}

core/core-frontend/src/views/chart/components/editor/util/chart.ts

@@ -1585,7 +1585,8 @@ export const DEFAULT_BASIC_STYLE: ChartBasicStyle = {
   seriesColor: [],
   layout: 'horizontal',
   mapSymbolSizeMin: 4,
-  mapSymbolSizeMax: 30
+  mapSymbolSizeMax: 30,
+  showLabel: true
 }
 
 export const BASE_VIEW_CONFIG = {

core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts

@@ -30,7 +30,7 @@ export class FlowMap extends L7ChartView<Scene, L7Config> {
   ]
   propertyInner: EditorPropertyInner = {
     ...MAP_EDITOR_PROPERTY_INNER,
-    'basic-style-selector': ['mapBaseStyle', 'mapLineStyle', 'zoom']
+    'basic-style-selector': ['mapBaseStyle', 'mapLineStyle', 'zoom', 'showLabel']
   }
   axis: AxisType[] = ['xAxis', 'xAxisExt', 'filter', 'flowMapStartName', 'flowMapEndName', 'yAxis']
   axisConfig: AxisConfig = {
@@ -84,7 +84,8 @@ export class FlowMap extends L7ChartView<Scene, L7Config> {
         token: key ?? undefined,
         style: mapStyle,
         pitch: misc.mapPitch,
-        zoom: 2.5
+        zoom: 2.5,
+        showLabel: !(basicStyle.showLabel === false)
       })
     })
     mapRendering(container)

core/core-frontend/src/views/chart/components/js/panel/charts/map/heat-map.ts

@@ -27,7 +27,7 @@ export class HeatMap extends L7ChartView<Scene, L7Config> {
   ]
   propertyInner: EditorPropertyInner = {
     ...MAP_EDITOR_PROPERTY_INNER,
-    'basic-style-selector': ['colors', 'heatMapStyle', 'zoom']
+    'basic-style-selector': ['colors', 'heatMapStyle', 'zoom', 'showLabel']
   }
   axis: AxisType[] = ['xAxis', 'yAxis', 'filter']
   axisConfig: AxisConfig = {
@@ -50,8 +50,8 @@ export class HeatMap extends L7ChartView<Scene, L7Config> {
     const { chart, container } = drawOption
     const xAxis = deepCopy(chart.xAxis)
     const yAxis = deepCopy(chart.yAxis)
-    let basicStyle
+    let basicStyle: DeepPartial<ChartBasicStyle>
-    let miscStyle
+    let miscStyle: DeepPartial<ChartMiscAttr>
     if (chart.customAttr) {
       basicStyle = parseJson(chart.customAttr).basicStyle
       miscStyle = parseJson(chart.customAttr).misc
@@ -66,7 +66,8 @@ export class HeatMap extends L7ChartView<Scene, L7Config> {
         token: key ?? undefined,
         style: mapStyle,
         pitch: miscStyle.mapPitch,
-        zoom: 2.5
+        zoom: 2.5,
+        showLabel: !(basicStyle.showLabel === false)
       })
     })
     mapRendering(container)

core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts

@@ -30,7 +30,14 @@ export class SymbolicMap extends L7ChartView<Scene, L7Config> {
   ]
   propertyInner: EditorPropertyInner = {
     ...MAP_EDITOR_PROPERTY_INNER,
-    'basic-style-selector': ['colors', 'alpha', 'mapBaseStyle', 'symbolicMapStyle', 'zoom'],
+    'basic-style-selector': [
+      'colors',
+      'alpha',
+      'mapBaseStyle',
+      'symbolicMapStyle',
+      'zoom',
+      'showLabel'
+    ],
     'label-selector': ['color', 'fontSize', 'showFields', 'customContent'],
     'tooltip-selector': [
       'color',
@@ -89,7 +96,8 @@ export class SymbolicMap extends L7ChartView<Scene, L7Config> {
         style: mapStyle,
         pitch: miscStyle.mapPitch,
         center: [104.434765, 38.256735],
-        zoom: 1.8
+        zoom: 2.5,
+        showLabel: !(basicStyle.showLabel === false)
       })
     })
     mapRendering(container)