@easyv/charts 1.4.35 → 1.4.36

package/lib/components/Axis.js

@@ -271,9 +271,7 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
       isClipAxis = _ref6$isClipAxis === void 0 ? false : _ref6$isClipAxis,
       yLineRange = _ref6.yLineRange,
       clipAxisRange = _ref6.clipAxisRange,
-      isControlChart = _ref6.isControlChart,
-      controlConfig = _ref6.controlConfig,
-      controlEnd = _ref6.controlEnd,
+      controlInfo = _ref6.controlInfo,
       rawTicks = _ref6.rawTicks;
   if (!(on && ticks.length > 0)) return null;
 
@@ -281,8 +279,10 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
       width = _useContext.width,
       height = _useContext.height;
 
+  var cHeight = controlInfo.cHeight,
+      isC = controlInfo.isC;
   var x = orientation == "right" ? width : 0;
-  var y = orientation == "bottom" ? height : 0;
+  var y = orientation == "bottom" ? height - cHeight : 0;
 
   function drawAxisTickLine() {
     var draw = function draw(ticks, scaler) {
@@ -335,7 +335,7 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
         });
         var x1 = gridCoord.x1;
         var y1 = gridCoord.y1;
-        return (!(orientation == "bottom" && (x1 < 0 || x1 > xLineRange) || y1 < 0 || y1 > yLineRange) || isControlChart) && /*#__PURE__*/_react["default"].createElement("g", {
+        return (!(orientation == "bottom" && (x1 < 0 || x1 > xLineRange) || y1 < 0 || y1 > yLineRange) || isC) && /*#__PURE__*/_react["default"].createElement("g", {
           key: index
         }, label && /*#__PURE__*/_react["default"].createElement(Label, {
           className: "__easyv-label",
@@ -358,7 +358,7 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ticks.map(function (ticks, index) {
         return draw(ticks, scaler[index]);
       }));
-    } else if (isControlChart && orientation == "bottom") {
+    } else if (isC && orientation == "bottom") {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, draw(rawTicks, scaler));
     } else {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, draw(ticks, scaler));
@@ -408,7 +408,7 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
   }), tickLine && drawAxisTickLine()))), /*#__PURE__*/_react["default"].createElement("svg", {
     width: width,
     style: {
-      overflow: axisType === "x" && isControlChart ? "hidden" : "visible"
+      overflow: axisType === "x" && isC ? "hidden" : "visible"
     }
   }, /*#__PURE__*/_react["default"].createElement("g", {
     transform: "translate(" + x + ", " + y + ")"

package/lib/components/Band.js

@@ -86,12 +86,9 @@ var getBorderRadius = function getBorderRadius(_ref2) {
 var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
   var triggerClick = _ref3.triggerClick,
       indicatorWidth = _ref3.indicatorWidth,
-      setControlChartTooltipShow = _ref3.setControlChartTooltipShow,
-      setControlChartTooltipX = _ref3.setControlChartTooltipX,
-      setControlChartTooltipXName = _ref3.setControlChartTooltipXName,
       _ref3$isControlChart = _ref3.isControlChart,
       isControlChart = _ref3$isControlChart === void 0 ? false : _ref3$isControlChart,
-      setControlChartIndicatorList = _ref3.setControlChartIndicatorList,
+      setCtlTip = _ref3.setCtlTip,
       _ref3$config = _ref3.config,
       _ref3$config$pattern = _ref3$config.pattern,
       pattern = _ref3$config$pattern === void 0 ? {} : _ref3$config$pattern,
@@ -115,15 +112,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
       bandLength = _ref3$bandLength === void 0 ? 0 : _ref3$bandLength,
       data = _ref3.data,
       _ref3$xAxis = _ref3.xAxis,
-      xScaler = _ref3$xAxis.scaler,
-      step = _ref3$xAxis.step,
+      normalScaler = _ref3$xAxis.scaler,
+      normalStep = _ref3$xAxis.step,
+      controlStep = _ref3$xAxis.controlStep,
       direction = _ref3$xAxis.direction,
-      xAxis = _ref3.xAxis,
+      controlDragScaler = _ref3$xAxis.controlDragScaler,
       _ref3$yAxis = _ref3.yAxis,
       yScaler = _ref3$yAxis.scaler,
       isClipAxis = _ref3$yAxis.isClipAxis,
       clipValue = _ref3$yAxis.clipValue;
   if (!data.length) return null;
+  var step = isControlChart ? controlStep : normalStep;
+  var xScaler = isControlChart ? controlDragScaler : normalScaler;
 
   var _getSeriesInfo = (0, _utils.getSeriesInfo)({
     step: step,
@@ -205,15 +205,19 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
       style: {
         overflow: "visible",
         position: "relative",
+        pointerEvents: isControlChart ? "auto" : "none",
         cursor: "pointer"
       }
     }, attr, {
       onClick: triggerClick //enter和leave事件，用于控制图的提示框
       ,
       onMouseEnter: function onMouseEnter() {
-        if (isControlChart) {
-          setControlChartIndicatorList(function (v) {
-            return v.map(function (item) {
+        setCtlTip(function (pre) {
+          return {
+            show: true,
+            x: xScaler(x),
+            xName: data.x,
+            indicatorList: pre.indicatorList.map(function (item) {
               if (item.tick === data.x) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isShow: true
@@ -221,32 +225,30 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
               } else {
                 return item;
               }
-            });
-          });
-          setControlChartTooltipShow(true);
-          setControlChartTooltipX(xScaler(x) - indicatorWidth / 2);
-          setControlChartTooltipXName(data.x);
-        }
+            })
+          };
+        });
       },
       onMouseLeave: function onMouseLeave() {
-        if (isControlChart) {
-          setControlChartIndicatorList(function (v) {
-            return v.map(function (item) {
+        setCtlTip(function (pre) {
+          return {
+            show: false,
+            x: undefined,
+            xName: undefined,
+            indicatorList: pre.indicatorList.map(function (item) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 isShow: false
               });
-            });
-          });
-          setControlChartTooltipShow(false);
-          setControlChartTooltipXName(undefined);
-          setControlChartTooltipX(undefined);
-        }
+            })
+          };
+        });
       },
       "data-data": JSON.stringify(data)
     }), headUrl && showHead && /*#__PURE__*/_react["default"].createElement("div", {
       style: {
         position: "absolute",
-        background: "url(".concat(window.appConfig.ASSETS_URL + headUrl, ") 0 0/100% 100%"),
+        background: "url(".concat( //@ts-ignore
+        window.appConfig.ASSETS_URL + headUrl, ") 0 0/100% 100%"),
         width: headWidth,
         height: headHeight,
         left: isVertical ? "100%" : "50%",