@easyv/charts 1.8.16 → 1.8.18

package/lib/components/Band.js

@@ -203,7 +203,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 = isXRepeat ? xScaler(x) - step / 2 + seriesStart + index * seriesStep : xScaler(x) - seriesStart / 2;
+    var positionX = isXRepeat ? xScaler(x) - step / 2 + seriesStart + index * seriesStep : xScaler(x) - seriesWidth / 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

@@ -430,22 +430,33 @@ 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 xValues = new Set();
     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);
+
+        // 关键修改：遍历当前item.data的所有项（不再只取第1项）
+        var _iterator2 = _createForOfIteratorHelper(item.data),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var subItem = _step2.value;
+            // 确保subItem有data和x属性（兜底防错）
+            if (!subItem.data || subItem.data.x === undefined) continue;
+            var x = subItem.data.x;
+            if (xValues.has(x)) return true; // 任意x重复就返回true
+            xValues.add(x);
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
       }
-      // 遍历完所有项都无重复，返回false
     } catch (err) {
       _iterator.e(err);
     } finally {
@@ -599,7 +610,9 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       yOrZ = _ref3.yOrZ,
       config = (0, _objectWithoutProperties2["default"])(_ref3, _excluded2);
     var yAxis = axes.get(yOrZ);
+    var isXRepeat = hasDuplicateX(series); //x项有重复项判断
     return yAxis && /*#__PURE__*/_react["default"].createElement(_.Label, (0, _extends2["default"])({
+      isXRepeat: isXRepeat,
       key: index
     }, config, {
       curXLabel: curXLabel,

package/lib/components/Label.js

@@ -44,7 +44,8 @@ var getHighlightData = function getHighlightData(data, extent) {
   }
 };
 var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref) {
-  var _ref$config = _ref.config,
+  var isXRepeat = _ref.isXRepeat,
+    _ref$config = _ref.config,
     _ref$config$seriesInt = _ref$config.seriesIntervalWidth,
     paddingInner = _ref$config$seriesInt === void 0 ? 0 : _ref$config$seriesInt,
     _ref$config$paddingIn = _ref$config.paddingInner,
@@ -155,7 +156,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     // const y2 =  yScaler(isVertical ? start : end);
     var positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
     if (isNaN(positionX)) return null;
-    var position = positionX + (config.line ? step : seriesWidth) / 2;
+    var position = isXRepeat ? positionX + (config.line ? step : seriesWidth) / 2 : xScaler(x);
     var labelPosition = isVertical ? getVerticalLabel({
       position: _position,
       y: y,

package/package.json

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

package/src/components/Band.tsx

@@ -169,7 +169,7 @@ export default memo(
             }, borderWidth=0 } = border || {};
             const borderStr = `${pure} solid ${borderWidth}px`;
             const borderImageSource = getMultiColorStr(linear);
-            const positionX =isXRepeat? xScaler(x) - step / 2 + seriesStart + index * seriesStep: xScaler(x) -seriesStart/2;
+            const positionX =isXRepeat? xScaler(x) - step / 2 + seriesStart + index * seriesStep: xScaler(x) -seriesWidth/2;
             let showHead, headType, headUrl, headVideo, headWidth, headHeight, headTranslate;
             if (headDecorate) {
               (showHead = headDecorate.show),

package/src/components/CartesianChart.js

@@ -400,21 +400,23 @@ const Chart = memo(
     const bodyWidth = isVertical?xLineRange + 100 + marginRight + marginLeft:xLineRange,
       bodyHeight = isVertical?yLineRange:yLineRange + marginTop + marginBottom;
       const hasDuplicateX = (data) => {
-        const xValues = new Set(); // 用Set存储已出现的x值，自动去重
+        const xValues = new Set(); 
         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);
+          
+          // 关键修改：遍历当前item.data的所有项（不再只取第1项）
+          for (const subItem of item.data) { 
+            // 确保subItem有data和x属性（兜底防错）
+            if (!subItem.data || subItem.data.x === undefined) continue;
+            const x = subItem.data.x;
+            if (xValues.has(x)) return true; // 任意x重复就返回true
+            xValues.add(x);
+          }
         }
-        // 遍历完所有项都无重复，返回false
         return false;
       };
-    useEffect(()=>{
+      useEffect(()=>{
       setCtlTip(pre=>{
         return {
           show:!!tickName, x:tooltipX, xName:tickName,
@@ -574,9 +576,11 @@ const Chart = memo(
               {/* 图表数值标签 */}
               {series.map(({ Component, yOrZ, ...config }, index) => {
                 const yAxis = axes.get(yOrZ);
+                const isXRepeat=hasDuplicateX(series);//x项有重复项判断
                 return (
                   yAxis && (
                     <Label
+                    isXRepeat={isXRepeat}
                       key={index}
                       {...config}
                       curXLabel={curXLabel}

package/src/components/Label.js

@@ -27,6 +27,7 @@ const getHighlightData = (data, extent) => {
 
 export default memo(
   ({
+    isXRepeat,
     config: {
       seriesIntervalWidth: paddingInner = 0,
       paddingInner: paddingOuter = 0,
@@ -107,7 +108,7 @@ export default memo(
               xScaler(x) - step / 2 + seriesStart + index * seriesStep;
 
             if (isNaN(positionX)) return null;
-            const position = positionX + (config.line ? step : seriesWidth) / 2;
+            const position =isXRepeat?positionX + (config.line ? step : seriesWidth) / 2: xScaler(x);
             const labelPosition = isVertical
               ? getVerticalLabel({
                   position: _position,