@easyv/charts 1.6.17 → 1.6.19

package/lib/components/CartesianChart.js

@@ -207,7 +207,9 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     var data = e.currentTarget.dataset.data;
     var _data = JSON.parse(data);
     if (type == "setCurrent") {
-      setCurXLabel(_data.x);
+      setCurXLabel(function (pre) {
+        return pre == _data.x ? "" : _data.x;
+      });
     }
     triggerOnRelative('click', _data);
     onEmit("click", _data);

package/lib/components/Label.js

@@ -189,7 +189,7 @@ var Label = function Label(_ref4) {
     }),
     textAnchor: textAnchor,
     dominantBaseline: dominantBaseline,
-    style: (0, _utils.getFontStyle)(font)
+    style: _objectSpread({}, (0, _utils.formatFont)(font, "svg"))
   }, /*#__PURE__*/React.createElement("tspan", null, value), /*#__PURE__*/React.createElement("tspan", {
     dx: suffixX,
     dy: suffixY,

package/lib/utils/index.js

@@ -5,17 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.band = band;
-exports.sortPie = exports.seriesYOrZ = exports.resetStacks = exports.reduceConfig = exports.mathR = exports.isValidHttpUrl = exports.identity = exports.getTranslate3d = exports.getTranslate2d = exports.getTicksOfAxis = exports.getTickCoord = exports.getStacks = exports.getSeriesInfo = exports.getMousePos = exports.getMargin = exports.getIcon = exports.getGridCoord = exports.getFontStyle = exports.getDomPath = exports.getDataWithPercent = exports.getCurrentStack = exports.getColorList = exports.getChildren = exports.getBreakWord = exports.getBandwidth = exports.getBandSeriesStepAndWidth = exports.getBandBackground = exports.filterChildren = exports.dateFormat = exports.dataYOrZ = void 0;
+exports.sortPie = exports.seriesYOrZ = exports.resetStacks = exports.reduceConfig = exports.mathR = exports.isValidHttpUrl = exports.identity = exports.getTranslate3d = exports.getTranslate2d = exports.getTicksOfAxis = exports.getTickCoord = exports.getStacks = exports.getSeriesInfo = exports.getMousePos = exports.getMargin = exports.getIcon = exports.getGridCoord = exports.getFontStyle = exports.getDomPath = exports.getDataWithPercent = exports.getCurrentStack = exports.getColorList = exports.getChildren = exports.getBreakWord = exports.getBandwidth = exports.getBandSeriesStepAndWidth = exports.getBandBackground = exports.formatFont = exports.filterChildren = exports.dateFormat = exports.dataYOrZ = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@easyv/utils");
 var _utils2 = require("@easyv/utils/lib/common/utils");
 var _d3v = require("d3v7");
 var _server = require("react-dom/server");
 var _svgPoints = require("svg-points");
-var _excluded = ["backgroundSize"];
+var _excluded = ["color", "fill", "bold", "italic"],
+  _excluded2 = ["backgroundSize"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultBackground = '#000000';
@@ -295,27 +296,46 @@ var getFontStyle = exports.getFontStyle = function getFontStyle(_ref7, type) {
     fontStyle: italic ? 'italic' : 'normal'
   };
 };
-var getMargin = exports.getMargin = function getMargin(_ref8) {
-  var marginTop = _ref8.marginTop,
-    marginRight = _ref8.marginRight,
-    marginBottom = _ref8.marginBottom,
-    marginLeft = _ref8.marginLeft;
+var formatFont = exports.formatFont = function formatFont(_ref8, type) {
+  var color = _ref8.color,
+    fill = _ref8.fill,
+    bold = _ref8.bold,
+    italic = _ref8.italic,
+    rest = (0, _objectWithoutProperties2["default"])(_ref8, _excluded);
+  if (type == 'svg') {
+    return _objectSpread({
+      fill: fill || color,
+      fontWeight: typeof bold == "string" ? bold : bold ? 'bold' : 'normal',
+      fontStyle: typeof italic == "string" ? italic : italic ? 'italic' : 'normal'
+    }, rest);
+  }
+  return _objectSpread({
+    color: color || fill,
+    fontWeight: typeof bold == "string" ? bold : bold ? 'bold' : 'normal',
+    fontStyle: typeof italic == "string" ? italic : italic ? 'italic' : 'normal'
+  }, rest);
+};
+var getMargin = exports.getMargin = function getMargin(_ref9) {
+  var marginTop = _ref9.marginTop,
+    marginRight = _ref9.marginRight,
+    marginBottom = _ref9.marginBottom,
+    marginLeft = _ref9.marginLeft;
   return marginTop + 'px ' + marginRight + 'px ' + marginBottom + 'px ' + marginLeft + 'px';
 };
-var getTranslate3d = exports.getTranslate3d = function getTranslate3d(_ref9) {
-  var _ref9$x = _ref9.x,
-    x = _ref9$x === void 0 ? 0 : _ref9$x,
-    _ref9$y = _ref9.y,
-    y = _ref9$y === void 0 ? 0 : _ref9$y,
-    _ref9$z = _ref9.z,
-    z = _ref9$z === void 0 ? 0 : _ref9$z;
-  return 'translate3d(' + x + 'px, ' + y + 'px, ' + z + 'px)';
-};
-var getTranslate2d = exports.getTranslate2d = function getTranslate2d(_ref10) {
+var getTranslate3d = exports.getTranslate3d = function getTranslate3d(_ref10) {
   var _ref10$x = _ref10.x,
     x = _ref10$x === void 0 ? 0 : _ref10$x,
     _ref10$y = _ref10.y,
-    y = _ref10$y === void 0 ? 0 : _ref10$y;
+    y = _ref10$y === void 0 ? 0 : _ref10$y,
+    _ref10$z = _ref10.z,
+    z = _ref10$z === void 0 ? 0 : _ref10$z;
+  return 'translate3d(' + x + 'px, ' + y + 'px, ' + z + 'px)';
+};
+var getTranslate2d = exports.getTranslate2d = function getTranslate2d(_ref11) {
+  var _ref11$x = _ref11.x,
+    x = _ref11$x === void 0 ? 0 : _ref11$x,
+    _ref11$y = _ref11.y,
+    y = _ref11$y === void 0 ? 0 : _ref11$y;
   return 'translate(' + x + ', ' + y + ')';
 };
 function band() {
@@ -353,12 +373,12 @@ function band() {
     return arguments.length ? (domain(_), rescale()) : domain();
   };
   scale.range = function (_) {
-    var _ref11;
-    return arguments.length ? (_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1], r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
+    var _ref12;
+    return arguments.length ? (_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1], r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
   };
   scale.rangeRound = function (_) {
-    var _ref12;
-    return _ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1], r0 = +r0, r1 = +r1, round = true, rescale();
+    var _ref13;
+    return _ref13 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref13[0], r1 = _ref13[1], r0 = +r0, r1 = +r1, round = true, rescale();
   };
   scale.bandwidth = function () {
     return bandwidth;
@@ -407,14 +427,14 @@ function initRange(domain, range) {
 }
 var getStacks = exports.getStacks = function getStacks(series) {
   var tmp = [];
-  series.forEach(function (_ref13, name) {
-    var type = _ref13.type,
-      stack = _ref13.stack,
-      yOrZ = _ref13.yOrZ;
-    var current = tmp.find(function (_ref14) {
-      var _type = _ref14.type,
-        _stack = _ref14.stack,
-        _yOrZ = _ref14.yOrZ;
+  series.forEach(function (_ref14, name) {
+    var type = _ref14.type,
+      stack = _ref14.stack,
+      yOrZ = _ref14.yOrZ;
+    var current = tmp.find(function (_ref15) {
+      var _type = _ref15.type,
+        _stack = _ref15.stack,
+        _yOrZ = _ref15.yOrZ;
       return _type == type && stack && _stack == stack && yOrZ == _yOrZ;
     });
     if (!current) {
@@ -444,9 +464,9 @@ var getStacks = exports.getStacks = function getStacks(series) {
   });
   return tmp;
 };
-var dataYOrZ = exports.dataYOrZ = function dataYOrZ(data, _ref15) {
-  var seriesY = _ref15.y,
-    seriesZ = _ref15.z;
+var dataYOrZ = exports.dataYOrZ = function dataYOrZ(data, _ref16) {
+  var seriesY = _ref16.y,
+    seriesZ = _ref16.z;
   var tmp = {
     y: [],
     z: []
@@ -485,11 +505,11 @@ var resetStacks = exports.resetStacks = function resetStacks(stacks) {
   });
 };
 var getCurrentStack = exports.getCurrentStack = function getCurrentStack(stack, stackMap) {
-  return stackMap.find(function (_ref16) {
-    var _stack = _ref16.stack,
-      _type = _ref16.type,
-      _yOrZ = _ref16.yOrZ,
-      _s = _ref16.s;
+  return stackMap.find(function (_ref17) {
+    var _stack = _ref17.stack,
+      _type = _ref17.type,
+      _yOrZ = _ref17.yOrZ,
+      _s = _ref17.s;
     return _type == stack.type && _stack == stack.stack && _yOrZ == stack.yOrZ && _s.includes(stack.name);
   });
 };
@@ -498,7 +518,7 @@ var getBandBackground = exports.getBandBackground = function getBandBackground(p
   try {
     var _pattern$backgroundSi = pattern.backgroundSize,
       backgroundSize = _pattern$backgroundSi === void 0 ? '100% 100%' : _pattern$backgroundSi,
-      _pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded);
+      _pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded2);
     return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)(/*#__PURE__*/React.createElement(SvgBackground, {
       fill: fill,
       pattern: _pattern
@@ -509,10 +529,10 @@ var getBandBackground = exports.getBandBackground = function getBandBackground(p
 var getBandwidth = exports.getBandwidth = function getBandwidth(step, paddingOuter) {
   return step * (1 - paddingOuter);
 };
-var getBandSeriesStepAndWidth = exports.getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref17) {
-  var width = _ref17.width,
-    paddingInner = _ref17.paddingInner,
-    bandLength = _ref17.bandLength;
+var getBandSeriesStepAndWidth = exports.getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref18) {
+  var width = _ref18.width,
+    paddingInner = _ref18.paddingInner,
+    bandLength = _ref18.bandLength;
   var seriesStep = width / (bandLength == 0 ? 1 : bandLength);
   var seriesWidth = seriesStep * (1 - paddingInner);
   return {
@@ -520,14 +540,14 @@ var getBandSeriesStepAndWidth = exports.getBandSeriesStepAndWidth = function get
     seriesWidth: seriesWidth
   };
 };
-var getSeriesInfo = exports.getSeriesInfo = function getSeriesInfo(_ref18) {
-  var step = _ref18.step,
-    _ref18$bandLength = _ref18.bandLength,
-    bandLength = _ref18$bandLength === void 0 ? 1 : _ref18$bandLength,
-    _ref18$paddingInner = _ref18.paddingInner,
-    paddingInner = _ref18$paddingInner === void 0 ? 0 : _ref18$paddingInner,
-    _ref18$paddingOuter = _ref18.paddingOuter,
-    paddingOuter = _ref18$paddingOuter === void 0 ? 0 : _ref18$paddingOuter;
+var getSeriesInfo = exports.getSeriesInfo = function getSeriesInfo(_ref19) {
+  var step = _ref19.step,
+    _ref19$bandLength = _ref19.bandLength,
+    bandLength = _ref19$bandLength === void 0 ? 1 : _ref19$bandLength,
+    _ref19$paddingInner = _ref19.paddingInner,
+    paddingInner = _ref19$paddingInner === void 0 ? 0 : _ref19$paddingInner,
+    _ref19$paddingOuter = _ref19.paddingOuter,
+    paddingOuter = _ref19$paddingOuter === void 0 ? 0 : _ref19$paddingOuter;
   if (bandLength == 0) return {
     seriesWidth: step,
     seriesStep: step,
@@ -634,23 +654,23 @@ var sortPie = exports.sortPie = function sortPie(data, order) {
   });
   switch (order) {
     case '':
-      _data.sort(function (_ref19, _ref20) {
-        var a = _ref19.index;
-        var b = _ref20.index;
+      _data.sort(function (_ref20, _ref21) {
+        var a = _ref20.index;
+        var b = _ref21.index;
         return (0, _d3v.ascending)(a, b);
       });
       break;
     case 'desc':
-      _data.sort(function (_ref21, _ref22) {
-        var a = _ref21.value;
-        var b = _ref22.value;
+      _data.sort(function (_ref22, _ref23) {
+        var a = _ref22.value;
+        var b = _ref23.value;
         return (0, _d3v.descending)(a, b);
       });
       break;
     case 'asc':
-      _data.sort(function (_ref23, _ref24) {
-        var a = _ref23.value;
-        var b = _ref24.value;
+      _data.sort(function (_ref24, _ref25) {
+        var a = _ref24.value;
+        var b = _ref25.value;
         return (0, _d3v.ascending)(a, b);
       });
       break;

package/package.json

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

package/src/components/CartesianChart.js

@@ -198,7 +198,9 @@ const Chart = memo(
         const { data } = e.currentTarget.dataset;
         const _data = JSON.parse(data);
         if(type=="setCurrent"){
-          setCurXLabel(_data.x);
+          setCurXLabel(pre=>{
+            return pre==_data.x?"":_data.x;
+          });
         }
         triggerOnRelative('click',_data);
         onEmit("click", _data);

package/src/components/Label.js

@@ -2,7 +2,7 @@
  * 轴类图表标签
  */
 import { memo, useContext } from "react";
-import { getTranslate2d, getSeriesInfo, getFontStyle } from "../utils";
+import { getTranslate2d, getSeriesInfo, getFontStyle, formatFont } from "../utils";
 import { chartContext } from "../context";
 
 export default memo(
@@ -155,7 +155,7 @@ const Label = ({
       })}
       textAnchor={textAnchor}
       dominantBaseline={dominantBaseline}
-      style={getFontStyle(font)}
+      style={{...formatFont(font,"svg")}}
     >
       <tspan>{value}</tspan>
       <tspan dx={suffixX} dy={suffixY} style={{

package/src/utils/index.js

@@ -274,6 +274,23 @@ const getFontStyle = (
     fontStyle: italic ? 'italic' : 'normal',
   };
 };
+const formatFont=({ color, fill, bold, italic, ...rest },
+  type)=>{
+  if (type == 'svg') {
+    return {
+      fill: fill || color,
+      fontWeight: typeof bold=="string" ? bold : ( bold ? 'bold' : 'normal'),
+      fontStyle: typeof italic=="string"? italic : (italic ? 'italic' : 'normal'),
+      ...rest
+    };
+  }
+  return {
+    color:color|| fill,
+    fontWeight: typeof bold=="string" ? bold : ( bold ? 'bold' : 'normal'),
+    fontStyle: typeof italic=="string"? italic : (italic ? 'italic' : 'normal'),
+    ...rest
+  };
+}
 
 const getMargin = ({ marginTop, marginRight, marginBottom, marginLeft }) =>
   marginTop +
@@ -756,6 +773,7 @@ export {
   identity,
   getMousePos,
   getFontStyle,
+  formatFont,
   getMargin,
   getTranslate3d,
   getTranslate2d,