@easyv/charts 1.4.24 → 1.4.25

package/lib/hooks/useAxes.js

@@ -1,54 +1,75 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = require("react");
+
 var _d3Scale = require("d3-scale");
+
 var _utils = require("../utils");
+
 var _utils2 = require("@easyv/utils/lib/common/utils");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var getCount = function getCount(num) {
   var i = 0,
-    num_ = Math.abs(num);
+      num_ = Math.abs(num);
   if (num_ < 1) return i;
+
   while (num_ > 10) {
     i++;
     num_ = Math.floor(num_ / 10);
   }
+
   return i;
 };
+
 var getNewDomain = function getNewDomain(domain, mode, step) {
   var newDomain = [];
   var min = domain[0],
-    max = domain[1];
+      max = domain[1];
   var minCount = Math.pow(10, getCount(min)),
-    maxCount = Math.pow(10, getCount(max));
+      maxCount = Math.pow(10, getCount(max));
+
   switch (mode) {
     case "count":
       newDomain[0] = Math.floor(domain[0] / minCount) * minCount;
       newDomain[1] = Math.ceil(domain[1] / maxCount) * maxCount;
       break;
+
     case "step":
       newDomain = [domain[0], domain[0]];
+
       while (newDomain[1] < domain[1]) {
         newDomain[1] += step;
       }
+
   }
+
   return newDomain;
 };
+
 var getTickCount = function getTickCount(domain, count, decimal) {
   var multiple = Math.pow(10, decimal);
   var gap = domain[1] * multiple - domain[0] * multiple;
+
   if (gap < count) {
     return Math.max(2, 1 + gap);
   }
+
   return count;
 };
+
 var scales = {
   linear: _d3Scale.scaleLinear,
   log: _d3Scale.scaleLog,
@@ -56,54 +77,54 @@ var scales = {
   utc: _d3Scale.scaleUtc,
   ordinal: _utils.band
 };
-
 /**
  * x/y/z轴
  * @param {Array} axes 轴列表数组
  * @param {Object} context 其中需要包括
  * @returns {Map} 返回所有轴
  */
+
 var _default = function _default(_ref) {
   var axes = _ref.axes,
-    _ref$context = _ref.context,
-    width = _ref$context.width,
-    height = _ref$context.height,
-    isControlChart = _ref.isControlChart,
-    controlConfig = _ref.control;
+      _ref$context = _ref.context,
+      width = _ref$context.width,
+      height = _ref$context.height,
+      isControlChart = _ref.isControlChart,
+      controlConfig = _ref.control;
+
   var _axes = (0, _react.useMemo)(function () {
     var tmp = new Map();
     var xAxisPositions = [];
     axes.forEach(function (item) {
       var _item$config$label = item.config.label,
-        _item$config$label$sh = _item$config$label.showLast,
-        showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
-        _item$config$label$de = _item$config$label.decimal,
-        decimal = _item$config$label$de === void 0 ? 0 : _item$config$label$de,
-        type = item.type,
-        orientation = item.orientation,
-        ticks = item.ticks,
-        _item$tickCount = item.tickCount,
-        count = _item$tickCount === void 0 ? 1 : _item$tickCount,
-        _item$step = item.step,
-        step = _item$step === void 0 ? 1 : _item$step,
-        domain = item.domain,
-        axisType = item.axisType,
-        _item$paddingOuter = item.paddingOuter,
-        paddingOuter = _item$paddingOuter === void 0 ? 0 : _item$paddingOuter,
-        auto = item.auto,
-        mode = item.mode,
-        carousel = item.carousel,
-        config = item.config,
-        isClipAxis = item.isClipAxis,
-        bottomClipAxisCount = item.bottomClipAxisCount,
-        topClipAxisCount = item.topClipAxisCount,
-        bottomClipAxisStep = item.bottomClipAxisStep,
-        topClipAxisStep = item.topClipAxisStep,
-        clipValue = item.clipValue,
-        clipPosition = item.clipPosition,
-        clipDifferenceValue = item.clipDifferenceValue,
-        clipAxisMode = item.clipAxisMode;
-      //如果是断轴类型，输出一套完全不同的values
+          _item$config$label$sh = _item$config$label.showLast,
+          showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
+          _item$config$label$de = _item$config$label.decimal,
+          decimal = _item$config$label$de === void 0 ? 0 : _item$config$label$de,
+          type = item.type,
+          orientation = item.orientation,
+          ticks = item.ticks,
+          _item$tickCount = item.tickCount,
+          count = _item$tickCount === void 0 ? 1 : _item$tickCount,
+          _item$step = item.step,
+          step = _item$step === void 0 ? 1 : _item$step,
+          domain = item.domain,
+          axisType = item.axisType,
+          _item$paddingOuter = item.paddingOuter,
+          paddingOuter = _item$paddingOuter === void 0 ? 0 : _item$paddingOuter,
+          auto = item.auto,
+          mode = item.mode,
+          carousel = item.carousel,
+          config = item.config,
+          isClipAxis = item.isClipAxis,
+          bottomClipAxisCount = item.bottomClipAxisCount,
+          topClipAxisCount = item.topClipAxisCount,
+          bottomClipAxisStep = item.bottomClipAxisStep,
+          topClipAxisStep = item.topClipAxisStep,
+          clipValue = item.clipValue,
+          clipPosition = item.clipPosition,
+          clipDifferenceValue = item.clipDifferenceValue,
+          clipAxisMode = item.clipAxisMode; //如果是断轴类型，输出一套完全不同的values
 
       /**
        * 获取轴的：朝向direction，起点位置start，终点位置end
@@ -113,10 +134,13 @@ var _default = function _default(_ref) {
        * @param {*} paddingOuter
        * @returns {start,end,direction}
        */
+
       function getChartsConfig(orientation, width, height, paddingOuter) {
         var direction = orientation === "top" || orientation === "bottom" ? "horizontal" : orientation === "left" || orientation === "right" ? "vertical" : "";
         var length = direction === "horizontal" ? width : direction === "vertical" ? height : 0;
+
         var _paddingOuter = paddingOuter * length;
+
         var start = _paddingOuter / 2;
         var end = length - start;
         return {
@@ -127,7 +151,6 @@ var _default = function _default(_ref) {
           _paddingOuter: _paddingOuter
         };
       }
-
       /**
        * 设置scaler
        * @param {*} scales
@@ -136,14 +159,16 @@ var _default = function _default(_ref) {
        * @param {*} range 屏幕坐标的范围
        * @returns
        */
+
+
       function setScaler(scales, type, domain, range) {
         //比例将抽象数据的维度映射到可视表示形式。虽然最常用于将数据编码为位置，例如将时间和温度映射到散点图中的水平和垂直位置
         var scaler = scales[type]().domain(domain).range(range);
         scaler.type = type;
         if (type !== "ordinal") scaler.clamp(true); //scaler.nice().clamp(true)
+
         return scaler;
       }
-
       /**
        * 获取所有标签数据
        * @param {*} scaler
@@ -151,10 +176,11 @@ var _default = function _default(_ref) {
        * @param {*} tickCount
        * @returns
        */
+
+
       function getAllTicks(scaler, ticks, tickCount) {
         return ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
       }
-
       /**
        * 计算非自动模式下的标签集合
        * @param {*} allTicks
@@ -168,8 +194,11 @@ var _default = function _default(_ref) {
        * @param {*} step
        * @returns
        */
+
+
       function getTicks(allTicks, type, carousel, showLast, auto, mode, newDomain, tickCount, step) {
         var _ticks = allTicks;
+
         if (type === "ordinal") {
           if (carousel === false) {
             _ticks = (0, _utils.getTicksOfAxis)(_ticks, +tickCount, showLast);
@@ -180,23 +209,26 @@ var _default = function _default(_ref) {
               case "count":
                 _ticks = (0, _utils2.getYTicks)(newDomain[1], newDomain[0], +tickCount);
                 break;
+
               case "step":
                 _ticks = (0, _utils2.getYTicksByStep)(newDomain[1], newDomain[0], +step);
                 break;
             }
           }
         }
+
         return _ticks;
-      }
-      //断轴相关
+      } //断轴相关
+
+
       var _isClipAxis = isClipAxis,
-        clipAxisDomain = [],
-        clipAxisCount = [],
-        clipAxisTickCount = [],
-        clipAxisStep = [];
+          clipAxisDomain = [],
+          clipAxisCount = [],
+          clipAxisTickCount = [],
+          clipAxisStep = [];
       var _count = count,
-        _step = step;
-      //计算topDomain，bottomDomain，当断轴值为设置不合理的时候，不开启断轴
+          _step = step; //计算topDomain，bottomDomain，当断轴值为设置不合理的时候，不开启断轴
+
       if (isClipAxis && (clipValue > domain[1] || clipValue < domain[0])) {
         _isClipAxis = false;
         _count = topClipAxisCount;
@@ -206,25 +238,30 @@ var _default = function _default(_ref) {
         clipAxisCount = [topClipAxisCount, bottomClipAxisCount];
         clipAxisStep = [topClipAxisStep, bottomClipAxisStep];
       }
+
       if (_isClipAxis) {
         var getClipAxisRange = function getClipAxisRange(start, end, clipPosition, clipMargin) {
           var topRange = [(end - start) * (clipPosition / 100) - clipMargin / 2, start];
           var bottomRange = [end, (end - start) * (clipPosition / 100) + clipMargin / 2];
           return [topRange, bottomRange];
         }; //计算range填入scaler参数
+
+
         clipAxisDomain.forEach(function (domain, index) {
           clipAxisTickCount.push(getTickCount(domain, clipAxisCount[index], decimal));
         });
+
         var _getChartsConfig = getChartsConfig(orientation, width, height, paddingOuter),
-          start = _getChartsConfig.start,
-          end = _getChartsConfig.end,
-          direction = _getChartsConfig.direction,
-          _paddingOuter = _getChartsConfig._paddingOuter,
-          length = _getChartsConfig.length;
+            start = _getChartsConfig.start,
+            end = _getChartsConfig.end,
+            direction = _getChartsConfig.direction,
+            _paddingOuter = _getChartsConfig._paddingOuter,
+            length = _getChartsConfig.length;
+
         var clipMargin = 10;
         var clipAxisRange = getClipAxisRange(start, end, clipPosition, clipMargin);
-        var newClipAxisDomain = [];
-        //如果非自适应模式，计算新的domain，传入scaler，适配强制步长或者数量强制
+        var newClipAxisDomain = []; //如果非自适应模式，计算新的domain，传入scaler，适配强制步长或者数量强制
+
         if (!isNaN(domain[1]) && !auto) {
           clipAxisDomain.forEach(function (domain, index) {
             newClipAxisDomain.push(getNewDomain(domain, mode, clipAxisStep[index]));
@@ -232,13 +269,14 @@ var _default = function _default(_ref) {
         } else {
           //如果为刻度自适应，使用原先domain直接传入scaler，使用scaler.ticks来计算出标签集合
           newClipAxisDomain = clipAxisDomain;
-        }
-        //设置scaler，scaler会将数值映射真实的坐标（svg坐标）
+        } //设置scaler，scaler会将数值映射真实的坐标（svg坐标）
+
+
         var clipAxisScaler = [];
         newClipAxisDomain.forEach(function (domain, index) {
           clipAxisScaler.push(setScaler(scales, type, domain, clipAxisRange[index]));
-        });
-        //clipAxisAllTicks作用是使用scaler.ticks方法,来计算标签集合
+        }); //clipAxisAllTicks作用是使用scaler.ticks方法,来计算标签集合
+
         var clipAxisAllTicks = [];
         clipAxisScaler.forEach(function (scaler, index) {
           clipAxisAllTicks.push(getAllTicks(scaler, ticks, clipAxisTickCount[index]));
@@ -265,23 +303,28 @@ var _default = function _default(_ref) {
       } else {
         //计算真正需要的tickCount，如果domain区间太小，不能完全按照count来，需要减少count数
         var tickCount = type == "ordinal" ? _count : getTickCount(domain, _count, decimal);
+
         var _getChartsConfig2 = getChartsConfig(orientation, width, height, paddingOuter),
-          _start = _getChartsConfig2.start,
-          _end = _getChartsConfig2.end,
-          _direction = _getChartsConfig2.direction,
-          _paddingOuter2 = _getChartsConfig2._paddingOuter,
-          _length = _getChartsConfig2.length;
+            _start = _getChartsConfig2.start,
+            _end = _getChartsConfig2.end,
+            _direction = _getChartsConfig2.direction,
+            _paddingOuter2 = _getChartsConfig2._paddingOuter,
+            _length = _getChartsConfig2.length;
+
         var range = _direction === "horizontal" ? [_start, _end] : _direction === "vertical" ? [_end, _start] : [0, 0];
         var newDomain = domain;
+
         if (type !== "ordinal" && !isNaN(domain[1]) && !auto) {
           newDomain = getNewDomain(domain, mode, _step);
         }
+
         var scaler = scales[type]().domain(newDomain).range(range);
         scaler.type = type;
         if (type !== "ordinal") scaler.clamp(true); //scaler.nice().clamp(true)
+
         var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
-        var _ticks = allTicks;
-        //
+        var _ticks = allTicks; //
+
         if (type === "ordinal") {
           if (carousel === false) {
             _ticks = (0, _utils.getTicksOfAxis)(_ticks, +tickCount, showLast);
@@ -292,15 +335,19 @@ var _default = function _default(_ref) {
               case "count":
                 _ticks = (0, _utils2.getYTicks)(newDomain[1], newDomain[0], +tickCount);
                 break;
+
               case "step":
                 _ticks = (0, _utils2.getYTicksByStep)(newDomain[1], newDomain[0], +_step);
                 break;
             }
           }
         }
+
         var _lengthWithoutPaddingOuter = _length - _paddingOuter2;
+
         if (type == "linear" && config.on) {
           var zeroPosition = scaler(0);
+
           if (zeroPosition !== range[0] && !isNaN(zeroPosition)) {
             if (_direction === "horizontal") {
               xAxisPositions.push({
@@ -315,6 +362,7 @@ var _default = function _default(_ref) {
             }
           }
         }
+
         tmp.set(axisType, _objectSpread(_objectSpread({}, item), {}, {
           count: _count,
           isClipAxis: _isClipAxis,
@@ -335,6 +383,8 @@ var _default = function _default(_ref) {
     tmp.get("x") && (tmp.get("x").positions = xAxisPositions);
     return tmp;
   }, [axes]);
+
   return _axes;
 };
+
 exports["default"] = _default;

package/lib/hooks/useCarouselAxisX.js

@@ -1,59 +1,74 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = require("react");
+
 var _popmotion = require("popmotion");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var initialState = {
   currentIndex: null,
   flag: false //表示是否为首次加载，true表示首次加载，不需要立刻执行动画，false表示可以执行轮播动画
-};
 
+};
 /**
  * x轴滚动逻辑
  * @param {Object} axis x轴配置项
  * @param {Object} config x轴轮播动画的配置项
  * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
  */
+
 var _default = function _default(axis, config, isHover) {
   var isControlChart = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var controlConfig = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   var show = config.show,
-    interval = config.interval,
-    duration = config.duration,
-    hover = config.hover;
+      interval = config.interval,
+      duration = config.duration,
+      hover = config.hover;
   var time = duration + interval;
   var tickCount = axis.tickCount,
-    allTicks = axis.allTicks,
-    scaler = axis.scaler,
-    start = axis.start,
-    end = axis.end,
-    step = axis.step,
-    ticks = axis.ticks,
-    lengthWithoutPaddingOuter = axis.lengthWithoutPaddingOuter;
+      allTicks = axis.allTicks,
+      scaler = axis.scaler,
+      start = axis.start,
+      end = axis.end,
+      step = axis.step,
+      ticks = axis.ticks,
+      lengthWithoutPaddingOuter = axis.lengthWithoutPaddingOuter;
   var tickLength = ticks.length;
-  var _end = isControlChart && controlConfig ? end / (controlConfig.drag.width / 100) : end;
+
+  var _end = isControlChart && controlConfig ? end * (1 / (controlConfig.drag.width / 100)) : end;
+
   var controlDragScaler = scaler.copy().range([start, end]);
+
   var _useState = (0, _react.useState)({
-      scaler: scaler,
-      step: step,
-      ticks: ticks
-    }),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
+    scaler: scaler,
+    step: step,
+    ticks: ticks
+  }),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
   var _useState3 = (0, _react.useState)(initialState),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    status = _useState4[0],
-    setStatus = _useState4[1];
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      status = _useState4[0],
+      setStatus = _useState4[1];
+
   (0, _react.useEffect)(function () {
     if (show && time && tickLength > tickCount) {
       setStatus({
@@ -66,6 +81,7 @@ var _default = function _default(axis, config, isHover) {
   }, [show, time, tickCount, tickLength]);
   (0, _react.useEffect)(function () {
     var handler;
+
     if (!(hover && isHover) && show && time && tickLength > tickCount) {
       handler = setInterval(function () {
         setStatus(function (_ref) {
@@ -78,6 +94,7 @@ var _default = function _default(axis, config, isHover) {
         });
       }, time * 1000);
     }
+
     return function () {
       handler && clearInterval(handler);
     };
@@ -85,11 +102,14 @@ var _default = function _default(axis, config, isHover) {
   (0, _react.useEffect)(function () {
     var animation;
     var currentIndex = status.currentIndex,
-      flag = status.flag;
+        flag = status.flag;
+
     if (currentIndex !== null) {
       var _step = lengthWithoutPaddingOuter / tickCount;
+
       if (flag) {
         var _ticks = allTicks.slice(currentIndex, tickCount);
+
         setState({
           step: _step,
           ticks: _ticks,
@@ -104,10 +124,13 @@ var _default = function _default(axis, config, isHover) {
           onPlay: function onPlay() {
             setState(function (axis) {
               var ticks = axis.ticks,
-                scaler = axis.scaler;
+                  scaler = axis.scaler;
+
               var _ticks2 = (0, _slicedToArray2["default"])(ticks, 1),
-                tick = _ticks2[0];
+                  tick = _ticks2[0];
+
               var _ticks = [tick].concat((0, _toConsumableArray2["default"])(getTicks(allTicks, currentIndex, tickCount)));
+
               return _objectSpread(_objectSpread({}, axis), {}, {
                 ticks: _ticks,
                 scaler: scaler.copy().range([start, _end + _step]).domain(_ticks)
@@ -117,7 +140,7 @@ var _default = function _default(axis, config, isHover) {
           onUpdate: function onUpdate(v) {
             setState(function (axis) {
               var scaler = axis.scaler,
-                step = axis.step;
+                  step = axis.step;
               return _objectSpread(_objectSpread({}, axis), {}, {
                 scaler: scaler.copy().range([start + step * v, _end + step + step * v])
               });
@@ -126,8 +149,10 @@ var _default = function _default(axis, config, isHover) {
           onComplete: function onComplete() {
             setState(function (axis) {
               var scaler = axis.scaler,
-                ticks = axis.ticks;
+                  ticks = axis.ticks;
+
               var _ticks = ticks.slice(1, ticks.length);
+
               return _objectSpread(_objectSpread({}, axis), {}, {
                 ticks: _ticks,
                 scaler: scaler.copy().range([start, _end]).domain(_ticks)
@@ -138,12 +163,14 @@ var _default = function _default(axis, config, isHover) {
       }
     } else {
       var _ticks3 = scaler.type == "linear" ? scaler.domain() : allTicks;
+
       setState({
         step: step,
         scaler: scaler.copy().domain(_ticks3).range([start, _end]),
         ticks: ticks
       });
     }
+
     return function () {
       animation && animation.stop();
     };
@@ -155,16 +182,22 @@ var _default = function _default(axis, config, isHover) {
     isControlChart: isControlChart
   });
 };
+
 exports["default"] = _default;
+
 var getTicks = function getTicks(ticks, currentIndex, length) {
   var _currentIndex = +currentIndex;
+
   var ticksLength = ticks.length;
   if (ticksLength <= length) return ticks;
+
   var _end = _currentIndex + length;
+
   if (ticksLength < _end) {
     var prev = ticks.slice(_currentIndex, ticksLength);
     var next = ticks.slice(0, _end - ticksLength);
     return [].concat((0, _toConsumableArray2["default"])(prev), (0, _toConsumableArray2["default"])(next));
   }
+
   return ticks.slice(_currentIndex, _end);
 };