@easyv/charts 1.4.33 → 1.4.35

package/lib/components/Chart.js

@@ -11,6 +11,8 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -19,6 +21,8 @@ var _context = require("../context");
 
 var _ = require(".");
 
+var _d3v = require("d3v7");
+
 var _excluded = ["id", "type", "config", "config", "data", "onRelative", "emit", "emitEvent"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -48,6 +52,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       type = _ref2.type,
       config = _ref2.config,
       _ref2$config = _ref2.config,
+      axes = _ref2$config.axes,
       _ref2$config$chart = _ref2$config.chart,
       _ref2$config$chart$di = _ref2$config$chart.dimension.chartDimension,
       height = _ref2$config$chart$di.height,
@@ -58,7 +63,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       marginBottom = _ref2$config$chart$ma.marginBottom,
       marginTop = _ref2$config$chart$ma.marginTop,
       interaction = _ref2$config.interaction,
-      data = _ref2.data,
+      originData = _ref2.data,
       onRelative = _ref2.onRelative,
       emit = _ref2.emit,
       emitEvent = _ref2.emitEvent,
@@ -101,7 +106,33 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       svg: svg,
       onEmit: onEmit
     };
-  }, [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]);
+  }, [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]); //对轴类图表进行
+
+  var data = originData;
+
+  if (axes) {
+    var xAxis = axes.find(function (d) {
+      return d.axisType == "x";
+    });
+
+    if (xAxis) {
+      var _xAxis$config$label = xAxis.config.label,
+          autoSort = _xAxis$config$label.autoSort,
+          _type = _xAxis$config$label.format.type;
+
+      if (_type == "date" && autoSort) {
+        var groupBySeries = (0, _d3v.group)(data, function (d) {
+          return d.s;
+        });
+        data = (0, _toConsumableArray2["default"])(groupBySeries).flatMap(function (d) {
+          return d[1].sort(function (a, b) {
+            return a.x > b.x ? 1 : -1;
+          });
+        });
+      }
+    }
+  }
+
   return /*#__PURE__*/_react["default"].createElement(_context.chartContext.Provider, {
     value: context
   }, type == 'pie' ? /*#__PURE__*/_react["default"].createElement(_.PieChart, (0, _extends2["default"])({

package/lib/hooks/useFilterData.js

@@ -97,7 +97,27 @@ var _default = function _default(_ref) {
     });
   }, []);
   (0, _react.useEffect)(function () {
-    setSelected(getInitialSelected(series));
+    var map = getInitialSelected(series);
+
+    var _iterator2 = _createForOfIteratorHelper(map.entries()),
+        _step2;
+
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _step2$value = (0, _slicedToArray2["default"])(_step2.value, 1),
+            key = _step2$value[0];
+
+        if (selected.has(key)) {
+          map.set(key, selected.get(key));
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+
+    setSelected(map);
   }, [series]);
   return [{
     series: _series,

package/package.json

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

package/src/components/CartesianChart.js

@@ -435,7 +435,6 @@ const Chart = memo(
                     );
                   })}
               </g>
-
               {series.map(({ Component, yOrZ, ...config }, index) => {
                 const yAxis = axes.get(yOrZ);
                 return (

package/src/components/Chart.js

@@ -4,6 +4,7 @@
 import React, { memo, useMemo, createRef, useCallback } from 'react';
 import { chartContext } from '../context';
 import { PieChart, CartesianChart } from '.';
+import { group } from 'd3v7';
 
 const getCallbackData = (action,callbacks, data) => {
   const callbackData={};
@@ -23,6 +24,7 @@ const Chart = memo(
     type,
     config,
     config: {
+      axes,
       chart: {
         dimension: {
           chartDimension: { height, width },
@@ -31,7 +33,7 @@ const Chart = memo(
       },
       interaction,
     },
-    data,
+    data:originData,
     onRelative,
     emit,
     emitEvent,
@@ -85,6 +87,21 @@ const Chart = memo(
       }),
       [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]
     );
+    //对轴类图表进行
+    let data = originData;
+    if(axes){
+      const xAxis = axes.find(d=>d.axisType=="x");
+      if(xAxis){
+        const { config:{ label:{ autoSort, format:{ type } } } } = xAxis;
+        if(type=="date" && autoSort){
+          const groupBySeries = group(data, (d) => d.s);
+          data=[...groupBySeries].flatMap(d=>{
+            return d[1].sort((a,b)=>a.x>b.x?1:-1)
+          });
+        }
+      }
+    }
+
     return (
       <chartContext.Provider value={context}>
         {type == 'pie' ? (

package/src/hooks/useFilterData.js

@@ -53,7 +53,13 @@ export default ({ data, series }) => {
   }, []);
 
   useEffect(() => {
-    setSelected(getInitialSelected(series));
+    const map = getInitialSelected(series);
+    for(let [ key ] of map.entries()){
+      if(selected.has(key)){
+        map.set(key, selected.get(key));
+      }
+    }
+    setSelected(map);
   }, [series]);
 
   return [