diff --git a/packages/f2-next/src/components/area/withArea.tsx b/packages/f2-next/src/components/area/withArea.tsx
index 4e9ee2bc7..4a63a1b26 100644
--- a/packages/f2-next/src/components/area/withArea.tsx
+++ b/packages/f2-next/src/components/area/withArea.tsx
@@ -1,5 +1,5 @@
import { jsx } from '../../jsx';
-import { mix } from '@antv/util';
+import { isArray, mix } from '@antv/util';
import Geometry from '../geometry';
import { ShapeType } from '../geometry/interface';
import { splitArray } from '../geometry/util';
@@ -8,6 +8,7 @@ import { each } from '@antv/util';
export default (View) => {
return class Area extends Geometry {
shapeType: ShapeType = 'area';
+ startOnZero: boolean = true; // 面积图默认设为从0开始
constructor(props, context) {
super(props, context);
@@ -36,15 +37,25 @@ export default (View) => {
}
_convertPosition(mappedArray) {
- const { props } = this;
+ const { props, startOnZero: defaultStartOnZero } = this;
const { coord } = props;
+ const { startOnZero = defaultStartOnZero } = props;
+
+ const originY = this.getY0Value(); // 坐标轴 y0
+ const originCoord = coord.convertPoint({ x: 0, y: originY }); // 零点映射到绝对坐标
+ // 面积图基线 y 坐标: 如果不从0开始,则取零点 y 坐标,否则取 yStart
+ const baseY = startOnZero ? originCoord.y : coord.y[0];
for (let i = 0; i < mappedArray.length; i++) {
const data = mappedArray[i];
for (let j = 0; j < data.length; j++) {
const record = data[j];
const { x, y } = record;
- mix(record, coord.convertPoint({ x, y }));
+
+ // stack 转换后的 y 为一个数组
+ mix(record, coord.convertPoint({ x, y: isArray(y) ? y[1] : y }));
+ const py0 = isArray(y) ? coord.convertPoint({ x, y: y[0] }).y : baseY;
+ record.y0 = py0;
}
}
const mapped = this.parsePoints(mappedArray);
@@ -65,30 +76,15 @@ export default (View) => {
// 生成多边形 points
_generatePolygonPoints(mappedArray) {
- const y0 = this.getY0Value();
- const { coord } = this.props;
- // 零点映射到绝对坐标
- const p = coord.convertPoint({ x: 0, y: y0 });
- // 如果 startOnZero,则取 yStart 坐标,否则取零点 y 坐标
- const y = this.props.startOnZero ? coord.y[0] : p.y;
each(mappedArray, function (obj) {
- const { dataArray } = obj;
- if (dataArray?.length) {
- each(dataArray, function (data) {
- const start = {
- x: data[0].x,
- y,
- };
- const end = {
- x: data[data.length - 1].x,
- y,
- };
- // 插入头尾坐标
- data.unshift(start);
- data.push(end);
- });
- obj.dataArray = dataArray;
- }
+ const { dataArray: pointsArray } = obj;
+ each(pointsArray, function (points) {
+ const bottomPoints = points
+ .map(({ x, y0 }) => ({ x, y: y0 }))
+ .reverse();
+ points.push(...bottomPoints);
+ });
+ obj.dataArray = pointsArray;
});
return mappedArray;
}
diff --git a/packages/f2-next/src/components/line/withLine.tsx b/packages/f2-next/src/components/line/withLine.tsx
index 1e79d4959..98600568a 100644
--- a/packages/f2-next/src/components/line/withLine.tsx
+++ b/packages/f2-next/src/components/line/withLine.tsx
@@ -1,5 +1,5 @@
import { jsx } from '../../jsx';
-import { mix } from '@antv/util';
+import { isArray, mix } from '@antv/util';
import Geometry from '../geometry';
import { ShapeType } from '../geometry/interface';
import { splitArray } from '../geometry/util';
@@ -22,7 +22,7 @@ export default (View) => {
for (let j = 0; j < data.length; j++) {
const record = data[j];
const { x, y } = record;
- mix(record, coord.convertPoint({ x, y }));
+ mix(record, coord.convertPoint({ x, y: isArray(y) ? y[1] : y }));
}
}
return mappedArray;
diff --git a/packages/f2-next/test/components/area/area.test.tsx b/packages/f2-next/test/components/area/area.test.tsx
index 981ba231c..6ce06fbb4 100644
--- a/packages/f2-next/test/components/area/area.test.tsx
+++ b/packages/f2-next/test/components/area/area.test.tsx
@@ -1,10 +1,23 @@
import { Rect } from '../../../src/coord';
import { jsx } from '../../../src/jsx';
-import { Canvas, Chart, Area, Line, Axis } from '../../../src';
+import {
+ Canvas,
+ Chart,
+ Area,
+ Line,
+ Axis,
+ Interval,
+ Legend,
+} from '../../../src';
import { createContext } from '../../util';
const { offsetWidth } = document.body;
const height = offsetWidth * 0.75;
+const defaultCanvasCfg = {
+ width: offsetWidth,
+ height,
+ pixelRatio: window.devicePixelRatio,
+};
const data = [
{
@@ -41,6 +54,12 @@ const data = [
},
];
+function formatterPercent(value) {
+ value = value || 0;
+ value = value * 100;
+ return parseInt(value) + '%';
+}
+
describe('面积图', () => {
describe('基础面积图', () => {
it('基础面积图', () => {
@@ -48,12 +67,10 @@ describe('面积图', () => {
const { type, props } = (
@@ -204,34 +239,44 @@ describe('面积图', () => {
it('渐变填充面积图', () => {
const context = createContext('渐变填充面积图');
- const data = [{
- time: '2016-08-08 00:00:00',
- tem: 10
- }, {
- time: '2016-08-08 00:10:00',
- tem: 22
- }, {
- time: '2016-08-08 00:30:00',
- tem: 16
- }, {
- time: '2016-08-09 00:35:00',
- tem: 26
- }, {
- time: '2016-08-09 01:00:00',
- tem: 12
- }, {
- time: '2016-08-09 01:20:00',
- tem: 26
- }, {
- time: '2016-08-10 01:40:00',
- tem: 18
- }, {
- time: '2016-08-10 02:00:00',
- tem: 26
- }, {
- time: '2016-08-10 02:20:00',
- tem: 12
- }];
+ const data = [
+ {
+ time: '2016-08-08 00:00:00',
+ tem: 10,
+ },
+ {
+ time: '2016-08-08 00:10:00',
+ tem: 22,
+ },
+ {
+ time: '2016-08-08 00:30:00',
+ tem: 16,
+ },
+ {
+ time: '2016-08-09 00:35:00',
+ tem: 26,
+ },
+ {
+ time: '2016-08-09 01:00:00',
+ tem: 12,
+ },
+ {
+ time: '2016-08-09 01:20:00',
+ tem: 26,
+ },
+ {
+ time: '2016-08-10 01:40:00',
+ tem: 18,
+ },
+ {
+ time: '2016-08-10 02:00:00',
+ tem: 26,
+ },
+ {
+ time: '2016-08-10 02:20:00',
+ tem: 12,
+ },
+ ];
const { type, props } = (
{
},
tem: {
min: 0,
- }
+ },
}}
>
@@ -272,429 +317,697 @@ describe('面积图', () => {
describe('层叠面积图', () => {
it('层叠面积图', () => {
const context = createContext('层叠面积图');
+ const areaRef = { current: null };
+ const data = [
+ {
+ value: 63.4,
+ city: 'New York',
+ date: '2011-10-01',
+ },
+ {
+ value: 62.7,
+ city: 'Alaska',
+ date: '2011-10-01',
+ },
+ {
+ value: 72.2,
+ city: 'Austin',
+ date: '2011-10-01',
+ },
+ {
+ value: 58,
+ city: 'New York',
+ date: '2011-10-02',
+ },
+ {
+ value: 59.9,
+ city: 'Alaska',
+ date: '2011-10-02',
+ },
+ {
+ value: 67.7,
+ city: 'Austin',
+ date: '2011-10-02',
+ },
+ {
+ value: 53.3,
+ city: 'New York',
+ date: '2011-10-03',
+ },
+ {
+ value: 59.1,
+ city: 'Alaska',
+ date: '2011-10-03',
+ },
+ {
+ value: 69.4,
+ city: 'Austin',
+ date: '2011-10-03',
+ },
+ {
+ value: 55.7,
+ city: 'New York',
+ date: '2011-10-04',
+ },
+ {
+ value: 58.8,
+ city: 'Alaska',
+ date: '2011-10-04',
+ },
+ {
+ value: 68,
+ city: 'Austin',
+ date: '2011-10-04',
+ },
+ {
+ value: 64.2,
+ city: 'New York',
+ date: '2011-10-05',
+ },
+ {
+ value: 58.7,
+ city: 'Alaska',
+ date: '2011-10-05',
+ },
+ {
+ value: 72.4,
+ city: 'Austin',
+ date: '2011-10-05',
+ },
+ {
+ value: 58.8,
+ city: 'New York',
+ date: '2011-10-06',
+ },
+ {
+ value: 57,
+ city: 'Alaska',
+ date: '2011-10-06',
+ },
+ {
+ value: 77,
+ city: 'Austin',
+ date: '2011-10-06',
+ },
+ {
+ value: 57.9,
+ city: 'New York',
+ date: '2011-10-07',
+ },
+ {
+ value: 56.7,
+ city: 'Alaska',
+ date: '2011-10-07',
+ },
+ {
+ value: 82.3,
+ city: 'Austin',
+ date: '2011-10-07',
+ },
+ {
+ value: 61.8,
+ city: 'New York',
+ date: '2011-10-08',
+ },
+ {
+ value: 56.8,
+ city: 'Alaska',
+ date: '2011-10-08',
+ },
+ {
+ value: 78.9,
+ city: 'Austin',
+ date: '2011-10-08',
+ },
+ {
+ value: 69.3,
+ city: 'New York',
+ date: '2011-10-09',
+ },
+ {
+ value: 56.7,
+ city: 'Alaska',
+ date: '2011-10-09',
+ },
+ {
+ value: 68.8,
+ city: 'Austin',
+ date: '2011-10-09',
+ },
+ {
+ value: 71.2,
+ city: 'New York',
+ date: '2011-10-10',
+ },
+ {
+ value: 60.1,
+ city: 'Alaska',
+ date: '2011-10-10',
+ },
+ {
+ value: 68.7,
+ city: 'Austin',
+ date: '2011-10-10',
+ },
+ {
+ value: 68.7,
+ city: 'New York',
+ date: '2011-10-11',
+ },
+ {
+ value: 61.1,
+ city: 'Alaska',
+ date: '2011-10-11',
+ },
+ {
+ value: 70.3,
+ city: 'Austin',
+ date: '2011-10-11',
+ },
+ {
+ value: 61.8,
+ city: 'New York',
+ date: '2011-10-12',
+ },
+ {
+ value: 61.5,
+ city: 'Alaska',
+ date: '2011-10-12',
+ },
+ {
+ value: 75.3,
+ city: 'Austin',
+ date: '2011-10-12',
+ },
+ {
+ value: 63,
+ city: 'New York',
+ date: '2011-10-13',
+ },
+ {
+ value: 64.3,
+ city: 'Alaska',
+ date: '2011-10-13',
+ },
+ {
+ value: 76.6,
+ city: 'Austin',
+ date: '2011-10-13',
+ },
+ {
+ value: 66.9,
+ city: 'New York',
+ date: '2011-10-14',
+ },
+ {
+ value: 67.1,
+ city: 'Alaska',
+ date: '2011-10-14',
+ },
+ {
+ value: 66.6,
+ city: 'Austin',
+ date: '2011-10-14',
+ },
+ {
+ value: 61.7,
+ city: 'New York',
+ date: '2011-10-15',
+ },
+ {
+ value: 64.6,
+ city: 'Alaska',
+ date: '2011-10-15',
+ },
+ {
+ value: 68,
+ city: 'Austin',
+ date: '2011-10-15',
+ },
+ {
+ value: 61.8,
+ city: 'New York',
+ date: '2011-10-16',
+ },
+ {
+ value: 61.6,
+ city: 'Alaska',
+ date: '2011-10-16',
+ },
+ {
+ value: 70.6,
+ city: 'Austin',
+ date: '2011-10-16',
+ },
+ {
+ value: 62.8,
+ city: 'New York',
+ date: '2011-10-17',
+ },
+ {
+ value: 61.1,
+ city: 'Alaska',
+ date: '2011-10-17',
+ },
+ {
+ value: 71.1,
+ city: 'Austin',
+ date: '2011-10-17',
+ },
+ {
+ value: 60.8,
+ city: 'New York',
+ date: '2011-10-18',
+ },
+ {
+ value: 59.2,
+ city: 'Alaska',
+ date: '2011-10-18',
+ },
+ {
+ value: 70,
+ city: 'Austin',
+ date: '2011-10-18',
+ },
+ {
+ value: 62.1,
+ city: 'New York',
+ date: '2011-10-19',
+ },
+ {
+ value: 58.9,
+ city: 'Alaska',
+ date: '2011-10-19',
+ },
+ {
+ value: 61.6,
+ city: 'Austin',
+ date: '2011-10-19',
+ },
+ {
+ value: 65.1,
+ city: 'New York',
+ date: '2011-10-20',
+ },
+ {
+ value: 57.2,
+ city: 'Alaska',
+ date: '2011-10-20',
+ },
+ {
+ value: 57.4,
+ city: 'Austin',
+ date: '2011-10-20',
+ },
+ {
+ value: 55.6,
+ city: 'New York',
+ date: '2011-10-21',
+ },
+ {
+ value: 56.4,
+ city: 'Alaska',
+ date: '2011-10-21',
+ },
+ {
+ value: 64.3,
+ city: 'Austin',
+ date: '2011-10-21',
+ },
+ {
+ value: 54.4,
+ city: 'New York',
+ date: '2011-10-22',
+ },
+ {
+ value: 60.7,
+ city: 'Alaska',
+ date: '2011-10-22',
+ },
+ {
+ value: 72.4,
+ city: 'Austin',
+ date: '2011-10-22',
+ },
+ {
+ value: 54.4,
+ city: 'New York',
+ date: '2011-10-23',
+ },
+ {
+ value: 65.1,
+ city: 'Alaska',
+ date: '2011-10-23',
+ },
+ {
+ value: 72.4,
+ city: 'Austin',
+ date: '2011-10-23',
+ },
+ {
+ value: 54.8,
+ city: 'New York',
+ date: '2011-10-24',
+ },
+ {
+ value: 60.9,
+ city: 'Alaska',
+ date: '2011-10-24',
+ },
+ {
+ value: 72.5,
+ city: 'Austin',
+ date: '2011-10-24',
+ },
+ {
+ value: 57.9,
+ city: 'New York',
+ date: '2011-10-25',
+ },
+ {
+ value: 56.1,
+ city: 'Alaska',
+ date: '2011-10-25',
+ },
+ {
+ value: 72.7,
+ city: 'Austin',
+ date: '2011-10-25',
+ },
+ {
+ value: 54.6,
+ city: 'New York',
+ date: '2011-10-26',
+ },
+ {
+ value: 54.6,
+ city: 'Alaska',
+ date: '2011-10-26',
+ },
+ {
+ value: 73.4,
+ city: 'Austin',
+ date: '2011-10-26',
+ },
+ {
+ value: 54.4,
+ city: 'New York',
+ date: '2011-10-27',
+ },
+ {
+ value: 56.1,
+ city: 'Alaska',
+ date: '2011-10-27',
+ },
+ {
+ value: 70.7,
+ city: 'Austin',
+ date: '2011-10-27',
+ },
+ {
+ value: 42.5,
+ city: 'New York',
+ date: '2011-10-28',
+ },
+ {
+ value: 58.1,
+ city: 'Alaska',
+ date: '2011-10-28',
+ },
+ {
+ value: 56.8,
+ city: 'Austin',
+ date: '2011-10-28',
+ },
+ {
+ value: 40.9,
+ city: 'New York',
+ date: '2011-10-29',
+ },
+ {
+ value: 57.5,
+ city: 'Alaska',
+ date: '2011-10-29',
+ },
+ {
+ value: 51,
+ city: 'Austin',
+ date: '2011-10-29',
+ },
+ {
+ value: 38.6,
+ city: 'New York',
+ date: '2011-10-30',
+ },
+ {
+ value: 57.7,
+ city: 'Alaska',
+ date: '2011-10-30',
+ },
+ {
+ value: 54.9,
+ city: 'Austin',
+ date: '2011-10-30',
+ },
+ {
+ value: 44.2,
+ city: 'New York',
+ date: '2011-10-31',
+ },
+ {
+ value: 55.1,
+ city: 'Alaska',
+ date: '2011-10-31',
+ },
+ {
+ value: 58.8,
+ city: 'Austin',
+ date: '2011-10-31',
+ },
+ {
+ value: 49.6,
+ city: 'New York',
+ date: '2011-11-01',
+ },
+ {
+ value: 57.9,
+ city: 'Alaska',
+ date: '2011-11-01',
+ },
+ {
+ value: 62.6,
+ city: 'Austin',
+ date: '2011-11-01',
+ },
+ {
+ value: 47.2,
+ city: 'New York',
+ date: '2011-11-02',
+ },
+ {
+ value: 64.6,
+ city: 'Alaska',
+ date: '2011-11-02',
+ },
+ {
+ value: 71,
+ city: 'Austin',
+ date: '2011-11-02',
+ },
+ ];
+ const { type, props } = (
+
+
+
+
+
+
+
+
+
+ );
+ // @ts-ignore
+ const canvas = new type(props);
+ canvas.render();
+ });
+
+ it('区域图(存在空值)', () => {
+ fetch('https://gw.alipayobjects.com/os/antfincdn/RJW3vmCf7v/area-none.json')
+ .then((res) => res.json())
+ .then((data) => {
+ const context = createContext('区域图(存在空值)');
+ const { type, props } = (
+
+
+
+
+
+
+
+
+ );
+ // @ts-ignore
+ const canvas = new type(props);
+ canvas.render();
+ });
+ });
+
+ it('百分比层叠面积图', () => {
+ const context = createContext('百分比层叠面积图');
const data = [{
- value: 63.4,
- city: 'New York',
- date: '2011-10-01'
- }, {
- value: 62.7,
- city: 'Alaska',
- date: '2011-10-01'
- }, {
- value: 72.2,
- city: 'Austin',
- date: '2011-10-01'
- }, {
- value: 58,
- city: 'New York',
- date: '2011-10-02'
- }, {
- value: 59.9,
- city: 'Alaska',
- date: '2011-10-02'
- }, {
- value: 67.7,
- city: 'Austin',
- date: '2011-10-02'
- }, {
- value: 53.3,
- city: 'New York',
- date: '2011-10-03'
- }, {
- value: 59.1,
- city: 'Alaska',
- date: '2011-10-03'
- }, {
- value: 69.4,
- city: 'Austin',
- date: '2011-10-03'
- }, {
- value: 55.7,
- city: 'New York',
- date: '2011-10-04'
- }, {
- value: 58.8,
- city: 'Alaska',
- date: '2011-10-04'
- }, {
- value: 68,
- city: 'Austin',
- date: '2011-10-04'
- }, {
- value: 64.2,
- city: 'New York',
- date: '2011-10-05'
- }, {
- value: 58.7,
- city: 'Alaska',
- date: '2011-10-05'
- }, {
- value: 72.4,
- city: 'Austin',
- date: '2011-10-05'
- }, {
- value: 58.8,
- city: 'New York',
- date: '2011-10-06'
- }, {
- value: 57,
- city: 'Alaska',
- date: '2011-10-06'
- }, {
- value: 77,
- city: 'Austin',
- date: '2011-10-06'
- }, {
- value: 57.9,
- city: 'New York',
- date: '2011-10-07'
- }, {
- value: 56.7,
- city: 'Alaska',
- date: '2011-10-07'
- }, {
- value: 82.3,
- city: 'Austin',
- date: '2011-10-07'
- }, {
- value: 61.8,
- city: 'New York',
- date: '2011-10-08'
- }, {
- value: 56.8,
- city: 'Alaska',
- date: '2011-10-08'
- }, {
- value: 78.9,
- city: 'Austin',
- date: '2011-10-08'
- }, {
- value: 69.3,
- city: 'New York',
- date: '2011-10-09'
- }, {
- value: 56.7,
- city: 'Alaska',
- date: '2011-10-09'
- }, {
- value: 68.8,
- city: 'Austin',
- date: '2011-10-09'
- }, {
- value: 71.2,
- city: 'New York',
- date: '2011-10-10'
- }, {
- value: 60.1,
- city: 'Alaska',
- date: '2011-10-10'
- }, {
- value: 68.7,
- city: 'Austin',
- date: '2011-10-10'
- }, {
- value: 68.7,
- city: 'New York',
- date: '2011-10-11'
- }, {
- value: 61.1,
- city: 'Alaska',
- date: '2011-10-11'
- }, {
- value: 70.3,
- city: 'Austin',
- date: '2011-10-11'
- }, {
- value: 61.8,
- city: 'New York',
- date: '2011-10-12'
- }, {
- value: 61.5,
- city: 'Alaska',
- date: '2011-10-12'
- }, {
- value: 75.3,
- city: 'Austin',
- date: '2011-10-12'
- }, {
- value: 63,
- city: 'New York',
- date: '2011-10-13'
- }, {
- value: 64.3,
- city: 'Alaska',
- date: '2011-10-13'
- }, {
- value: 76.6,
- city: 'Austin',
- date: '2011-10-13'
- }, {
- value: 66.9,
- city: 'New York',
- date: '2011-10-14'
- }, {
- value: 67.1,
- city: 'Alaska',
- date: '2011-10-14'
- }, {
- value: 66.6,
- city: 'Austin',
- date: '2011-10-14'
- }, {
- value: 61.7,
- city: 'New York',
- date: '2011-10-15'
- }, {
- value: 64.6,
- city: 'Alaska',
- date: '2011-10-15'
- }, {
- value: 68,
- city: 'Austin',
- date: '2011-10-15'
- }, {
- value: 61.8,
- city: 'New York',
- date: '2011-10-16'
- }, {
- value: 61.6,
- city: 'Alaska',
- date: '2011-10-16'
- }, {
- value: 70.6,
- city: 'Austin',
- date: '2011-10-16'
- }, {
- value: 62.8,
- city: 'New York',
- date: '2011-10-17'
- }, {
- value: 61.1,
- city: 'Alaska',
- date: '2011-10-17'
- }, {
- value: 71.1,
- city: 'Austin',
- date: '2011-10-17'
- }, {
- value: 60.8,
- city: 'New York',
- date: '2011-10-18'
- }, {
- value: 59.2,
- city: 'Alaska',
- date: '2011-10-18'
- }, {
- value: 70,
- city: 'Austin',
- date: '2011-10-18'
- }, {
- value: 62.1,
- city: 'New York',
- date: '2011-10-19'
- }, {
- value: 58.9,
- city: 'Alaska',
- date: '2011-10-19'
- }, {
- value: 61.6,
- city: 'Austin',
- date: '2011-10-19'
- }, {
- value: 65.1,
- city: 'New York',
- date: '2011-10-20'
- }, {
- value: 57.2,
- city: 'Alaska',
- date: '2011-10-20'
- }, {
- value: 57.4,
- city: 'Austin',
- date: '2011-10-20'
- }, {
- value: 55.6,
- city: 'New York',
- date: '2011-10-21'
- }, {
- value: 56.4,
- city: 'Alaska',
- date: '2011-10-21'
- }, {
- value: 64.3,
- city: 'Austin',
- date: '2011-10-21'
- }, {
- value: 54.4,
- city: 'New York',
- date: '2011-10-22'
- }, {
- value: 60.7,
- city: 'Alaska',
- date: '2011-10-22'
- }, {
- value: 72.4,
- city: 'Austin',
- date: '2011-10-22'
- }, {
- value: 54.4,
- city: 'New York',
- date: '2011-10-23'
- }, {
- value: 65.1,
- city: 'Alaska',
- date: '2011-10-23'
- }, {
- value: 72.4,
- city: 'Austin',
- date: '2011-10-23'
- }, {
- value: 54.8,
- city: 'New York',
- date: '2011-10-24'
- }, {
- value: 60.9,
- city: 'Alaska',
- date: '2011-10-24'
- }, {
- value: 72.5,
- city: 'Austin',
- date: '2011-10-24'
- }, {
- value: 57.9,
- city: 'New York',
- date: '2011-10-25'
- }, {
- value: 56.1,
- city: 'Alaska',
- date: '2011-10-25'
- }, {
- value: 72.7,
- city: 'Austin',
- date: '2011-10-25'
- }, {
- value: 54.6,
- city: 'New York',
- date: '2011-10-26'
- }, {
- value: 54.6,
- city: 'Alaska',
- date: '2011-10-26'
- }, {
- value: 73.4,
- city: 'Austin',
- date: '2011-10-26'
- }, {
- value: 54.4,
- city: 'New York',
- date: '2011-10-27'
- }, {
- value: 56.1,
- city: 'Alaska',
- date: '2011-10-27'
- }, {
- value: 70.7,
- city: 'Austin',
- date: '2011-10-27'
- }, {
- value: 42.5,
- city: 'New York',
- date: '2011-10-28'
- }, {
- value: 58.1,
- city: 'Alaska',
- date: '2011-10-28'
- }, {
- value: 56.8,
- city: 'Austin',
- date: '2011-10-28'
- }, {
- value: 40.9,
- city: 'New York',
- date: '2011-10-29'
- }, {
- value: 57.5,
- city: 'Alaska',
- date: '2011-10-29'
- }, {
- value: 51,
- city: 'Austin',
- date: '2011-10-29'
- }, {
- value: 38.6,
- city: 'New York',
- date: '2011-10-30'
- }, {
- value: 57.7,
- city: 'Alaska',
- date: '2011-10-30'
- }, {
- value: 54.9,
- city: 'Austin',
- date: '2011-10-30'
- }, {
- value: 44.2,
- city: 'New York',
- date: '2011-10-31'
- }, {
- value: 55.1,
- city: 'Alaska',
- date: '2011-10-31'
- }, {
- value: 58.8,
- city: 'Austin',
- date: '2011-10-31'
- }, {
- value: 49.6,
- city: 'New York',
- date: '2011-11-01'
- }, {
- value: 57.9,
- city: 'Alaska',
- date: '2011-11-01'
- }, {
- value: 62.6,
- city: 'Austin',
- date: '2011-11-01'
- }, {
- value: 47.2,
- city: 'New York',
- date: '2011-11-02'
- }, {
- value: 64.6,
- city: 'Alaska',
- date: '2011-11-02'
- }, {
- value: 71,
- city: 'Austin',
- date: '2011-11-02'
+ country: 'Asia',
+ year: '1750',
+ value: 502,
+ percent: 0.6511024643320363
+ }, {
+ country: 'Africa',
+ year: '1750',
+ value: 106,
+ percent: 0.13748378728923477
+ }, {
+ country: 'Europe',
+ year: '1750',
+ value: 163,
+ percent: 0.21141374837872892
+ }, {
+ country: 'Asia',
+ year: '1800',
+ value: 635,
+ percent: 0.671957671957672
+ }, {
+ country: 'Africa',
+ year: '1800',
+ value: 107,
+ percent: 0.11322751322751323
+ }, {
+ country: 'Europe',
+ year: '1800',
+ value: 203,
+ percent: 0.21481481481481482
+ }, {
+ country: 'Asia',
+ year: '1850',
+ value: 809,
+ percent: 0.6764214046822743
+ }, {
+ country: 'Africa',
+ year: '1850',
+ value: 111,
+ percent: 0.09280936454849498
+ }, {
+ country: 'Europe',
+ year: '1850',
+ value: 276,
+ percent: 0.23076923076923078
+ }, {
+ country: 'Asia',
+ year: '1900',
+ value: 947,
+ percent: 0.6364247311827957
+ }, {
+ country: 'Africa',
+ year: '1900',
+ value: 133,
+ percent: 0.08938172043010753
+ }, {
+ country: 'Europe',
+ year: '1900',
+ value: 408,
+ percent: 0.27419354838709675
+ }, {
+ country: 'Asia',
+ year: '1950',
+ value: 1402,
+ percent: 0.6460829493087558
+ }, {
+ country: 'Africa',
+ year: '1950',
+ value: 221,
+ percent: 0.10184331797235023
+ }, {
+ country: 'Europe',
+ year: '1950',
+ value: 547,
+ percent: 0.252073732718894
+ }, {
+ country: 'Asia',
+ year: '1999',
+ value: 3634,
+ percent: 0.7083820662768031
+ }, {
+ country: 'Africa',
+ year: '1999',
+ value: 767,
+ percent: 0.14951267056530215
+ }, {
+ country: 'Europe',
+ year: '1999',
+ value: 729,
+ percent: 0.14210526315789473
+ }, {
+ country: 'Asia',
+ year: '2050',
+ value: 5268,
+ percent: 0.687548942834769
+ }, {
+ country: 'Africa',
+ year: '2050',
+ value: 1766,
+ percent: 0.23048812320542938
+ }, {
+ country: 'Europe',
+ year: '2050',
+ value: 628,
+ percent: 0.08196293395980161
}];
const { type, props } = (
-
-
-
-
-
-
-
+
+ formatterPercent(val),
+ alias: 'percent(%)',
+ }
+ }}
+ >
+
+
+
+
+
+
+
);
// @ts-ignore
const canvas = new type(props);