@easyv/charts 1.3.27 → 1.3.29

package/lib/css/index.module.css

@@ -1,42 +1,42 @@
-.rotateClockwise {
-  animation-name: rotateClockwise;
-}
-
-@keyframes rotateClockwise {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.rotateCounterClockwise {
-  animation-name: rotateCounterClockwise;
-}
-
-@keyframes rotateCounterClockwise {
-  0% {
-    transform: rotate(360deg);
-  }
-  100% {
-    transform: rotate(0deg);
-  }
-}
-
-.showAllStyle {
-  display: grid;
-  width: 100%;
-  grid-template-columns: 40% 30% 30%;
-  align-items: center;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.notShowAllStyle {
-  display: flex;
-  width: 100%;
-  align-items: center;
-  flex-direction: row;
-  justify-content: space-between;
+.rotateClockwise {
+  animation-name: rotateClockwise;
+}
+
+@keyframes rotateClockwise {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.rotateCounterClockwise {
+  animation-name: rotateCounterClockwise;
+}
+
+@keyframes rotateCounterClockwise {
+  0% {
+    transform: rotate(360deg);
+  }
+  100% {
+    transform: rotate(0deg);
+  }
+}
+
+.showAllStyle {
+  display: grid;
+  width: 100%;
+  grid-template-columns: 40% 30% 30%;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+.notShowAllStyle {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
 }

package/lib/css/piechart.module.css

@@ -1,27 +1,27 @@
-/*甜甜圈图专用css*/
-.label-line {
-    stroke-dasharray: 100;
-    stroke-dashoffset: 100;
-    animation: dash 800ms ease forwards;
-  }
-  
-  .label-text {
-    opacity: 0;
-    animation: show 800ms ease forwards;
-  }
-  
-  .inner-arc {
-    animation: dash 2s ease forwards;
-  }
-  
-  @keyframes dash {
-    100% {
-      stroke-dashoffset: 0%;
-    }
-  }
-  
-  @keyframes show {
-    100% {
-      opacity: 1;
-    }
+/*甜甜圈图专用css*/
+.label-line {
+    stroke-dasharray: 100;
+    stroke-dashoffset: 100;
+    animation: dash 800ms ease forwards;
+  }
+  
+  .label-text {
+    opacity: 0;
+    animation: show 800ms ease forwards;
+  }
+  
+  .inner-arc {
+    animation: dash 2s ease forwards;
+  }
+  
+  @keyframes dash {
+    100% {
+      stroke-dashoffset: 0%;
+    }
+  }
+  
+  @keyframes show {
+    100% {
+      opacity: 1;
+    }
   }

package/lib/element/ConicGradient.js

@@ -1,73 +1,73 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = ConicGradient;
-
-var d3 = _interopRequireWildcard(require("d3"));
-
-//只支持在svg中使用
-//在<clipPath>标签中绘制圆环路径，在<foreignObject>中使用conic-gradient来制作角向渐变
-//然后在foreignObject中调用clipPath来剪切dom元素，实现环形渐变效果
-function ConicGradient(props) {
-  var gradientId = props.gradientId,
-      _props$colorConfig = props.colorConfig,
-      colorConfig = _props$colorConfig === void 0 ? {} : _props$colorConfig,
-      _props$circleConfig = props.circleConfig,
-      circleConfig = _props$circleConfig === void 0 ? {} : _props$circleConfig,
-      _colorConfig$colorTyp = colorConfig.colorType,
-      colorType = _colorConfig$colorTyp === void 0 ? "linear" : _colorConfig$colorTyp,
-      _colorConfig$colors = colorConfig.colors,
-      colors = _colorConfig$colors === void 0 ? [{
-    offset: 0,
-    color: "rgba(255,0,0,0.5)"
-  }, {
-    offset: 50,
-    color: "rgba(0,255,0,0.5)"
-  }, {
-    offset: 100,
-    color: "rgba(0,0,255,0.5)"
-  }] : _colorConfig$colors,
-      _circleConfig$innerRa = circleConfig.innerRadius,
-      innerRadius = _circleConfig$innerRa === void 0 ? 80 : _circleConfig$innerRa,
-      _circleConfig$outerRa = circleConfig.outerRadius,
-      outerRadius = _circleConfig$outerRa === void 0 ? 100 : _circleConfig$outerRa,
-      _circleConfig$startAn = circleConfig.startAngle,
-      startAngle = _circleConfig$startAn === void 0 ? 0 : _circleConfig$startAn,
-      _circleConfig$endAngl = circleConfig.endAngle,
-      endAngle = _circleConfig$endAngl === void 0 ? 360 : _circleConfig$endAngl,
-      _circleConfig$cornerR = circleConfig.cornerRadius,
-      cornerRadius = _circleConfig$cornerR === void 0 ? 0 : _circleConfig$cornerR,
-      _circleConfig$padAngl = circleConfig.padAngle,
-      padAngle = _circleConfig$padAngl === void 0 ? 0 : _circleConfig$padAngl;
-  var arc = d3.arc().innerRadius(innerRadius).outerRadius(outerRadius).startAngle(startAngle * Math.PI / 180).endAngle(endAngle * Math.PI / 180).cornerRadius(cornerRadius).padAngle(padAngle);
-  return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("clipPath", {
-    id: "" + gradientId,
-    style: {
-      transform: "translate(50%,50%)"
-    }
-  }, /*#__PURE__*/React.createElement("path", {
-    d: arc()
-  })), /*#__PURE__*/React.createElement("foreignObject", {
-    style: {
-      width: "100%",
-      height: "100%",
-      transform: "translate(-50%,-50%)",
-      background: colorType === "pure" ? colors : "conic-gradient(".concat(colorsToString(colors), ")"),
-      clipPath: "url(".concat('#' + gradientId, ")")
-    }
-  }));
-}
-
-function colorsToString(colors) {
-  var s = "";
-  colors.sort(function (a, b) {
-    return a.offset - b.offset;
-  }).map(function (d) {
-    s = s + d.color + " " + d.offset + "%,";
-  });
-  return s.slice(0, -1);
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = ConicGradient;
+
+var d3 = _interopRequireWildcard(require("d3"));
+
+//只支持在svg中使用
+//在<clipPath>标签中绘制圆环路径，在<foreignObject>中使用conic-gradient来制作角向渐变
+//然后在foreignObject中调用clipPath来剪切dom元素，实现环形渐变效果
+function ConicGradient(props) {
+  var gradientId = props.gradientId,
+      _props$colorConfig = props.colorConfig,
+      colorConfig = _props$colorConfig === void 0 ? {} : _props$colorConfig,
+      _props$circleConfig = props.circleConfig,
+      circleConfig = _props$circleConfig === void 0 ? {} : _props$circleConfig,
+      _colorConfig$colorTyp = colorConfig.colorType,
+      colorType = _colorConfig$colorTyp === void 0 ? "linear" : _colorConfig$colorTyp,
+      _colorConfig$colors = colorConfig.colors,
+      colors = _colorConfig$colors === void 0 ? [{
+    offset: 0,
+    color: "rgba(255,0,0,0.5)"
+  }, {
+    offset: 50,
+    color: "rgba(0,255,0,0.5)"
+  }, {
+    offset: 100,
+    color: "rgba(0,0,255,0.5)"
+  }] : _colorConfig$colors,
+      _circleConfig$innerRa = circleConfig.innerRadius,
+      innerRadius = _circleConfig$innerRa === void 0 ? 80 : _circleConfig$innerRa,
+      _circleConfig$outerRa = circleConfig.outerRadius,
+      outerRadius = _circleConfig$outerRa === void 0 ? 100 : _circleConfig$outerRa,
+      _circleConfig$startAn = circleConfig.startAngle,
+      startAngle = _circleConfig$startAn === void 0 ? 0 : _circleConfig$startAn,
+      _circleConfig$endAngl = circleConfig.endAngle,
+      endAngle = _circleConfig$endAngl === void 0 ? 360 : _circleConfig$endAngl,
+      _circleConfig$cornerR = circleConfig.cornerRadius,
+      cornerRadius = _circleConfig$cornerR === void 0 ? 0 : _circleConfig$cornerR,
+      _circleConfig$padAngl = circleConfig.padAngle,
+      padAngle = _circleConfig$padAngl === void 0 ? 0 : _circleConfig$padAngl;
+  var arc = d3.arc().innerRadius(innerRadius).outerRadius(outerRadius).startAngle(startAngle * Math.PI / 180).endAngle(endAngle * Math.PI / 180).cornerRadius(cornerRadius).padAngle(padAngle);
+  return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("clipPath", {
+    id: "" + gradientId,
+    style: {
+      transform: "translate(50%,50%)"
+    }
+  }, /*#__PURE__*/React.createElement("path", {
+    d: arc()
+  })), /*#__PURE__*/React.createElement("foreignObject", {
+    style: {
+      width: "100%",
+      height: "100%",
+      transform: "translate(-50%,-50%)",
+      background: colorType === "pure" ? colors : "conic-gradient(".concat(colorsToString(colors), ")"),
+      clipPath: "url(".concat('#' + gradientId, ")")
+    }
+  }));
+}
+
+function colorsToString(colors) {
+  var s = "";
+  colors.sort(function (a, b) {
+    return a.offset - b.offset;
+  }).map(function (d) {
+    s = s + d.color + " " + d.offset + "%,";
+  });
+  return s.slice(0, -1);
 }

package/lib/hooks/useAnimateData.js

@@ -19,11 +19,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
-/**
- * 图表数据动画
- * @param {Array} data data列表
- * @param {boolean} dataAnimation 是否开启数据增长动画
- * @returns 改变后的数据
+/**
+ * 图表数据动画
+ * @param {Array} data data列表
+ * @param {boolean} dataAnimation 是否开启数据增长动画
+ * @returns 改变后的数据
  */
 var _default = function _default(data, dataAnimation) {
   var _useState = (0, _react.useState)([]),

package/lib/hooks/useCarouselAxisX.js

@@ -23,7 +23,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var initialState = {
   currentIndex: null,
-  flag: false
+  flag: false //表示是否为首次加载，true表示首次加载，不需要立刻执行动画，false表示可以执行轮播动画
+
 };
 /**
  * x轴滚动逻辑
@@ -32,10 +33,11 @@ var initialState = {
  * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
  */
 
-var _default = function _default(axis, config) {
+var _default = function _default(axis, config, isHover) {
   var show = config.show,
       interval = config.interval,
-      duration = config.duration;
+      duration = config.duration,
+      hover = config.hover;
   var time = duration + interval;
   var tickCount = axis.tickCount,
       allTicks = axis.allTicks,
@@ -62,13 +64,19 @@ var _default = function _default(axis, config) {
       setStatus = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    var handler;
-
     if (show && time && tickLength > tickCount) {
       setStatus({
         currentIndex: 0,
         flag: true
       });
+    } else {
+      setStatus(initialState);
+    }
+  }, [show, time, tickCount, tickLength]);
+  (0, _react.useEffect)(function () {
+    var handler;
+
+    if (!(hover && isHover) && show && time && tickLength > tickCount) {
       handler = setInterval(function () {
         setStatus(function (_ref) {
           var currentIndex = _ref.currentIndex;
@@ -79,14 +87,12 @@ var _default = function _default(axis, config) {
           };
         });
       }, time * 1000);
-    } else {
-      setStatus(initialState);
     }
 
     return function () {
       handler && clearInterval(handler);
     };
-  }, [show, time, tickCount, tickLength]);
+  }, [show, time, tickCount, tickLength, hover, isHover]);
   (0, _react.useEffect)(function () {
     var animation;
     var currentIndex = status.currentIndex,

package/lib/hooks/useFilterData.js

@@ -56,11 +56,11 @@ var getSelected = function getSelected(selected, name) {
   });
   return tmp;
 };
-/**
- * 图例点击状态管理
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
+/**
+ * 图例点击状态管理
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
  */
 
 

package/lib/hooks/useStackData.js

@@ -87,11 +87,11 @@ var setStackData = function setStackData(data, series, stacks) {
   dataMap.clear();
   return series;
 };
-/**
- * 计算堆叠数据
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
+/**
+ * 计算堆叠数据
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
  */
 
 

package/lib/hooks/useTooltip.js

@@ -14,16 +14,16 @@ var _react = require("react");
 var _utils = require("../utils");
 
 var callback = function callback() {};
-/**
- * 主要用于轴类图表，返回当前选中的是哪一个x
- * @param {Array} svg svg的dom实例
- * @param {Number} marginLeft 左间距
- * @param {Number} marginTop 上间距
- * @param {Number} width 宽
- * @param {Number} height 高
- * @param {Number} axisX 类目轴
- * @param {Object} config 轮播动画参数
- * @returns {Object} 返回被选中的名称，坐标，选中方法
+/**
+ * 主要用于轴类图表，返回当前选中的是哪一个x
+ * @param {Array} svg svg的dom实例
+ * @param {Number} marginLeft 左间距
+ * @param {Number} marginTop 上间距
+ * @param {Number} width 宽
+ * @param {Number} height 高
+ * @param {Number} axisX 类目轴
+ * @param {Object} config 轮播动画参数
+ * @returns {Object} 返回被选中的名称，坐标，选中方法
  */
 
 

package/package.json

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

package/src/components/Background.tsx

@@ -1,62 +1,62 @@
-/**
- * 轴类图背景
- */
-import React from 'react';
-import { getSeriesInfo } from '../utils';
-
-export default ({
-  axis: { ticks, scaler, step, direction },
-  bandLength,
-  config: {
-    background,
-    seriesIntervalWidth: paddingInner,
-    paddingInner: paddingOuter,
-  },
-  length,
-}: {
-  axis: {
-    ticks: Array<string>;
-    scaler: Function;
-    step: number;
-    direction: string;
-  };
-  bandLength: number;
-  config: {
-    background: string;
-    seriesIntervalWidth: number;
-    paddingInner: number;
-  };
-  length: number;
-}) => {
-  const isVertical: boolean = direction === 'vertical';
-
-  const { width: bandwidth } = getSeriesInfo({
-    step,
-    bandLength,
-    paddingInner,
-    paddingOuter,
-  });
-
-  const size = isVertical
-    ? {
-        width: length,
-        height: bandwidth,
-      }
-    : {
-        width: bandwidth,
-        height: length,
-      };
-
-  return ticks.map((tick, index: number) => {
-    return (
-      <rect
-        key={index}
-        {...size}
-        x={isVertical ? 0 : scaler(tick) - bandwidth / 2}
-        y={isVertical ? scaler(tick) - bandwidth / 2 : 0}
-        fill={background}
-        stroke='none'
-      />
-    );
-  });
-};
+/**
+ * 轴类图背景
+ */
+import React from 'react';
+import { getSeriesInfo } from '../utils';
+
+export default ({
+  axis: { ticks, scaler, step, direction },
+  bandLength,
+  config: {
+    background,
+    seriesIntervalWidth: paddingInner,
+    paddingInner: paddingOuter,
+  },
+  length,
+}: {
+  axis: {
+    ticks: Array<string>;
+    scaler: Function;
+    step: number;
+    direction: string;
+  };
+  bandLength: number;
+  config: {
+    background: string;
+    seriesIntervalWidth: number;
+    paddingInner: number;
+  };
+  length: number;
+}) => {
+  const isVertical: boolean = direction === 'vertical';
+
+  const { width: bandwidth } = getSeriesInfo({
+    step,
+    bandLength,
+    paddingInner,
+    paddingOuter,
+  });
+
+  const size = isVertical
+    ? {
+        width: length,
+        height: bandwidth,
+      }
+    : {
+        width: bandwidth,
+        height: length,
+      };
+
+  return ticks.map((tick, index: number) => {
+    return (
+      <rect
+        key={index}
+        {...size}
+        x={isVertical ? 0 : scaler(tick) - bandwidth / 2}
+        y={isVertical ? scaler(tick) - bandwidth / 2 : 0}
+        fill={background}
+        stroke='none'
+      />
+    );
+  });
+};