合并分支 'feature/branch_wm' 到 'develop'

扫光城市数据写死mock

查看合并请求 !26

src/icons/svg/city-brightness.svg

-<svg t="1689841433435" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5685" width="200" height="200"><path d="M290.773333 213.333333v85.333334H426.666667v512H149.333333V213.333333h141.44m42.666667-42.666666H106.666667v682.666666h362.666666V256h-135.893333V170.666667z" p-id="5686"></path><path d="M661.333333 384v426.666667h-192V384h192m42.666667-42.666667H426.666667v512h277.333333V341.333333z" p-id="5687"></path><path d="M768 298.666667v128h106.666667v384h-170.666667V298.666667h64m42.666667-42.666667h-149.333334v597.333333h256V384h-106.666666v-128z" p-id="5688"></path><path d="M85.333333 810.666667h853.333334v42.666666H85.333333zM234.666667 384h106.666666v42.666667h-106.666666zM234.666667 533.333333h106.666666v42.666667h-106.666666zM234.666667 682.666667h106.666666v42.666666h-106.666666zM533.333333 512h64v42.666667h-64zM533.333333 640h64v42.666667h-64zM768 533.333333h42.666667v42.666667h-42.666667zM768 661.333333h42.666667v42.666667h-42.666667z" p-id="5689"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690265919057" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14240" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M491.52 76.8h37.888v111.616l53.76 66.56 74.24 91.648h-296.96l74.24-91.648 56.32-69.632V76.8h0.512zM289.792 886.272h59.392V382.464h323.072v504.32h57.856V486.4H870.4v399.872h93.184V957.44H83.456V353.792l206.336 118.272v414.208z m231.936-143.36V798.72h44.544v-55.808h-44.544z m-409.6-84.992v33.792h27.136v-33.792h-27.136z m130.048 59.392v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m0-59.392v33.792h27.136v-33.792h-27.136z m-43.008 119.808v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m-44.544 119.808v33.792h27.136v-33.792h-27.136z m0 59.392v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m-42.496-59.392v33.792h27.136v-33.792h-27.136z m642.048 130.048v41.984h33.792v-41.984h-33.792z m0 73.216v41.984h33.792v-41.984h-33.792z m0-222.208v41.984h33.792v-41.984h-33.792z m52.736 73.216v41.984h33.28v-41.984h-33.28z m0-73.216v41.984h33.28v-41.984h-33.28z m-421.376 223.744V798.72H430.08v-55.808h-44.544z m0-198.656v55.808H430.08v-55.808h-44.544z m203.264 0v55.808h44.544v-55.808H588.8z m-67.072 0v55.808h44.544v-55.808h-44.544z m-67.072 0v55.808h44.544v-55.808h-44.544zM385.536 446.464v55.808H430.08V446.464h-44.544z m203.264 0v55.808h44.544V446.464H588.8z m-67.072 0v55.808h44.544V446.464h-44.544zM385.536 645.12v55.808H430.08V645.12h-44.544z m203.264 0v55.808h44.544V645.12H588.8z" fill="#2c2c2c" p-id="14241"></path></svg>

src/icons/svg/city-sweep.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690265990298" class="icon" viewBox="0 0 1038 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16350" xmlns:xlink="http://www.w3.org/1999/xlink" width="202.734375" height="200"><path d="M522.666667 0c282.766222 0 512 229.233778 512 512s-229.233778 512-512 512-512-229.233778-512-512 229.233778-512 512-512z m-35.029334 213.333333h-126.791111a14.222222 14.222222 0 0 0-14.222222 14.222223v47.018666H312.888889a28.444444 28.444444 0 0 0-28.444445 28.444445V782.222222a28.444444 28.444444 0 0 0 28.444445 28.444445h426.666667a28.444444 28.444444 0 0 0 28.444444-28.444445V471.893333a28.444444 28.444444 0 0 0-19.555556-27.022222l-125.013333-41.173333a14.222222 14.222222 0 0 0-18.673778 13.511111v299.52a13.240889 13.240889 0 1 1-26.481777 0V303.004444a28.444444 28.444444 0 0 0-28.444445-28.444444h-33.749333V241.777778a28.444444 28.444444 0 0 0-28.444445-28.444445z m232.945778 407.352889v60.373334h-68.408889v-60.373334h68.408889z m-230.926222 0v60.373334h-116.593778v-60.373334h116.593778z m230.926222-126.663111v60.387556h-68.408889v-60.387556h68.408889z m-230.926222 0v60.387556h-116.593778v-60.387556h116.593778z m0-126.663111v60.387556h-116.593778V367.36h116.593778z" fill="#2c2c2c" p-id="16351"></path></svg>

src/lang/en.js

@@ -1534,6 +1534,7 @@ export default {
     no_function: 'Function not enter，please input.',
     chart_flow_map: 'Flow Map',
     chart_city_brightness_map: 'City Brightness Map',
+    chart_city_sweep_map: 'City Sweep Map',
     start_point: 'Start point(Lat/Long)',
     end_point: 'End point(Lat/Long)',
     line: 'Line',

src/lang/tw.js

@@ -1527,6 +1527,7 @@ export default {
     no_function: '函數尚未支持直接引用，請在字段表達式中手動輸入。',
     chart_flow_map: '流向地圖',
     chart_city_brightness_map: '城市亮度圖',
+    chart_city_sweep_map: '圓形掃光城市',
     start_point: '起點經緯度',
     end_point: '終點經緯度',
     line: '線條',

src/lang/zh.js

@@ -1559,7 +1559,8 @@ export default {
     map_line_color_target_color: '结束颜色',
     map_line_theta_offset: '弧度',
     chart_bubble_map: '气泡地图',
-    chart_city_brightness_map: '城市亮度图'
+    chart_city_brightness_map: '城市亮度图',
+    chart_city_sweep_map: '圆形扫光城市'
   },
   dataset: {
     scope_edit: '仅编辑时生效',

src/views/chart/chart/cityBrightness/cityBrightness_antv.js

@@ -46,7 +46,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
       chartDom.setMapStyle(mapStyle)
     }
   }
-  if (xAxis?.length < 2 || yAxis?.lang < 1) {
+  if (xAxis?.length < 2 || yAxis?.length < 1) {
     chartDom.removeAllLayer()
     return chartDom
   }
@@ -67,6 +67,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
   })
   const mapData = { type: 'FeatureCollection', features: newTableRow }
   // console.log('mapData', mapData)
+
   chartDom.removeAllLayer()
     .then(() => {
       const pointLayer = new PointLayer({})

src/views/chart/chart/util.js

@@ -2076,7 +2076,40 @@ export const TYPE_CONFIGS = [
       ]
     }
   },
-
+  // 圆形城市扫光图
+  {
+    render: 'antv',
+    category: 'chart.chart_type_space',
+    value: 'city-sweep',
+    title: 'chart.chart_city_sweep_map',
+    icon: 'city-sweep',
+    properties: [
+      'color-selector',
+      'size-selector-ant-v',
+      'title-selector-ant-v'
+    ],
+    propertyInner: {
+      'color-selector': [
+        'mapStyle'
+      ],
+      'size-selector-ant-v': [
+        'mapPitch'
+      ],
+      'title-selector-ant-v': [
+        'show',
+        'title',
+        'fontSize',
+        'color',
+        'hPosition',
+        'isItalic',
+        'isBolder',
+        'remarkShow',
+        'fontFamily',
+        'letterSpace',
+        'fontShadow'
+      ]
+    }
+  },
   // 城市亮度图
   {
     render: 'antv',

src/views/chart/components/ChartComponentG2.vue

@@ -65,8 +65,9 @@ import { mapState } from 'vuex'
 import { baseFlowMapOption } from '@/views/chart/chart/map/map_antv'
 import { baseBubbleMapOption } from '@/views/chart/chart/bubble/bubble_antv'
 import { baseCityBrightnessMapOptionAntV } from '@/views/chart/chart/cityBrightness/cityBrightness_antv'
+import { baseCitySweepMapOptionAntV } from '@/views/chart/chart/citySweep/citySweep_antv'
 import { clear } from 'size-sensor'
-import {baseSankeyOptionAntV} from "@/views/chart/chart/sankey/sankey_antv";
+import { baseSankeyOptionAntV } from '@/views/chart/chart/sankey/sankey_antv'
 export default {
   name: 'ChartComponentG2',
   components: { TitleRemark, ViewTrackBar, ChartTitleUpdate },
@@ -312,7 +313,9 @@ export default {
         this.myChart = baseBubbleMapOption(this.myChart, this.chartId, chart, this.antVAction)
       } else if (chart.type === 'city-brightness') {
         this.myChart = baseCityBrightnessMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
-       }else if (chart.type === 'chart_sankey') {
+      } else if (chart.type === 'city-sweep') {
+        this.myChart = baseCitySweepMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
+      } else if (chart.type === 'chart_sankey') {
         this.myChart = baseSankeyOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
       } else if (chart.type === 'threeDColumn') {
         this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
@@ -323,7 +326,7 @@ export default {
         }
       }
 
-      if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map', 'bubble', 'city-brightness') && this.searchCount > 0) {
+      if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map', 'bubble', 'city-brightness','city-sweep') && this.searchCount > 0) {
         this.myChart.options.animation = false
       }
       if (this.myChart?.options?.legend) {
@@ -460,6 +463,10 @@ export default {
           this.title_class.zIndex = 4
           this.title_class.position = 'absolute'
         }
+        if (this.chart.type === 'city-sweep') {
+          this.title_class.zIndex = 4
+          this.title_class.position = 'absolute'
+        }
       }
       this.initRemark()
     },