test/g6
1
0
Fork 0
mirror of https://gitee.com/antv/g6.git synced 2024-12-14 17:40:49 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
TomHuangCN 2018-07-16 20:02:36 +08:00
commit 08e7845d2e
4 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gallery-workflow.html
View File

@ -11,7 +11,7 @@
<body> <body>
<div id="mountNode"></div> <div id="mountNode"></div>
<script src="../build/g6.js"></script> <script src="../build/g6.js"></script>
<script src="../build/plugins.js"></script> <script src="../build/plugin.layout.dagre.js"></script>
<script> <script>
G6.registerNode('rect', { G6.registerNode('rect', {
getPath(item) { getPath(item) {

55
demos/plugin-dagre.html Normal file
View File

@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>插件-布局-Dagre</title>
</head>
<body>
<div id="mountNode"></div>
<script src="../build/g6.js"></script>
<script src="../build/plugin.layout.dagre.js"></script>
<script>
const data = {
nodes: [{
id: 'node1',
}, {
id: 'node2',
}, {
id: 'node3',
}, {
id: 'node4',
},{
id: 'node5',
}],
edges: [{
source: 'node1',
target: 'node2'
},{
source: 'node1',
target: 'node3'
},{
source: 'node3',
target: 'node4'
},{
source: 'node2',
target: 'node4'
},{
source: 'node4',
target: 'node5'
}]
};
const graph = new G6.Graph({
container: 'mountNode',
fitView: 'cc',
width: 500,
height: 500,
plugins: [new G6.Plugins['layout.dagre']()],
});
graph.read(data);
</script>
</body>
</html>

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/g6", "name": "@antv/g6",
"version": "2.0.4", "version": "2.0.5-beta",
"description": "graph visualization frame work", "description": "graph visualization frame work",
"main": "build/g6.js", "main": "build/g6.js",
"homepage": "https://github.com/antvis/g6", "homepage": "https://github.com/antvis/g6",
@ -107,7 +107,7 @@
"dependencies": { "dependencies": {
"@antv/scale": "^0.0.1", "@antv/scale": "^0.0.1",
"@antv/g2": "^3.2.0", "@antv/g2": "^3.2.0",
"@antv/g": "^3.0.0-beta.8", "@antv/g": "~3.0.0-beta.8",
"@antv/hierarchy": "~0.3.13", "@antv/hierarchy": "~0.3.13",
"ant-design-palettes": "~1.1.2", "ant-design-palettes": "~1.1.2",
"d3": "^5.4.0", "d3": "^5.4.0",

2
src/version.js
View File

@ -1 +1 @@
module.exports = '2.0.4'; module.exports = '2.0.5-beta';