Merge branch 'master' into docs-fix

antvis · Nov 15, 2019 · 267df03 · 267df03
2 parents e5a9f32 + 804f9d7
commit 267df03
Show file tree

Hide file tree

Showing 17 changed files with 4,479 additions and 32 deletions.
diff --git a/__tests__/unit/theme/index-spec.ts b/__tests__/unit/theme/index-spec.ts
@@ -26,7 +26,7 @@ describe('theme', () => {
     registerTheme('test-pie', { b: 2 });
 
     // not exist
-    expect(getTheme('test-circle')).toEqual(getGlobalTheme());
-    expect(getTheme('test-pie')).toEqual({ ...getGlobalTheme(), b: 2 });
+    expect(getTheme('test-circle')).toEqual({});
+    expect(getTheme('test-pie')).toEqual({ b: 2 });
   });
 });
diff --git a/examples/area/stack/demo/area-large-data.js b/examples/area/stack/demo/area-large-data.js
@@ -0,0 +1,31 @@
+import { StackArea } from '@antv/g2plot';
+
+fetch('../data/emissions.json')
+  .then((res) => res.json())
+  .then((data) => {
+    const plot = new StackArea(document.getElementById('container'), {
+      title: {
+        visible: true,
+        text: 'The causes of CO2 emissions',
+      },
+      width: 600,
+      height: 600,
+      padding: 'auto',
+      data,
+      xField: 'year',
+      yField: 'value',
+      seriesField: 'category',
+      xAxis: {
+        type: 'time',
+      },
+      yAxis: {
+        label: {
+          // 数值格式化为千分位
+          formatter: (v) => `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`),
+        },
+      },
+      responsive: true,
+    });
+
+    plot.render();
+  });
diff --git a/examples/area/stack/demo/meta.json b/examples/area/stack/demo/meta.json
@@ -18,6 +18,11 @@
       "filename": "line-label.js",
       "title": "堆叠面积图 - 尾部跟随标签",
       "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*rSBPRpGX3yEAAAAAAAAAAABkARQnAQ"
+    },
+    {
+      "filename": "area-large-data.js",
+      "title": "The causes of CO2 emissions",
+      "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*rSBPRpGX3yEAAAAAAAAAAABkARQnAQ"
     }
   ]
 }