@easyv/charts 1.6.5 → 1.6.7

package/lib/components/Tooltip.js

@@ -38,10 +38,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       lineHeight = _ref$config$tip$data$2.lineHeight,
       dataGap = _ref$config$tip$data$2.gap,
       iconSize = _ref$config$tip$data$2.iconSize,
-      dataBackground = _ref$config$tip$data$2.background,
+      dataBg = _ref$config$tip$data$2.background,
       name = _ref$config$tip$data$2.name,
       value = _ref$config$tip$data$2.value,
       suffix = _ref$config$tip$data$2.suffix,
+      bgType = _ref$config$tip.bgType,
       bgColor = _ref$config$tip.bgColor,
       image = _ref$config$tip.image,
       margin = _ref$config$tip.margin,
@@ -61,12 +62,12 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     });
 
     if (translate3d.x + tipWidth > width) {
-      var newPositon = position + marginLeft - tipWidth - translateTip.x;
+      var newPositon = position + marginLeft - tipWidth + translateTip.x;
       translate3d.x = newPositon >= 0 ? newPositon : 0;
     }
 
     if (translate3d.y + tipHeight > height) {
-      var _newPositon = position + marginTop - tipHeight - translateTip.y;
+      var _newPositon = position + marginTop - tipHeight + translateTip.y;
 
       translate3d.y = _newPositon <= 0 ? _newPositon : height - tipHeight;
     }
@@ -81,7 +82,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       width: tipWidth,
       minHeight: tipHeight,
       padding: (0, _utils.getMargin)(margin),
-      background: image ? '50% 50% / 100% 100% no-repeat url(' + window.appConfig.ASSETS_URL + image + ')' : bgColor
+      background: bgType == "image" ? image ? '50% 50% / 100% 100% no-repeat url(' + window.appConfig.ASSETS_URL + image + ')' : "transparent" : bgColor
     }, (0, _utils.getFontStyle)(font))
   }, formatter ? formatter({
     series: series,
@@ -93,19 +94,28 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       data: data,
       config: dataConfig
     }
-  }) : /*#__PURE__*/React.createElement("dl", {
+  }) : /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
       flexDirection: 'column',
       justifyContent: 'space-between',
+      gap: gap,
       height: '100%'
     }
-  }, /*#__PURE__*/React.createElement("dt", {
+  }, /*#__PURE__*/React.createElement("div", {
     style: _objectSpread({
       textAlign: align,
-      transform: (0, _utils.getTranslate3d)(translateXAxis)
+      transform: (0, _utils.getTranslate3d)(translateXAxis),
+      background: background ? "url(".concat(window.appConfig.ASSETS_URL + background, ") 0 0/100% 100%") : "transparent"
     }, font)
-  }, x), data.map(function (_ref2, index) {
+  }, x), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexFlow: "column nowrap",
+      gap: dataGap,
+      background: dataBg ? "url(".concat(window.appConfig.ASSETS_URL + dataBg, ") 0 0/100% 100%") : "transparent"
+    }
+  }, data.map(function (_ref2, index) {
     var showY = _ref2.showY,
         s = _ref2.s;
 
@@ -156,7 +166,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         transform: (0, _utils.getTranslate3d)(suffixTranslate)
       })
     }, tmp.get(s))));
-  })));
+  }))));
 });
 
 exports["default"] = _default;

package/package.json

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

package/src/components/Tooltip.js

@@ -20,6 +20,7 @@ export default memo(
           data: dataConfig,
           data: { lineHeight, gap:dataGap, iconSize, background:dataBg, name, value, suffix },
         },
+        bgType,
         bgColor,
         image,
         margin,
@@ -43,11 +44,11 @@ export default memo(
           x: translateTip.x + position + marginLeft,
         };
       if (translate3d.x + tipWidth > width) {
-        const newPositon = position + marginLeft - tipWidth - translateTip.x;
+        const newPositon = position + marginLeft - tipWidth + translateTip.x;
         translate3d.x = newPositon >= 0 ? newPositon : 0;
       }
       if (translate3d.y + tipHeight > height) {
-        const newPositon = position + marginTop - tipHeight - translateTip.y;
+        const newPositon = position + marginTop - tipHeight + translateTip.y;
         translate3d.y = newPositon <= 0 ? newPositon : height - tipHeight;
       }
       return getTranslate3d(translate3d);
@@ -70,12 +71,12 @@ export default memo(
           width: tipWidth,
           minHeight: tipHeight,
           padding: getMargin(margin),
-          background: image
+          background: bgType=="image"?image
             ? '50% 50% / 100% 100% no-repeat url(' +
             window.appConfig.ASSETS_URL +
             image +
             ')'
-            : bgColor,
+            : "transparent":bgColor,
           ...getFontStyle(font),
         }}
       >