@easyv/charts 1.0.69 → 1.0.73

package/lib/utils/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.band = band;
-exports.getDataWithPercent = exports.sortPie = exports.getDomPath = exports.filterChildren = exports.getChildren = exports.isValidHttpUrl = exports.getBandSeriesStepAndWidth = exports.getBandwidth = exports.getBandBackground = exports.getCurrentStack = exports.resetStacks = exports.seriesYOrZ = exports.dataYOrZ = exports.getStacks = exports.getColorList = exports.getIcon = exports.getTranslate2d = exports.getTranslate3d = exports.getMargin = exports.getFontStyle = exports.getMousePos = exports.identity = exports.getGridCoord = exports.getTickCoord = exports.getBreakWord = exports.dateFormat = void 0;
+exports.getDataWithPercent = exports.sortPie = exports.getDomPath = exports.filterChildren = exports.getChildren = exports.isValidHttpUrl = exports.getBandSeriesStepAndWidth = exports.getBandwidth = exports.getBandBackground = exports.getCurrentStack = exports.resetStacks = exports.seriesYOrZ = exports.dataYOrZ = exports.getStacks = exports.getColorList = exports.getIcon = exports.getTranslate2d = exports.getTranslate3d = exports.getMargin = exports.getFontStyle = exports.getMousePos = exports.identity = exports.getGridCoord = exports.getTickCoord = exports.getTicksOfAxis = exports.getBreakWord = exports.dateFormat = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -169,10 +169,33 @@ exports.dateFormat = dateFormat;
 var getBreakWord = function getBreakWord(str, breakNumber) {
   var re = new RegExp('([^]){1,' + breakNumber + '}', 'g');
   return str.match(re);
-};
+}; //x轴标签逻辑
+
 
 exports.getBreakWord = getBreakWord;
 
+var getTicksOfAxis = function getTicksOfAxis(domain, ticksCount, showLast) {
+  var len = domain.length;
+  if (ticksCount < 2 || ticksCount > len) return domain;
+  var step = Math.floor((len - ticksCount) / (ticksCount - 1));
+  var ticksArr = domain.filter(function (d, i) {
+    return i % (step + 1) === 0;
+  });
+  var Tlen = ticksArr.length;
+  var lastIndex = domain.findIndex(function (d) {
+    return d == ticksArr[Tlen - 1];
+  });
+
+  if (showLast) {
+    len % ticksCount == 0 || len - 1 - lastIndex >= Math.round(len / Tlen / 2) ? null : ticksArr.pop();
+    ticksArr.push(domain[len - 1]);
+  }
+
+  return ticksArr;
+};
+
+exports.getTicksOfAxis = getTicksOfAxis;
+
 var getTickCoord = function getTickCoord(_ref5) {
   var orientation = _ref5.orientation,
       coordinate = _ref5.coordinate,
@@ -804,7 +827,6 @@ var getDataWithPercent = function getDataWithPercent() {
 
     return obj;
   });
-  console.log(tmp);
   return tmp;
 };
 

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "@easyv/charts",
-  "version": "1.0.69",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "make": "babel src -d lib --extensions .ts,.tsx,.js && cp -r src/css lib"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.14.5",
-    "@types/d3": "^7.0.0",
-    "@types/react": "^17.0.14",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0",
-    "load-styles": "^2.0.0"
-  },
-  "dependencies": {
-    "@easyv/utils": "^0.0.26",
-    "d3v7": "npm:d3@^7.0.0",
-    "popmotion": "^9.3.6",
-    "react": "^17.0.2",
-    "svg-points": "^6.0.1"
-  }
-}
+{
+  "name": "@easyv/charts",
+  "version": "1.0.73",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "make": "babel src -d lib --extensions .ts,.tsx,.js && cp -r src/css lib"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "@babel/preset-typescript": "^7.14.5",
+    "@types/d3": "^7.0.0",
+    "@types/react": "^17.0.14",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0",
+    "load-styles": "^2.0.0"
+  },
+  "dependencies": {
+    "@easyv/utils": "^0.0.26",
+    "d3v7": "npm:d3@^7.0.0",
+    "popmotion": "^9.3.6",
+    "react": "^17.0.2",
+    "svg-points": "^6.0.1"
+  }
+}

package/src/components/AnimateData.tsx

@@ -1,24 +1,24 @@
-/**
- * 用来做图表数据改变（增长）动画（HOC）
- */
-import React, { memo, ComponentType } from 'react';
-import { useAnimateData } from '../hooks';
-
-export default (Component: ComponentType<any>) =>
-  memo(
-    ({
-      data,
-      config: { dataAnimation, ...config },
-      ...rest
-    }: {
-      data: DataType[];
-      config: { dataAnimation: boolean; [key: string]: any };
-      [key: string]: any;
-    }) => (
-      <Component
-        {...rest}
-        config={config}
-        data={useAnimateData(data, dataAnimation)}
-      />
-    )
-  );
+/**
+ * 用来做图表数据改变（增长）动画（HOC）
+ */
+import React, { memo, ComponentType } from 'react';
+import { useAnimateData } from '../hooks';
+
+export default (Component: ComponentType<any>) =>
+  memo(
+    ({
+      data,
+      config: { dataAnimation, ...config },
+      ...rest
+    }: {
+      data: DataType[];
+      config: { dataAnimation: boolean; [key: string]: any };
+      [key: string]: any;
+    }) => (
+      <Component
+        {...rest}
+        config={config}
+        data={useAnimateData(data, dataAnimation)}
+      />
+    )
+  );