@easyv/charts 1.8.25 → 1.8.27

package/lib/components/Band.js

@@ -243,10 +243,10 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       }
     }, bgAttr, {
       onClick: function onClick(e) {
-        return triggerEvents(e, "setCurrent");
+        return triggerEvents ? triggerEvents(e, "setCurrent") : "";
       },
       onMouseMove: function onMouseMove(e) {
-        return triggerEvents(e, "mouseenter");
+        return triggerEvents ? triggerEvents(e, "mouseenter") : "";
       },
       onMouseEnter: function onMouseEnter() {
         if (isControlChart) {
@@ -269,7 +269,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         }
       },
       onMouseLeave: function onMouseLeave(e) {
-        triggerEvents(e, "mouseleave");
+        triggerEvents ? triggerEvents(e, "mouseleave") : "";
         if (isControlChart && !auto) {
           setCtlTip(function (pre) {
             return {

package/lib/components/CartesianChart.js

@@ -638,7 +638,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       bandLength: bandLength,
       xAxis: axisX,
       yAxis: yAxis,
-      triggerEvents: onInteraction
+      triggerEvents: onInteraction,
+      isControlChart: !!control
     }));
   }), /*#__PURE__*/_react["default"].createElement("g", null, control && zIndex != "bottom" && ctlIndicatorList.map(function (item, index) {
     var x = axisX.scaler(item.tick);

package/lib/components/Label.js

@@ -65,14 +65,19 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     bandLength = _ref$bandLength === void 0 ? 0 : _ref$bandLength,
     data = _ref.data,
     _ref$xAxis = _ref.xAxis,
-    xScaler = _ref$xAxis.scaler,
-    step = _ref$xAxis.step,
+    normalScaler = _ref$xAxis.scaler,
+    normalStep = _ref$xAxis.step,
     direction = _ref$xAxis.direction,
+    controlStep = _ref$xAxis.controlStep,
+    controlDragScaler = _ref$xAxis.controlDragScaler,
     _ref$yAxis = _ref.yAxis,
     yScaler = _ref$yAxis.scaler,
     isClipAxis = _ref$yAxis.isClipAxis,
     clipValue = _ref$yAxis.clipValue,
-    triggerEvents = _ref.triggerEvents;
+    triggerEvents = _ref.triggerEvents,
+    isControlChart = _ref.isControlChart;
+  var step = isControlChart ? controlStep : normalStep;
+  var xScaler = isControlChart ? controlDragScaler : normalScaler;
   var selectConfig = other;
   if (selectStyle) {
     var show = selectStyle.show,
@@ -186,12 +191,10 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         return triggerEvents(e, "setCurrent");
       },
       onMouseMove: function onMouseMove(e) {
-        console.log("mousemove", data, e);
-        triggerEvents(e, "mouseenter");
+        return triggerEvents(e, "mouseenter");
       },
       onMouseLeave: function onMouseLeave(e) {
-        console.log("mouseleave", e);
-        triggerEvents(e, "mouseleave");
+        return triggerEvents(e, "mouseleave");
       },
       style: {
         cursor: "pointer"

package/lib/components/Line.js

@@ -47,7 +47,8 @@ var Area = function Area(_ref) {
     curve = _ref$config.curve,
     tension = _ref$config.tension,
     xScaler = _ref.xScaler,
-    yScaler = _ref.yScaler;
+    yScaler = _ref.yScaler,
+    Areaopacity = _ref.opacity;
   var _yScaler$range = yScaler.range(),
     _yScaler$range2 = (0, _slicedToArray2["default"])(_yScaler$range, 1),
     height = _yScaler$range2[0];
@@ -72,7 +73,8 @@ var Area = function Area(_ref) {
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("path", {
     d: areaGen(data),
     style: {
-      pointerEvents: "none"
+      pointerEvents: "none",
+      opacity: Areaopacity
     },
     stroke: "none",
     fill: 'url(#' + id + ')'
@@ -94,7 +96,9 @@ var Area = function Area(_ref) {
 };
 var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
   var type = _ref5.type,
-    _ref5$config$line = _ref5.config.line,
+    _ref5$config = _ref5.config,
+    areaColor = _ref5$config.areaColor,
+    _ref5$config$line = _ref5$config.line,
     lineType = _ref5$config$line.type,
     lineWidth = _ref5$config$line.lineWidth,
     curve = _ref5$config$line.curve,
@@ -169,7 +173,8 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       tension: tension
     }),
     xScaler: xScaler,
-    yScaler: yScaler
+    yScaler: yScaler,
+    opacity: areaColor ? areaColor.linear.opacity : 1
   }), showLighter && /*#__PURE__*/_react["default"].createElement(_.Lighter, {
     path: path,
     config: lighter

package/package.json

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

package/src/components/Band.tsx

@@ -232,8 +232,8 @@ export default memo(
                     cursor: "pointer",
                   }}
                   {...bgAttr}
-                  onClick={(e) => triggerEvents(e, "setCurrent")}
-                  onMouseMove={(e) => triggerEvents(e, "mouseenter")}
+                  onClick={(e) => triggerEvents?triggerEvents(e, "setCurrent"):""}
+                  onMouseMove={(e) => triggerEvents?triggerEvents(e, "mouseenter"):""}
                   onMouseEnter={() => {
                     if (isControlChart) {
                       setCtlTip((pre: any) => ({
@@ -251,7 +251,7 @@ export default memo(
                     }
                   }}
                   onMouseLeave={(e) => {
-                    triggerEvents(e, "mouseleave");
+                    triggerEvents?triggerEvents(e, "mouseleave"):"";
                     if (isControlChart && !auto) {
                       setCtlTip((pre: any) => ({
                         show: false,

package/src/components/CartesianChart.js

@@ -654,6 +654,7 @@ const Chart = memo(
                       xAxis={axisX}
                       yAxis={yAxis}
                       triggerEvents={onInteraction}
+                      isControlChart={!!control}
                     />
                   )
                 );

package/src/components/Label.js

@@ -45,10 +45,13 @@ export default memo(
     selectStyle,
     bandLength = 0,
     data,
-    xAxis: { scaler: xScaler, step, direction },
+    xAxis: { scaler: normalScaler, step:normalStep, direction,controlStep,controlDragScaler },
     yAxis: { scaler: yScaler, isClipAxis, clipValue },
     triggerEvents,
+    isControlChart
   }) => {
+    const step = isControlChart ? controlStep : normalStep;
+    const xScaler = isControlChart ? controlDragScaler : normalScaler;
     let selectConfig = other;
     if (selectStyle) {
       const { show, showType, icon, numlabel: label } = selectStyle;
@@ -117,8 +120,7 @@ export default memo(
             }
 
             // const y2 =  yScaler(isVertical ? start : end);
-            const positionX =
-              xScaler(x) - step / 2 + seriesStart + index * seriesStep;
+            const positionX =xScaler(x)- step / 2+seriesStart+ index * seriesStep;
 
             if (isNaN(positionX)) return null;
             const position = isXRepeat

package/src/components/Line.js

@@ -34,6 +34,7 @@ const Area = ({
   },
   xScaler,
   yScaler,
+  opacity:Areaopacity
 }) => {
   const [height] = yScaler.range();
   const area = useMemo(() => getColorList(fill), [fill]);
@@ -51,7 +52,7 @@ const Area = ({
 
   return (
     <>
-      <path d={areaGen(data)} style={{pointerEvents:"none"}} stroke='none' fill={'url(#' + id + ')'} />
+      <path d={areaGen(data)} style={{pointerEvents:"none",opacity:Areaopacity}} stroke='none' fill={'url(#' + id + ')'} />
       <defs>
         {type && type == 'pattern' ? (
           <pattern id={id} patternUnits="userSpaceOnUse" width={patternW} height={patternH}>
@@ -69,6 +70,7 @@ export default memo(
   ({
     type,
     config: {
+      areaColor,
       line: {
         type: lineType,
         lineWidth,
@@ -144,6 +146,7 @@ export default memo(
             config={{ ...area, curve, tension }}
             xScaler={xScaler}
             yScaler={yScaler}
+            opacity={areaColor?areaColor.linear.opacity:1}
           />
         )}
         {showLighter && <Lighter path={path} config={lighter} />}