@easyv/charts 1.6.3 → 1.6.4

package/lib/hooks/useAxes.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = require("react");
@@ -134,7 +136,8 @@ var _default = function _default(_ref) {
 
   var _axes = (0, _react.useMemo)(function () {
     var tmp = new Map();
-    var xAxisPositions = [];
+    var xAxisPositions = new Set(); //用Set去重，去掉重复的x轴
+
     axes.forEach(function (item) {
       var _item$config$label = item.config.label,
           extent = _item$config$label.extent,
@@ -396,17 +399,17 @@ var _default = function _default(_ref) {
         if (type == "linear" && config.on) {
           var zeroPosition = scaler(0);
 
-          if (zeroPosition !== range[0] && !isNaN(zeroPosition)) {
+          if (!isNaN(zeroPosition)) {
             if (_direction === "horizontal") {
-              xAxisPositions.push({
+              xAxisPositions.add(JSON.stringify({
                 x: zeroPosition,
                 y: 0
-              });
+              }));
             } else if (_direction === "vertical") {
-              xAxisPositions.push({
+              xAxisPositions.add(JSON.stringify({
                 x: 0,
                 y: zeroPosition
-              });
+              }));
             }
           }
         }
@@ -456,7 +459,9 @@ var _default = function _default(_ref) {
         }));
       }
     });
-    tmp.get("x") && (tmp.get("x").positions = xAxisPositions);
+    tmp.get("x") && (tmp.get("x").positions = (0, _toConsumableArray2["default"])(xAxisPositions).map(function (d) {
+      return JSON.parse(d);
+    }));
     return tmp;
   }, [axes, controlInfo]);
 

package/package.json

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

package/src/hooks/useAxes.js

@@ -102,7 +102,7 @@ export default ({
 
   const _axes = useMemo(() => {
     const tmp = new Map();
-    const xAxisPositions = [];
+    const xAxisPositions = new Set();   //用Set去重，去掉重复的x轴
     axes.forEach((item) => {
       const {
         config: {
@@ -390,7 +390,6 @@ export default ({
           );
         }
         let scaler = scales[type]().domain(newDomain).range(range);
-
         scaler.type = type;
         if (type !== "ordinal") scaler.clamp(true);
 
@@ -425,17 +424,17 @@ export default ({
         const lengthWithoutPaddingOuter = length - _paddingOuter;
         if (type == "linear" && config.on) {
           const zeroPosition = scaler(0);
-          if (zeroPosition !== range[0] && !isNaN(zeroPosition)) {
+          if (!isNaN(zeroPosition)) {
             if (direction === "horizontal") {
-              xAxisPositions.push({
+              xAxisPositions.add(JSON.stringify({
                 x: zeroPosition,
                 y: 0,
-              });
+              }));
             } else if (direction === "vertical") {
-              xAxisPositions.push({
+              xAxisPositions.add(JSON.stringify({
                 x: 0,
                 y: zeroPosition,
-              });
+              }));
             }
           }
         }
@@ -487,7 +486,7 @@ export default ({
         });
       }
     });
-    tmp.get("x") && (tmp.get("x").positions = xAxisPositions);
+    tmp.get("x") && (tmp.get("x").positions = [...xAxisPositions].map(d=>JSON.parse(d)));
     return tmp;
   }, [axes, controlInfo]);
   return _axes;