@easyv/charts 1.6.12 → 1.6.14

package/lib/css/piechart.module.css

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

package/lib/hooks/useAnimateData.js

@@ -11,12 +11,12 @@ var _react = require("react");
 var _popmotion = require("popmotion");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-/**
- * 图表数据动画
- * @param {Array} data data列表
- * @param {boolean} dataAnimation 是否开启数据增长动画
- * @param {boolean} active 是否处于活跃状态，false为休眠
- * @returns 改变后的数据
+/**
+ * 图表数据动画
+ * @param {Array} data data列表
+ * @param {boolean} dataAnimation 是否开启数据增长动画
+ * @param {boolean} active 是否处于活跃状态，false为休眠
+ * @returns 改变后的数据
  */
 var _default = exports["default"] = function _default(data, dataAnimation, active) {
   var _useState = (0, _react.useState)([]),

package/lib/hooks/useAxes.js

@@ -46,7 +46,6 @@ var getNewDomain = function getNewDomain(domain, mode, step) {
     max = domain[1];
   var minCount = Math.pow(10, getCount(min)),
     maxCount = Math.pow(10, getCount(max));
-
   //轴标签，范围模式，百分比模式
   if (numericalRangeModel == "percentage") {
     var _max = defaultPercentageMax === "" ? 100 : defaultPercentageMax;
@@ -57,7 +56,7 @@ var getNewDomain = function getNewDomain(domain, mode, step) {
   switch (mode) {
     case "count":
       newDomain[0] = bottom != "" ? bottom : Math.floor(domain[0] / minCount) * minCount;
-      newDomain[1] = top != "" ? top : Math.ceil(domain[1] / maxCount) * maxCount;
+      newDomain[1] = top != "" ? top : maxCount == 1 ? domain[1] : Math.ceil(domain[1] / maxCount) * maxCount;
       break;
     case "step":
       if (defaultTop != "") {

package/lib/hooks/useFilterData.js

@@ -42,11 +42,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} 返回筛选后的数据和是否选中状态，及控制选中函数
  */
 var _default = exports["default"] = function _default(_ref) {
   var data = _ref.data,

package/lib/hooks/useStackData.js

@@ -75,11 +75,11 @@ var setStackData = function setStackData(data, series, stacks) {
   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}
  */
 var _default = exports["default"] = function _default(_ref2) {
   var data = _ref2.data,

package/lib/hooks/useTooltip.js

@@ -10,17 +10,17 @@ 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 轮播动画参数
- * @param {Boolean} active 组件是否处于活跃状态
- * @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 轮播动画参数
+ * @param {Boolean} active 组件是否处于活跃状态
+ * @returns {Object} 返回被选中的名称，坐标，选中方法
  */
 var _default = exports["default"] = function _default(_ref) {
   var svg = _ref.svg,

package/lib/utils/index.js

@@ -354,11 +354,11 @@ function band() {
   };
   scale.range = function (_) {
     var _ref11;
-    return arguments.length ? ((_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1]), r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
+    return arguments.length ? (_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1], r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
   };
   scale.rangeRound = function (_) {
     var _ref12;
-    return (_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1]), r0 = +r0, r1 = +r1, round = true, rescale();
+    return _ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1], r0 = +r0, r1 = +r1, round = true, rescale();
   };
   scale.bandwidth = function () {
     return bandwidth;
@@ -499,7 +499,7 @@ var getBandBackground = exports.getBandBackground = function getBandBackground(p
     var _pattern$backgroundSi = pattern.backgroundSize,
       backgroundSize = _pattern$backgroundSi === void 0 ? '100% 100%' : _pattern$backgroundSi,
       _pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded);
-    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)( /*#__PURE__*/React.createElement(SvgBackground, {
+    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)(/*#__PURE__*/React.createElement(SvgBackground, {
       fill: fill,
       pattern: _pattern
     }))) + '")';

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "@easyv/charts",
-  "version": "1.6.12",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "make": "babel src -d lib --extensions .ts,.tsx,.js,.jsx && cp -r src/css lib",
-    "prepare": "husky install"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.10",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-export-default-from": "^7.16.7",
-    "@babel/plugin-transform-runtime": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "@babel/preset-react": "^7.16.7",
-    "@babel/preset-typescript": "^7.16.7",
-    "@commitlint/cli": "^17.6.7",
-    "@commitlint/config-conventional": "^16.2.4",
-    "@types/d3": "^7.0.0",
-    "@types/react": "^18.0.12",
-    "@types/react-dom": "^18.0.5",
-    "babel-plugin-transform-import-styles": "^0.0.11",
-    "babel-preset-env": "^1.7.0",
-    "cz-conventional-changelog": "^3.3.0",
-    "husky": "^7.0.4",
-    "load-styles": "^2.0.0",
-    "standard-version": "^9.3.2"
-  },
-  "dependencies": {
-    "@easyv/utils": "^0.0.45",
-    "d3v7": "npm:d3@^7.0.0",
-    "gitignore": "^0.7.0",
-    "mrm": "^4.0.0",
-    "popmotion": "^9.3.6",
-    "react": "^17.0.2",
-    "svg-path-properties": "^1.0.11",
-    "svg-points": "^6.0.1",
-    "yarn": "^1.22.19"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
-  },
-  "standard-version": {
-    "skip": {
-      "commit": true
-    }
-  }
-}
+{
+  "name": "@easyv/charts",
+  "version": "1.6.14",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "make": "babel src -d lib --extensions .ts,.tsx,.js,.jsx && cp -r src/css lib",
+    "prepare": "husky install"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.17.10",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-export-default-from": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.17.10",
+    "@babel/preset-env": "^7.17.10",
+    "@babel/preset-react": "^7.16.7",
+    "@babel/preset-typescript": "^7.16.7",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^16.2.4",
+    "@types/d3": "^7.0.0",
+    "@types/react": "^18.0.12",
+    "@types/react-dom": "^18.0.5",
+    "babel-plugin-transform-import-styles": "^0.0.11",
+    "babel-preset-env": "^1.7.0",
+    "cz-conventional-changelog": "^3.3.0",
+    "husky": "^7.0.4",
+    "load-styles": "^2.0.0",
+    "standard-version": "^9.3.2"
+  },
+  "dependencies": {
+    "@easyv/utils": "^0.0.45",
+    "d3v7": "npm:d3@^7.0.0",
+    "gitignore": "^0.7.0",
+    "mrm": "^4.0.0",
+    "popmotion": "^9.3.6",
+    "react": "^17.0.2",
+    "svg-path-properties": "^1.0.11",
+    "svg-points": "^6.0.1",
+    "yarn": "^1.22.19"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true
+    }
+  }
+}

package/src/components/Background.tsx

@@ -1,61 +1,61 @@
-/**
- * 轴类图背景
- */
-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'
+      />
+    );
+  });
+};