@easyv/charts 1.10.23 → 1.10.25

package/lib/components/Axis.js

@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.calculateTextWidth = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../utils");
 var _context = require("../context");
@@ -193,20 +192,71 @@ var Unit = function Unit(_ref4) {
     textAnchor: textAnchor
   }, dataUnit || text);
 };
+function getLabelFormatterContext(config) {
+  var format = config.format,
+    showType = config.showType;
+  if (format && (0, _typeof2["default"])(format) === "object" && format.type != null) {
+    var _format$showType;
+    return _objectSpread(_objectSpread({}, config), {}, {
+      format: {
+        type: format.type,
+        showType: (_format$showType = format.showType) !== null && _format$showType !== void 0 ? _format$showType : showType
+      }
+    });
+  }
+  return _objectSpread(_objectSpread({}, config), {}, {
+    format: {
+      type: format,
+      showType: showType
+    }
+  });
+}
+function formatAxisLabel(label, config, formatter) {
+  return formatter(label, getLabelFormatterContext(config));
+}
+function buildUniformStepIndices(n, step) {
+  var indices = [];
+  for (var i = 0; i < n; i += step) {
+    indices.push(i);
+  }
+  return indices;
+}
+function satisfiesIndexSpacing(indices, xAt, minSpacing) {
+  for (var j = 1; j < indices.length; j++) {
+    if (xAt(indices[j]) - xAt(indices[j - 1]) < minSpacing) return false;
+  }
+  return true;
+}
+function getAdaptiveOrdinalTicks(allTicks, scaler, labelWidth, minGap) {
+  var n = allTicks.length;
+  if (!n) return [];
+  if (n === 1) return [allTicks[0]];
+  var minSpacing = labelWidth + minGap;
+  var xAt = function xAt(i) {
+    return scaler(allTicks[i]);
+  };
+
+  // 仅用相邻刻度像素间距约束，不用 floor(available/step) 限制数量：
+  // 极长标签时后者会得到 maxByWidth=1，错误地丢弃所有多刻度方案。
+  for (var step = 1; step < n; step++) {
+    var indices = buildUniformStepIndices(n, step);
+    if (satisfiesIndexSpacing(indices, xAt, minSpacing)) {
+      return indices.map(function (i) {
+        return allTicks[i];
+      });
+    }
+  }
+  if (n >= 2 && xAt(n - 1) - xAt(0) >= minSpacing) {
+    return [allTicks[0], allTicks[n - 1]];
+  }
+  return [allTicks[0]];
+}
 function maxLabelFT(data, config, formatter, font, isVertical) {
   var max = 0;
   data.length ? data.forEach(function (item) {
-    if (calculateTextWidth(formatter(item, _objectSpread(_objectSpread({}, config), {}, {
-      format: {
-        type: config.format,
-        showType: config.showType
-      }
-    })), font, isVertical) > max) max = calculateTextWidth(formatter(item, _objectSpread(_objectSpread({}, config), {}, {
-      format: {
-        type: config.format,
-        showType: config.showType
-      }
-    })), font, isVertical);
+    var formatted = formatAxisLabel(item, config, formatter);
+    var width = calculateTextWidth(formatted, font, isVertical);
+    if (width > max) max = width;
   }) : "";
   return max;
 }
@@ -245,12 +295,7 @@ var Label = function Label(_ref5) {
     textOverflow = _ref5$config$appearan2.textOverflow,
     LabelWidth = _ref5.LabelWidth;
   if (!show) return null;
-  var _label = formatter(label, _objectSpread(_objectSpread({}, config), {}, {
-    format: {
-      type: config.format,
-      showType: config.showType
-    }
-  }));
+  var _label = formatAxisLabel(label, config, formatter);
   var _getLayout = getLayout(orientation, adaptive ? 0 : rotate),
     transform = _getLayout.transform,
     directionX = _getLayout.directionX,
@@ -351,68 +396,12 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(
   var LabelWidth = 1;
   if (!label.adaptive && label.appearance) {
     LabelWidth = label.appearance.width;
-  } else {
-    if (allTicks.length && typeof allTicks[0] == "string") {
-      LabelWidth = maxLabelFT(allTicks, label, formatter, label.font, isVertical);
-    }
+  } else if (allTicks.length) {
+    LabelWidth = Math.max(maxLabelFT(allTicks, label, formatter, label.font, isVertical), 1);
   }
-  var LabelNum = !isVertical ? Math.floor(width / (isC ? cPercent : 1) * (1 - paddingOuter) / LabelWidth) : Math.floor(height / LabelWidth);
-  var ticks = !label.adaptive ? tickss : getEvenlySpacedElements(allTicks, LabelNum < allTicks.length ? LabelNum > allTicks.length / 2 ? Math.ceil(allTicks.length / 2) : LabelNum : allTicks.length, label.showLast);
+  var LABEL_MIN_GAP = 12;
+  var ticks = !label.adaptive ? tickss : getAdaptiveOrdinalTicks(allTicks, scaler, LabelWidth, LABEL_MIN_GAP);
   if (!(on && ticks.length > 0)) return null;
-
-  //数据抽取逻辑
-  function getEvenlySpacedElements(arr, expectCount) {
-    var acc = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    if (!arr.length || expectCount <= 0) return [];
-    if (expectCount >= arr.length) return (0, _toConsumableArray2["default"])(arr);
-    if (expectCount === 1) return [arr[0]];
-    if (acc) {
-      var totalLength = arr.length;
-      var result = [];
-      var bestCount = 2;
-      for (var k = expectCount; k >= 2; k--) {
-        var denominator = k - 1;
-        var numerator = totalLength - 1;
-        if (denominator > 0 && numerator % denominator === 0) {
-          bestCount = k;
-          break;
-        }
-      }
-      var step = (totalLength - 1) / (bestCount - 1);
-      for (var i = 0; i < bestCount; i++) {
-        var rawIndex = i * step;
-        var index = Math.ceil(rawIndex);
-        var safeIndex = Math.max(0, Math.min(totalLength - 1, index));
-        result.push(arr[safeIndex]);
-      }
-      if (result.length > 0) result[0] = arr[0];
-      if (result.length >= 2) result[result.length - 1] = arr[totalLength - 1];
-      return result;
-    } else {
-      // 重构acc=false逻辑：优先均匀分布，不强制首尾
-      var _result = [];
-      var arrLen = arr.length;
-      if (expectCount === 2) {
-        _result.push(arr[0]);
-        _result.push(arr[arrLen - 1]);
-        return _result;
-      }
-      var idealStep = (arrLen - 1) / (expectCount - 1);
-      var isIdealStepInteger = Math.abs(idealStep - Math.round(idealStep)) < 1e-10;
-      if (isIdealStepInteger) {
-        for (var _i = 0; _i < expectCount; _i++) {
-          var _index = _i * idealStep;
-          _result.push(arr[_index]);
-        }
-      } else {
-        var _step = Math.max(1, Math.floor(arrLen / expectCount));
-        for (var _i2 = 0; _i2 < arrLen && _result.length < expectCount; _i2 += _step) {
-          _result.push(arr[_i2]);
-        }
-      }
-      return _result;
-    }
-  }
   function drawAxisTickLine() {
     var draw = function draw(ticks, scaler) {
       return ticks.map(function (tick, index) {

package/lib/components/PieChart.js

@@ -27,8 +27,8 @@ var _excluded = ["startAngle", "endAngle", "antiClockwise"],
   _excluded2 = ["padAngle", "innerRadius", "outerRadius", "cornerRadius", "startAngle", "endAngle"],
   _excluded3 = ["formatter"],
   _excluded4 = ["startAngle", "endAngle"];
-/**
- * 饼环图
+/**
+ * 饼环图
  */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.10.23",
+  "version": "1.10.25",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -55,4 +55,4 @@
       "commit": true
     }
   }
-}
+}

package/src/components/Axis.tsx

@@ -248,6 +248,74 @@ type LabelType = {
   LabelWidth: any;
 };
 
+function getLabelFormatterContext(config: any) {
+  const { format, showType } = config;
+  if (format && typeof format === "object" && format.type != null) {
+    return {
+      ...config,
+      format: {
+        type: format.type,
+        showType: format.showType ?? showType,
+      },
+    };
+  }
+  return {
+    ...config,
+    format: { type: format, showType },
+  };
+}
+
+function formatAxisLabel(label: any, config: any, formatter: any) {
+  return formatter(label, getLabelFormatterContext(config));
+}
+
+function buildUniformStepIndices(n: number, step: number): number[] {
+  const indices: number[] = [];
+  for (let i = 0; i < n; i += step) {
+    indices.push(i);
+  }
+  return indices;
+}
+
+function satisfiesIndexSpacing(
+  indices: number[],
+  xAt: (i: number) => number,
+  minSpacing: number,
+) {
+  for (let j = 1; j < indices.length; j++) {
+    if (xAt(indices[j]) - xAt(indices[j - 1]) < minSpacing) return false;
+  }
+  return true;
+}
+
+function getAdaptiveOrdinalTicks(
+  allTicks: any[],
+  scaler: any,
+  labelWidth: number,
+  minGap: number,
+) {
+  const n = allTicks.length;
+  if (!n) return [];
+  if (n === 1) return [allTicks[0]];
+
+  const minSpacing = labelWidth + minGap;
+  const xAt = (i: number) => scaler(allTicks[i]);
+
+  // 仅用相邻刻度像素间距约束，不用 floor(available/step) 限制数量：
+  // 极长标签时后者会得到 maxByWidth=1，错误地丢弃所有多刻度方案。
+  for (let step = 1; step < n; step++) {
+    const indices = buildUniformStepIndices(n, step);
+    if (satisfiesIndexSpacing(indices, xAt, minSpacing)) {
+      return indices.map((i) => allTicks[i]);
+    }
+  }
+
+  if (n >= 2 && xAt(n - 1) - xAt(0) >= minSpacing) {
+    return [allTicks[0], allTicks[n - 1]];
+  }
+  return [allTicks[0]];
+}
+
 function maxLabelFT(
   data: any,
   config: any,
@@ -258,24 +326,9 @@ function maxLabelFT(
   let max = 0;
   data.length
     ? data.forEach((item: any) => {
-        if (
-          calculateTextWidth(
-            formatter(item, {
-              ...config,
-              format: { type: config.format, showType: config.showType },
-            }),
-            font,
-            isVertical,
-          ) > max
-        )
-          max = calculateTextWidth(
-            formatter(item, {
-              ...config,
-              format: { type: config.format, showType: config.showType },
-            }),
-            font,
-            isVertical,
-          );
+        const formatted = formatAxisLabel(item, config, formatter);
+        const width = calculateTextWidth(formatted, font, isVertical);
+        if (width > max) max = width;
       })
     : "";
   return max;
@@ -305,10 +358,7 @@ const Label: (
   LabelWidth,
 }) => {
   if (!show) return null;
-  const _label = formatter(label, {
-    ...config,
-    format: { type: config.format, showType: config.showType },
-  });
+  const _label = formatAxisLabel(label, config, formatter);
   const { transform, directionX, directionY } = getLayout(
     orientation,
     adaptive ? 0 : rotate,
@@ -420,104 +470,29 @@ export default memo(
       let LabelWidth = 1;
       if (!label.adaptive && label.appearance) {
         LabelWidth = label.appearance.width;
-      } else {
-        if (allTicks.length && typeof allTicks[0] == "string") {
-          LabelWidth = maxLabelFT(
+      } else if (allTicks.length) {
+        LabelWidth = Math.max(
+          maxLabelFT(
             allTicks,
             label,
             formatter,
             label.font,
             isVertical,
-          );
-        }
+          ),
+          1,
+        );
       }
-      const LabelNum = !isVertical
-        ? Math.floor(
-            ((width / (isC ? cPercent : 1)) * (1 - paddingOuter)) / LabelWidth,
-          )
-        : Math.floor(height / LabelWidth);
-
+      const LABEL_MIN_GAP = 12;
       const ticks: any = !label.adaptive
         ? tickss
-        : getEvenlySpacedElements(
+        : getAdaptiveOrdinalTicks(
             allTicks,
-            LabelNum < allTicks.length
-              ? LabelNum > allTicks.length / 2
-                ? Math.ceil(allTicks.length / 2)
-                : LabelNum
-              : allTicks.length,
-            label.showLast,
+            scaler,
+            LabelWidth,
+            LABEL_MIN_GAP,
           );
       if (!(on && ticks.length > 0)) return null;
 
-      //数据抽取逻辑
-      function getEvenlySpacedElements(
-        arr: any[],
-        expectCount: number,
-        acc: boolean = false,
-      ): any[] {
-        if (!arr.length || expectCount <= 0) return [];
-        if (expectCount >= arr.length) return [...arr];
-        if (expectCount === 1) return [arr[0]];
-
-        if (acc) {
-          const totalLength = arr.length;
-          const result: any[] = [];
-
-          let bestCount = 2;
-          for (let k = expectCount; k >= 2; k--) {
-            const denominator = k - 1;
-            const numerator = totalLength - 1;
-            if (denominator > 0 && numerator % denominator === 0) {
-              bestCount = k;
-              break;
-            }
-          }
-
-          const step = (totalLength - 1) / (bestCount - 1);
-          for (let i = 0; i < bestCount; i++) {
-            const rawIndex = i * step;
-            const index = Math.ceil(rawIndex);
-            const safeIndex = Math.max(0, Math.min(totalLength - 1, index));
-            result.push(arr[safeIndex]);
-          }
-
-          if (result.length > 0) result[0] = arr[0];
-          if (result.length >= 2)
-            result[result.length - 1] = arr[totalLength - 1];
-
-          return result;
-        } else {
-          // 重构acc=false逻辑：优先均匀分布，不强制首尾
-          const result: any[] = [];
-          const arrLen = arr.length;
-          if (expectCount === 2) {
-            result.push(arr[0]);
-            result.push(arr[arrLen - 1]);
-            return result;
-          }
-          const idealStep = (arrLen - 1) / (expectCount - 1);
-          const isIdealStepInteger =
-            Math.abs(idealStep - Math.round(idealStep)) < 1e-10;
-
-          if (isIdealStepInteger) {
-            for (let i = 0; i < expectCount; i++) {
-              const index = i * idealStep;
-              result.push(arr[index]);
-            }
-          } else {
-            const step = Math.max(1, Math.floor(arrLen / expectCount));
-            for (
-              let i = 0;
-              i < arrLen && result.length < expectCount;
-              i += step
-            ) {
-              result.push(arr[i]);
-            }
-          }
-          return result;
-        }
-      }
       function drawAxisTickLine() {
         const draw = (ticks: any, scaler: any) => {
           return ticks.map((tick: string, index: number) => {