test/g6
1
0
Fork 0
mirror of https://gitee.com/antv/g6.git synced 2024-12-05 05:09:07 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix(edge): fix edge label when edge is a point

Browse Source
This commit is contained in:
yilin.qyl 2019-03-07 14:18:54 +08:00
parent 4c4e5c980b
commit ac56abff57
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shape/edge.js
View File

@ -93,6 +93,13 @@ const singleEdgeDefinition = Util.mix({}, SingleShapeMixin, {
pointPercent = 0.5;
}
const point = pathShape.getPoint(pointPercent);
const { refX, refY } = labelCfg; // 默认的偏移量
// 如果两个节点重叠，线就变成了一个点，这时候label的位置，就是这个点 + 绝对偏移
if (cfg.startPoint.x === cfg.endPoint.x && cfg.startPoint.y === cfg.endPoint.y) {
style.x = cfg.startPoint.x + refX ? refX : 0;
style.y = cfg.endPoint.y + refY ? refY : 0;
return style;
}
let firstPoint;
let nextPoint;
if (pointPercent === 1) {
@ -105,7 +112,6 @@ const singleEdgeDefinition = Util.mix({}, SingleShapeMixin, {
const autoRotate = Util.isNil(labelCfg.autoRotate) ? this.labelAutoRotate : labelCfg.autoRotate;
const tangent = [];
vec2.normalize(tangent, [ nextPoint.x - firstPoint.x, nextPoint.y - firstPoint.y ]); // 求切线
const { refX, refY } = labelCfg; // 默认的偏移量
if (refX || refY) { // 进行偏移时，求偏移向量
const offset = this._getOffset(refX, refY, tangent);
style.x = point.x + offset[0];
@ -235,7 +241,7 @@ Shape.registerEdge('quadratic', {
}, 'single-line');
Shape.registerEdge('cubic', {
curvePosition: [ 1 / 3, 2 / 3 ],
curvePosition: [ 1 / 2, 1 / 2 ],
curveOffset: [ -20, 20 ],
getControlPoints(cfg) {
let controlPoints = cfg.controlPoints; // 指定controlPoints