@easyv/charts 1.3.9 → 1.3.11

package/lib/utils/index.js

@@ -26,8 +26,7 @@ var _server = require("react-dom/server");
 
 var _svgPoints = require("svg-points");
 
-var _excluded = ["backgroundSize"],
-    _excluded2 = ["vote", "value"];
+var _excluded = ["backgroundSize"];
 
 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; }
 
@@ -408,15 +407,15 @@ function band() {
   };
 
   scale.range = function (_) {
-    var _ref11, _ref12;
+    var _ref11;
 
-    return arguments.length ? ((_ref11 = _, _ref12 = (0, _slicedToArray2["default"])(_ref11, 2), r0 = _ref12[0], r1 = _ref12[1], _ref11), 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 _ref13, _ref14;
+    var _ref12;
 
-    return (_ref13 = _, _ref14 = (0, _slicedToArray2["default"])(_ref13, 2), r0 = _ref14[0], r1 = _ref14[1], _ref13), 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 () {
@@ -481,14 +480,14 @@ function initRange(domain, range) {
 
 var getStacks = function getStacks(series) {
   var tmp = [];
-  series.forEach(function (_ref15, name) {
-    var type = _ref15.type,
-        stack = _ref15.stack,
-        yOrZ = _ref15.yOrZ;
-    var current = tmp.find(function (_ref16) {
-      var _type = _ref16.type,
-          _stack = _ref16.stack,
-          _yOrZ = _ref16.yOrZ;
+  series.forEach(function (_ref13, name) {
+    var type = _ref13.type,
+        stack = _ref13.stack,
+        yOrZ = _ref13.yOrZ;
+    var current = tmp.find(function (_ref14) {
+      var _type = _ref14.type,
+          _stack = _ref14.stack,
+          _yOrZ = _ref14.yOrZ;
       return _type == type && stack && _stack == stack && yOrZ == _yOrZ;
     });
 
@@ -523,9 +522,9 @@ var getStacks = function getStacks(series) {
 
 exports.getStacks = getStacks;
 
-var dataYOrZ = function dataYOrZ(data, _ref17) {
-  var seriesY = _ref17.y,
-      seriesZ = _ref17.z;
+var dataYOrZ = function dataYOrZ(data, _ref15) {
+  var seriesY = _ref15.y,
+      seriesZ = _ref15.z;
   var tmp = {
     y: [],
     z: []
@@ -577,11 +576,11 @@ var resetStacks = function resetStacks(stacks) {
 exports.resetStacks = resetStacks;
 
 var getCurrentStack = function getCurrentStack(stack, stackMap) {
-  return stackMap.find(function (_ref18) {
-    var _stack = _ref18.stack,
-        _type = _ref18.type,
-        _yOrZ = _ref18.yOrZ,
-        _s = _ref18.s;
+  return stackMap.find(function (_ref16) {
+    var _stack = _ref16.stack,
+        _type = _ref16.type,
+        _yOrZ = _ref16.yOrZ,
+        _s = _ref16.s;
     return _type == stack.type && _stack == stack.stack && _yOrZ == stack.yOrZ && _s.includes(stack.name);
   });
 };
@@ -609,10 +608,10 @@ var getBandwidth = function getBandwidth(step, paddingOuter) {
 
 exports.getBandwidth = getBandwidth;
 
-var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref19) {
-  var width = _ref19.width,
-      paddingInner = _ref19.paddingInner,
-      bandLength = _ref19.bandLength;
+var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref17) {
+  var width = _ref17.width,
+      paddingInner = _ref17.paddingInner,
+      bandLength = _ref17.bandLength;
   var seriesStep = width / (bandLength == 0 ? 1 : bandLength);
   var seriesWidth = seriesStep * (1 - paddingInner);
   return {
@@ -623,14 +622,14 @@ var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref19) {
 
 exports.getBandSeriesStepAndWidth = getBandSeriesStepAndWidth;
 
-var getSeriesInfo = function getSeriesInfo(_ref20) {
-  var step = _ref20.step,
-      _ref20$bandLength = _ref20.bandLength,
-      bandLength = _ref20$bandLength === void 0 ? 1 : _ref20$bandLength,
-      _ref20$paddingInner = _ref20.paddingInner,
-      paddingInner = _ref20$paddingInner === void 0 ? 0 : _ref20$paddingInner,
-      _ref20$paddingOuter = _ref20.paddingOuter,
-      paddingOuter = _ref20$paddingOuter === void 0 ? 0 : _ref20$paddingOuter;
+var getSeriesInfo = function getSeriesInfo(_ref18) {
+  var step = _ref18.step,
+      _ref18$bandLength = _ref18.bandLength,
+      bandLength = _ref18$bandLength === void 0 ? 1 : _ref18$bandLength,
+      _ref18$paddingInner = _ref18.paddingInner,
+      paddingInner = _ref18$paddingInner === void 0 ? 0 : _ref18$paddingInner,
+      _ref18$paddingOuter = _ref18.paddingOuter,
+      paddingOuter = _ref18$paddingOuter === void 0 ? 0 : _ref18$paddingOuter;
   if (bandLength == 0) return {
     seriesWidth: step,
     seriesStep: step,
@@ -767,27 +766,27 @@ var sortPie = function sortPie(data, order) {
 
   switch (order) {
     case '':
-      _data.sort(function (_ref21, _ref22) {
-        var a = _ref21.index;
-        var b = _ref22.index;
+      _data.sort(function (_ref19, _ref20) {
+        var a = _ref19.index;
+        var b = _ref20.index;
         return (0, _d3v.ascending)(a, b);
       });
 
       break;
 
     case 'desc':
-      _data.sort(function (_ref23, _ref24) {
-        var a = _ref23.value;
-        var b = _ref24.value;
+      _data.sort(function (_ref21, _ref22) {
+        var a = _ref21.value;
+        var b = _ref22.value;
         return (0, _d3v.descending)(a, b);
       });
 
       break;
 
     case 'asc':
-      _data.sort(function (_ref25, _ref26) {
-        var a = _ref25.value;
-        var b = _ref26.value;
+      _data.sort(function (_ref23, _ref24) {
+        var a = _ref23.value;
+        var b = _ref24.value;
         return (0, _d3v.ascending)(a, b);
       });
 
@@ -821,43 +820,61 @@ 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 total = (0, _d3v.sum)(data, function (d) {
-    return d.value;
-  }) || 1;
-  var votesPerQuota = data.map(function (d, index) {
-    return _objectSpread(_objectSpread({}, d), {}, {
-      vote: Math.round(d.value / total * digits * 100),
-      index: index
+  var objData = [];
+
+  function getPercentWithPrecision(valueList, idx, precision) {
+    if (!valueList[idx]) {
+      return 0;
+    }
+
+    var sum = valueList.reduce(function (acc, val) {
+      return acc + val.data.y;
+    }, 0);
+
+    if (sum === 0) {
+      return 0;
+    }
+
+    var digits = Math.pow(10, precision);
+    var votesPerQuota = valueList.map(function (val) {
+      return val.data.y / sum * digits * 100;
     });
-  });
-  var currentSum = (0, _d3v.sum)(votesPerQuota, function (d) {
-    return d.vote;
-  });
-  var remainder = targetSeats - currentSum;
-  votesPerQuota.sort(function (_ref27, _ref28) {
-    var a = _ref27.value;
-    var b = _ref28.value;
-    return a % total - b % total;
-  });
-  var tmp = votesPerQuota.map(function (_ref29, index) {
-    var vote = _ref29.vote,
-        value = _ref29.value,
-        data = (0, _objectWithoutProperties2["default"])(_ref29, _excluded2);
-
-    var obj = _objectSpread(_objectSpread({}, data), {}, {
-      value: value,
-      percent: (0, _utils2.toFixed)((vote + (value && value != 0 ? remainder : 0)) / digits, precision)
+    var targetSeats = digits * 100;
+    var seats = votesPerQuota.map(function (votes) {
+      return Math.floor(votes);
+    });
+    var currentSum = seats.reduce(function (acc, val) {
+      return acc + val;
+    }, 0);
+    var remainder = votesPerQuota.map(function (votes, idx) {
+      return votes - seats[idx];
     });
 
-    if (value && value != 0) {
-      remainder = 0;
+    while (currentSum < targetSeats) {
+      var max = Number.NEGATIVE_INFINITY;
+      var maxId = null;
+
+      for (var i = 0, len = remainder.length; i < len; ++i) {
+        if (remainder[i] > max) {
+          max = remainder[i];
+          maxId = i;
+        }
+      }
+
+      ++seats[maxId];
+      remainder[maxId] = 0;
+      ++currentSum;
     }
 
-    return obj;
+    return seats[idx] / digits;
+  }
+
+  data.forEach(function (d, i) {
+    objData.push(_objectSpread(_objectSpread({}, d), {}, {
+      percent: getPercentWithPrecision(data, i, precision)
+    }));
   });
-  return tmp;
+  return objData;
 };
 
 exports.getDataWithPercent = getDataWithPercent;

package/package.json

@@ -1,54 +1,54 @@
-{
-  "name": "@easyv/charts",
-  "version": "1.3.9",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "make": "babel src -d lib --extensions .ts,.tsx,.js && 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.0.3",
-    "@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"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
-  },
-  "standard-version": {
-    "skip": {
-      "commit": true
-    }
-  }
-}
+{
+  "name": "@easyv/charts",
+  "version": "1.3.11",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "make": "babel src -d lib --extensions .ts,.tsx,.js && 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.0.3",
+    "@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"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true
+    }
+  }
+}

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: DataAnimation; [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: DataAnimation; [key: string]: any };
+      [key: string]: any;
+    }) => (
+      <Component
+        {...rest}
+        config={config}
+        data={useAnimateData(data, dataAnimation)}
+      />
+    )
+  );