sea-chart 1.1.133 → 1.1.134

package/dist/utils/chart-utils/base-utils.js

@@ -546,7 +546,7 @@ BaseUtils.formatEmptyName = (dataList, column_groupby_column_key, emptyName) =>
     if (!item.name && item.name !== 0) {
       item.name = emptyName;
     }
-    if (column_groupby_column_key && !item.group_name) {
+    if (column_groupby_column_key && !item.group_name && item.group_name !== 0) {
       item.group_name = emptyName;
     }
     updatedStatistics.push(item);

package/dist/view/wrapper/area.js

@@ -43,9 +43,10 @@ class Area extends ChartComponent {
     this.drawChart = () => {
       let {
         result: data,
-        customRender
+        customRender,
+        chart
       } = this.props;
-      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, chart.config.column_groupby_column_key, intl.get('Empty'));
       if (!Array.isArray(data)) return;
       if (this.isGroupChart) {
         this.chart.scale(this.groupName, {
@@ -98,7 +99,8 @@ class Area extends ChartComponent {
         useSingleSelectColumnColor ? this.setSingleSelectColorMap(data) : this.setColorMap(data, chartColorTheme);
         chartBarColor = this.groupName;
         colorCallBack = group_name => {
-          return this.colorMap[group_name];
+          const colorKey = group_name || group_name === 0 ? group_name : '';
+          return this.colorMap[colorKey];
         };
         this.drawLabels(newData);
       } else {

package/dist/view/wrapper/bar-group.js

@@ -42,16 +42,14 @@ class BarGroup extends ChartComponent {
     };
     this.drawChart = () => {
       let {
-        result: data
+        result: data,
+        chart
       } = this.props;
-      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, chart.config.column_groupby_column_key, intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.chart.scale(this.groupName, {
         type: 'cat'
       });
-      const {
-        chart
-      } = this.props;
       const {
         sort_type,
         type
@@ -173,8 +171,10 @@ class BarGroup extends ChartComponent {
         },
         position: type === CHART_TYPE.BAR_STACK ? 'middle' : ''
       }).position('name*value').size(singleBarWidth).color('group_name', group_name => {
+        var _this$colorMap$colorK;
         const groupName = isGroupByDate ? dayjs(group_name).format('YYYY-MM-DD') : group_name;
-        return this.colorMap[groupName] || CHART_STYLE_COLORS[0];
+        const colorKey = groupName || groupName === 0 ? groupName : '';
+        return (_this$colorMap$colorK = this.colorMap[colorKey]) !== null && _this$colorMap$colorK !== void 0 ? _this$colorMap$colorK : CHART_STYLE_COLORS[0];
       }).tooltip('name*value*group_name*raw_name', (name, value, group_name, raw_name) => {
         return {
           title: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,

package/dist/view/wrapper/chart-component.js

@@ -628,8 +628,9 @@ export default class ChartComponent extends Component {
         colors = BaseUtils.getCurrentTheme(chartColorTheme).colors;
       }
       const colorMap = data.reduce((acc, cur) => {
-        if (cur.group_name && !acc[cur.group_name]) {
-          acc[cur.group_name] = colors[currentIdx++ % colors.length];
+        const key = cur.group_name || cur.group_name === 0 ? cur.group_name : '';
+        if (!acc.hasOwnProperty(key)) {
+          acc[key] = colors[currentIdx++ % colors.length];
         }
         return acc;
       }, {});

package/dist/view/wrapper/horizontal-bar-group.js

@@ -46,7 +46,7 @@ class HorizontalBarGroup extends HorizontalComponent {
         customRender,
         chart
       } = this.props;
-      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, chart.config.column_groupby_column_key, intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.chart.scale(this.groupName, {
         type: 'cat'
@@ -139,8 +139,10 @@ class HorizontalBarGroup extends HorizontalComponent {
           ...this.labelStroke
         }
       }).position('name*value').size(singleBarWidth).color('group_name', group_name => {
+        var _this$colorMap$colorK;
         const groupName = isGroupByDate ? dayjs(group_name).format('YYYY-MM-DD') : group_name;
-        return this.colorMap[groupName] || CHART_STYLE_COLORS[0];
+        const colorKey = groupName || groupName === 0 ? groupName : '';
+        return (_this$colorMap$colorK = this.colorMap[colorKey]) !== null && _this$colorMap$colorK !== void 0 ? _this$colorMap$colorK : CHART_STYLE_COLORS[0];
       }).tooltip('name*value*group_name*raw_name', (name, value, group_name, raw_name) => {
         return {
           title: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,

package/dist/view/wrapper/line-group.js

@@ -32,9 +32,10 @@ class LineGroup extends ChartComponent {
     this.drawChart = () => {
       let {
         result: data,
-        customRender
+        customRender,
+        chart
       } = this.props;
-      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, chart.config.column_groupby_column_key, intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.chart.scale(this.groupName, {
         type: 'cat'
@@ -98,7 +99,8 @@ class LineGroup extends ChartComponent {
           easing: 'easeLinear'
         }
       }).position('name*value').color(chartBarColor, group_name => {
-        return this.colorMap[group_name];
+        const colorKey = group_name || group_name === 0 ? group_name : '';
+        return this.colorMap[colorKey];
       }).shape(isSmooth ? 'smooth' : 'line').style({
         lineWidth: 2,
         opacity: 1
@@ -109,9 +111,9 @@ class LineGroup extends ChartComponent {
           name: !group_name && typeof group_name !== 'number' ? intl.get(EMPTY_NAME) : group_name
         };
       });
-      let point;
-      point = this.chart.point().position('name*value').color(chartBarColor, group_name => {
-        return this.colorMap[group_name];
+      this.chart.point().position('name*value').color(chartBarColor, group_name => {
+        const colorKey = group_name || group_name === 0 ? group_name : '';
+        return this.colorMap[colorKey];
       }).animate({
         appear: {
           animation: 'fadeIn',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.133",
+  "version": "1.1.134",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",