Merge branch 'master' into upgrade-pie

antvis · Nov 20, 2019 · 2a6c756 · 2a6c756
2 parents 8c5773a + 665ac36
commit 2a6c756
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 11 deletions.
diff --git a/examples/general/axis/index.en.md b/examples/general/axis/index.en.md
@@ -1,6 +1,6 @@
 ---
 title: Axis
-order: 1
+order: 2
 ---
 
 Description about this component.
diff --git a/examples/general/axis/index.zh.md b/examples/general/axis/index.zh.md
@@ -1,4 +1,4 @@
 ---
 title: 坐标轴
-order: 1
+order: 2
 ---
diff --git a/examples/general/label/index.en.md b/examples/general/label/index.en.md
@@ -1,6 +1,6 @@
 ---
-title: Lable
-order: 3
+title: Label
+order: 4
 ---
 
 Description about this component.
diff --git a/examples/general/label/index.zh.md b/examples/general/label/index.zh.md
@@ -1,4 +1,4 @@
 ---
 title: 图形标签
-order: 3
+order: 4
 ---
diff --git a/examples/general/legend/index.en.md b/examples/general/legend/index.en.md
@@ -1,6 +1,6 @@
 ---
 title: Legend
-order: 2
+order: 3
 ---
 
 Description about this component.
diff --git a/examples/general/legend/index.zh.md b/examples/general/legend/index.zh.md
@@ -1,4 +1,4 @@
 ---
 title: 图例
-order: 2
+order: 3
 ---
diff --git a/examples/general/padding/index.en.md b/examples/general/padding/index.en.md
@@ -1,6 +1,6 @@
 ---
 title: Set Padding
-order: 4
+order: 5
 ---
 
 Description about this component.
diff --git a/examples/general/padding/index.zh.md b/examples/general/padding/index.zh.md
@@ -1,4 +1,4 @@
 ---
 title: 设置图表出血
-order: 4
+order: 5
 ---
diff --git a/examples/general/state/index.en.md b/examples/general/state/index.en.md
@@ -1,6 +1,6 @@
 ---
 title: Set State
-order: 5
+order: 6
 ---
 
 Description about this component.
diff --git a/examples/general/state/index.zh.md b/examples/general/state/index.zh.md
@@ -1,4 +1,4 @@
 ---
 title: 设置图表状态量
-order: 5
+order: 6
 ---
diff --git a/examples/general/theme/API.en.md b/examples/general/theme/API.en.md
@@ -0,0 +1,13 @@
+---
+title: API
+---
+
+API.
+
+- Modern browsers and Internet Explorer 9+ (with [polyfills](https:// ant.design/docs/react/getting-started#Compatibility))
+- Server-side Rendering
+- [Electron](http:// electron.atom.io/)
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http:// godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| IE9, IE10, IE11, Edge                                                                                                                                                                                            | last 2 versions                                                                                                                                                                                                   | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                           | last 2 versions                                                                                                                                                                                                       |
diff --git a/examples/general/theme/API.zh.md b/examples/general/theme/API.zh.md
@@ -0,0 +1,13 @@
+---
+title: API
+---
+
+暂无。
+
+- Modern browsers and Internet Explorer 9+ (with [polyfills](https:// ant.design/docs/react/getting-started#Compatibility))
+- Server-side Rendering
+- [Electron](http:// electron.atom.io/)
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http:// godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| IE9, IE10, IE11, Edge                                                                                                                                                                                            | last 2 versions                                                                                                                                                                                                   | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                           | last 2 versions                                                                                                                                                                                                       |
diff --git a/examples/general/theme/demo/meta.json b/examples/general/theme/demo/meta.json
@@ -0,0 +1,13 @@
+{
+  "title": {
+    "zh": "中文分类",
+    "en": "Category"
+  },
+  "demos": [
+    {
+      "filename": "set-dark-theme.js",
+      "title": "设置暗黑主题",
+      "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*iHeNS6zg4gIAAAAAAAAAAABkARQnAQ"
+    }
+  ]
+}
diff --git a/examples/general/theme/demo/set-dark-theme.js b/examples/general/theme/demo/set-dark-theme.js
@@ -0,0 +1,57 @@
+import { Column } from '@antv/g2plot';
+
+const data = [
+  {
+    year: '1991',
+    value: 31,
+  },
+  {
+    year: '1992',
+    value: 41,
+  },
+  {
+    year: '1993',
+    value: 35,
+  },
+  {
+    year: '1994',
+    value: 55,
+  },
+  {
+    year: '1995',
+    value: 49,
+  },
+  {
+    year: '1996',
+    value: 15,
+  },
+  {
+    year: '1997',
+    value: 17,
+  },
+  {
+    year: '1998',
+    value: 29,
+  },
+  {
+    year: '1999',
+    value: 33,
+  },
+];
+
+const columnPlot = new Column(document.getElementById('container'), {
+  title: {
+    visible: true,
+    text: '设置图表暗黑主题',
+  },
+  description: {
+    visible: true,
+    text: 'g2plot内置了暗黑主题，可通过theme配置。',
+  },
+  theme: 'dark',
+  data,
+  xField: 'year',
+  yField: 'value',
+});
+
+columnPlot.render();
diff --git a/examples/general/theme/design.en.md b/examples/general/theme/design.en.md
@@ -0,0 +1,5 @@
+---
+title: 设计规范
+---
+
+设计规范
diff --git a/examples/general/theme/design.zh.md b/examples/general/theme/design.zh.md
@@ -0,0 +1,5 @@
+---
+title: 设计规范
+---
+
+设计规范
diff --git a/examples/general/theme/index.en.md b/examples/general/theme/index.en.md
@@ -0,0 +1,4 @@
+---
+title: Dark Mode
+order: 1
+---
diff --git a/examples/general/theme/index.zh.md b/examples/general/theme/index.zh.md
@@ -0,0 +1,4 @@
+---
+title: 暗黑主题
+order: 1
+---