@easyv/charts 1.6.23 → 1.6.25

package/lib/components/SplitText.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+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; }
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var value = props.value,
+    _props$config = props.config,
+    fontFamily = _props$config.fontFamily,
+    separator = _props$config.separator,
+    show = _props$config.show,
+    splitCount = _props$config.splitCount,
+    style = _props$config.style,
+    _props$config$margin = _props$config.margin,
+    left = _props$config$margin.left,
+    right = _props$config$margin.right;
+  var stringValue = String(value);
+  var _stringValue$split = stringValue.split('.'),
+    _stringValue$split2 = (0, _slicedToArray2["default"])(_stringValue$split, 2),
+    intValueString = _stringValue$split2[0],
+    _stringValue$split2$ = _stringValue$split2[1],
+    pointValueSting = _stringValue$split2$ === void 0 ? '' : _stringValue$split2$;
+  var intArray = [];
+  var pointArray = (0, _toConsumableArray2["default"])(pointValueSting);
+  (0, _toConsumableArray2["default"])(intValueString).forEach(function (i, index) {
+    !(intValueString.length - index - 1) || (intValueString.length - index - 1) % splitCount ? intArray.push(i) : (intArray.push(i), intArray.push('分隔符'));
+  });
+  return show ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, intArray.map(function (v, index) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      key: 'int_' + index,
+      style: {
+        fontFamily: v === '分隔符' && style != 'default' ? fontFamily : 'inherit',
+        marginLeft: v === '分隔符' ? left : 0,
+        marginRight: v === '分隔符' ? right : 0
+      }
+    }, v === '分隔符' ? style == 'custom' && separator ? separator : ',' : v);
+  }), pointArray.length ? /*#__PURE__*/_react["default"].createElement("span", null, ".") : null, pointArray.map(function (v, index) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      key: 'point_' + index
+    }, v);
+  })) : value;
+});

package/lib/components/index.js

@@ -143,6 +143,12 @@ Object.defineProperty(exports, "PieTooltip", {
     return _PieTooltip.PieTooltip;
   }
 });
+Object.defineProperty(exports, "SplitText", {
+  enumerable: true,
+  get: function get() {
+    return _SplitText["default"];
+  }
+});
 Object.defineProperty(exports, "StackData", {
   enumerable: true,
   get: function get() {
@@ -194,4 +200,5 @@ var _TextOverflow = _interopRequireDefault(require("./TextOverflow"));
 var _BaseLine = _interopRequireDefault(require("./BaseLine"));
 var _Control = _interopRequireDefault(require("./Control"));
 var _PieTooltip = require("./PieTooltip");
+var _SplitText = _interopRequireDefault(require("./SplitText"));
 var Area = exports.Area = _Line["default"];

package/lib/formatter/legend.js

@@ -37,6 +37,7 @@ var pieLegendFormatter = exports.pieLegendFormatter = function pieLegendFormatte
     _ref2$value$translate = _ref2$value.translate,
     valueX = _ref2$value$translate.x,
     valueY = _ref2$value$translate.y,
+    splitConfig = _ref2$value.splitConfig,
     _ref2$value$suffix = _ref2$value.suffix,
     showSuffix = _ref2$value$suffix.show,
     text = _ref2$value$suffix.text,
@@ -90,7 +91,10 @@ var pieLegendFormatter = exports.pieLegendFormatter = function pieLegendFormatte
       alignItems: 'center',
       justifyContent: valueAlign == "left" ? "flex-start" : valueAlign == "right" ? "flex-end" : 'center'
     })
-  }, /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(_components.SplitText, {
+    value: data.y,
+    config: splitConfig
+  })), showSuffix && /*#__PURE__*/React.createElement("span", {
     style: {
       whiteSpace: "nowrap",
       fontSize: fontSize,

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/package.json

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

package/src/components/SplitText.tsx

@@ -0,0 +1,70 @@
+import React, { memo } from 'react';
+
+type SplitConfig = {
+	fontFamily: string;
+	separator: string;
+	show: boolean;
+	splitCount: number;
+	style: 'custom' | 'default';
+	margin: {
+		left: number;
+		right: number;
+	};
+};
+
+interface SplitProps {
+	value: number | string;
+	config: SplitConfig;
+}
+
+export default memo((props: SplitProps) => {
+	const {
+		value,
+		config: {
+			fontFamily,
+			separator,
+			show,
+			splitCount,
+			style,
+			margin: { left, right },
+		},
+	} = props;
+
+	const stringValue = String(value);
+	const [intValueString, pointValueSting = ''] = stringValue.split('.');
+
+	const intArray: (string | '分隔符')[] = [];
+
+	const pointArray = [...pointValueSting];
+
+	[...intValueString].forEach((i, index) => {
+		!(intValueString.length - index - 1) || (intValueString.length - index - 1) % splitCount
+			? intArray.push(i)
+			: (intArray.push(i), intArray.push('分隔符'));
+	});
+
+	return show ? (
+		<>
+			{intArray.map((v, index) => {
+				return (
+					<span
+						key={'int_' + index}
+						style={{
+							fontFamily: v === '分隔符' && style != 'default' ? fontFamily : 'inherit',
+							marginLeft: v === '分隔符' ? left : 0,
+							marginRight: v === '分隔符' ? right : 0,
+						}}
+					>
+						{v === '分隔符' ? (style == 'custom' && separator ? separator : ',') : v}
+					</span>
+				);
+			})}
+			{pointArray.length ? <span>.</span> : null}
+			{pointArray.map((v, index) => {
+				return <span key={'point_' + index}>{v}</span>;
+			})}
+		</>
+	) : (
+		value
+	);
+});

package/src/components/index.js

@@ -25,6 +25,7 @@ import TextOverflow from './TextOverflow';
 import BaseLine from './BaseLine';
 import Control from './Control';
 import { PieTooltip } from './PieTooltip';
+import SplitText from './SplitText';
 
 const Area = Line;
 export {
@@ -55,5 +56,6 @@ export {
   Chart,
   ConicalGradient,
   BaseLine,
-  PieTooltip
+  PieTooltip,
+  SplitText
 };

package/src/formatter/legend.js

@@ -1,6 +1,6 @@
 import css from '../css/index.module.css';
 import { getFontStyle } from '../utils';
-import { TextOverflow } from '../components';
+import { TextOverflow, SplitText } from '../components';
 
 export const pieLegendFormatter = (
   { displayName, data, percent, series: { color: seriesColor, icon="" } },
@@ -16,6 +16,7 @@ export const pieLegendFormatter = (
         x:valueX,
         y:valueY
       },
+      splitConfig,
       suffix: {
         show: showSuffix,
         text,
@@ -77,7 +78,7 @@ export const pieLegendFormatter = (
               justifyContent: valueAlign=="left"?"flex-start":valueAlign=="right"?"flex-end":'center',
             }}
           >
-            <span>{data.y}</span>
+            <span><SplitText value={data.y} config={splitConfig} /></span>
             {showSuffix && (
               <span
                 style={{

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 != "") {