@easyv/charts 1.8.19 → 1.8.21

package/lib/components/Label.js

@@ -53,9 +53,10 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     _ref$config$showType = _ref$config.showType,
     seriesType = _ref$config$showType === void 0 ? 'bar' : _ref$config$showType,
     _ref$config$highlight = _ref$config.highlight,
-    showHighlight = _ref$config$highlight.show,
-    extent = _ref$config$highlight.extent,
-    highlightStyle = (0, _objectWithoutProperties2["default"])(_ref$config$highlight, _excluded),
+    _ref$config$highlight2 = _ref$config$highlight === void 0 ? {} : _ref$config$highlight,
+    showHighlight = _ref$config$highlight2.show,
+    extent = _ref$config$highlight2.extent,
+    highlightStyle = (0, _objectWithoutProperties2["default"])(_ref$config$highlight2, _excluded),
     other = (0, _objectWithoutProperties2["default"])(_ref$config, _excluded2),
     config = _ref.config,
     curXLabel = _ref.curXLabel,

package/lib/components/Tooltip.js

@@ -66,7 +66,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     }
     return (0, _utils.getTranslate3d)(translate3d);
   }, [width, height, marginLeft, marginTop, position, tipWidth, tipHeight, translateTip]);
-  return /*#__PURE__*/React.createElement("div", {
+  return manual ? /*#__PURE__*/React.createElement("div", {
     className: "__easyv-tooltip",
     style: _objectSpread({
       pointerEvents: 'none',
@@ -154,5 +154,5 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         transform: (0, _utils.getTranslate3d)(suffixTranslate)
       })
     }, tmp.get(s))));
-  }))));
+  })))) : "";
 });

package/lib/utils/index.js

@@ -294,7 +294,8 @@ var getFontStyle = exports.getFontStyle = function getFontStyle(_ref7, type) {
     italic = _ref7.italic,
     fontSize = _ref7.fontSize,
     fontFamily = _ref7.fontFamily,
-    letterSpacing = _ref7.letterSpacing;
+    letterSpacing = _ref7.letterSpacing,
+    lineHeight = _ref7.lineHeight;
   if (type == 'svg') {
     return {
       fontSize: fontSize,
@@ -302,7 +303,8 @@ var getFontStyle = exports.getFontStyle = function getFontStyle(_ref7, type) {
       letterSpacing: letterSpacing,
       fill: color,
       fontWeight: bold ? 'bold' : 'normal',
-      fontStyle: italic ? 'italic' : 'normal'
+      fontStyle: italic ? 'italic' : 'normal',
+      lineHeight: lineHeight + "px"
     };
   }
   return {
@@ -311,7 +313,8 @@ var getFontStyle = exports.getFontStyle = function getFontStyle(_ref7, type) {
     letterSpacing: letterSpacing,
     color: color,
     fontWeight: bold ? 'bold' : 'normal',
-    fontStyle: italic ? 'italic' : 'normal'
+    fontStyle: italic ? 'italic' : 'normal',
+    lineHeight: lineHeight + "px" //不加px默认是倍数关系
   };
 };
 var formatFont = exports.formatFont = function formatFont(_ref8, type) {

package/package.json

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

package/src/components/Label.js

@@ -32,7 +32,7 @@ export default memo(
       seriesIntervalWidth: paddingInner = 0,
       paddingInner: paddingOuter = 0,
       showType:seriesType = 'bar',
-      highlight: { show: showHighlight, extent, ...highlightStyle },
+      highlight: { show: showHighlight, extent, ...highlightStyle }={},//配置项不存在的处理
       ...other
     },
     config,

package/src/components/Tooltip.js

@@ -64,7 +64,7 @@ export default memo(
       translateTip,
     ]);
     return (
-      <div
+      manual?<div
         className='__easyv-tooltip'
         style={{
           pointerEvents: 'none',
@@ -175,7 +175,7 @@ export default memo(
             
           </div>
         )}
-      </div>
+      </div>:""
     );
   }
 );

package/src/types/index.d.ts

@@ -53,6 +53,7 @@ type Font = {
   fontSize: number;
   italic: boolean;
   letterSpacing: number;
+  lineHeight:number
 };
 
 type Align = { textAnchor: string; dominantBaseline: string };

package/src/utils/index.js

@@ -265,7 +265,7 @@ const getMousePos = (evt, dom) => {
 };
 
 const getFontStyle = (
-  { color, bold, italic, fontSize, fontFamily, letterSpacing },
+  { color, bold, italic, fontSize, fontFamily, letterSpacing,lineHeight },
   type
 ) => {
   if (type == 'svg') {
@@ -276,6 +276,7 @@ const getFontStyle = (
       fill: color,
       fontWeight: bold ? 'bold' : 'normal',
       fontStyle: italic ? 'italic' : 'normal',
+      lineHeight:lineHeight+"px"
     };
   }
   return {
@@ -285,6 +286,7 @@ const getFontStyle = (
     color,
     fontWeight: bold ? 'bold' : 'normal',
     fontStyle: italic ? 'italic' : 'normal',
+    lineHeight:lineHeight+"px"//不加px默认是倍数关系
   };
 };
 const formatFont=({ color, fill, bold, italic, ...rest },