test/g6
1
0
Fork 0
mirror of https://gitee.com/antv/g6.git synced 2024-12-02 11:48:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Yanyan-Wang 2018-07-23 21:33:27 +08:00
commit e69861105d
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/gallery-graphanalyzer.html
View File

@ -96,7 +96,7 @@
scale: 0.5
}
});
const edgeSizeMapper = new Mapper('edge', 'userview', 'size', [2, 20], {
const edgeSizeMapper = new Mapper('edge', 'userview', 'size', [1, 16], {
legendCfg: null
});
const nodeColorMapper = new Mapper('node', 'stayTime', 'color', ['#BAE7FF', '#1890FF', '#0050B3'], {
@ -129,7 +129,6 @@
height: 1000,
});
graph.read(data);
const minimap = document.getElementById('minimap');
const legend = document.getElementById('legend');
if (minimap !== undefined) minimap.style.display = 'none';

1
plugins/template.maxSpanningForest/index.js
View File

@ -141,7 +141,6 @@ class Plugin {
if (item.item != null) {
graph.activeItem(item.item);
}
});
graph.on('mouseleave', item => {
let style = {};

2
plugins/tool.highlightSubgraph/index.js
View File

@ -18,7 +18,7 @@ G6.registerGuide('mask', {
y: box.minY - 100,
width: box.maxX * 1.5,
height: box.maxY * 1.5,
fill: 'rgba(255, 255, 255, 0.7)'
fill: 'rgba(255, 255, 255, 0.8)'
},
capture: false
});

5
src/item/edge.js
View File

@ -46,8 +46,8 @@ class Edge extends Item {
const styleStartArrow = keyShape.attr('startArrow');
const endArrow = model.endArrow || styleEndArrow;
const startArrow = model.startArrow || styleStartArrow;
styleStartArrow && keyShape.attr('startArrow', null);
styleEndArrow && keyShape.attr('endArrow', null);
styleStartArrow && keyShape.attr('startArrow', false);
styleEndArrow && keyShape.attr('endArrow', false);
endArrow && this._drawArrow(shapeObj.endArrow, 'end');
startArrow && this._drawArrow(shapeObj.startArrow, 'start');
}
@ -101,7 +101,6 @@ class Edge extends Item {
startSegment[startSegment.length - 1] = vDindent[1] + point.y;
startSegment[startSegment.length - 2] = vDindent[0] + point.x;
}
keyShape.attr('path', keyShapePath);
}
_getControlPoints() {

4
src/shape/edges/common.js
View File

@ -6,7 +6,7 @@
const Shape = require('../shape');
const Util = require('../../util/');
const Global = require('../../global');
const MIN_ARROW_SIZE = 10 / 3;
const MIN_ARROW_SIZE = 3;
const defaultArrow = {
path(item) {
const keyShape = item.getKeyShape();
@ -26,7 +26,7 @@ const defaultArrow = {
dindent(item) {
const keyShape = item.getKeyShape();
const lineWidth = keyShape.attr('lineWidth');
return (lineWidth > MIN_ARROW_SIZE ? lineWidth : MIN_ARROW_SIZE) * 1.2;
return (lineWidth > MIN_ARROW_SIZE ? lineWidth : MIN_ARROW_SIZE) * 3.1;
},
style(item) {
const keyShape = item.getKeyShape();