@visactor/vchart 1.5.1 → 1.5.2

package/build/index.js

@@ -1226,12 +1226,12 @@
     function radianToDegree(radian) {
       return 180 * radian / Math.PI;
     }
-    const clampRadian = function () {
+    const clampRadian$1 = function () {
       let angle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       if (angle < 0) for (; angle < -tau$1;) angle += tau$1;else if (angle > 0) for (; angle > tau$1;) angle -= tau$1;
       return angle;
     };
-    const clampAngleByRadian = clampRadian;
+    const clampAngleByRadian = clampRadian$1;
     function polarToCartesian$2(center, radius, angleInRadian) {
       return {
         x: center.x + radius * Math.cos(angleInRadian),
@@ -25308,7 +25308,10 @@
           canvasControled: !1 !== params.canvasControled,
           title: params.title || "",
           canvas: params.canvas
-        }), this._viewBox = new AABBBounds(), params.viewBox ? this._viewBox.setValue(params.viewBox.x1, params.viewBox.y1, params.viewBox.x2, params.viewBox.y2) : this._viewBox.setValue(0, 0, this.width, this.height), this.state = "normal", this.renderCount = 0, this._subView = !(this._viewBox.width() === this.width && this._viewBox.height() === this.height), this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig$1.BACKGROUND, this.appendChild(this.layerService.createLayer(this, {
+        }), this._viewBox = new AABBBounds(), params.viewBox ? this._viewBox.setValue(params.viewBox.x1, params.viewBox.y1, params.viewBox.x2, params.viewBox.y2) : this._viewBox.setValue(0, 0, this.width, this.height), this.state = "normal", this.renderCount = 0, this._subView = !(this._viewBox.width() === this.width && this._viewBox.height() === this.height), this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig$1.BACKGROUND, this.appendChild(this.layerService.createLayer(this, params.canvas && isString$1(params.canvas) ? {
+          main: !0,
+          canvasId: params.canvas
+        } : {
           main: !0
         })), this.nextFrameRenderLayerSet = new Set(), this.willNextFrameRender = !1, this.stage = this, this.renderStyle = params.renderStyle, this.global.supportEvent && (this.eventSystem = new EventSystem({
           targetElement: this.window,
@@ -26639,34 +26642,10 @@
         return bounds.x1 > x || bounds.x2 < x || bounds.y1 > y || bounds.y2 < y;
     }
     function min(data, field) {
-        const initialData = field ? +data[0][field] : +data[0];
-        if (!isValidNumber$1(initialData)) {
-            warn('invalid data');
-            return 0;
-        }
-        const min = data.reduce((pre, _cur) => {
-            const cur = field ? +_cur[field] : +_cur;
-            if (isValidNumber$1(cur) && cur < pre) {
-                pre = cur;
-            }
-            return pre;
-        }, initialData);
-        return min;
+        return minInArray(data.map(d => +d[field]).filter(d => isValidNumber$1(d)));
     }
     function max(data, field) {
-        const initialData = field ? +data[0][field] : +data[0];
-        if (!isValidNumber$1(initialData)) {
-            warn('invalid data');
-            return 0;
-        }
-        const max = data.reduce((pre, _cur) => {
-            const cur = field ? +_cur[field] : +_cur;
-            if (isValidNumber$1(cur) && cur > pre) {
-                pre = cur;
-            }
-            return pre;
-        }, initialData);
-        return max;
+        return maxInArray(data.map(d => +d[field]).filter(d => isValidNumber$1(d)));
     }
     function sum(data, field) {
         return data.reduce((pre, _cur) => {
@@ -30421,7 +30400,7 @@
               x2: text.AABBBounds.x2 + dx,
               y1: text.AABBBounds.y1 + dy,
               y2: text.AABBBounds.y2 + dy
-            }, void 0, overlapPadding)) {
+            })) {
               text.setAttributes({
                 x: text.attribute.x + dx,
                 y: text.attribute.y + dy
@@ -31906,11 +31885,14 @@
           value: tickDatum.rawValue,
           index: tickDatum.index,
           layer: layer
-        })), Object.assign(Object.assign(Object.assign({}, point), {
+        })), Object.assign(Object.assign(Object.assign({}, this.getLabelPosition(point, vector, text, textStyle)), {
           text: text,
           lineHeight: null == textStyle ? void 0 : textStyle.fontSize
         }), textStyle);
       }
+      getLabelPosition(point, vector, text, style) {
+        return point;
+      }
       _transformItems(items) {
         const data = [];
         return items.forEach(item => {
@@ -32523,6 +32505,37 @@
       }
     }
 
+    const clampRadian = function () {
+      let angle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      if (angle < 0) for (; angle < 0;) angle += tau$1;else if (angle > 0) for (; angle > tau$1;) angle -= tau$1;
+      return angle;
+    };
+    function isInRange(a, min, max) {
+      return !isLess(a, min, 0, 1e-6) && !isGreater(a, max, 0, 1e-6);
+    }
+    function getLabelPosition(tickPosition, tickVector, text, style) {
+      const labelBounds = getTextBounds(Object.assign({
+          text: text
+        }, style)),
+        width = labelBounds.width(),
+        height = labelBounds.height(),
+        angle = clampRadian(Math.atan2(tickVector[1], tickVector[0])) - Math.PI,
+        PI_3_4 = 3 * Math.PI / 4,
+        PI_1_4 = Math.PI / 4,
+        PI_1_2 = Math.PI / 2,
+        baseX = tickPosition.x;
+      let dx = 0;
+      dx = isInRange(angle, -PI_3_4, -PI_1_4) ? ((angle + PI_3_4) / PI_1_2 - .5) * width : isInRange(angle, PI_1_4, PI_3_4) ? (.5 - (angle - PI_1_4) / PI_1_2) * width : Math.cos(angle) >= 0 ? .5 * width : .5 * -width;
+      const x = baseX - dx,
+        baseY = tickPosition.y;
+      let dy = 0;
+      dy = isInRange(angle, -PI_3_4, -PI_1_4) ? .5 * -height : isInRange(angle, PI_1_4, PI_3_4) ? .5 * height : Math.cos(angle) >= 0 ? (.5 - (PI_1_4 - angle) / PI_1_2) * height : (.5 - clampRadian(angle - PI_3_4) / PI_1_2) * height;
+      return {
+        x: x,
+        y: baseY - dy
+      };
+    }
+
     var __rest$3 = undefined && undefined.__rest || function (s, e) {
       var t = {};
       for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
@@ -32654,10 +32667,13 @@
       afterLabelsOverlap(labelShapes, labelData, labelContainer, layer, layerCount) {}
       getLabelAlign(vector, inside, angle) {
         return {
-          textAlign: this.getTextAlign(vector),
-          textBaseline: this.getTextBaseline(vector)
+          textAlign: "center",
+          textBaseline: "middle"
         };
       }
+      getLabelPosition(point, vector, text, style) {
+        return getLabelPosition(point, vector, text, style);
+      }
     }
     CircleAxis.defaultAttributes = DEFAULT_AXIS_THEME, mixin(CircleAxis, CircleAxisMixin);
 
@@ -34913,10 +34929,10 @@
         }));
         this._appendDataToShape(labelShape, LEGEND_ELEMENT_NAME.itemLabel, item, itemGroup, null == labelAttr ? void 0 : labelAttr.state), labelShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(labelShape);
         const labelSpace = get$1(labelAttr, "space", DEFAULT_LABEL_SPACE);
-        if (focusStartX += shapeSize / 2 + shapeSpace + labelShape.AABBBounds.width() + labelSpace, isValid$1(value)) {
+        if (isValid$1(value)) {
           const valueSpace = get$1(valueAttr, "space", focus ? DEFAULT_VALUE_SPACE : 0),
             valueShape = createText(Object.assign(Object.assign({
-              x: focusStartX + labelSpace,
+              x: 0,
               y: 0,
               textAlign: "start",
               textBaseline: "middle",
@@ -34930,13 +34946,13 @@
               labelBounds = labelShape.AABBBounds,
               valueWidth = valueBounds.width(),
               labelWidth = labelBounds.width();
-            labelWidth > layoutWidth ? (layoutWidth - valueWidth) / labelWidth > .4 ? labelShape.setAttribute("maxLineWidth", layoutWidth - valueWidth) : (valueShape.setAttribute("maxLineWidth", .5 * layoutWidth), labelShape.setAttribute("maxLineWidth", .5 * layoutWidth)) : valueShape.setAttribute("maxLineWidth", layoutWidth - labelWidth), valueAttr.alignRight && valueShape.setAttributes({
+            labelWidth > layoutWidth ? (layoutWidth - valueWidth) / labelWidth > .4 ? labelShape.setAttribute("maxLineWidth", layoutWidth - valueWidth) : (valueShape.setAttribute("maxLineWidth", .5 * layoutWidth), labelShape.setAttribute("maxLineWidth", .5 * layoutWidth)) : valueShape.setAttribute("maxLineWidth", layoutWidth - labelWidth), valueAttr.alignRight ? valueShape.setAttributes({
               textAlign: "right",
               x: this._itemWidthByUser - shapeSize / 2 - parsedPadding[1] - parsedPadding[3] - focusSpace - valueSpace
-            });
-          }
+            }) : valueShape.setAttribute("x", labelShape.AABBBounds.x2 + valueSpace);
+          } else valueShape.setAttribute("x", labelShape.AABBBounds.x2 + valueSpace);
           focusStartX = valueShape.AABBBounds.x2 + valueSpace, innerGroup.add(valueShape);
-        } else this._itemWidthByUser && labelShape.setAttribute("maxLineWidth", this._itemWidthByUser - parsedPadding[1] - parsedPadding[3] - shapeSize - shapeSpace - focusSpace);
+        } else this._itemWidthByUser ? (labelShape.setAttribute("maxLineWidth", this._itemWidthByUser - parsedPadding[1] - parsedPadding[3] - shapeSize - shapeSpace - focusSpace), focusStartX = labelShape.AABBBounds.x2 + labelSpace) : focusStartX = labelShape.AABBBounds.x2 + labelSpace;
         focusShape && (focusShape.setAttribute("x", focusStartX), innerGroup.add(focusShape));
         const innerGroupBounds = innerGroup.AABBBounds,
           innerGroupWidth = innerGroupBounds.width(),
@@ -44813,7 +44829,7 @@
           return !1 === untransformedPoint.defined && (invertedPoint.defined = !1), invertedPoint;
         }
         let theta = Math.atan(sin / cos);
-        theta += cos >= 0 ? 2 * Math.PI : Math.PI, theta >= 2 * Math.PI && (theta -= 2 * Math.PI), theta = clampRadian(theta);
+        theta += cos >= 0 ? 2 * Math.PI : Math.PI, theta >= 2 * Math.PI && (theta -= 2 * Math.PI), theta = clampRadian$1(theta);
         const radius = isNumberClose(sin, 0) ? cos / Math.cos(theta) : sin / Math.sin(theta),
           invertedPoint = this.isTransposed() ? {
             r: theta,
@@ -49432,7 +49448,7 @@
             }
         },
         label: {
-            space: 8
+            space: 5
         }
     };
 
@@ -58019,6 +58035,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             });
         }
+        exportCanvas() {
+            var _a;
+            const stage = this.getStage();
+            if (this._chart && stage) {
+                return stage.toCanvas();
+            }
+            (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError(new ReferenceError(`render is not defined`));
+            return undefined;
+        }
         getImageBuffer() {
             var _a, _b;
             if (this._option.mode !== 'node') {
@@ -58183,7 +58208,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.5.1";
+    const version = "1.5.2";
 
     class ChartData {
         get dataList() {
@@ -63599,11 +63624,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         nameToPosition(datum) {
             var _a, _b;
-            const name = this._getDatumName(datum);
+            const name = this.getDatumName(datum);
             if (isNil$1(name)) {
                 return null;
             }
-            const mapData = (_b = (_a = this.getMapViewData()) === null || _a === void 0 ? void 0 : _a.latestData) === null || _b === void 0 ? void 0 : _b.filter((data) => this._getDatumName(data) === name)[0];
+            const mapData = (_b = (_a = this.getMapViewData()) === null || _a === void 0 ? void 0 : _a.latestData) === null || _b === void 0 ? void 0 : _b.filter((data) => this.getDatumName(data) === name)[0];
             if (isNil$1(mapData)) {
                 return null;
             }
@@ -63730,9 +63755,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         constructor() {
             super(...arguments);
             this.titleValueCallback = (datum) => {
-                var _a, _b;
+                var _a;
                 const series = this.series;
-                return (_a = this._getDimensionData(datum)) !== null && _a !== void 0 ? _a : (_b = datum.properties) === null || _b === void 0 ? void 0 : _b[`${series.getNameProperty()}`];
+                return (_a = this._getDimensionData(datum)) !== null && _a !== void 0 ? _a : series.getDatumName(datum);
             };
         }
     }
@@ -64825,11 +64850,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return this._projection.invert(point);
         }
         evaluateProjection(start, size) {
-            var _a;
+            var _a, _b;
             const evaluated = this._projection.evaluate(start, size, this.collectFeatures());
             let translate = evaluated.translate();
             const scale = evaluated.scale() * ((_a = this._projectionSpec.zoom) !== null && _a !== void 0 ? _a : 1);
-            const center = this._projectionSpec.center;
+            const center = (_b = this._projectionSpec.center) !== null && _b !== void 0 ? _b : evaluated.invert([size[0] / 2, size[1] / 2]);
             center && (translate = [size[0] / 2, size[1] / 2]);
             return { translate, scale, center };
         }
@@ -64977,7 +65002,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._labelMark = labelMark;
             this.setMarkStyle(labelMark, {
                 text: (datum) => {
-                    const text = this._getDatumName(datum);
+                    const text = this.getDatumName(datum);
                     return text;
                 },
                 x: (datum) => { var _a; return (_a = this.dataToPosition(datum)) === null || _a === void 0 ? void 0 : _a.x; },
@@ -65075,7 +65100,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             return [Number.NaN, Number.NaN];
         }
-        _getDatumName(datum) {
+        getDatumName(datum) {
             var _a, _b, _c, _d;
             if (datum[this.nameField]) {
                 return datum[this.nameField];
@@ -67897,41 +67922,39 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const series = Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), { seriesField: spec.seriesField, categoryField: spec.categoryField || spec.radiusField, valueField: spec.valueField || spec.angleField, startAngle: spec.startAngle, endAngle: spec.endAngle, radius: spec.radius, innerRadius: spec.innerRadius, centerX: spec.centerX, centerY: spec.centerY });
             return series;
         }
-        _transformProgressAxisSpec(spec, angleAxisDefaultSpec, radiusAxisDefaultSpec) {
-            var _a;
+        _transformProgressAxisSpec(spec, angleAxisDefaultSpec, radiusAxisDefaultSpec, angleAxisAppendSpec, radiusAxisAppendSpec) {
+            var _a, _b;
             if (!spec.axes) {
                 spec.axes = [];
             }
-            const axesPtr = { radius: null, angle: null };
-            ((_a = spec.axes) !== null && _a !== void 0 ? _a : []).forEach((axis) => {
-                const { orient } = axis;
-                if (orient === 'radius') {
-                    axesPtr.radius = axis;
-                }
-                if (orient === 'angle') {
-                    axesPtr.angle = axis;
-                }
-            });
-            if (!axesPtr.angle) {
-                axesPtr.angle = angleAxisDefaultSpec;
-                spec.axes.push(axesPtr.angle);
+            let radiusAxis = ((_a = spec.axes) !== null && _a !== void 0 ? _a : []).find((axis) => axis.orient === 'radius');
+            let angleAxis = ((_b = spec.axes) !== null && _b !== void 0 ? _b : []).find((axis) => axis.orient === 'angle');
+            if (!angleAxis) {
+                angleAxis = angleAxisDefaultSpec;
+                spec.axes.push(angleAxis);
             }
-            if (!axesPtr.radius) {
-                axesPtr.radius = radiusAxisDefaultSpec;
-                spec.axes.push(axesPtr.radius);
+            if (!radiusAxis) {
+                radiusAxis = radiusAxisDefaultSpec;
+                spec.axes.push(radiusAxis);
             }
-            if (isNil$1(axesPtr.angle.type)) {
-                axesPtr.angle.type = 'linear';
+            if (isNil$1(angleAxis.type)) {
+                angleAxis.type = 'linear';
             }
-            if (isNil$1(axesPtr.radius.type)) {
-                axesPtr.radius.type = 'band';
+            if (isNil$1(radiusAxis.type)) {
+                radiusAxis.type = 'band';
+            }
+            const domain = getLinearAxisSpecDomain(angleAxis, { min: 0, max: 1 });
+            if (isNil$1(angleAxis.min)) {
+                angleAxis.min = domain.min;
             }
-            const domain = getLinearAxisSpecDomain(axesPtr.angle, { min: 0, max: 1 });
-            if (isNil$1(axesPtr.angle.min)) {
-                axesPtr.angle.min = domain.min;
+            if (isNil$1(angleAxis.max)) {
+                angleAxis.max = domain.max;
             }
-            if (isNil$1(axesPtr.angle.max)) {
-                axesPtr.angle.max = domain.max;
+            if (angleAxisAppendSpec) {
+                Object.assign(angleAxis, mergeSpec({}, angleAxisAppendSpec, angleAxis));
+            }
+            if (radiusAxisAppendSpec) {
+                Object.assign(radiusAxis, mergeSpec({}, radiusAxisAppendSpec, radiusAxis));
             }
         }
     }
@@ -68696,6 +68719,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }, {
                     orient: 'radius',
                     visible: false
+                }, {
+                    zIndex: LayoutZIndex.Region + 50
                 });
             }
             else {
@@ -68737,6 +68762,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (isNil$1(axesPtr.radius.type)) {
                 axesPtr.radius.type = 'linear';
             }
+            if (isNil$1(axesPtr.angle.zIndex)) {
+                axesPtr.angle.zIndex = LayoutZIndex.Region + 50;
+            }
         }
     }
     GaugeChart.type = ChartTypeEnum.gauge;
@@ -86783,6 +86811,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     size: {
                         width: this._computeWidth(),
                         height: this._computeHeight()
+                    },
+                    position: {
+                        x: this.getLayoutStartPoint().x,
+                        y: this.getLayoutStartPoint().y
                     }
                 });
             }