@easyv/charts 1.3.21 → 1.3.22

package/lib/components/Legend.js

@@ -19,6 +19,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../utils");
 
+var _TextOverflow = _interopRequireDefault(require("./TextOverflow"));
+
 var _excluded = ["italic", "bold"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -42,6 +44,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       _ref$config$order = _ref$config.order,
       order = _ref$config$order === void 0 ? '' : _ref$config$order,
       interactive = _ref$config.interactive,
+      maxWidth = _ref$config.maxWidth,
+      textOverflow = _ref$config.textOverflow,
+      speed = _ref$config.speed,
       _ref$config$layout = _ref$config.layout,
       _ref$config$layout$al = _ref$config$layout.alignment,
       alignment = _ref$config$layout$al === void 0 ? 'right center' : _ref$config$layout$al,
@@ -123,12 +128,16 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       }
     }, formatter ? formatter(series, config) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
       style: _icon
-    }), /*#__PURE__*/_react["default"].createElement("span", {
+    }), /*#__PURE__*/_react["default"].createElement(_TextOverflow["default"], {
+      type: textOverflow,
+      value: displayName || name,
       style: _objectSpread(_objectSpread({}, font), {}, {
+        width: maxWidth,
         fontStyle: italic ? 'italic' : 'normal',
         fontWeight: bold ? 'bold' : 'normal'
-      })
-    }, displayName || name)));
+      }),
+      speed: speed
+    })));
   })));
 });
 

package/lib/hooks/useAxes.js

@@ -145,7 +145,7 @@ var _default = function _default(_ref) {
       if (type == 'linear' && config.on) {
         var zeroPosition = scaler(0);
 
-        if (zeroPosition !== range[0]) {
+        if (zeroPosition !== range[0] && !isNaN(zeroPosition)) {
           if (direction === 'horizontal') {
             xAxisPositions.push({
               x: zeroPosition,

package/package.json

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

package/src/components/Legend.js

@@ -3,6 +3,7 @@
  */
 import React, { memo, useCallback } from 'react';
 import { getIcon, sortPie } from '../utils';
+import TextOverflow from './TextOverflow';
 
 const defaultFont = {
   fontStyle: 'normal',
@@ -17,6 +18,9 @@ export default memo(
       show,
       order = '',
       interactive,
+      maxWidth,
+      textOverflow,
+      speed,
       layout: {
         alignment = 'right center',
         gridTemplateColumns,
@@ -45,7 +49,6 @@ export default memo(
     );
 
      //木然判断数据都为零时做的，此处并不严谨，待想到好方法在进一步解决
-     
      if (judge == 0) {
        _series.forEach((d) => {
          d.percent=0
@@ -91,15 +94,13 @@ export default memo(
                 ) : (
                   <>
                     <span style={_icon} />
-                    <span
-                      style={{
+                    <TextOverflow type={textOverflow} value={displayName || name} style={{
                         ...font,
+                        width:maxWidth,
                         fontStyle: italic ? 'italic' : 'normal',
                         fontWeight: bold ? 'bold' : 'normal',
-                      }}
-                    >
-                      {displayName || name}
-                    </span>
+                      }} speed={speed}></TextOverflow>
+                    
                   </>
                 )}
               </li>

package/src/components/TextOverflow.js

@@ -33,13 +33,11 @@ export default memo((props) => {
     }
   };
 
-
   const styles = {
     ...getTextOverflow(type),
     ...style
   }
 
-
   return type == 'marquee' ? (
     <Marquee
       value={value}

package/src/hooks/useAxes.js

@@ -141,7 +141,7 @@ export default ({ axes, context: { width, height } }) => {
 
       if (type == 'linear' && config.on) {
         const zeroPosition = scaler(0);
-        if (zeroPosition !== range[0]) {
+        if (zeroPosition !== range[0] && !isNaN(zeroPosition)) {
           if (direction === 'horizontal') {
             xAxisPositions.push({
               x: zeroPosition,