@easyv/charts 1.5.11 → 1.5.12

package/lib/components/Chart.js

@@ -11,8 +11,6 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -127,32 +125,20 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     return function () {
       document.removeEventListener("switchActive_".concat(id), activeHandler);
     };
-  }, []); //对轴类图表进行
-
-  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;
-          });
-        });
-      }
-    }
-  }
+  }, []);
+  var 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 /*#__PURE__*/_react["default"].createElement(_context.chartContext.Provider, {
     value: context

package/lib/hooks/useExtentData.js

@@ -93,7 +93,26 @@ var _default = function _default(_ref) {
     }).keys());
   }, [data]);
   var y = stackData(dataY, _series.y);
-  var z = stackData(dataZ, _series.z); //clipAxisMode如果是auto根据clipDifferenceValue设置clipValue
+  var z = stackData(dataZ, _series.z);
+  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) {
+      x.sort(function (a, b) {
+        return a > b ? 1 : -1;
+      }); // const groupBySeries = group(data, (d) => d.s);
+      // data=[...groupBySeries].flatMap(d=>{
+      //   return d[1].sort((a,b)=>a.x>b.x?1:-1)
+      // });
+    }
+  } //clipAxisMode如果是auto根据clipDifferenceValue设置clipValue
+
 
   return axes.map(function (item) {
     var axisType = item.axisType,

package/package.json

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

package/src/components/Chart.js

@@ -102,20 +102,20 @@ const Chart = memo(
       }
     },[]);
     
-    //对轴类图表进行
     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)
-          });
-        }
-      }
-    }
+    //对轴类图表进行自动排序
+    // 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}>

package/src/components/ExtentData.js

@@ -4,8 +4,8 @@
 import { memo } from 'react';
 import { useExtentData } from '../hooks';
 export default (Component) =>
-  memo(({ config: { axes, series, ...config }, data, ...props }) => (
-    <Component
+  memo(({ config: { axes, series, ...config }, data, ...props }) => {
+    return <Component
       {...props}
       config={{
         ...config,
@@ -14,4 +14,5 @@ export default (Component) =>
       }}
       data={data}
     />
-  ));
+  }
+);

package/src/components/Mapping.js

@@ -18,7 +18,7 @@ const isValidData = (data) =>
         Object.prototype.toString.call(obj) === '[object Object]' &&
         Object.keys(obj).length !== 0
     ).length > 0
-  );
+);
 
 export default (Component) =>
   memo(({ config: { series, ...config }, data: originData, ...rest }) => {
@@ -47,8 +47,7 @@ export default (Component) =>
         data.forEach(({ key }) => {
           const current = series.find(({ fieldName }) => fieldName == key);
           const result = current || lastSeries;
-          const name =
-            (current ? current.fieldName || current.displayName : key) || '';
+          const name = (current ? current.fieldName || current.displayName : key) || '';
           tmp.set(name, {
             ...result,
             name,

package/src/hooks/useExtentData.js

@@ -57,10 +57,20 @@ export default ({ axes, series, data }) => {
     () => dataYOrZ(data, _series),
     [data, _series]
   );
-
   const x = useMemo(() => [...group(data, (d) => d.x).keys()], [data]);
   const y = stackData(dataY, _series.y);
   const z = stackData(dataZ, _series.z);
+  const xAxis = axes.find(d=>d.axisType=="x");
+  if(xAxis){
+    const { config:{ label:{ autoSort, format:{ type } } } } = xAxis;
+    if(type=="date" && autoSort){
+      x.sort((a,b)=>a>b?1:-1);
+      // const groupBySeries = group(data, (d) => d.s);
+      // data=[...groupBySeries].flatMap(d=>{
+      //   return d[1].sort((a,b)=>a.x>b.x?1:-1)
+      // });
+    }
+  }
   //clipAxisMode如果是auto根据clipDifferenceValue设置clipValue
   return axes.map((item) => {
     const { axisType, domain, type } = item;