@easyv/charts 1.0.58 → 1.0.59

package/lib/components/Label.js

@@ -72,6 +72,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         _ref2$data = _ref2.data,
         x = _ref2$data.x,
         y = _ref2$data.y,
+        showY = _ref2$data.showY,
         s = _ref2$data.s;
 
     var y1 = yScaler(isVertical ? end : start);
@@ -108,7 +109,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       cy: attr.y,
       config: icon
     }), showLabel && /*#__PURE__*/React.createElement(Label, (0, _extends2["default"])({
-      value: y,
+      value: showY,
       config: label
     }, attr)));
   }));

package/lib/components/Tooltip.js

@@ -81,7 +81,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       transform: (0, _utils.getTranslate3d)(translateXAxis)
     }, font)
   }, x), data.map(function (_ref2, index) {
-    var y = _ref2.y,
+    var showY = _ref2.showY,
         s = _ref2.s;
 
     var _series$find = series.find(function (series) {
@@ -112,7 +112,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       style: (0, _utils.getFontStyle)(name)
     }, displayName || s)), /*#__PURE__*/React.createElement("span", {
       style: (0, _utils.getFontStyle)(value)
-    }, y));
+    }, showY));
   })));
 });
 

package/lib/hooks/useFilterData.js

@@ -101,7 +101,12 @@ var _default = function _default(_ref) {
   }, [series]);
   return [{
     series: _series,
-    data: _data
+    data: _data.map(function (d) {
+      return _objectSpread(_objectSpread({}, d), {}, {
+        y: parseFloat(d.y),
+        showY: d.y
+      });
+    })
   }, onClick];
 };
 

package/package.json

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

package/src/components/Label.js

@@ -40,11 +40,10 @@ export default memo(
       paddingInner * seriesStep;
     const isVertical = direction === 'vertical';
     const _position = label.position;
-
     return (
       <g className='__easyv-label'>
         {data.map(
-          ({ index, bound: [start, end], data, data: { x, y, s } }, i) => {
+          ({ index, bound: [start, end], data, data: { x, y, showY, s } }, i) => {
 
             const y1 = yScaler(isVertical ? end : start);
             const y2 = start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end);
@@ -84,7 +83,7 @@ export default memo(
                 data-data={JSON.stringify(data)}
               >
                 {showIcon && <Icon cx={attr.x} cy={attr.y} config={icon} />}
-                {showLabel && <Label value={y} config={label} {...attr} />}
+                {showLabel && <Label value={showY} config={label} {...attr} />}
               </g>
             );
           }

package/src/components/Tooltip.js

@@ -81,7 +81,7 @@ export default memo(
             >
               {x}
             </dt>
-            {data.map(({ y, s }, index) => {
+            {data.map(({ showY, s }, index) => {
               const { type, icon, displayName } = series.find(
                 (series) => series.name == s
               );
@@ -105,7 +105,7 @@ export default memo(
                     <span style={_icon} />
                     <span style={getFontStyle(name)}>{displayName || s}</span>
                   </span>
-                  <span style={getFontStyle(value)}>{y}</span>
+                  <span style={getFontStyle(value)}>{showY}</span>
                 </dd>
               );
             })}

package/src/hooks/useFilterData.js

@@ -29,7 +29,7 @@ const getSelected = (selected, name) => {
 
 export default ({ data, series }) => {
   const [selected, setSelected] = useState(getInitialSelected(series));
-
+  
   const _series = useMemo(() => {
     const tmp = new Map();
     series.forEach((currentSeries, key) => {
@@ -55,10 +55,17 @@ export default ({ data, series }) => {
   useEffect(() => {
     setSelected(getInitialSelected(series));
   }, [series]);
+
   return [
     {
       series: _series,
-      data: _data,
+      data: _data.map(d=>{
+        return {
+          ...d,
+          y:parseFloat(d.y),
+          showY:d.y
+        }
+      }),
     },
     onClick,
   ];