@visactor/vrender-components 0.15.0-alpha.15 → 0.15.0-alpha.17

package/cjs/marker/line.js

@@ -53,4 +53,4 @@ class MarkLine extends base_1.Marker {
 }
 
 exports.MarkLine = MarkLine, MarkLine.defaultAttributes = config_1.DEFAULT_MARK_LINE_THEME;
-//# sourceMappingURL=line.js.map
+//# sourceMappingURL=line.js.map

package/cjs/pager/index.js

@@ -18,4 +18,4 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./type"), exports), __exportStar(require("./pager"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/pager/pager.js

@@ -131,4 +131,4 @@ exports.Pager = Pager, Pager.defaultAttributes = {
         fontSize: 12
     }
 };
-//# sourceMappingURL=pager.js.map
+//# sourceMappingURL=pager.js.map

package/cjs/pager/type.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=type.js.map
+//# sourceMappingURL=type.js.map

package/dist/index.js

@@ -36,7 +36,7 @@
             });
         }
         setAttribute(key, value, forceUpdateTag) {
-            if (vutils.isPlainObject(this.attribute[key])) {
+            if (vutils.isPlainObject(this.attribute[key]) && !vutils.isFunction(this.attribute[key]) && !vutils.isFunction(value)) {
                 vutils.merge(this.attribute[key], value);
             }
             else {
@@ -77,7 +77,7 @@
             }
             for (let i = 0; i < keys.length; i++) {
                 const key = keys[i];
-                if (vutils.isPlainObject(this.attribute[key])) {
+                if (vutils.isPlainObject(this.attribute[key]) && !vutils.isFunction(this.attribute[key]) && !vutils.isFunction(params[key])) {
                     vutils.merge(this.attribute[key], params[key]);
                 }
                 else {
@@ -2471,7 +2471,8 @@
                     maxLineWidth: basedArc.labelLimit,
                     points: (basedArc === null || basedArc === void 0 ? void 0 : basedArc.pointA) && (basedArc === null || basedArc === void 0 ? void 0 : basedArc.pointB) && (basedArc === null || basedArc === void 0 ? void 0 : basedArc.pointC)
                         ? [basedArc.pointA, basedArc.pointB, basedArc.pointC]
-                        : undefined
+                        : undefined,
+                    line: basedArc === null || basedArc === void 0 ? void 0 : basedArc.labelLine
                 };
                 labels[i].setAttributes(labelAttribute);
             }
@@ -2633,6 +2634,7 @@
                     arc.labelVisible = false;
                 }
                 arc.angle = (_b = (_a = attribute === null || attribute === void 0 ? void 0 : attribute.textStyle) === null || _a === void 0 ? void 0 : _a.angle) !== null && _b !== void 0 ? _b : 0;
+                arc.labelLine = Object.assign({}, attribute === null || attribute === void 0 ? void 0 : attribute.line);
             });
             return arcs;
         }
@@ -2641,7 +2643,13 @@
             const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
             const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
             const plotLayout = { width: center.x * 2, height: center.y * 2 };
-            const radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height);
+            let maxRadius = 0;
+            currentMarks.forEach((currentMark) => {
+                if (currentMark.attribute.outerRadius > maxRadius) {
+                    maxRadius = currentMark.attribute.outerRadius;
+                }
+            });
+            const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const line1MinLength = attribute.line.line1MinLength;
             const line2MinLength = attribute.line.line2MinLength;
             const labelLayoutAlign = (_f = attribute.layout) === null || _f === void 0 ? void 0 : _f.align;
@@ -2872,7 +2880,13 @@
         _computePointB(arc, r, attribute, currentMarks) {
             var _a, _b, _c, _d, _e;
             const labelConfig = attribute;
-            const radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height);
+            let maxRadius = 0;
+            currentMarks.forEach((currentMark) => {
+                if (currentMark.attribute.outerRadius > maxRadius) {
+                    maxRadius = currentMark.attribute.outerRadius;
+                }
+            });
+            const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const line1MinLength = labelConfig.line.line1MinLength;
             const labelLayout = labelConfig.layout;
             if (labelLayout.strategy === 'none') {
@@ -2911,7 +2925,13 @@
             var _a, _b, _c, _d, _e;
             const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
             const plotRect = { width: center.x * 2, height: center.y * 2 };
-            const radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height);
+            let maxRadius = 0;
+            currentMarks.forEach((currentMark) => {
+                if (currentMark.attribute.outerRadius > maxRadius) {
+                    maxRadius = currentMark.attribute.outerRadius;
+                }
+            });
+            const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const line1MinLength = attribute.line.line1MinLength;
             const { width, height } = plotRect;
             const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
@@ -2978,7 +2998,13 @@
             const labelConfig = attribute;
             const layoutArcGap = labelConfig.layoutArcGap;
             const line1MinLength = labelConfig.line.line1MinLength;
-            const radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height);
+            let maxRadius = 0;
+            currentMarks.forEach((currentMark) => {
+                if (currentMark.attribute.outerRadius > maxRadius) {
+                    maxRadius = currentMark.attribute.outerRadius;
+                }
+            });
+            const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const centerOffset = (_a = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _a !== void 0 ? _a : 0;
             const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset);
             const outerR = radius + line1MinLength;
@@ -3047,13 +3073,13 @@
             }
         }
         _labelLine(text) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             const labelLine = ((_a = text.attribute) === null || _a === void 0 ? void 0 : _a.points)
                 ? vrender.createLine({
-                    visible: (_c = (_b = text.attribute) === null || _b === void 0 ? void 0 : _b.visible) !== null && _c !== void 0 ? _c : true,
-                    stroke: (_f = (_e = (_d = text.attribute) === null || _d === void 0 ? void 0 : _d.line) === null || _e === void 0 ? void 0 : _e.stroke) !== null && _f !== void 0 ? _f : (_g = text.attribute) === null || _g === void 0 ? void 0 : _g.fill,
-                    lineWidth: (_k = (_j = (_h = text.attribute) === null || _h === void 0 ? void 0 : _h.line) === null || _j === void 0 ? void 0 : _j.lineWidth) !== null && _k !== void 0 ? _k : 1,
-                    points: (_l = text.attribute) === null || _l === void 0 ? void 0 : _l.points
+                    visible: (_g = (_e = (((_c = (_b = text.attribute) === null || _b === void 0 ? void 0 : _b.line) === null || _c === void 0 ? void 0 : _c.visible) && ((_d = text.attribute) === null || _d === void 0 ? void 0 : _d.visible))) !== null && _e !== void 0 ? _e : (_f = text.attribute) === null || _f === void 0 ? void 0 : _f.visible) !== null && _g !== void 0 ? _g : true,
+                    stroke: (_k = (_j = (_h = text.attribute) === null || _h === void 0 ? void 0 : _h.line) === null || _j === void 0 ? void 0 : _j.stroke) !== null && _k !== void 0 ? _k : (_l = text.attribute) === null || _l === void 0 ? void 0 : _l.fill,
+                    lineWidth: (_p = (_o = (_m = text.attribute) === null || _m === void 0 ? void 0 : _m.line) === null || _o === void 0 ? void 0 : _o.lineWidth) !== null && _p !== void 0 ? _p : 1,
+                    points: (_q = text.attribute) === null || _q === void 0 ? void 0 : _q.points
                 })
                 : undefined;
             return labelLine;
@@ -10331,7 +10357,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.15.0-alpha.15";
+    const version = "0.15.0-alpha.17";
 
     exports.AbstractComponent = AbstractComponent;
     exports.ArcInfo = ArcInfo;