@easyv/charts 1.0.68 → 1.0.69

package/.babelrc

@@ -1,8 +1,8 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
-  "plugins": [
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties"
-  ]
-}
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
+  "plugins": [
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties"
+  ]
+}

package/lib/components/AnimateData.js

@@ -17,8 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _hooks = require("../hooks");
 
-/**
- * 用来做图表数据改变（增长）动画（HOC）
+/**
+ * 用来做图表数据改变（增长）动画（HOC）
  */
 var _default = function _default(Component) {
   return /*#__PURE__*/(0, _react.memo)(function (_ref) {

package/lib/components/Axis.js

@@ -19,8 +19,8 @@ var _context = require("../context");
 
 var _element = require("../element");
 
-/**
- * x, y, z轴
+/**
+ * x, y, z轴
  */
 var defaultAlign = {
   textAnchor: 'middle',
@@ -48,16 +48,16 @@ var getAxesPath = function getAxesPath(orientation, _ref2) {
       return 'M0, -0.5V' + (height + 0.5);
   }
 };
-/**
- * 根据坐标轴位置来确定轴标签的垂直对齐方式，水平对齐方式，以及轴标签位于坐标轴的哪个方向
- * @param orientation 坐标轴位置
- * @param rotate 旋转角度
- * @returns {
- *    dominantBaseline,
- *    textAnchor,
- *    directionX,
- *    directionY
- * }
+/**
+ * 根据坐标轴位置来确定轴标签的垂直对齐方式，水平对齐方式，以及轴标签位于坐标轴的哪个方向
+ * @param orientation 坐标轴位置
+ * @param rotate 旋转角度
+ * @returns {
+ *    dominantBaseline,
+ *    textAnchor,
+ *    directionX,
+ *    directionY
+ * }
  */
 
 

package/lib/components/Background.js

@@ -13,8 +13,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _utils = require("../utils");
 
-/**
- * 轴类图背景
+/**
+ * 轴类图背景
  */
 var _default = function _default(_ref) {
   var _ref$axis = _ref.axis,

package/lib/components/Carousel.js

@@ -42,8 +42,8 @@ var defaultAnimation = {
     opacity: 100
   }
 };
-/**
- * 饼图类图表轮播逻辑，用来管理currentIndex，及回调逻辑（HOC）
+/**
+ * 饼图类图表轮播逻辑，用来管理currentIndex，及回调逻辑（HOC）
  */
 
 var _default = function _default(Component) {

package/lib/components/Chart.js

@@ -19,8 +19,8 @@ var _context = require("../context");
 
 var _ = require(".");
 
-/**
- * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
+/**
+ * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
  */
 var getCallbackData = function getCallbackData(callbacks, data) {
   var callbackData;

package/lib/components/ConicalGradient.js

@@ -19,8 +19,8 @@ var _utils = require("@easyv/utils/lib/common/utils");
 
 var _indexModule = _interopRequireDefault(require("../css/index.module.css"));
 
-/**
- * 饼图装饰内圈
+/**
+ * 饼图装饰内圈
  */
 var _default = function _default(_ref) {
   var width = _ref.width,
@@ -123,8 +123,8 @@ var _default = function _default(_ref) {
     }
   });
 };
-/**
- * ConicalGradient
+/**
+ * ConicalGradient
  */
 
 
@@ -136,11 +136,11 @@ function ConicalGradient() {
 }
 
 ConicalGradient.prototype = {
-  /**
-   * addColorStop
-   *
-   * @param {Number} offset
-   * @param {Array} color RGBA值
+  /**
+   * addColorStop
+   *
+   * @param {Number} offset
+   * @param {Array} color RGBA值
    */
   addColorStop: function addColorStop(offset, color) {
     this._offsets.push(offset);
@@ -150,23 +150,23 @@ ConicalGradient.prototype = {
     return this;
   },
 
-  /**
-   * _offsetsReverse (array.forEach callback)
+  /**
+   * _offsetsReverse (array.forEach callback)
    */
   _offsetsReverse: function _offsetsReverse(offset, index, array) {
     array[index] = 1 - offset;
   },
 
-  /**
-   * fill
-   *
-   * @param {Number} context
-   * @param {Number} x
-   * @param {Number} y
-   * @param {Number} radius
-   * @param {Number} startAngle
-   * @param {Number} endAngle
-   * @param {Boolean} anticlockwise
+  /**
+   * fill
+   *
+   * @param {Number} context
+   * @param {Number} x
+   * @param {Number} y
+   * @param {Number} radius
+   * @param {Number} startAngle
+   * @param {Number} endAngle
+   * @param {Boolean} anticlockwise
    */
   fill: function fill(context, x, y, radius, startAngle, endAngle, anticlockwise) {
     var offsets = this._offsets;

package/lib/components/Indicator.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-/**
- * 轴类图表移上去的指示框背景
+/**
+ * 轴类图表移上去的指示框背景
  */
 var _default = function _default(_ref) {
   var color = _ref.color,

package/lib/components/LinearGradient.js

@@ -9,8 +9,8 @@ exports["default"] = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-/**
- * svg渐变滤镜
+/**
+ * svg渐变滤镜
  */
 var _default = function _default(_ref) {
   var id = _ref.id,

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/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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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/useAxes.js

@@ -28,11 +28,11 @@ var scales = {
   utc: _d3Scale.scaleUtc,
   ordinal: _utils.band
 };
-/**
- * x/y/z轴
- * @param {Array} axes 轴列表数组
- * @param {Object} context 其中需要包括
- * @returns {Map} 返回所有轴
+/**
+ * x/y/z轴
+ * @param {Array} axes 轴列表数组
+ * @param {Object} context 其中需要包括
+ * @returns {Map} 返回所有轴
  */
 
 var _default = function _default(_ref) {

package/lib/hooks/useCarouselAxisX.js

@@ -25,11 +25,11 @@ var initialState = {
   currentIndex: null,
   flag: false
 };
-/**
- * x轴滚动逻辑
- * @param {Object} axis x轴配置项
- * @param {Object} config x轴轮播动画的配置项
- * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
+/**
+ * x轴滚动逻辑
+ * @param {Object} axis x轴配置项
+ * @param {Object} config x轴轮播动画的配置项
+ * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
  */
 
 var _default = function _default(axis, config) {

package/lib/hooks/useExtentData.js

@@ -61,12 +61,12 @@ var stackData = function stackData(data, series) {
   dataMap.clear();
   return [min, max];
 };
-/**
- * 计算轴的domain
- * @param {Array} axes x轴列表
- * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
- * @param {Object} data 数据列表
- * @returns {Array} 返回带domain的轴
+/**
+ * 计算轴的domain
+ * @param {Array} axes x轴列表
+ * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
+ * @param {Object} data 数据列表
+ * @returns {Array} 返回带domain的轴
  */
 
 

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

@@ -89,11 +89,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/lib/utils/index.js

@@ -742,15 +742,34 @@ var sortPie = function sortPie(data, order) {
   }
 
   return _data;
-};
+}; // const getDataWithPercent = (data = [], precision = 0, type) => {
+//   const digits = Math.pow(10, precision);
+//   const targetSeats = digits * 100;
+//   const total = sum(data, (d) => d.value);
+//   const votesPerQuota = data.map((d, index) => ({
+//     ...d,
+//     vote: Math.round((d.value / total) * digits * 100),
+//     index,
+//   }));
+//   const currentSum = sum(votesPerQuota, (d) => d.vote);
+//   const remainder = targetSeats - currentSum;
+//   console.log(type+":",votesPerQuota, toFixed);
+//   votesPerQuota.sort(({ value: a }, { value: b }) => (a % total) - (b % total));
+//   const tmp = votesPerQuota.map(({ vote, ...data }, index) => ({
+//     ...data,
+//     percent: toFixed((vote + (index < remainder ? 1 : 0)) / digits, precision),
+//   }));
+//   return tmp;
+// };
+
 
 exports.sortPie = sortPie;
 
 var getDataWithPercent = function getDataWithPercent() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var digits = Math.pow(10, precision);
-  var targetSeats = digits * 100;
+  var digits = Math.pow(10, precision); //const targetSeats = digits * 100;
+
   var total = (0, _d3v.sum)(data, function (d) {
     return d.value;
   });
@@ -763,7 +782,7 @@ var getDataWithPercent = function getDataWithPercent() {
   var currentSum = (0, _d3v.sum)(votesPerQuota, function (d) {
     return d.vote;
   });
-  var remainder = targetSeats - currentSum;
+  var remainder = 100 - currentSum;
   votesPerQuota.sort(function (_ref26, _ref27) {
     var a = _ref26.value;
     var b = _ref27.value;
@@ -771,11 +790,21 @@ var getDataWithPercent = function getDataWithPercent() {
   });
   var tmp = votesPerQuota.map(function (_ref28, index) {
     var vote = _ref28.vote,
-        data = (0, _objectWithoutProperties2["default"])(_ref28, ["vote"]);
-    return _objectSpread(_objectSpread({}, data), {}, {
-      percent: (0, _utils2.toFixed)((vote + (index < remainder ? 1 : 0)) / digits, precision)
+        value = _ref28.value,
+        data = (0, _objectWithoutProperties2["default"])(_ref28, ["vote", "value"]);
+
+    var obj = _objectSpread(_objectSpread({}, data), {}, {
+      value: value,
+      percent: (0, _utils2.toFixed)((vote + (value && value != 0 ? remainder : 0)) / digits, precision)
     });
+
+    if (value && value != 0) {
+      remainder = 0;
+    }
+
+    return obj;
   });
+  console.log(tmp);
   return tmp;
 };
 

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "@easyv/charts",
-  "version": "1.0.68",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "make": "babel src -d lib --extensions .ts,.tsx,.js && cp -r src/css lib"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.14.5",
-    "@types/d3": "^7.0.0",
-    "@types/react": "^17.0.14",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0",
-    "load-styles": "^2.0.0"
-  },
-  "dependencies": {
-    "@easyv/utils": "^0.0.26",
-    "d3v7": "npm:d3@^7.0.0",
-    "popmotion": "^9.3.6",
-    "react": "^17.0.2",
-    "svg-points": "^6.0.1"
-  }
-}
+{
+  "name": "@easyv/charts",
+  "version": "1.0.69",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "make": "babel src -d lib --extensions .ts,.tsx,.js && cp -r src/css lib"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "@babel/preset-typescript": "^7.14.5",
+    "@types/d3": "^7.0.0",
+    "@types/react": "^17.0.14",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0",
+    "load-styles": "^2.0.0"
+  },
+  "dependencies": {
+    "@easyv/utils": "^0.0.26",
+    "d3v7": "npm:d3@^7.0.0",
+    "popmotion": "^9.3.6",
+    "react": "^17.0.2",
+    "svg-points": "^6.0.1"
+  }
+}

package/src/components/AnimateData.tsx

@@ -1,24 +1,24 @@
-/**
- * 用来做图表数据改变（增长）动画（HOC）
- */
-import React, { memo, ComponentType } from 'react';
-import { useAnimateData } from '../hooks';
-
-export default (Component: ComponentType<any>) =>
-  memo(
-    ({
-      data,
-      config: { dataAnimation, ...config },
-      ...rest
-    }: {
-      data: DataType[];
-      config: { dataAnimation: boolean; [key: string]: any };
-      [key: string]: any;
-    }) => (
-      <Component
-        {...rest}
-        config={config}
-        data={useAnimateData(data, dataAnimation)}
-      />
-    )
-  );
+/**
+ * 用来做图表数据改变（增长）动画（HOC）
+ */
+import React, { memo, ComponentType } from 'react';
+import { useAnimateData } from '../hooks';
+
+export default (Component: ComponentType<any>) =>
+  memo(
+    ({
+      data,
+      config: { dataAnimation, ...config },
+      ...rest
+    }: {
+      data: DataType[];
+      config: { dataAnimation: boolean; [key: string]: any };
+      [key: string]: any;
+    }) => (
+      <Component
+        {...rest}
+        config={config}
+        data={useAnimateData(data, dataAnimation)}
+      />
+    )
+  );