@easyv/charts 1.4.17 → 1.4.19

package/.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm commitlint --edit $1
+yarn commitlint --edit $1

package/lib/components/BaseLine.js

@@ -46,10 +46,12 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       marginLeft = _ref$config$line$marg.marginLeft,
       marginRight = _ref$config$line$marg.marginRight,
       strokeDasharray = _ref$config$line.strokeDasharray,
+      yOrZ = _ref.yOrZ,
       _ref$yAxis = _ref.yAxis,
       yScaler = _ref$yAxis.scaler,
       clipValue = _ref$yAxis.clipValue,
       isClipAxis = _ref$yAxis.isClipAxis,
+      scaler = _ref.axisX.scaler,
       data = _ref.data;
 
   try {
@@ -62,7 +64,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         x1 = orientation == 'left' ? yScaler[1](data.value) : marginLeft, x2 = orientation == 'left' ? yScaler[1](data.value) : width - marginRight, y1 = orientation == 'left' ? marginLeft : yScaler[1](data.value), y2 = orientation == 'left' ? height - marginRight : yScaler[1](data.value);
       }
     } else {
-      x1 = orientation == 'left' ? yScaler(data.value) : marginLeft, x2 = orientation == 'left' ? yScaler(data.value) : width - marginRight, y1 = orientation == 'left' ? marginLeft : yScaler(data.value), y2 = orientation == 'left' ? height - marginRight : yScaler(data.value);
+      if (yOrZ == "x") {
+        x1 = orientation == 'left' ? marginLeft : scaler(data.value), x2 = orientation == 'left' ? width - marginRight : scaler(data.value), y1 = orientation == 'left' ? scaler(data.value) : marginLeft, y2 = orientation == 'left' ? scaler(data.value) : height - marginRight;
+      } else {
+        x1 = orientation == 'left' ? yScaler(data.value) : marginLeft, x2 = orientation == 'left' ? yScaler(data.value) : width - marginRight, y1 = orientation == 'left' ? marginLeft : yScaler(data.value), y2 = orientation == 'left' ? height - marginRight : yScaler(data.value);
+      }
+    } //当坐标值存在undefined时，返回null
+
+
+    if ([x1, x2, y1, y2].some(function (d) {
+      return d == undefined;
+    })) {
+      return null;
     }
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("g", {

package/lib/components/CartesianChart.js

@@ -225,7 +225,9 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       key: index,
       config: baseLineConfig[index],
       baseLineOri: baseLineOri,
+      yOrZ: yOrZ,
       yAxis: yAxis,
+      axisX: axisX,
       data: item
     });
   })), /*#__PURE__*/_react["default"].createElement(_.Legend, (0, _extends2["default"])({}, legend, {

package/lib/components/Label.js

@@ -151,6 +151,12 @@ var Label = function Label(_ref3) {
       translateX = _ref3$config$translat2 === void 0 ? 0 : _ref3$config$translat2,
       _ref3$config$translat3 = _ref3$config$translat.y,
       translateY = _ref3$config$translat3 === void 0 ? 0 : _ref3$config$translat3,
+      _ref3$config$suffix = _ref3$config.suffix,
+      content = _ref3$config$suffix.content,
+      suffixFont = _ref3$config$suffix.font,
+      _ref3$config$suffix$t = _ref3$config$suffix.translate,
+      suffixX = _ref3$config$suffix$t.x,
+      suffixY = _ref3$config$suffix$t.y,
       _ref3$textAnchor = _ref3.textAnchor,
       textAnchor = _ref3$textAnchor === void 0 ? "middle" : _ref3$textAnchor,
       _ref3$dominantBaselin = _ref3.dominantBaseline,
@@ -164,7 +170,11 @@ var Label = function Label(_ref3) {
     }),
     textAnchor: textAnchor,
     dominantBaseline: dominantBaseline
-  }, font), value);
+  }, font), /*#__PURE__*/React.createElement("tspan", null, value), /*#__PURE__*/React.createElement("tspan", {
+    dx: suffixX,
+    dy: suffixY,
+    style: _objectSpread({}, (0, _utils.getFontStyle)(suffixFont, "svg"))
+  }, content));
 };
 
 var Icon = function Icon(_ref4) {

package/package.json

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

package/src/components/Background.tsx

@@ -46,7 +46,6 @@ export default ({
         width: bandwidth,
         height: length,
       };
-
   return ticks.map((tick, index: number) => {
     return (
       <rect

package/src/components/BaseLine.js

@@ -34,11 +34,12 @@ export default memo(
         strokeDasharray,
       },
     },
-    yAxis: { scaler: yScaler,clipValue,isClipAxis },
+    yOrZ,
+    yAxis: { scaler: yScaler, clipValue, isClipAxis },
+    axisX: { scaler },
     data
   }) => {
     try{
-
       let x1,x2,y1,y2
       if (isClipAxis) {
         if (data.value > +clipValue) {
@@ -53,12 +54,22 @@ export default memo(
           y2 = orientation == 'left' ? height - marginRight : yScaler[1](data.value);
         }
       } else {
-        x1 = orientation == 'left' ? yScaler(data.value) : marginLeft,
-        x2 = orientation == 'left' ? yScaler(data.value) : width - marginRight,
-        y1 = orientation == 'left' ? marginLeft : yScaler(data.value),
-        y2 = orientation == 'left' ? height - marginRight : yScaler(data.value);
+        if(yOrZ=="x"){
+          x1 = orientation == 'left' ? marginLeft:scaler(data.value),
+          x2 = orientation == 'left' ? width - marginRight:scaler(data.value),
+          y1 = orientation == 'left' ? scaler(data.value):marginLeft ,
+          y2 = orientation == 'left' ? scaler(data.value):height - marginRight;
+        }else{
+          x1 = orientation == 'left' ? yScaler(data.value) : marginLeft,
+          x2 = orientation == 'left' ? yScaler(data.value) : width - marginRight,
+          y1 = orientation == 'left' ? marginLeft : yScaler(data.value),
+          y2 = orientation == 'left' ? height - marginRight : yScaler(data.value);
+        }
+      }
+      //当坐标值存在undefined时，返回null
+      if([x1,x2,y1,y2].some(d=>d==undefined)){
+        return null
       }
-     
       return (
         <>
           <g className='__easyv-baseLine' >

package/src/components/CartesianChart.js

@@ -218,7 +218,9 @@ const Chart = memo(
                     key={index}
                     config={baseLineConfig[index]}
                     baseLineOri={baseLineOri}
+                    yOrZ={yOrZ}
                     yAxis={yAxis}
+                    axisX={axisX}
                     data={item}
                   />
                 )

package/src/components/Label.js

@@ -2,7 +2,7 @@
  * 轴类图表标签
  */
 import { memo, useContext } from "react";
-import { getTranslate2d, getSeriesInfo } from "../utils";
+import { getTranslate2d, getSeriesInfo, getFontStyle } from "../utils";
 import { chartContext } from "../context";
 
 export default memo(
@@ -120,6 +120,9 @@ const Label = ({
   config: {
     font,
     translate: { x: translateX = 0, y: translateY = 0 },
+    suffix:{
+      content, font:suffixFont, translate:{ x:suffixX, y:suffixY }
+    }
   },
   textAnchor = "middle",
   dominantBaseline = "middle",
@@ -136,7 +139,10 @@ const Label = ({
       dominantBaseline={dominantBaseline}
       {...font}
     >
-      {value}
+      <tspan>{value}</tspan>
+      <tspan dx={suffixX} dy={suffixY} style={{
+        ...getFontStyle(suffixFont,"svg")
+      }}>{content}</tspan>
     </text>
   );
 };