@visactor/vchart 1.5.1 → 1.5.2-alpha.0

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),
@@ -31906,11 +31906,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 +32526,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 +32688,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);
 
@@ -44813,7 +44850,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 +49469,7 @@
             }
         },
         label: {
-            space: 8
+            space: 5
         }
     };
 
@@ -58183,7 +58220,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.5.1";
+    const version = "1.5.2-alpha.0";
 
     class ChartData {
         get dataList() {
@@ -67897,7 +67934,7 @@ 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) {
+        _transformProgressAxisSpec(spec, angleAxisDefaultSpec, radiusAxisDefaultSpec, angleAxisAppendSpec, radiusAxisAppendSpec) {
             var _a;
             if (!spec.axes) {
                 spec.axes = [];
@@ -67933,6 +67970,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (isNil$1(axesPtr.angle.max)) {
                 axesPtr.angle.max = domain.max;
             }
+            if (angleAxisAppendSpec) {
+                const newSpec = mergeSpec({}, angleAxisAppendSpec, axesPtr.angle);
+                Object.assign(axesPtr.angle, newSpec);
+            }
+            if (radiusAxisAppendSpec) {
+                const newSpec = mergeSpec({}, radiusAxisAppendSpec, axesPtr.radius);
+                Object.assign(axesPtr.radius, newSpec);
+            }
         }
     }
 
@@ -68696,6 +68741,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }, {
                     orient: 'radius',
                     visible: false
+                }, {
+                    zIndex: LayoutZIndex.Region + 50
                 });
             }
             else {
@@ -68737,6 +68784,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;