@visactor/vrender 0.20.21 → 0.20.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/index.d.ts +1 -1
- package/cjs/index.js +1 -1
- package/cjs/index.js.map +1 -1
- package/dist/index.es.js +39 -131
- package/dist/index.js +39 -131
- package/dist/index.min.js +1 -1
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/index.js.map +1 -1
- package/package.json +5 -5
package/dist/index.js
CHANGED
|
@@ -3330,7 +3330,7 @@
|
|
|
3330
3330
|
default:
|
|
3331
3331
|
if (this._t <= 0) this.context.lineTo(this._x, y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined, p);else {
|
|
3332
3332
|
const x1 = this._x * (1 - this._t) + x * this._t;
|
|
3333
|
-
this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
|
|
3333
|
+
.5 === this._t ? this.context.lineTo(x1, this._y, !1 !== this._lastDefined, this.lastPoint) : this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
|
|
3334
3334
|
}
|
|
3335
3335
|
}
|
|
3336
3336
|
this._lastDefined = p.defined, this._x = x, this._y = y, this.lastPoint = p;
|
|
@@ -12809,7 +12809,7 @@
|
|
|
12809
12809
|
this._draw(line, lineAttribute, !1, drawContext, params);
|
|
12810
12810
|
}
|
|
12811
12811
|
drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
|
|
12812
|
-
var _a
|
|
12812
|
+
var _a;
|
|
12813
12813
|
if (!cache) return;
|
|
12814
12814
|
context.beginPath();
|
|
12815
12815
|
const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
|
|
@@ -12822,27 +12822,7 @@
|
|
|
12822
12822
|
x: originX = 0,
|
|
12823
12823
|
x: originY = 0
|
|
12824
12824
|
} = attribute;
|
|
12825
|
-
!1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke()));
|
|
12826
|
-
let {
|
|
12827
|
-
connectedType: connectedType,
|
|
12828
|
-
connectedX: connectedX,
|
|
12829
|
-
connectedY: connectedY,
|
|
12830
|
-
connectedStyle: connectedStyle
|
|
12831
|
-
} = attribute;
|
|
12832
|
-
if (isArray$1(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
|
|
12833
|
-
context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
|
|
12834
|
-
offsetX: offsetX,
|
|
12835
|
-
offsetY: offsetY,
|
|
12836
|
-
offsetZ: z,
|
|
12837
|
-
drawConnect: !0,
|
|
12838
|
-
mode: connectedType,
|
|
12839
|
-
zeroX: connectedX,
|
|
12840
|
-
zeroY: connectedY
|
|
12841
|
-
});
|
|
12842
|
-
const da = [];
|
|
12843
|
-
isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
|
|
12844
|
-
}
|
|
12845
|
-
return !1;
|
|
12825
|
+
return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke())), !1;
|
|
12846
12826
|
}
|
|
12847
12827
|
drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
|
|
12848
12828
|
var _a;
|
|
@@ -12874,7 +12854,8 @@
|
|
|
12874
12854
|
segments: segments,
|
|
12875
12855
|
points: points,
|
|
12876
12856
|
closePath: closePath,
|
|
12877
|
-
curveTension = lineAttribute.curveTension
|
|
12857
|
+
curveTension = lineAttribute.curveTension,
|
|
12858
|
+
connectedType = lineAttribute.connectedType
|
|
12878
12859
|
} = line.attribute;
|
|
12879
12860
|
if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
|
|
12880
12861
|
let {
|
|
@@ -12886,6 +12867,9 @@
|
|
|
12886
12867
|
clipRangeByDimension = lineAttribute.clipRangeByDimension
|
|
12887
12868
|
} = line.attribute;
|
|
12888
12869
|
if (1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearLineHighPerformance(line, context, !!fill, !!stroke, fillOpacity, strokeOpacity, x, y, lineAttribute, drawContext, params, fillCb, strokeCb);
|
|
12870
|
+
function parsePoint(points, connectedType) {
|
|
12871
|
+
return "none" === connectedType ? points : points.filter(p => !1 !== p.defined);
|
|
12872
|
+
}
|
|
12889
12873
|
if (line.shouldUpdateShape()) {
|
|
12890
12874
|
const {
|
|
12891
12875
|
points: points,
|
|
@@ -12907,7 +12891,7 @@
|
|
|
12907
12891
|
y: lastSeg.endY,
|
|
12908
12892
|
defined: lastSeg.curves[lastSeg.curves.length - 1].defined
|
|
12909
12893
|
} : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
|
|
12910
|
-
const data = calcLineCache(seg.points, curveType, {
|
|
12894
|
+
const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
|
|
12911
12895
|
startPoint: startPoint,
|
|
12912
12896
|
curveTension: curveTension
|
|
12913
12897
|
});
|
|
@@ -12926,7 +12910,7 @@
|
|
|
12926
12910
|
}
|
|
12927
12911
|
} else {
|
|
12928
12912
|
if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
|
|
12929
|
-
line.cache = calcLineCache(_points, curveType, {
|
|
12913
|
+
line.cache = calcLineCache(parsePoint(_points, connectedType), curveType, {
|
|
12930
12914
|
curveTension: curveTension
|
|
12931
12915
|
});
|
|
12932
12916
|
}
|
|
@@ -12958,11 +12942,6 @@
|
|
|
12958
12942
|
|
|
12959
12943
|
function drawAreaSegments(path, segPath, percent, params) {
|
|
12960
12944
|
var _a;
|
|
12961
|
-
const {
|
|
12962
|
-
drawConnect = !1,
|
|
12963
|
-
mode = "none"
|
|
12964
|
-
} = params || {};
|
|
12965
|
-
if (drawConnect && "none" === mode) return;
|
|
12966
12945
|
const {
|
|
12967
12946
|
top: top,
|
|
12968
12947
|
bottom: bottom
|
|
@@ -12972,34 +12951,11 @@
|
|
|
12972
12951
|
const topList = [],
|
|
12973
12952
|
bottomList = [];
|
|
12974
12953
|
let lastDefined = !0;
|
|
12975
|
-
|
|
12976
|
-
|
|
12977
|
-
|
|
12978
|
-
defined0 = !0;
|
|
12979
|
-
const n = top.curves.length;
|
|
12980
|
-
top.curves.forEach((curve, i) => {
|
|
12981
|
-
const bototmCurve = bottom.curves[n - i - 1];
|
|
12982
|
-
let currentTopCurve = curve,
|
|
12983
|
-
currentBottomCurve = bototmCurve;
|
|
12984
|
-
if (curve.originP1 === curve.originP2) return lastCurve = curve, void (lastBottomCurve = bototmCurve);
|
|
12985
|
-
if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (currentTopCurve = lastCurve, currentBottomCurve = lastBottomCurve), curve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
|
|
12986
|
-
const {
|
|
12987
|
-
originP1: originP1,
|
|
12988
|
-
originP2: originP2
|
|
12989
|
-
} = curve;
|
|
12990
|
-
let validTopCurve, validBottomCurve;
|
|
12991
|
-
originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = curve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
|
|
12992
|
-
}
|
|
12993
|
-
lastCurve = curve;
|
|
12994
|
-
}), drawAreaConnectBlock(path, topList, bottomList, params);
|
|
12995
|
-
} else {
|
|
12996
|
-
for (let i = 0, n = top.curves.length; i < n; i++) {
|
|
12997
|
-
const topCurve = top.curves[i];
|
|
12998
|
-
lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
|
|
12999
|
-
}
|
|
13000
|
-
drawAreaBlock(path, topList, bottomList, params);
|
|
12954
|
+
for (let i = 0, n = top.curves.length; i < n; i++) {
|
|
12955
|
+
const topCurve = top.curves[i];
|
|
12956
|
+
lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
|
|
13001
12957
|
}
|
|
13002
|
-
return;
|
|
12958
|
+
return void drawAreaBlock(path, topList, bottomList, params);
|
|
13003
12959
|
}
|
|
13004
12960
|
if (percent <= 0) return;
|
|
13005
12961
|
let {
|
|
@@ -13017,51 +12973,17 @@
|
|
|
13017
12973
|
lastDefined = !0;
|
|
13018
12974
|
const topList = [],
|
|
13019
12975
|
bottomList = [];
|
|
13020
|
-
let lastTopCurve,
|
|
13021
|
-
lastBottomCurve,
|
|
13022
|
-
defined0 = !0;
|
|
13023
12976
|
for (let i = 0, n = top.curves.length; i < n; i++) {
|
|
13024
12977
|
const topCurve = top.curves[i],
|
|
13025
12978
|
curCurveLength = topCurve.getLength(direction),
|
|
13026
12979
|
percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
|
|
13027
12980
|
if (percent < 0) break;
|
|
13028
|
-
|
|
13029
|
-
|
|
13030
|
-
|
|
13031
|
-
|
|
13032
|
-
if (topCurve.originP1 === topCurve.originP2) {
|
|
13033
|
-
lastTopCurve = topCurve, lastBottomCurve = bototmCurve;
|
|
13034
|
-
continue;
|
|
13035
|
-
}
|
|
13036
|
-
if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2 && (currentTopCurve = lastTopCurve, currentBottomCurve = lastBottomCurve), topCurve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
|
|
13037
|
-
const {
|
|
13038
|
-
originP1: originP1,
|
|
13039
|
-
originP2: originP2
|
|
13040
|
-
} = topCurve;
|
|
13041
|
-
let validTopCurve, validBottomCurve;
|
|
13042
|
-
originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = topCurve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
|
|
13043
|
-
}
|
|
13044
|
-
lastTopCurve = topCurve;
|
|
13045
|
-
} else {
|
|
13046
|
-
let tc = null,
|
|
13047
|
-
bc = null;
|
|
13048
|
-
lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
|
|
13049
|
-
}
|
|
12981
|
+
drawedLengthUntilLast += curCurveLength;
|
|
12982
|
+
let tc = null,
|
|
12983
|
+
bc = null;
|
|
12984
|
+
lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
|
|
13050
12985
|
}
|
|
13051
|
-
|
|
13052
|
-
}
|
|
13053
|
-
function drawAreaConnectBlock(path, topList, bottomList, params) {
|
|
13054
|
-
if (topList.length < 2) return;
|
|
13055
|
-
const {
|
|
13056
|
-
offsetX = 0,
|
|
13057
|
-
offsetY = 0,
|
|
13058
|
-
offsetZ = 0,
|
|
13059
|
-
mode: mode
|
|
13060
|
-
} = params || {};
|
|
13061
|
-
let curve = topList[0];
|
|
13062
|
-
path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = topList[topList.length - 1];
|
|
13063
|
-
let end = curve.p3 || curve.p1;
|
|
13064
|
-
path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), curve = bottomList[bottomList.length - 1], path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = bottomList[0], end = curve.p3 || curve.p1, path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), path.closePath();
|
|
12986
|
+
drawAreaBlock(path, topList, bottomList, params);
|
|
13065
12987
|
}
|
|
13066
12988
|
function drawAreaBlock(path, topList, bottomList, params) {
|
|
13067
12989
|
const {
|
|
@@ -13162,7 +13084,8 @@
|
|
|
13162
13084
|
fillOpacity = areaAttribute.fillOpacity,
|
|
13163
13085
|
z = areaAttribute.z,
|
|
13164
13086
|
strokeOpacity = areaAttribute.strokeOpacity,
|
|
13165
|
-
curveTension = areaAttribute.curveTension
|
|
13087
|
+
curveTension = areaAttribute.curveTension,
|
|
13088
|
+
connectedType = areaAttribute.connectedType
|
|
13166
13089
|
} = area.attribute,
|
|
13167
13090
|
data = this.valid(area, areaAttribute, fillCb, strokeCb);
|
|
13168
13091
|
if (!data) return;
|
|
@@ -13179,6 +13102,9 @@
|
|
|
13179
13102
|
let {
|
|
13180
13103
|
curveType = areaAttribute.curveType
|
|
13181
13104
|
} = area.attribute;
|
|
13105
|
+
function parsePoint(points, connectedType) {
|
|
13106
|
+
return "connect" !== connectedType ? points : points.filter(p => !1 !== p.defined);
|
|
13107
|
+
}
|
|
13182
13108
|
if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
|
|
13183
13109
|
if (area.shouldUpdateShape()) {
|
|
13184
13110
|
if (segments && segments.length) {
|
|
@@ -13192,7 +13118,7 @@
|
|
|
13192
13118
|
x: lastTopSeg.endX,
|
|
13193
13119
|
y: lastTopSeg.endY
|
|
13194
13120
|
} : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
|
|
13195
|
-
const data = calcLineCache(seg.points, curveType, {
|
|
13121
|
+
const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
|
|
13196
13122
|
startPoint: startPoint,
|
|
13197
13123
|
curveTension: curveTension
|
|
13198
13124
|
});
|
|
@@ -13215,7 +13141,7 @@
|
|
|
13215
13141
|
y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
|
|
13216
13142
|
});
|
|
13217
13143
|
}
|
|
13218
|
-
bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
|
|
13144
|
+
bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
|
|
13219
13145
|
curveTension: curveTension
|
|
13220
13146
|
}), bottomCaches.unshift(lastBottomSeg));
|
|
13221
13147
|
}
|
|
@@ -13226,11 +13152,11 @@
|
|
|
13226
13152
|
} else {
|
|
13227
13153
|
if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
|
|
13228
13154
|
{
|
|
13229
|
-
const topPoints = points,
|
|
13155
|
+
const topPoints = parsePoint(points, connectedType),
|
|
13230
13156
|
bottomPoints = [];
|
|
13231
|
-
for (let i =
|
|
13232
|
-
x: null !== (_e = points[i].x1) && void 0 !== _e ? _e :
|
|
13233
|
-
y: null !== (_f = points[i].y1) && void 0 !== _f ? _f :
|
|
13157
|
+
for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
|
|
13158
|
+
x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
|
|
13159
|
+
y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : topPoints[i].y
|
|
13234
13160
|
});
|
|
13235
13161
|
const topCache = calcLineCache(topPoints, curveType, {
|
|
13236
13162
|
curveTension: curveTension
|
|
@@ -13272,20 +13198,10 @@
|
|
|
13272
13198
|
this._draw(area, areaAttribute, !1, drawContext, params);
|
|
13273
13199
|
}
|
|
13274
13200
|
drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
|
|
13275
|
-
|
|
13276
|
-
return ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !1, fillCb, strokeCb), ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !0, fillCb, strokeCb), ret;
|
|
13201
|
+
return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
|
|
13277
13202
|
}
|
|
13278
|
-
_drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext,
|
|
13279
|
-
var _a, _b, _c, _d;
|
|
13203
|
+
_drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
|
|
13280
13204
|
if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
|
|
13281
|
-
let {
|
|
13282
|
-
connectedType: connectedType,
|
|
13283
|
-
connectedX: connectedX,
|
|
13284
|
-
connectedY: connectedY,
|
|
13285
|
-
connectedStyle: connectedStyle
|
|
13286
|
-
} = attribute;
|
|
13287
|
-
const da = [];
|
|
13288
|
-
if (connect && (isArray$1(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
|
|
13289
13205
|
context.beginPath();
|
|
13290
13206
|
const {
|
|
13291
13207
|
points: points,
|
|
@@ -13304,11 +13220,7 @@
|
|
|
13304
13220
|
offsetX: offsetX,
|
|
13305
13221
|
offsetY: offsetY,
|
|
13306
13222
|
offsetZ: offsetZ,
|
|
13307
|
-
direction: direction
|
|
13308
|
-
drawConnect: connect,
|
|
13309
|
-
mode: connectedType,
|
|
13310
|
-
zeroX: connectedX,
|
|
13311
|
-
zeroY: connectedY
|
|
13223
|
+
direction: direction
|
|
13312
13224
|
}), this.beforeRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
|
|
13313
13225
|
attribute: attribute
|
|
13314
13226
|
}), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);
|
|
@@ -13316,7 +13228,7 @@
|
|
|
13316
13228
|
x: originX = 0,
|
|
13317
13229
|
x: originY = 0
|
|
13318
13230
|
} = attribute;
|
|
13319
|
-
return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area,
|
|
13231
|
+
return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
|
|
13320
13232
|
attribute: attribute
|
|
13321
13233
|
}), (() => {
|
|
13322
13234
|
if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
|
|
@@ -13326,12 +13238,8 @@
|
|
|
13326
13238
|
isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === exports.Direction.ROW ? "x" : "y", {
|
|
13327
13239
|
offsetX: offsetX,
|
|
13328
13240
|
offsetY: offsetY,
|
|
13329
|
-
offsetZ: offsetZ
|
|
13330
|
-
|
|
13331
|
-
mode: connectedType,
|
|
13332
|
-
zeroX: connectedX,
|
|
13333
|
-
zeroY: connectedY
|
|
13334
|
-
})), context.setStrokeStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.stroke();
|
|
13241
|
+
offsetZ: offsetZ
|
|
13242
|
+
})), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
|
|
13335
13243
|
}
|
|
13336
13244
|
})(), !1;
|
|
13337
13245
|
}
|
|
@@ -15898,7 +15806,7 @@
|
|
|
15898
15806
|
} = attribute,
|
|
15899
15807
|
b = aabbBounds;
|
|
15900
15808
|
return points.forEach(p => {
|
|
15901
|
-
!1 === p.defined && "
|
|
15809
|
+
!1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
|
|
15902
15810
|
}), b;
|
|
15903
15811
|
}
|
|
15904
15812
|
updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
|
|
@@ -15909,7 +15817,7 @@
|
|
|
15909
15817
|
b = aabbBounds;
|
|
15910
15818
|
return segments.forEach(s => {
|
|
15911
15819
|
s.points.forEach(p => {
|
|
15912
|
-
!1 === p.defined && "
|
|
15820
|
+
!1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
|
|
15913
15821
|
});
|
|
15914
15822
|
}), b;
|
|
15915
15823
|
}
|
|
@@ -28638,7 +28546,7 @@
|
|
|
28638
28546
|
|
|
28639
28547
|
const roughModule = _roughModule;
|
|
28640
28548
|
|
|
28641
|
-
const version = "0.20.
|
|
28549
|
+
const version = "0.20.23";
|
|
28642
28550
|
preLoadAllModule();
|
|
28643
28551
|
if (isBrowserEnv()) {
|
|
28644
28552
|
loadBrowserEnv(container);
|