Merge remote-tracking branch 'remotes/origin/master' into dev3.0.0

# Conflicts:
#	package.json
#	src/global.js
#	src/helper/graph2canvas.js
#	src/util/graphic.js
#	src/version.js
This commit is contained in:
Elaine1234 2019-03-22 10:59:24 +08:00
commit 8768160486
3 changed files with 43 additions and 5 deletions

View File

@ -2,6 +2,24 @@
---
#### 2.2.5
`2018-12-20`
* feat: add saveimage limitRatio
#### 2.2.4
`2018-12-20`
* fix: bug fix
#### 2.2.3
`2018-12-10`
* fix: bug fix
#### 2.2.2
`2018-11-30`

View File

@ -9,9 +9,11 @@
[English README](README.md)
G6 是一个图可视化框架。它提供了一套图可视化的基础设置,能帮助开发者搭建属于自己的图 **图分析** 应用或是 **图编辑器** 应用。
G6 是一个图可视化框架。它提供了一套图可视化的基础设置,能帮助开发者搭建属于自己的图 **图分析** 应用或是 **图编辑器** 应用。
[完整文档](https://www.yuque.com/antv/g6)
**注意** G6 3.0 版本带来了重大更新目前正在beta测试中。欢迎开发者们试用详情请见 [3.x文档](https://www.yuque.com/antv/g6/xauk5e)。
[2.x 完整文档](https://www.yuque.com/antv/g6/introduce)
<img src="https://user-images.githubusercontent.com/6113694/44995293-02858600-afd5-11e8-840c-349e4730d63d.gif" height=150><img src="https://cdn.nlark.com/yuque/0/2018/gif/93506/1535955277773-840190f8-836a-4bd6-875a-b3a18e6cebf1.gif" height=150><img src="https://user-images.githubusercontent.com/6113694/44995332-2ba61680-afd5-11e8-8cab-db0e9d08ceb7.gif" height=150>
@ -22,7 +24,7 @@ G6 是一个图可视化框架。它提供了一套图可视化的基础设置
<img src="https://gw.alipayobjects.com/zos/rmsportal/nzmycBewjfxKDbepTDlT.gif" width=560>
<img src="https://gw.alipayobjects.com/zos/rmsportal/WVqnbgJmamdahbAuDpBL.gif" width=560>
## G6-Analyser [coming soon]
## G6-Analyzer [coming soon]
![](https://gw.alipayobjects.com/zos/rmsportal/GxupfuhWyMZWwPWWYgaO.gif)
@ -81,6 +83,14 @@ Please let us know how can we help. Do check out [issues](https://github.com/ant
成为一个贡献者前请阅读 [代码贡献规范](https://github.com/antvis/g6/blob/master/CONTRIBUTING.zh-CN.md).
## 体验改进计划说明
为了更好服务用户G6 会将 URL 和版本信息发送回 AntV 服务器:
https://kcart.alipay.com/web/bi.do
除了 URL 与 G6 版本信息外,不会收集任何其他信息。如有担心,可以通过下面的代码关闭:
```js
// 关闭 G6 的体验改进计划打点请求
G6.track(false)
```
## License
[MIT license](./LICENSE).

View File

@ -10,10 +10,11 @@
[中文 README](README-zh_CN.md)
G6 is a graph visualization framework. It provides a set of basic mechanisms, helps developers build their own graph visualization **analysis** application or graph visualization **edit** application.
G6 is a graph visualization framework which provides a set of basic mechanisms. Developers are able to build graph visualization **analysis** application or graph visualization **modeling** application easily.
[Full documentation](https://www.yuque.com/antv/g6-en)
**notice**: G6 3.0 version is now beta testing which brings many breaking changes and new features. For more information please check [3.0 documentation](https://www.yuque.com/antv/g6/xauk5e).
See also [ 2.x Full documentation](https://www.yuque.com/antv/g6-en)
<img src="https://user-images.githubusercontent.com/6113694/44995293-02858600-afd5-11e8-840c-349e4730d63d.gif" height=150><img src="https://cdn.nlark.com/yuque/0/2018/gif/93506/1535955277773-840190f8-836a-4bd6-875a-b3a18e6cebf1.gif" height=150><img src="https://user-images.githubusercontent.com/6113694/44995332-2ba61680-afd5-11e8-8cab-db0e9d08ceb7.gif" height=150>
@ -77,6 +78,15 @@ Please let us know how can we help. Do check out [issues](https://github.com/ant
To become a contributor, please follow our [contributing guide](https://github.com/antvis/g6/blob/master/CONTRIBUTING.md).
## Experience Improvement
To better serve the users, G6 sends URL and version infomation back to AntV server:
https://kcart.alipay.com/web/bi.do
We will never collect other information. If you are worried about that, close it by:
```js
G6.track(false);
```
## License
[MIT license](./LICENSE).