@easyv/charts 1.8.17 → 1.8.19

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/lib/components/PieChart.js

@@ -936,6 +936,7 @@ var Label = function Label(_ref10) {
     lineColor = _ref10$config.lineColor,
     distance = _ref10$config.distance,
     mode = _ref10$config.mode,
+    align = _ref10$config.align,
     show = _ref10$config.show,
     _ref10$config$transla = _ref10$config.translate,
     translateX = _ref10$config$transla.x,
@@ -946,6 +947,7 @@ var Label = function Label(_ref10) {
     maxWidth = _ref10$config$name.maxWidth,
     textOverflow = _ref10$config$name.textOverflow,
     speed = _ref10$config$name.speed,
+    NameTranslate = _ref10$config$name.translate,
     _ref10$config$value = _ref10$config.value,
     showValue = _ref10$config$value.show,
     valueFont = _ref10$config$value.font,
@@ -957,11 +959,13 @@ var Label = function Label(_ref10) {
     _ref10$config$value$s2 = _ref10$config$value$s.translate,
     suffixTranslateX = _ref10$config$value$s2.x,
     suffixTranslateY = _ref10$config$value$s2.y,
+    ValueTranslate = _ref10$config$value.translate,
     _ref10$config$percent = _ref10$config.percent,
     showPercent = _ref10$config$percent.show,
     percentSameColor = _ref10$config$percent.sameColor,
     percentFont = _ref10$config$percent.font,
     precision = _ref10$config$percent.precision,
+    PercentTranslate = _ref10$config$percent.translate,
     _ref10$iosStyle = _ref10.iosStyle,
     isIOS = _ref10$iosStyle.isIOS,
     left = _ref10$iosStyle.left,
@@ -1039,7 +1043,7 @@ var Label = function Label(_ref10) {
         width: "max-content",
         display: "flex",
         flexDirection: mode == "horizontal" ? "row" : "column",
-        alignItems: "center",
+        alignItems: align == "left" ? "flex-start" : align == "center" ? "center" : "flex-end",
         justifyContent: "center"
       }
     }, _showName && /*#__PURE__*/_react["default"].createElement(_.TextOverflow, {
@@ -1049,11 +1053,13 @@ var Label = function Label(_ref10) {
       style: _objectSpread(_objectSpread({
         maxWidth: maxWidth
       }, nameStyle), {}, {
-        "float": mode == "horizontal" ? "left" : "none"
+        "float": mode == "horizontal" ? "left" : "none",
+        transform: "translate(".concat(NameTranslate.x, "px, ").concat(NameTranslate.y, "px)")
       })
     }), showValue && /*#__PURE__*/_react["default"].createElement("span", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(valueFont)), {}, {
-        color: valueSameColor ? pure : valueFont.color
+        color: valueSameColor ? pure : valueFont.color,
+        transform: "translate(".concat(ValueTranslate.x, "px, ").concat(ValueTranslate.y, "px)")
       })
     }, data.y, showSuffix && /*#__PURE__*/_react["default"].createElement("span", {
       style: {
@@ -1064,7 +1070,8 @@ var Label = function Label(_ref10) {
       }
     }, text)), showPercent && /*#__PURE__*/_react["default"].createElement("span", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(percentFont)), {}, {
-        color: percentSameColor ? pure : percentFont.color
+        color: percentSameColor ? pure : percentFont.color,
+        transform: "translate(".concat(PercentTranslate.x, "px, ").concat(PercentTranslate.y, "px)")
       })
     }, (_showValue ? "（" : "") + percent + "%" + (_showValue ? "）" : "")))));
   }));

package/lib/utils/index.js

@@ -606,7 +606,6 @@ var getSeriesInfo = exports.getSeriesInfo = function getSeriesInfo(_ref19) {
   return {
     seriesWidth: _step,
     seriesStep: (1 + paddingInner) * _step,
-    // seriesStart: 0,
     seriesStart: paddingOuter * _step,
     width: step - paddingOuter * 2 * _step
   };

package/package.json

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

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,

package/src/components/PieChart.js

@@ -1103,9 +1103,10 @@ const Label = ({
     lineColor,
     distance,
     mode,
+    align,
     show,
     translate: { x: translateX, y: translateY },
-    name: { show: showName, font: nameFont, maxWidth, textOverflow, speed },
+    name: { show: showName, font: nameFont, maxWidth, textOverflow, speed,translate:NameTranslate },
     value: {
       show: showValue,
       font: valueFont,
@@ -1116,12 +1117,14 @@ const Label = ({
         fontSize: suffixFontSize,
         translate: { x: suffixTranslateX, y: suffixTranslateY },
       },
+      translate:ValueTranslate
     },
     percent: {
       show: showPercent,
       sameColor: percentSameColor,
       font: percentFont,
       precision,
+      translate:PercentTranslate
     },
   },
   iosStyle: { isIOS, left, top },
@@ -1237,7 +1240,7 @@ const Label = ({
                       width: "max-content",
                       display: "flex",
                       flexDirection: mode == "horizontal" ? "row" : "column",
-                      alignItems: "center",
+                      alignItems: align=="left"?"flex-start":align=="center"?"center":"flex-end",
                       justifyContent: "center",
                     }}
                   >
@@ -1252,6 +1255,7 @@ const Label = ({
                           maxWidth,
                           ...nameStyle,
                           float: mode == "horizontal" ? "left" : "none",
+                          transform: `translate(${NameTranslate.x}px, ${NameTranslate.y}px)`
                         }}
                       ></TextOverflow>
                     )}
@@ -1260,6 +1264,7 @@ const Label = ({
                         style={{
                           ...getFontStyle(valueFont),
                           color: valueSameColor ? pure : valueFont.color,
+                          transform: `translate(${ValueTranslate.x}px, ${ValueTranslate.y}px)`
                         }}
                       >
                         {data.y}
@@ -1282,6 +1287,7 @@ const Label = ({
                         style={{
                           ...getFontStyle(percentFont),
                           color: percentSameColor ? pure : percentFont.color,
+                          transform: `translate(${PercentTranslate.x}px, ${PercentTranslate.y}px)`,
                         }}
                       >
                         {(_showValue ? "（" : "") +

package/src/utils/index.js

@@ -585,7 +585,6 @@ const getSeriesInfo = ({
   return {
     seriesWidth: _step,
     seriesStep: (1 + paddingInner) * _step,
-    // seriesStart: 0,
     seriesStart: paddingOuter * _step,
     width: step - paddingOuter * 2 * _step,
   };