fix: change chart-core varaity name and fix colors bug

Author: Davont

internals/cli/src/commands/build/build-entry-app.ts

@@ -151,7 +151,7 @@ const buildFullRuntime = (mode: RunTimeModeType) => {
         .map((component) => {
           if (component.includes('Hui')) {
             return `${component}${joinStr}${component} as ${component
-              .replace('Huicharts', 'Charts')
+              .replace('Huicharts', 'Chart')
               .trim()}${joinStr}${component} as Tiny${component.trim()}`
           }
           return `${component}${joinStr}${component} as Tiny${component.trim()}`
@@ -161,7 +161,7 @@ const buildFullRuntime = (mode: RunTimeModeType) => {
         .map((component) => {
           if (component.includes('Hui')) {
             return `${component}${joinStr}${component
-              .replace('Huicharts', 'Charts')
+              .replace('Huicharts', 'Chart')
               .trim()}: ${component}${joinStr}Tiny${component.trim()}: ${component}`
           }
           return `${component}${joinStr}Tiny${component.trim()}: ${component}`

packages/vue/src/huicharts/huicharts-amap/src/AMapModel.ts

@@ -19,12 +19,12 @@ export default function extendComponentModel() {
     },
 
     setCenterAndZoom(center, zoom) {
-      this.option.center = center
-      this.option.zoom = zoom
+      this.huiChartOption.center = center
+      this.huiChartOption.zoom = zoom
     },
 
     centerOrZoomChanged(center, zoom) {
-      let option = this.option
+      let option = this.huiChartOption
       return !(equal(center, option.center) && zoom === option.zoom)
     },
 

packages/vue/src/huicharts/huicharts-amap/src/autonavi-map.vue

@@ -25,13 +25,13 @@ export default {
   methods: {
     updateChart() {
       if (this.options && Object.keys(this.options).length) {
-        this.option = { ...this.options, ...this.settings }
+        this.huiChartOption = { ...this.options, ...this.settings }
         if (!this.tooltipVisible) {
-          this.option.tooltip = { show: false }
+          this.huiChartOption.tooltip = { show: false }
         }
 
         if (!this.legendVisible) {
-          this.option.legend = { show: false }
+          this.huiChartOption.legend = { show: false }
         }
 
         return
@@ -55,20 +55,20 @@ export default {
         'backgroundColor',
         'textStyle'
       ]
-      this.option = {
+      this.huiChartOption = {
         ...this.settings,
         tooltip: this.tooltipVisible ? this.tooltip : { show: false },
         series: this.series
       }
 
       echartsSettings.forEach((prop) => {
         if (this[prop]) {
-          this.option[prop] = this[prop]
+          this.huiChartOption[prop] = this[prop]
         }
       })
 
       if (!this.legendVisible) {
-        this.option.legend = { show: false }
+        this.huiChartOption.legend = { show: false }
       }
     }
   }

packages/vue/src/huicharts/huicharts-bar/src/chart-bar.vue

@@ -31,7 +31,7 @@ export default {
 
       const option = histogram(columns, rows, this.settings, extra, false)
 
-      this.option = {
+      this.huiChartOption = {
         smooth: true,
         ...option,
         direction: 'horizontal'

packages/vue/src/huicharts/huicharts-bmap/src/baidu-map.vue

@@ -22,13 +22,13 @@ export default {
   methods: {
     updateChart() {
       if (this.options && Object.keys(this.options).length) {
-        this.option = { ...this.options, ...this.settings }
+        this.huiChartOption = { ...this.options, ...this.settings }
         if (!this.tooltipVisible) {
-          this.option.tooltip = { show: false }
+          this.huiChartOption.tooltip = { show: false }
         }
 
         if (!this.legendVisible) {
-          this.option.legend = { show: false }
+          this.huiChartOption.legend = { show: false }
         }
 
         return
@@ -52,20 +52,20 @@ export default {
         'backgroundColor',
         'textStyle'
       ]
-      this.option = {
+      this.huiChartOption = {
         ...this.settings,
         tooltip: this.tooltipVisible ? this.tooltip : { show: false },
         series: this.series
       }
 
       echartsSettings.forEach((prop) => {
         if (this[prop]) {
-          this.option[prop] = this[prop]
+          this.huiChartOption[prop] = this[prop]
         }
       })
 
       if (!this.legendVisible) {
-        this.option.legend = { show: false }
+        this.huiChartOption.legend = { show: false }
       }
     }
   }

packages/vue/src/huicharts/huicharts-boxplot/src/chart-boxplot.vue

@@ -28,7 +28,7 @@ export default {
         data: prepareBoxplotData && Array.isArray(data) ? data : null
       }
       const option = boxplot(columns, rows, this.settings, extra)
-      this.option = { ...option }
+      this.huiChartOption = { ...option }
     },
     prepareBoxplotData(data) {
       return prepareBoxplotData(data)

packages/vue/src/huicharts/huicharts-candle/src/chart-candle.vue

@@ -27,7 +27,7 @@ export default {
         legendVisible: this.legendVisible,
         t
       }
-      this.option = candle(columns, rows, this.settings, extra)
+      this.huiChartOption = candle(columns, rows, this.settings, extra)
     }
   }
 }

packages/vue/src/huicharts/huicharts-core/common/extend.ts

@@ -19,8 +19,8 @@ function removeNullKeys(obj) {
   return obj
 }
 
-export default ({ option, extend }) => {
-  const cloneOption = cloneDeep(option)
+export default ({ huiChartOption, extend }) => {
+  const cloneOption = cloneDeep(huiChartOption)
   const mergeOption = removeNullKeys(cloneOption)
   if (!extend) {
     return
@@ -59,7 +59,7 @@ export default ({ option, extend }) => {
       // 属性为对象(eg: tooltip)或包含对象的数组(eg: series)
       if (isArr(mergeOption[key]) && isObject(mergeOption[key][0])) {
         // 属性值是包含对象数组
-        mergeOption[key].forEach((option, i) => (mergeOption[key][i] = { ...option, ...value }))
+        mergeOption[key].forEach((huiChartOption, i) => (mergeOption[key][i] = { ...huiChartOption, ...value }))
       } else if (isObject(mergeOption[key])) {
         // 被替换属性值是对象
         let optionBase = mergeOption[key]