@easyv/charts 1.3.14 → 1.3.16

package/lib/components/Legend.js

@@ -93,13 +93,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       gridTemplateColumns: 'repeat(' + Math.min(gridTemplateColumns, length) + ', 1fr)'
     }
   }, _series.map(function (series, index) {
+    var _series$config, _series$config$line;
+
     var type = series.type,
         name = series.name,
         displayName = series.displayName,
         icon = series.icon,
         selected = series.selected;
 
-    var _icon = (0, _utils.getIcon)(type, icon);
+    var _icon = (0, _utils.getIcon)(type, icon, series === null || series === void 0 ? void 0 : (_series$config = series.config) === null || _series$config === void 0 ? void 0 : (_series$config$line = _series$config.line) === null || _series$config$line === void 0 ? void 0 : _series$config$line.type);
 
     return /*#__PURE__*/_react["default"].createElement("li", {
       key: index,

package/lib/components/PieChart.js

@@ -435,8 +435,9 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
 
     var _series = (0, _toConsumableArray2["default"])(series.values());
 
+    if (_series.length < arcs.length) console.warn("请检查数据中是否存在相同的s");
     return arcs.map(function (arc, index) {
-      return getArc(radius, arc, _series[index]);
+      return getArc(radius, arc, _series[index % _series.length]);
     });
   }, [series, arcs, radius]);
 

package/lib/utils/index.js

@@ -124,10 +124,15 @@ var getColorList = function getColorList(_ref3) {
 exports.getColorList = getColorList;
 
 var getIcon = function getIcon(type, icon) {
+  var lineType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "solid";
+
   switch (type) {
     case 'area':
     case 'line':
-      return icon ? _objectSpread(_objectSpread({}, defaultLineIcon), icon) : defaultLineIcon;
+      var color = icon.background;
+      return icon ? _objectSpread(_objectSpread(_objectSpread({}, defaultLineIcon), icon), {}, {
+        background: lineType == "solid" ? color : "linear-gradient(90deg, ".concat(color, ", ").concat(color, " 66%, transparent 66%) 0 0/33% 100% repeat")
+      }) : defaultLineIcon;
 
     default:
       return icon ? _objectSpread(_objectSpread({}, defaultIcon), icon) : defaultIcon;
@@ -828,7 +833,7 @@ var getDataWithPercent = function getDataWithPercent() {
     }
 
     var sum = valueList.reduce(function (acc, val) {
-      return acc + val.data.y;
+      return acc + val.value;
     }, 0);
 
     if (sum === 0) {
@@ -837,7 +842,7 @@ var getDataWithPercent = function getDataWithPercent() {
 
     var digits = Math.pow(10, precision);
     var votesPerQuota = valueList.map(function (val) {
-      return val.data.y / sum * digits * 100;
+      return val.value / sum * digits * 100;
     });
     var targetSeats = digits * 100;
     var seats = votesPerQuota.map(function (votes) {

package/package.json

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

package/src/components/Legend.js

@@ -30,9 +30,7 @@ export default memo(
     formatter,
   }) => {
     if (!show) return null;
-
     const _series = sortPie(series, order);
-
     const [_alignment, position] = alignment.split(' ');
     const length = _series.length;
 
@@ -66,7 +64,7 @@ export default memo(
         >
           {_series.map((series, index) => {
             const { type, name, displayName, icon, selected } = series;
-            const _icon = getIcon(type, icon);
+            const _icon = getIcon(type, icon, series?.config?.line?.type);
             return (
               <li
                 key={index}

package/src/components/PieChart.js

@@ -175,22 +175,24 @@ const getArc = (
     ...rest
   },
   series
-) => ({
-  ...rest,
-  type: 'pie',
-  fieldName: series.fieldName,
-  displayName: series.displayName || rest.data.s,
-  series: series,
-  innerRadius: innerRadius * radius,
-  outerRadius: outerRadius * radius,
-  arc: arc()
-    .innerRadius(innerRadius * radius)
-    .outerRadius(outerRadius * radius)
-    .cornerRadius(cornerRadius)
-    .startAngle(startAngle)
-    .endAngle(endAngle)
-    .padAngle(padAngle),
-});
+) => {
+  return {
+    ...rest,
+    type: 'pie',
+    fieldName: series.fieldName,
+    displayName: series.displayName || rest.data.s,
+    series: series,
+    innerRadius: innerRadius * radius,
+    outerRadius: outerRadius * radius,
+    arc: arc()
+      .innerRadius(innerRadius * radius)
+      .outerRadius(outerRadius * radius)
+      .cornerRadius(cornerRadius)
+      .startAngle(startAngle)
+      .endAngle(endAngle)
+      .padAngle(padAngle),
+  } 
+};
 
 const getCircleScale = ({ count, color, width, length } = tick, radius) => {
   let data = [],
@@ -353,7 +355,8 @@ const Component = memo(
       const seriesLength = series.size;
       if (!seriesLength) return [];
       const _series = [...series.values()];
-      return arcs.map((arc, index) => getArc(radius, arc, _series[index]));
+      if(_series.length<arcs.length) console.warn("请检查数据中是否存在相同的s")
+      return arcs.map((arc, index) => getArc(radius, arc, _series[index%_series.length]));
     }, [series, arcs, radius]);
     const onClick = useCallback(
       (e) =>

package/src/utils/index.js

@@ -80,14 +80,16 @@ const getColorList = ({ type, pure, linear: { stops, angle, opacity } }) => {
   }
   return stops.map(({ color, offset }) => ({ color, offset: offset / 100 }));
 };
-const getIcon = (type, icon) => {
+const getIcon = (type, icon, lineType="solid") => {
   switch (type) {
     case 'area':
     case 'line':
+      let color = icon.background;
       return icon
         ? {
             ...defaultLineIcon,
             ...icon,
+            background:lineType=="solid"?color:`linear-gradient(90deg, ${color}, ${color} 66%, transparent 66%) 0 0/33% 100% repeat`
           }
         : defaultLineIcon;
     default:
@@ -661,14 +663,14 @@ const getDataWithPercent = (data = [], precision = 0) => {
       return 0;
     }
     const sum = valueList.reduce( function (acc, val) {
-      return acc + val.data.y;
+      return acc + val.value;
     }, 0);
     if (sum === 0) {
       return 0;
     }
     const digits = Math.pow(10, precision);
     const votesPerQuota = valueList.map(function (val) {
-      return val.data.y / sum * digits * 100;
+      return val.value / sum * digits * 100;
     });
     const targetSeats = digits * 100;
     const seats = votesPerQuota.map(function (votes) {