@easyv/charts 1.8.2 → 1.8.4

package/lib/components/Band.js

@@ -92,6 +92,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     _ref3$isControlChart = _ref3.isControlChart,
     isControlChart = _ref3$isControlChart === void 0 ? false : _ref3$isControlChart,
     setCtlTip = _ref3.setCtlTip,
+    isXRepeat = _ref3.isXRepeat,
     _ref3$config = _ref3.config,
     _ref3$config$pattern = _ref3$config.pattern,
     pattern = _ref3$config$pattern === void 0 ? {} : _ref3$config$pattern,
@@ -197,7 +198,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       borderWidth = _ref6$borderWidth === void 0 ? 0 : _ref6$borderWidth;
     var borderStr = "".concat(pure, " solid ").concat(borderWidth, "px");
     var borderImageSource = (0, _utils.getMultiColorStr)(linear);
-    var positionX = _data.length == 1 ? xScaler(x) - seriesStart / 2 : xScaler(x) - step / 2 + seriesStart + index * seriesStep;
+    var positionX = isXRepeat ? xScaler(x) - step / 2 + seriesStart + index * seriesStep : xScaler(x) - seriesStart / 2;
     var showHead, headType, headUrl, headVideo, headWidth, headHeight, headTranslate;
     if (headDecorate) {
       showHead = headDecorate.show, headType = headDecorate.type, headUrl = headDecorate.url, headVideo = headDecorate.video, headWidth = headDecorate.size.width, headHeight = headDecorate.size.height, headTranslate = headDecorate.translate;

package/lib/components/CartesianChart.js

@@ -19,6 +19,9 @@ var _excluded = ["Component", "yOrZ"],
   _excluded2 = ["Component", "yOrZ"];
 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; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
  * 轴类图表
@@ -426,6 +429,30 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   });
   var bodyWidth = isVertical ? xLineRange + 100 + marginRight + marginLeft : xLineRange,
     bodyHeight = isVertical ? yLineRange : yLineRange + marginTop + marginBottom;
+  var hasDuplicateX = function hasDuplicateX(data) {
+    var xValues = new Set(); // 用Set存储已出现的x值，自动去重
+    var _iterator = _createForOfIteratorHelper(data),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        // 跳过空数据项（如示例中第三个data为空的对象）
+        if (!item.data || !item.data.length) continue;
+        // 获取当前项的x值（从嵌套结构中提取）
+        var x = item.data[0].data.x;
+        // 若x已存在于Set中，说明有重复，直接返回true
+        if (xValues.has(x)) return true;
+        // 否则将x存入Set
+        xValues.add(x);
+      }
+      // 遍历完所有项都无重复，返回false
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return false;
+  };
   (0, _react.useEffect)(function () {
     setCtlTip(function (pre) {
       return {
@@ -549,6 +576,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       yOrZ = _ref2.yOrZ,
       config = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
     var yAxis = axes.get(yOrZ);
+    var isXRepeat = hasDuplicateX(series); //x项有重复项判断
     return yAxis && Component && /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
       key: index
     }, config, {
@@ -563,7 +591,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       isControlChart: !!control,
       indicatorWidth: indicatorWidth,
       triggerClick: onInteraction,
-      setCtlTip: setCtlTip
+      setCtlTip: setCtlTip,
+      isXRepeat: isXRepeat
     }));
   }), series.map(function (_ref3, index) {
     var Component = _ref3.Component,

package/lib/utils/index.js

@@ -100,20 +100,22 @@ var getColorList = exports.getColorList = function getColorList(_ref3) {
   });
 };
 var getMultiColorStr = exports.getMultiColorStr = function getMultiColorStr(colors) {
-  var stops = colors.stops,
-    angle = colors.angle;
-  var result = 'linear-gradient(' + angle + 'deg, ';
-  var stops_ = JSON.parse(JSON.stringify(stops));
-  stops_.sort(function (a, b) {
-    return a.offset - b.offset;
-  });
-  for (var i = 0; i < stops_.length; i++) {
-    var _stops_$i = stops_[i],
-      color = _stops_$i.color,
-      offset = _stops_$i.offset;
-    result += "".concat(color, " ").concat(offset, "%,");
+  if (colors) {
+    var stops = colors.stops,
+      angle = colors.angle;
+    var result = 'linear-gradient(' + angle + 'deg, ';
+    var stops_ = JSON.parse(JSON.stringify(stops));
+    stops_.sort(function (a, b) {
+      return a.offset - b.offset;
+    });
+    for (var i = 0; i < stops_.length; i++) {
+      var _stops_$i = stops_[i],
+        color = _stops_$i.color,
+        offset = _stops_$i.offset;
+      result += "".concat(color, " ").concat(offset, "%,");
+    }
+    return result.slice(0, -1) + ")";
   }
-  return result.slice(0, -1) + ")";
 };
 var getIcon = exports.getIcon = function getIcon(type, icon) {
   var lineType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "solid";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/Band.tsx

@@ -87,6 +87,7 @@ export default memo(
     indicatorWidth,
     isControlChart = false,
     setCtlTip,
+    isXRepeat,
     config: {
       pattern = {},
       seriesIntervalWidth: paddingInner = 0,
@@ -164,8 +165,7 @@ export default memo(
             }, borderWidth=0 } = border || {};
             const borderStr = `${pure} solid ${borderWidth}px`;
             const borderImageSource = getMultiColorStr(linear);
-            const positionX =_data.length==1? xScaler(x) -seriesStart/2 :xScaler(x) - step / 2 + seriesStart + index * seriesStep;
-            
+            const positionX =isXRepeat? xScaler(x) - step / 2 + seriesStart + index * seriesStep: xScaler(x) -seriesStart/2;
             let showHead, headType, headUrl, headVideo, headWidth, headHeight, headTranslate;
             if (headDecorate) {
               (showHead = headDecorate.show),

package/src/components/CartesianChart.js

@@ -399,7 +399,21 @@ const Chart = memo(
     const controlChartTooltipData = ctlXName && originData.filter((d) => d.x === ctlXName);
     const bodyWidth = isVertical?xLineRange + 100 + marginRight + marginLeft:xLineRange,
       bodyHeight = isVertical?yLineRange:yLineRange + marginTop + marginBottom;
-
+      const hasDuplicateX = (data) => {
+        const xValues = new Set(); // 用Set存储已出现的x值，自动去重
+        for (const item of data) {
+          // 跳过空数据项（如示例中第三个data为空的对象）
+          if (!item.data || !item.data.length) continue;
+          // 获取当前项的x值（从嵌套结构中提取）
+          const x = item.data[0].data.x;
+          // 若x已存在于Set中，说明有重复，直接返回true
+          if (xValues.has(x)) return true;
+          // 否则将x存入Set
+          xValues.add(x);
+        }
+        // 遍历完所有项都无重复，返回false
+        return false;
+      };
     useEffect(()=>{
       setCtlTip(pre=>{
         return {
@@ -534,6 +548,7 @@ const Chart = memo(
               {/**绘制图表主体 */}
               {series.map(({ Component, yOrZ, ...config }, index) => {
                 const yAxis = axes.get(yOrZ);
+                const isXRepeat=hasDuplicateX(series);//x项有重复项判断
                 return (
                   yAxis &&
                   Component && (
@@ -551,6 +566,7 @@ const Chart = memo(
                       indicatorWidth={indicatorWidth}
                       triggerClick={onInteraction}
                       setCtlTip={setCtlTip}
+                      isXRepeat={isXRepeat}
                     />
                   )
                 );

package/src/utils/index.js

@@ -77,15 +77,17 @@ const getColorList = ({ type, pure, linear: { stops, angle, opacity } }) => {
   return stops.map(({ color, offset }) => ({ color, offset: offset / 100 }));
 };
 const getMultiColorStr = (colors)=>{
-  const { stops, angle } = colors;
-  let result = 'linear-gradient(' + angle + 'deg, ';
-  const stops_ = JSON.parse(JSON.stringify(stops));
-  stops_.sort((a,b)=>a.offset-b.offset);
-  for(let i=0;i<stops_.length;i++){
-    const { color, offset } = stops_[i];
-    result += `${color} ${offset}%,`;
+  if(colors){
+    const { stops, angle } = colors;
+    let result = 'linear-gradient(' + angle + 'deg, ';
+    const stops_ = JSON.parse(JSON.stringify(stops));
+    stops_.sort((a,b)=>a.offset-b.offset);
+    for(let i=0;i<stops_.length;i++){
+      const { color, offset } = stops_[i];
+      result += `${color} ${offset}%,`;
+    }
+    return result.slice(0,-1)+")";
   }
-  return result.slice(0,-1)+")";
 }
 const getIcon = (type, icon, lineType="solid") => {
   switch (type) {