Merge remote-tracking branch 'origin/develop' into feature/fzy

合并

src/views/chart/chart/map/map_antv.js

@@ -61,8 +61,8 @@ export function baseFlowMapOption(chartDom, chartId, chart, action) {
         .animate({
         .animate({
           enable: size.mapLineAnimate,
           enable: size.mapLineAnimate,
           duration: size.mapLineAnimateDuration,
           duration: size.mapLineAnimateDuration,
-          interval: 1,
-          trailLength: 1
+          interval: size.mapLineAnimateInterval,
+          trailLength: size.mapLineAnimateTrailLength
         })
         })
       if (color.mapLineGradient) {
       if (color.mapLineGradient) {
         lineLayer.style({
         lineLayer.style({

src/views/chart/components/shapeAttr/SizeSelectorAntV.vue

@@ -1330,7 +1330,7 @@
             />
             />
           </el-form-item>
           </el-form-item>
           <el-form-item
           <el-form-item
-            v-show="false"
+            v-show="true"
             :label="$t('chart.map_line_animate_interval')"
             :label="$t('chart.map_line_animate_interval')"
             class="form-item form-item-slider"
             class="form-item form-item-slider"
           >
           >
@@ -1343,7 +1343,7 @@
             />
             />
           </el-form-item>
           </el-form-item>
           <el-form-item
           <el-form-item
-            v-show="false"
+            v-show="true"
             :label="$t('chart.map_line_animate_trail_length')"
             :label="$t('chart.map_line_animate_trail_length')"
             class="form-item form-item-slider"
             class="form-item form-item-slider"
           >
           >
@@ -1427,7 +1427,8 @@ export default {
       lineTypeOptions: [
       lineTypeOptions: [
         { name: this.$t('chart.map_line_type_line'), value: 'line' },
         { name: this.$t('chart.map_line_type_line'), value: 'line' },
         { name: this.$t('chart.map_line_type_arc'), value: 'arc' },
         { name: this.$t('chart.map_line_type_arc'), value: 'arc' },
-        { name: this.$t('chart.map_line_type_arc_3d'), value: 'arc3d' }
+        { name: this.$t('chart.map_line_type_arc_3d'), value: 'arc3d' },
+        { name: this.$t('chart.map_line_type_great_circle'), value: 'greatcircle' }
       ]
       ]
     }
     }
   },
   },