@easyv/charts 1.6.24 → 1.6.25

package/lib/components/Axis.js

@@ -228,7 +228,7 @@ var Label = function Label(_ref5) {
     }
   })));
 };
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref6, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (_ref6, ref) {
   var orientation = _ref6.orientation,
     scaler = _ref6.scaler,
     _ref6$tickSize = _ref6.tickSize,

package/lib/components/ChartContainer.js

@@ -15,7 +15,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * svg外框
  */
 var event = function event() {};
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var width = _ref.width,
     height = _ref.height,
     marginLeft = _ref.marginLeft,

package/lib/components/Control.js

@@ -18,7 +18,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$actions = props.actions,
     setX = _props$actions.setX,
     setWorking = _props$actions.setWorking,

package/lib/components/Marquee.js

@@ -17,7 +17,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * 文字跑马灯组件
  * eg: <Marquee value={文本内容} speed={跑马灯速度} style={额外样式}></Marquee>
  */
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var value = props.value,
     style = props.style,
     _props$speed = props.speed,

package/lib/components/TextOverflow.js

@@ -17,7 +17,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * 文本溢出组件
  * eg: <TextOverflow  type={溢出形式} value={文本内容} speed={跑马灯速度} style={额外样式}></Marquee>
  */
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var type = props.type,
     value = props.value,
     style = props.style,

package/lib/hooks/useAxes.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var getCount = function getCount(num) {
   var i = 0,
     num_ = Math.abs(num);
-  if (num_ < 1) return i;
+  if (num_ < 1) return 0;
   while (num_ > 10) {
     i++;
     num_ = Math.floor(num_ / 10);
@@ -57,6 +57,8 @@ var getNewDomain = function getNewDomain(domain, mode, step) {
     case "count":
       newDomain[0] = bottom != "" ? bottom : Math.floor(domain[0] / minCount) * minCount;
       newDomain[1] = top != "" ? top : maxCount == 1 ? domain[1] : Math.ceil(domain[1] / maxCount) * maxCount;
+      if (newDomain[0] > 0 && newDomain[0] < 10 && defaultBottom === "") newDomain[0] = 0;
+      if (newDomain[1] < 0 && newDomain[1] > -10 && defaultTop === "") newDomain[1] = 0;
       break;
     case "step":
       if (defaultTop != "") {

package/lib/utils/index.js

@@ -390,11 +390,11 @@ function band() {
   };
   scale.range = function (_) {
     var _ref12;
-    return arguments.length ? ((_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1]), r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
+    return arguments.length ? (_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1], r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
   };
   scale.rangeRound = function (_) {
     var _ref13;
-    return (_ref13 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref13[0], r1 = _ref13[1]), r0 = +r0, r1 = +r1, round = true, rescale();
+    return _ref13 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref13[0], r1 = _ref13[1], r0 = +r0, r1 = +r1, round = true, rescale();
   };
   scale.bandwidth = function () {
     return bandwidth;
@@ -535,7 +535,7 @@ var getBandBackground = exports.getBandBackground = function getBandBackground(p
     var _pattern$backgroundSi = pattern.backgroundSize,
       backgroundSize = _pattern$backgroundSi === void 0 ? '100% 100%' : _pattern$backgroundSi,
       _pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded2);
-    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)( /*#__PURE__*/React.createElement(SvgBackground, {
+    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)(/*#__PURE__*/React.createElement(SvgBackground, {
       fill: fill,
       pattern: _pattern
     }))) + '")';

package/package.json

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

package/src/hooks/useAxes.js

@@ -6,7 +6,7 @@ import { getYTicksByStep, getYTicks } from "@easyv/utils/lib/common/utils";
 const getCount = (num) => {
   let i = 0,
     num_ = Math.abs(num);
-  if (num_ < 1) return i;
+  if (num_ < 1) return 0;
   while (num_ > 10) {
     i++;
     num_ = Math.floor(num_ / 10);
@@ -27,11 +27,12 @@ const getNewDomain = (
     percentageExtent;
   let bottom = defaultBottom,
     top = defaultTop;
-
+  
   let newDomain = [];
   //能进入这个函数，说明extent中min和max至少有一个是缺失的，如果max存在，意味着纵轴上限被固定
   let min = domain[0],
     max = domain[1];
+    
   let minCount = Math.pow(10, getCount(min)),
     maxCount = Math.pow(10, getCount(max));
   //轴标签，范围模式，百分比模式
@@ -41,13 +42,14 @@ const getNewDomain = (
     bottom = (min * _min) / 100;
     top = (max * _max) / 100;
   }
-
   switch (mode) {
     case "count":
       newDomain[0] =
         bottom != "" ? bottom : Math.floor(domain[0] / minCount) * minCount;
       newDomain[1] =
         top != "" ? top : maxCount==1?domain[1]:Math.ceil(domain[1] / maxCount) * maxCount;
+      if(newDomain[0]>0 && newDomain[0]<10 && defaultBottom==="")newDomain[0] = 0;
+      if(newDomain[1]<0 && newDomain[1]>-10 && defaultTop==="")newDomain[1] = 0;
       break;
     case "step":
       if (defaultTop != "") {