fix: 图例只支持分类数据

antvis · Oct 12, 2019 · bfe5042 · bfe5042
1 parent 19a3cc6
commit bfe5042
Show file tree

Hide file tree

Showing 3 changed files with 297 additions and 1 deletion.
diff --git a/src/chart/chart.js b/src/chart/chart.js
@@ -749,7 +749,8 @@ class Chart extends Base {
       const colorAttr = geom.getAttr('color');
       if (colorAttr) {
         const scale = colorAttr.getScale('color');
-        if (scale.type !== 'identity' && !_isScaleExist(scales, scale)) {
+        // 只支持分类图例
+        if (scale.isCategory && !_isScaleExist(scales, scale)) {
           scales.push(scale);
 
           const field = scale.field;

diff --git a/test/bug/issue-586-spec.js b/test/bug/issue-586-spec.js
@@ -0,0 +1,59 @@
+const expect = require('chai').expect;
+
+const F2 = require('../../src/core');
+require('../../src/geom/schema');
+const data = require('../fixtures/mobile-k.json');
+
+const canvas = document.createElement('canvas');
+canvas.width = 500;
+canvas.height = 500;
+canvas.id = '586';
+document.body.appendChild(canvas);
+
+describe('issue 586', () => {
+  let canvas;
+  let chart;
+  before(() => {
+    canvas = document.createElement('canvas');
+    canvas.width = 300;
+    canvas.height = 300;
+    canvas.id = 'issue550';
+    document.body.appendChild(canvas);
+  });
+
+  it('issue#586', () => {
+    const throwFn = () => {
+      try {
+        data.sort((obj1, obj2) => {
+          return obj1.time > obj2.time ? 1 : -1;
+        });
+        data.forEach(obj => {
+          obj.range = [ obj.start, obj.end, obj.max, obj.min ];
+          obj.trend = (obj.start <= obj.end) ? 0 : 1;
+        });
+
+        chart = new F2.Chart({
+          id: '586',
+          width: 400,
+          height: 300
+        });
+        chart.source(data);
+        chart.schema().position('time*range')
+          .color('trend', trend => [ '#C00000', '#19B24B' ][trend])
+          .shape('candle');
+        chart.render();
+      } catch (err) {
+        throw new Error(err);
+      }
+    };
+    expect(throwFn).to.not.throw();
+
+    const legendItems = chart.getLegendItems();
+    expect(legendItems).to.be.empty;
+  });
+
+  after(() => {
+    chart.destroy();
+    document.body.removeChild(canvas);
+  });
+});
diff --git a/test/fixtures/mobile-k.json b/test/fixtures/mobile-k.json
@@ -0,0 +1,236 @@
+[
+  {
+    "time": "2015-11-19",
+    "start": 8.18,
+    "max": 8.33,
+    "min": 7.98,
+    "end": 8.32,
+    "volumn": 1810,
+    "money": 14723.56
+  },
+  {
+    "time": "2015-11-18",
+    "start": 8.37,
+    "max": 8.6,
+    "min": 8.03,
+    "end": 8.09,
+    "volumn": 2790.37,
+    "money": 23309.19
+  },
+  {
+    "time": "2015-11-17",
+    "start": 8.7,
+    "max": 8.78,
+    "min": 8.32,
+    "end": 8.37,
+    "volumn": 3729.04,
+    "money": 31709.71
+  },
+  {
+    "time": "2015-11-16",
+    "start": 8.18,
+    "max": 8.69,
+    "min": 8.05,
+    "end": 8.62,
+    "volumn": 3095.44,
+    "money": 26100.69
+  },
+  {
+    "time": "2015-11-13",
+    "start": 8.01,
+    "max": 8.75,
+    "min": 7.97,
+    "end": 8.41,
+    "volumn": 5815.58,
+    "money": 48562.37
+  },
+  {
+    "time": "2015-11-12",
+    "start": 7.76,
+    "max": 8.18,
+    "min": 7.61,
+    "end": 8.15,
+    "volumn": 4742.6,
+    "money": 37565.36
+  },
+  {
+    "time": "2015-11-11",
+    "start": 7.55,
+    "max": 7.81,
+    "min": 7.49,
+    "end": 7.8,
+    "volumn": 3133.82,
+    "money": 24065.42
+  },
+  {
+    "time": "2015-11-10",
+    "start": 7.5,
+    "max": 7.68,
+    "min": 7.44,
+    "end": 7.57,
+    "volumn": 2670.35,
+    "money": 20210.58
+  },
+  {
+    "time": "2015-11-09",
+    "start": 7.65,
+    "max": 7.66,
+    "min": 7.3,
+    "end": 7.58,
+    "volumn": 2841.79,
+    "money": 21344.36
+  },
+  {
+    "time": "2015-11-06",
+    "start": 7.52,
+    "max": 7.71,
+    "min": 7.48,
+    "end": 7.64,
+    "volumn": 2725.44,
+    "money": 20721.51
+  },
+  {
+    "time": "2015-11-05",
+    "start": 7.48,
+    "max": 7.57,
+    "min": 7.29,
+    "end": 7.48,
+    "volumn": 3520.85,
+    "money": 26140.83
+  },
+  {
+    "time": "2015-11-04",
+    "start": 7.01,
+    "max": 7.5,
+    "min": 7.01,
+    "end": 7.46,
+    "volumn": 3591.47,
+    "money": 26285.52
+  },
+  {
+    "time": "2015-11-03",
+    "start": 7.1,
+    "max": 7.17,
+    "min": 6.82,
+    "end": 7,
+    "volumn": 2029.21,
+    "money": 14202.33
+  },
+  {
+    "time": "2015-11-02",
+    "start": 7.09,
+    "max": 7.44,
+    "min": 6.93,
+    "end": 7.17,
+    "volumn": 3191.31,
+    "money": 23205.11
+  },
+  {
+    "time": "2015-10-30",
+    "start": 6.98,
+    "max": 7.27,
+    "min": 6.84,
+    "end": 7.18,
+    "volumn": 3522.61,
+    "money": 25083.44
+  },
+  {
+    "time": "2015-10-29",
+    "start": 6.94,
+    "max": 7.2,
+    "min": 6.8,
+    "end": 7.05,
+    "volumn": 2752.27,
+    "money": 19328.44
+  },
+  {
+    "time": "2015-10-28",
+    "start": 7.01,
+    "max": 7.14,
+    "min": 6.8,
+    "end": 6.85,
+    "volumn": 2311.11,
+    "money": 16137.32
+  },
+  {
+    "time": "2015-10-27",
+    "start": 6.91,
+    "max": 7.31,
+    "min": 6.48,
+    "end": 7.18,
+    "volumn": 3172.9,
+    "money": 21827.3
+  },
+  {
+    "time": "2015-10-26",
+    "start": 6.9,
+    "max": 7.08,
+    "min": 6.87,
+    "end": 6.95,
+    "volumn": 2769.31,
+    "money": 19337.44
+  },
+  {
+    "time": "2015-10-23",
+    "start": 6.71,
+    "max": 6.85,
+    "min": 6.58,
+    "end": 6.79,
+    "volumn": 2483.18,
+    "money": 16714.31
+  },
+  {
+    "time": "2015-10-22",
+    "start": 6.38,
+    "max": 6.67,
+    "min": 6.34,
+    "end": 6.65,
+    "volumn": 2225.88,
+    "money": 14465.56
+  },
+  {
+    "time": "2015-10-21",
+    "start": 7.08,
+    "max": 7.1,
+    "min": 6.41,
+    "end": 6.41,
+    "volumn": 2891.47,
+    "money": 19585.98
+  },
+  {
+    "time": "2015-10-20",
+    "start": 6.88,
+    "max": 7.19,
+    "min": 6.85,
+    "end": 7.12,
+    "volumn": 2389.62,
+    "money": 16813.58
+  },
+  {
+    "time": "2015-10-19",
+    "start": 7.1,
+    "max": 7.14,
+    "min": 6.8,
+    "end": 6.94,
+    "volumn": 2786.61,
+    "money": 19474.72
+  },
+  {
+    "time": "2015-10-16",
+    "start": 6.92,
+    "max": 7.38,
+    "min": 6.73,
+    "end": 7.15,
+    "volumn": 3289.27,
+    "money": 22963.97
+  },
+  {
+    "time": "2015-10-15",
+    "start": 6.63,
+    "max": 6.9,
+    "min": 6.6,
+    "end": 6.89,
+    "volumn": 2440.37,
+    "money": 16575.84
+  }
+]