test/g6
1
0
Fork 0
mirror of https://gitee.com/antv/g6.git synced 2024-12-16 02:21:25 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #391 from antvis/maxSpanningFortestStyle

Browse Source 
feat: update maxSpanningFortest style
This commit is contained in:
Yellowthrough 2018-07-23 19:27:41 +08:00 committed by GitHub
commit 19a67733bf
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/gallery-graphanalyzer.html
View File

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

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

@ -90,7 +90,8 @@ class Plugin {
style() { style() {
return { return {
endArrow: true, endArrow: true,
strokeOpacity: 0.8 stroke: '#4F7DAB',
strokeOpacity: 0.65
}; };
} }
}); });
@ -114,8 +115,8 @@ class Plugin {
style: { style: {
stroke: '#fff', stroke: '#fff',
lineWidth: 2, lineWidth: 2,
shadowColor: '#6a80aa', shadowColor: '#4F7DAB',
shadowBlur: 20 shadowBlur: 8
} }
}); });
}); });

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

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

5
src/item/edge.js
View File

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

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

@ -6,7 +6,7 @@
const Shape = require('../shape'); const Shape = require('../shape');
const Util = require('../../util/'); const Util = require('../../util/');
const Global = require('../../global'); const Global = require('../../global');
const MIN_ARROW_SIZE = 10 / 3; const MIN_ARROW_SIZE = 3;
const defaultArrow = { const defaultArrow = {
path(item) { path(item) {
const keyShape = item.getKeyShape(); const keyShape = item.getKeyShape();
@ -26,7 +26,7 @@ const defaultArrow = {
dindent(item) { dindent(item) {
const keyShape = item.getKeyShape(); const keyShape = item.getKeyShape();
const lineWidth = keyShape.attr('lineWidth'); 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) { style(item) {
const keyShape = item.getKeyShape(); const keyShape = item.getKeyShape();