From f538183c8389011a19e033cfac80b84307c89175 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 4 Apr 2023 20:11:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E6=B5=81=E5=90=91?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E8=A7=86=E5=9B=BE=E9=A2=9C=E8=89=B2=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/utils/style.js |   4 +-
 frontend/src/components/canvas/utils/utils.js |   2 +-
 .../src/views/chart/chart/map/map_antv.js     |   6 +-
 .../components/shapeAttr/MapSelectorAntV.vue  | 304 ------------------
 4 files changed, 8 insertions(+), 308 deletions(-)
 delete mode 100644 frontend/src/views/chart/components/shapeAttr/MapSelectorAntV.vue

diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js
index b7cc3dd182..84d3f7c5b4 100644
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@@ -1,6 +1,7 @@
 import { cos, sin } from '@/components/canvas/utils/translate'
 import store from '@/store'
 import Vue from 'vue'
+import { DEFAULT_COLOR_CASE, DEFAULT_COLOR_CASE_DARK } from '@/views/chart/chart/chart'
 
 export const LIGHT_THEME_COLOR_MAIN = '#000000'
 export const LIGHT_THEME_COLOR_SLAVE1 = '#CCCCCC'
@@ -348,6 +349,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) {
       // 符号地图特殊处理
       Vue.set(customStyle, 'baseMapStyle', { baseMapTheme: 'light' })
     }
+    customAttr['color'] = { ...DEFAULT_COLOR_CASE, ...canvasStyle.chartInfo.chartColor }
   } else {
     recursionThemTransObj(THEME_STYLE_TRANS_MAIN, customStyle, DARK_THEME_COLOR_MAIN)
     recursionThemTransObj(THEME_STYLE_TRANS_SLAVE1, customStyle, DARK_THEME_COLOR_SLAVE1)
@@ -359,8 +361,8 @@ export function adaptCurTheme(customStyle, customAttr, chartType) {
       recursionThemTransObj(THEME_ATTR_TRANS_MAIN, customAttr, DARK_THEME_COLOR_MAIN)
       recursionThemTransObj(THEME_ATTR_TRANS_SLAVE1_BACKGROUND, customAttr, DARK_THEME_COMPONENT_BACKGROUND_BACK)
     }
+    customAttr['color'] = { ...DEFAULT_COLOR_CASE_DARK, ...canvasStyle.chartInfo.chartColor }
   }
-  customAttr['color'] = { ...canvasStyle.chartInfo.chartColor }
   customStyle['text'] = {
     ...canvasStyle.chartInfo.chartTitle,
     title: customStyle['text']['title'],
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index 947fae5048..ff651c0dc8 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -85,7 +85,7 @@ export function panelDataPrepare(componentData, componentStyle, callback) {
   componentStyle.refreshViewEnable = (componentStyle.refreshViewEnable === undefined ? true : componentStyle.refreshViewEnable)
   componentStyle.aidedDesign = (componentStyle.aidedDesign || deepCopy(AIDED_DESIGN))
   componentStyle.pdfPageLine = (componentStyle.pdfPageLine || deepCopy(PAGE_LINE_DESIGN))
-  componentStyle.chartInfo = { ...deepCopy(PANEL_CHART_INFO), ...componentStyle.chartInfo }
+  componentStyle.chartInfo = (componentStyle.chartInfo || deepCopy(PANEL_CHART_INFO))
   componentStyle.chartInfo.tabStyle = (componentStyle.chartInfo.tabStyle || deepCopy(TAB_COMMON_STYLE))
   componentStyle.themeId = (componentStyle.themeId || 'NO_THEME')
   componentStyle.panel.themeColor = (componentStyle.panel.themeColor || 'light')
diff --git a/frontend/src/views/chart/chart/map/map_antv.js b/frontend/src/views/chart/chart/map/map_antv.js
index 087fbbedba..c597604fa9 100644
--- a/frontend/src/views/chart/chart/map/map_antv.js
+++ b/frontend/src/views/chart/chart/map/map_antv.js
@@ -26,8 +26,10 @@ export function baseFlowMapOption(chartDom, chartId, chart, action) {
     })
     init = true
   } else {
-    chartDom.setPitch(size.mapPitch)
-    chartDom.setMapStyle(mapStyle)
+    if (chartDom.map) {
+      chartDom.setPitch(size.mapPitch)
+      chartDom.setMapStyle(mapStyle)
+    }
   }
   if (xAxis?.length < 2 || xAxisExt?.length < 2) {
     return chartDom
diff --git a/frontend/src/views/chart/components/shapeAttr/MapSelectorAntV.vue b/frontend/src/views/chart/components/shapeAttr/MapSelectorAntV.vue
deleted file mode 100644
index 42ff9f4ea5..0000000000
--- a/frontend/src/views/chart/components/shapeAttr/MapSelectorAntV.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <div style="width: 100%">
-    <el-col>
-      <el-form
-        ref="mapForm"
-        :model="mapForm"
-        label-width="80px"
-        size="mini"
-      >
-        <el-form-item
-          :label="$t('chart.map_style')"
-          class="form-item"
-        >
-          <el-select
-            v-model="mapForm.mapStyle"
-            @change="changeMapAttr('mapStyle')"
-          >
-            <el-option
-              v-for="item in mapStyleOptions"
-              :key="item.name"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="$t('chart.map_pitch')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="mapForm.mapPitch"
-            :min="0"
-            :max="90"
-            @change="changeMapAttr('mapPitch')"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="$t('chart.map_line_type')"
-          class="form-item"
-        >
-          <el-select
-            v-model="mapForm.lineType"
-            @change="changeMapAttr('lineType')"
-          >
-            <el-option
-              v-for="item in lineTypeOptions"
-              :key="item.name"
-              :label="item.name"
-              :value="item.value"
-              :disabled="checkLineType(item)"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          :label="$t('chart.map_line_width')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="mapForm.lineWidth"
-            :min="1"
-            :max="10"
-            @change="changeMapAttr('lineWidth')"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="$t('panel.opacity')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="mapForm.lineOpacity"
-            :min="0"
-            :max="1"
-            :step="0.01"
-            @change="changeMapAttr('lineOpacity')"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="$t('chart.map_line_linear')"
-          class="form-item"
-        >
-          <el-checkbox
-            v-model="mapForm.lineLinear"
-            :disabled="checkLineLinear"
-            @change="changeMapAttr('lineLinear')"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="mapForm.lineLinear ? $t('chart.map_line_color_source_color') : $t('chart.color')"
-          class="form-item"
-        >
-          <el-color-picker
-            v-model="mapForm.lineSourceColor"
-            @change="changeMapAttr('lineSourceColor')"
-          />
-        </el-form-item>
-        <el-form-item
-          v-if="mapForm.lineLinear"
-          :label="$t('chart.map_line_color_target_color')"
-          class="form-item"
-        >
-          <el-color-picker
-            v-model="mapForm.lineTargetColor"
-            @change="changeMapAttr('lineTargetColor')"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="$t('chart.map_line_animate')"
-          class="form-item"
-        >
-          <el-checkbox
-            v-model="mapForm.lineAnimate"
-            :disabled="checkLineAnimate"
-            @change="changeMapAttr('lineAnimate')"
-          />
-        </el-form-item>
-        <div v-if="mapForm.lineAnimate">
-          <el-form-item
-            :label="$t('chart.map_line_animate_duration')"
-            class="form-item form-item-slider"
-          >
-            <el-slider
-              v-model="mapForm.lineAnimateDuration"
-              :min="0"
-              :max="20"
-              @change="changeMapAttr('lineAnimateDuration')"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="$t('chart.map_line_animate_interval')"
-            class="form-item form-item-slider"
-          >
-            <el-slider
-              v-model="mapForm.lineAnimateInterval"
-              :min="0"
-              :max="1"
-              :step="0.1"
-              @change="changeMapAttr('lineAnimateInterval')"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="$t('chart.map_line_animate_trail_length')"
-            class="form-item form-item-slider"
-          >
-            <el-slider
-              v-model="mapForm.lineAnimateTrailLength"
-              :min="0"
-              :max="1"
-              :step="0.1"
-              @change="changeMapAttr('lineAnimateTrailLength')"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
-    </el-col>
-  </div>
-</template>
-
-<script>
-import { DEFAULT_MAP } from '@/views/chart/chart/chart'
-import _ from 'lodash'
-import { equalsAny } from '@/utils/StringUtils'
-
-export default {
-  name: 'MapSelectorAntV',
-  props: {
-    chart: {
-      type: Object,
-      required: true
-    },
-    propertyInner: {
-      type: Array,
-      required: false,
-      default: function() {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      mapForm: _.cloneDeep(DEFAULT_MAP),
-      mapStyleOptions: [
-        { name: this.$t('chart.map_style_normal'), value: 'normal' },
-        { name: this.$t('chart.map_style_light'), value: 'light' },
-        { name: this.$t('chart.map_style_dark'), value: 'dark' },
-        { name: this.$t('chart.map_style_whitesmoke'), value: 'whitesmoke' },
-        { name: this.$t('chart.map_style_fresh'), value: 'fresh' },
-        { name: this.$t('chart.map_style_grey'), value: 'grey' },
-        { name: this.$t('chart.map_style_graffiti'), value: 'graffiti' },
-        { name: this.$t('chart.map_style_macaron'), value: 'macaron' },
-        { name: this.$t('chart.map_style_darkblue'), value: 'darkblue' },
-        { name: this.$t('chart.map_style_blue'), value: 'blue' },
-        { name: this.$t('chart.map_style_wine'), value: 'wine' }
-      ],
-      lineTypeOptions: [
-        { 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_3d'), value: 'arc3d' },
-        { name: this.$t('chart.map_line_type_great_circle'), value: 'greatcircle' }
-      ]
-    }
-  },
-  computed: {
-    checkLineLinear() {
-      return this.mapForm.lineAnimate && equalsAny(this.mapForm.lineType, 'line', 'arc')
-    },
-    checkLineAnimate() {
-      return this.mapForm.lineLinear && equalsAny(this.mapForm.lineType, 'line', 'arc')
-    }
-  },
-  watch: {
-    'chart': {
-      handler: function() {
-        this.initData()
-      }
-    }
-  },
-  mounted() {
-    this.initData()
-  },
-  methods: {
-    checkLineType(item) {
-      if (this.mapForm.lineLinear && this.mapForm.lineAnimate) {
-        return equalsAny(item.value, 'line', 'arc')
-      }
-      return false
-    },
-    changeMapAttr(modifyName) {
-      this.mapForm['modifyName'] = modifyName
-      this.$emit('onMapChange', this.mapForm)
-    },
-    initData() {
-      if (this.chart.customAttr) {
-        if (this.chart.customAttr) {
-          let customAttr = null
-          if (Object.prototype.toString.call(this.chart.customAttr) === '[object Object]') {
-            customAttr = JSON.parse(JSON.stringify(this.chart.customAttr))
-          } else {
-            customAttr = JSON.parse(this.chart.customAttr)
-          }
-          if (customAttr.map) {
-            const map = customAttr.map
-            this.mapForm.mapStyle = map.mapStyle ?? 'normal'
-            this.mapForm.mapPitch = map.mapPitch ?? 0
-            this.mapForm.lineType = map.lineType ?? 'line'
-            this.mapForm.lineWidth = map.lineWidth ?? 1
-            this.mapForm.lineOpacity = map.lineOpacity ?? 1
-            this.mapForm.lineSourceColor = map.lineSourceColor ?? '#000000'
-            this.mapForm.lineTargetColor = map.lineTargetColor ?? '#000000'
-            this.mapForm.lineAnimateDuration = map.lineAnimateDuration ?? 4
-            this.mapForm.lineAnimateInterval = map.lineAnimateInterval ?? 0.5
-            this.mapForm.lineAnimateTrailLength = map.lineAnimateTrailLength ?? 0.1
-          }
-        }
-      }
-    }
-  },
-}
-</script>
-
-<style scoped>
-.shape-item {
-  padding: 6px;
-  border: none;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.form-item-slider ::v-deep .el-form-item__label {
-  font-size: 12px;
-  line-height: 38px;
-}
-
-.form-item ::v-deep .el-form-item__label {
-  font-size: 12px;
-}
-
-.el-select-dropdown__item {
-  padding: 0 20px;
-}
-
-span {
-  font-size: 12px
-}
-
-.el-form-item {
-  margin-bottom: 6px;
-}
-
-.el-divider--horizontal {
-  margin: 10px 0
-}
-
-.divider-style ::v-deep .el-divider__text {
-  color: #606266;
-  font-size: 12px;
-  font-weight: 400;
-  padding: 0 10px;
-}
-.form-flex >>> .el-form-item__content {
-  display: flex;
-}
-</style>