diff --git a/demos/gallery-graphanalyzer.html b/demos/gallery-graphanalyzer.html index 1205ef68c..51c102e83 100644 --- a/demos/gallery-graphanalyzer.html +++ b/demos/gallery-graphanalyzer.html @@ -95,7 +95,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'], { @@ -127,7 +127,6 @@ height: 1000, }); graph.read(data); - const minimap = document.getElementById('minimap'); const legend = document.getElementById('legend'); if (minimap !== undefined) minimap.style.display = 'none'; diff --git a/plugins/template.maxSpanningForest/index.js b/plugins/template.maxSpanningForest/index.js index f822caf0d..445a4e4fd 100644 --- a/plugins/template.maxSpanningForest/index.js +++ b/plugins/template.maxSpanningForest/index.js @@ -90,7 +90,8 @@ class Plugin { style() { return { endArrow: true, - strokeOpacity: 0.8 + stroke: '#4F7DAB', + strokeOpacity: 0.65 }; } }); @@ -114,8 +115,8 @@ class Plugin { style: { stroke: '#fff', lineWidth: 2, - shadowColor: '#6a80aa', - shadowBlur: 20 + shadowColor: '#4F7DAB', + shadowBlur: 8 } }); }); diff --git a/plugins/tool.highlightSubgraph/index.js b/plugins/tool.highlightSubgraph/index.js index 714829b3b..e7d398eda 100644 --- a/plugins/tool.highlightSubgraph/index.js +++ b/plugins/tool.highlightSubgraph/index.js @@ -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 }); diff --git a/src/item/edge.js b/src/item/edge.js index 6ba706fca..a74335593 100755 --- a/src/item/edge.js +++ b/src/item/edge.js @@ -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() { diff --git a/src/shape/edges/common.js b/src/shape/edges/common.js index ab0777f2a..9dac74495 100755 --- a/src/shape/edges/common.js +++ b/src/shape/edges/common.js @@ -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();