@easyv/charts 1.0.67 → 1.0.71

package/lib/components/Axis.js

@@ -194,7 +194,7 @@ var Label = function Label(_ref5) {
     letterSpacing: letterSpacing,
     dx: "0",
     dy: "0",
-    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : translateText : translateText + 'rotate(' + rotate + ')'
+    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : 'translate(' + translateX + ', ' + translateY + ')' : translateText + 'rotate(' + rotate + ')'
   }, !!Array.isArray(_label) ? _label.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("tspan", {
       key: index,

package/lib/components/Label.js

@@ -157,19 +157,29 @@ var Icon = function Icon(_ref4) {
       inner = _ref4$config.inner,
       outer = _ref4$config.outer,
       color = _ref4$config.color,
-      radius = _ref4$config.radius;
+      radius = _ref4$config.radius,
+      image = _ref4$config.image,
+      _ref4$config$size = _ref4$config.size,
+      width = _ref4$config$size.width,
+      height = _ref4$config$size.height;
   return mode == 'single' ? /*#__PURE__*/React.createElement(Circle, {
     cx: cx,
     cy: cy,
     color: color,
     radius: radius
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
+  }) : mode == 'double' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
   }, inner)), /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
-  }, outer)));
+  }, outer))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("image", {
+    width: width,
+    height: height,
+    x: cx - width / 2,
+    y: cy - height / 2,
+    xlinkHref: window.appConfig.ASSETS_URL + image
+  }));
 };
 
 var Circle = function Circle(_ref5) {

package/lib/components/PieChart.js

@@ -887,7 +887,7 @@ var Label = function Label(_ref10) {
 
     var _showValue = showValue && (value || showSuffix);
 
-    return show && (_showName || showPercent || _showValue) && /*#__PURE__*/_react["default"].createElement("g", {
+    return show && (_showName || showPercent || showValue) && /*#__PURE__*/_react["default"].createElement("g", {
       key: index
     }, /*#__PURE__*/_react["default"].createElement("path", {
       className: animation ? _piechartModule["default"]['label-line'] : "",
@@ -908,7 +908,7 @@ var Label = function Label(_ref10) {
       textAnchor: x3 >= 0 ? 'start' : 'end'
     }, _showName && /*#__PURE__*/_react["default"].createElement("tspan", {
       style: (0, _utils.getFontStyle)(nameFont, 'svg')
-    }, displayName + (showValue || showPercent ? ':' : '')), _showValue && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("tspan", {
+    }, displayName + (showValue || showPercent ? ':' : '')), showValue && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("tspan", {
       x: !!(_showName && mode == 'vertical') ? _x : '',
       dx: valueDx(_showName, mode),
       dy: !!(_showName && mode == 'vertical') ? '1.5em' : '',

package/lib/formatter/legend.js

@@ -73,7 +73,7 @@ var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
       alignItems: 'center',
       justifyContent: 'flex-start'
     })
-  }, showValue && /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
     style: {
       whiteSpace: "nowrap",
       fontSize: fontSize,

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,10 +790,19 @@ 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;
   });
   return tmp;
 };

package/package.json

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

package/src/components/Axis.tsx

@@ -180,7 +180,7 @@ const Label: (props: LabelType) => ReactComponentElement<ComponentType> | null =
       translateY * directionY;
 
     const translateText = 'translate(' + x + ', ' + y + ')';
-    
+   
     return (
       <text
         className={className}
@@ -202,7 +202,7 @@ const Label: (props: LabelType) => ReactComponentElement<ComponentType> | null =
                 : 'rotate(' + rotate + ', ' + x + ', ' + y + ')'
               : isVertical
               ? translateText
-              : translateText
+              : 'translate(' + translateX + ', ' + translateY + ')'
             : translateText + 'rotate(' + rotate + ')'
         }
       >

package/src/components/Label.js

@@ -123,15 +123,25 @@ const Label = ({
     </text>
   );
 };
-const Icon = ({ cx, cy, config: { mode, inner, outer, color, radius } }) =>
+const Icon = ({ cx, cy, config: { mode, inner, outer, color, radius, image, size: { width, height } } }) =>
   mode == 'single' ? (
     <Circle cx={cx} cy={cy} color={color} radius={radius} />
-  ) : (
+  ) : mode == 'double' ? (
     <>
       <Circle cx={cx} cy={cy} {...inner} />
       <Circle cx={cx} cy={cy} {...outer} />
     </>
+  ) : (
+    <>
+      <image
+        width={width}
+        height={height}
+        x={cx - width / 2}
+        y={cy - height / 2}
+        xlinkHref={window.appConfig.ASSETS_URL + image} />
+    </>
   );
+
 const Circle = ({ cx, cy, color, radius }) => (
   <circle cx={cx} cy={cy} fill={color} r={radius} stroke='none' />
 );

package/src/components/PieChart.js

@@ -861,7 +861,7 @@ const Label = ({
 
           return (
             show &&
-            (_showName || showPercent || _showValue) && (
+            (_showName || showPercent || showValue) && (
               <g key={index}>
                 <path
                   className={animation? ringCss['label-line']:""}
@@ -887,7 +887,7 @@ const Label = ({
                       {displayName + (showValue || showPercent ? ':' : '')}
                     </tspan>
                   )}
-                  {_showValue && (
+                  {showValue && (
                     <>
                       <tspan
                         x={!!(_showName && mode == 'vertical') ? _x : ''}

package/src/formatter/legend.js

@@ -58,7 +58,7 @@ export const pieLegendFormatter = (
               justifyContent: 'flex-start',
             }}
           >
-            {showValue && <span>{data.y}</span>}
+            <span>{data.y}</span>
             {showSuffix && (
               <span
                 style={{

package/src/utils/index.js

@@ -586,9 +586,33 @@ const 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;
+// };
+
 const getDataWithPercent = (data = [], precision = 0) => {
   const digits = Math.pow(10, precision);
-  const targetSeats = digits * 100;
+  //const targetSeats = digits * 100;
 
   const total = sum(data, (d) => d.value);
 
@@ -598,17 +622,24 @@ const getDataWithPercent = (data = [], precision = 0) => {
     index,
   }));
   const currentSum = sum(votesPerQuota, (d) => d.vote);
-  const remainder = targetSeats - currentSum;
 
+  let remainder = 100 - currentSum;
   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),
-  }));
-
+  const tmp = votesPerQuota.map(({ vote, value, ...data }, index) => {
+    let obj={
+      ...data,
+      value,
+      percent: toFixed((vote + ((value && value != 0) ? remainder : 0)) / digits, precision),
+    };
+    if(value && value!=0){
+      remainder = 0
+    }
+    return obj
+  });
   return tmp;
 };
+
 export {
   dateFormat,
   getBreakWord,