@visactor/vrender 0.14.7 → 0.14.8

package/dist/index.js

@@ -9210,6 +9210,7 @@
 	    angle: 0,
 	    alpha: 0,
 	    beta: 0,
+	    scaleCenter: [0, 0],
 	    anchor: [0, 0],
 	    anchor3d: [0, 0],
 	    postMatrix: new Matrix()
@@ -9274,7 +9275,7 @@
 	const DefaultCircleAttribute = Object.assign(Object.assign({}, DefaultAttribute), { radius: 1, startAngle: 0, endAngle: pi2 });
 	const DefaultGroupAttribute = Object.assign(Object.assign({}, DefaultAttribute), { width: 0, height: 0, cornerRadius: 0, path: [], clip: false, visibleAll: true, display: 'relative', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'flex-start', alignItems: 'flex-start', alignContent: 'flex-start' });
 	const DefaultGlyphAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: '', width: 0, height: 0, cornerRadius: 0, clip: false });
-	const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default' });
+	const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default', closePath: false });
 	const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: new CustomPath2D(), customPath: () => {
 	        console.warn('空函数');
 	    } });
@@ -17566,7 +17567,7 @@
 	        this._updateTag &= exports.UpdateTag.CLEAR_GLOBAL_MATRIX;
 	    }
 	    doUpdateLocalMatrix() {
-	        const { x = DefaultTransform.x, y = DefaultTransform.y, scaleX = DefaultTransform.scaleX, scaleY = DefaultTransform.scaleY, angle = DefaultTransform.angle, anchor, postMatrix } = this.attribute;
+	        const { x = DefaultTransform.x, y = DefaultTransform.y, scaleX = DefaultTransform.scaleX, scaleY = DefaultTransform.scaleY, angle = DefaultTransform.angle, scaleCenter, anchor, postMatrix } = this.attribute;
 	        const _anchor = [0, 0];
 	        if (anchor) {
 	            if (typeof anchor[0] === 'string') {
@@ -17586,7 +17587,18 @@
 	                _anchor[1] = anchor[1];
 	            }
 	        }
-	        normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);
+	        if (scaleCenter && (scaleX !== 1 || scaleY !== 1)) {
+	            const m = this._transMatrix;
+	            m.reset();
+	            m.translate(_anchor[0], _anchor[1]);
+	            m.rotate(angle);
+	            m.translate(-_anchor[0], -_anchor[1]);
+	            m.translate(x, y);
+	            application.transformUtil.fromMatrix(m, m).scale(scaleX, scaleY, { x: scaleCenter[0], y: scaleCenter[1] });
+	        }
+	        else {
+	            normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);
+	        }
 	        const p = this.getOffsetXY(DefaultTransform);
 	        this._transMatrix.e += p.x;
 	        this._transMatrix.f += p.y;
@@ -24786,12 +24798,28 @@
 	            return;
 	        }
 	        if (line.shouldUpdateShape()) {
-	            const { points, segments, curveType = lineAttribute.curveType } = line.attribute;
+	            const { points, segments, closePath } = line.attribute;
+	            let { curveType = lineAttribute.curveType } = line.attribute;
+	            if (closePath && curveType === 'linear') {
+	                curveType = 'linearClosed';
+	            }
 	            const _points = points;
 	            if (segments && segments.length) {
 	                let startPoint;
 	                let lastSeg;
-	                line.cache = segments.map((seg, index) => {
+	                line.cache = segments
+	                    .map((seg, index) => {
+	                    if (seg.points.length <= 1) {
+	                        if (index === 0) {
+	                            seg.points[0] &&
+	                                (lastSeg = {
+	                                    endX: seg.points[0].x,
+	                                    endY: seg.points[0].y,
+	                                    curves: [{ defined: seg.points[0].defined !== false }]
+	                                });
+	                            return null;
+	                        }
+	                    }
 	                    if (index === 1) {
 	                        startPoint = {
 	                            x: lastSeg.endX,
@@ -24804,11 +24832,29 @@
 	                        startPoint.y = lastSeg.endY;
 	                        startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;
 	                    }
-	                    lastSeg = calcLineCache$1(seg.points, curveType, {
+	                    const data = calcLineCache$1(seg.points, curveType, {
 	                        startPoint
 	                    });
-	                    return lastSeg;
-	                });
+	                    lastSeg = data;
+	                    return data;
+	                })
+	                    .filter(item => !!item);
+	                if (curveType === 'linearClosed') {
+	                    let startP;
+	                    for (let i = 0; i < line.cache.length; i++) {
+	                        const cacheItem = line.cache[i];
+	                        for (let i = 0; i < cacheItem.curves.length; i++) {
+	                            if (cacheItem.curves[i].defined) {
+	                                startP = cacheItem.curves[i].p0;
+	                                break;
+	                            }
+	                        }
+	                        if (startP) {
+	                            break;
+	                        }
+	                    }
+	                    line.cache[line.cache.length - 1] && line.cache[line.cache.length - 1].lineTo(startP.x, startP.y, true);
+	                }
 	            }
 	            else if (points && points.length) {
 	                line.cache = calcLineCache$1(_points, curveType);
@@ -24822,13 +24868,17 @@
 	        }
 	        const { clipRange = lineAttribute.clipRange, clipRangeByDimension = lineAttribute.clipRangeByDimension } = line.attribute;
 	        if (Array.isArray(line.cache)) {
+	            const segments = line.attribute.segments.filter(item => item.points.length);
+	            if (segments[0].points.length === 1) {
+	                segments.shift();
+	            }
 	            if (clipRange === 1) {
 	                let skip = false;
 	                line.cache.forEach((cache, index) => {
 	                    if (skip) {
 	                        return;
 	                    }
-	                    skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute.segments[index], [lineAttribute, line.attribute], clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb);
+	                    skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, segments[index], [lineAttribute, line.attribute], clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb);
 	                });
 	            }
 	            else {
@@ -24844,7 +24894,7 @@
 	                    const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
 	                    drawedLengthUntilLast += curSegLength;
 	                    if (_cr > 0) {
-	                        skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute.segments[index], [lineAttribute, line.attribute], min(_cr, 1), clipRangeByDimension, x, y, line, fillCb, strokeCb);
+	                        skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, segments[index], [lineAttribute, line.attribute], min(_cr, 1), clipRangeByDimension, x, y, line, fillCb, strokeCb);
 	                    }
 	                });
 	            }
@@ -25213,7 +25263,14 @@
 	            if (segments && segments.length) {
 	                let startPoint;
 	                let lastTopSeg;
-	                const topCaches = segments.map((seg, index) => {
+	                const topCaches = segments
+	                    .map((seg, index) => {
+	                    if (seg.points.length <= 1) {
+	                        if (index === 0) {
+	                            seg.points[0] && (lastTopSeg = { endX: seg.points[0].x, endY: seg.points[0].y });
+	                            return null;
+	                        }
+	                    }
 	                    if (index === 1) {
 	                        startPoint = { x: lastTopSeg.endX, y: lastTopSeg.endY };
 	                    }
@@ -25221,11 +25278,13 @@
 	                        startPoint.x = lastTopSeg.endX;
 	                        startPoint.y = lastTopSeg.endY;
 	                    }
-	                    lastTopSeg = calcLineCache(seg.points, curveType, {
+	                    const data = calcLineCache(seg.points, curveType, {
 	                        startPoint
 	                    });
-	                    return lastTopSeg;
-	                });
+	                    lastTopSeg = data;
+	                    return data;
+	                })
+	                    .filter(item => !!item);
 	                let lastBottomSeg;
 	                const bottomCaches = [];
 	                for (let i = segments.length - 1; i >= 0; i--) {
@@ -25275,13 +25334,17 @@
 	            area.clearUpdateShapeTag();
 	        }
 	        if (Array.isArray(area.cacheArea)) {
+	            const segments = area.attribute.segments.filter(item => item.points.length);
+	            if (segments[0].points.length === 1) {
+	                segments.shift();
+	            }
 	            if (clipRange === 1) {
 	                let skip = false;
 	                area.cacheArea.forEach((cache, index) => {
 	                    if (skip) {
 	                        return;
 	                    }
-	                    skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute.segments[index], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb);
+	                    skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb);
 	                });
 	            }
 	            else {
@@ -25297,7 +25360,7 @@
 	                    const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
 	                    drawedLengthUntilLast += curSegLength;
 	                    if (_cr > 0) {
-	                        skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute.segments[index], [areaAttribute, area.attribute], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb);
+	                        skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb);
 	                    }
 	                });
 	            }
@@ -36975,7 +37038,7 @@
 	    'rect'
 	];
 
-	const version = "0.14.7";
+	const version = "0.14.8";
 
 	exports.ACustomAnimate = ACustomAnimate;
 	exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;