@easyv/charts 1.0.60 → 1.0.64

package/.babelrc

@@ -1,8 +1,8 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
-  "plugins": [
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties"
-  ]
-}
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
+  "plugins": [
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties"
+  ]
+}

package/lib/components/AnimateData.js

@@ -17,8 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _hooks = require("../hooks");
 
-/**
- * 用来做图表数据改变（增长）动画（HOC）
+/**
+ * 用来做图表数据改变（增长）动画（HOC）
  */
 var _default = function _default(Component) {
   return /*#__PURE__*/(0, _react.memo)(function (_ref) {

package/lib/components/Axis.js

@@ -19,8 +19,8 @@ var _context = require("../context");
 
 var _element = require("../element");
 
-/**
- * x, y, z轴
+/**
+ * x, y, z轴
  */
 var defaultAlign = {
   textAnchor: 'middle',
@@ -48,16 +48,16 @@ var getAxesPath = function getAxesPath(orientation, _ref2) {
       return 'M0, -0.5V' + (height + 0.5);
   }
 };
-/**
- * 根据坐标轴位置来确定轴标签的垂直对齐方式，水平对齐方式，以及轴标签位于坐标轴的哪个方向
- * @param orientation 坐标轴位置
- * @param rotate 旋转角度
- * @returns {
- *    dominantBaseline,
- *    textAnchor,
- *    directionX,
- *    directionY
- * }
+/**
+ * 根据坐标轴位置来确定轴标签的垂直对齐方式，水平对齐方式，以及轴标签位于坐标轴的哪个方向
+ * @param orientation 坐标轴位置
+ * @param rotate 旋转角度
+ * @returns {
+ *    dominantBaseline,
+ *    textAnchor,
+ *    directionX,
+ *    directionY
+ * }
  */
 
 
@@ -194,7 +194,7 @@ var Label = function Label(_ref5) {
     letterSpacing: letterSpacing,
     dx: "0",
     dy: "0",
-    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : '' : translateText + 'rotate(' + rotate + ')'
+    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : translateText : translateText + 'rotate(' + rotate + ')'
   }, !!Array.isArray(_label) ? _label.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("tspan", {
       key: index,

package/lib/components/Background.js

@@ -13,8 +13,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _utils = require("../utils");
 
-/**
- * 轴类图背景
+/**
+ * 轴类图背景
  */
 var _default = function _default(_ref) {
   var _ref$axis = _ref.axis,

package/lib/components/Carousel.js

@@ -42,8 +42,8 @@ var defaultAnimation = {
     opacity: 100
   }
 };
-/**
- * 饼图类图表轮播逻辑，用来管理currentIndex，及回调逻辑（HOC）
+/**
+ * 饼图类图表轮播逻辑，用来管理currentIndex，及回调逻辑（HOC）
  */
 
 var _default = function _default(Component) {

package/lib/components/Chart.js

@@ -19,8 +19,8 @@ var _context = require("../context");
 
 var _ = require(".");
 
-/**
- * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
+/**
+ * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
  */
 var getCallbackData = function getCallbackData(callbacks, data) {
   var callbackData;

package/lib/components/ConicalGradient.js

@@ -19,8 +19,8 @@ var _utils = require("@easyv/utils/lib/common/utils");
 
 var _indexModule = _interopRequireDefault(require("../css/index.module.css"));
 
-/**
- * 饼图装饰内圈
+/**
+ * 饼图装饰内圈
  */
 var _default = function _default(_ref) {
   var width = _ref.width,
@@ -123,8 +123,8 @@ var _default = function _default(_ref) {
     }
   });
 };
-/**
- * ConicalGradient
+/**
+ * ConicalGradient
  */
 
 
@@ -136,11 +136,11 @@ function ConicalGradient() {
 }
 
 ConicalGradient.prototype = {
-  /**
-   * addColorStop
-   *
-   * @param {Number} offset
-   * @param {Array} color RGBA值
+  /**
+   * addColorStop
+   *
+   * @param {Number} offset
+   * @param {Array} color RGBA值
    */
   addColorStop: function addColorStop(offset, color) {
     this._offsets.push(offset);
@@ -150,23 +150,23 @@ ConicalGradient.prototype = {
     return this;
   },
 
-  /**
-   * _offsetsReverse (array.forEach callback)
+  /**
+   * _offsetsReverse (array.forEach callback)
    */
   _offsetsReverse: function _offsetsReverse(offset, index, array) {
     array[index] = 1 - offset;
   },
 
-  /**
-   * fill
-   *
-   * @param {Number} context
-   * @param {Number} x
-   * @param {Number} y
-   * @param {Number} radius
-   * @param {Number} startAngle
-   * @param {Number} endAngle
-   * @param {Boolean} anticlockwise
+  /**
+   * fill
+   *
+   * @param {Number} context
+   * @param {Number} x
+   * @param {Number} y
+   * @param {Number} radius
+   * @param {Number} startAngle
+   * @param {Number} endAngle
+   * @param {Boolean} anticlockwise
    */
   fill: function fill(context, x, y, radius, startAngle, endAngle, anticlockwise) {
     var offsets = this._offsets;

package/lib/components/Indicator.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-/**
- * 轴类图表移上去的指示框背景
+/**
+ * 轴类图表移上去的指示框背景
  */
 var _default = function _default(_ref) {
   var color = _ref.color,

package/lib/components/Label.js

@@ -31,6 +31,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       paddingOuter = _ref$config$paddingIn === void 0 ? 0 : _ref$config$paddingIn,
       label = _ref$config.label,
       icon = _ref$config.icon,
+      config = _ref.config,
       _ref$bandLength = _ref.bandLength,
       bandLength = _ref$bandLength === void 0 ? 0 : _ref$bandLength,
       data = _ref.data,
@@ -40,6 +41,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       direction = _ref$xAxis.direction,
       yScaler = _ref.yAxis.scaler,
       triggerClick = _ref.triggerClick;
+  var lineType = config.hasOwnProperty('line'); //堆叠处理
+
   var showIcon = icon && icon.show;
   var showLabel = label && label.show;
   if (!(data.length && (showIcon || showLabel))) return null;
@@ -75,8 +78,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         showY = _ref2$data.showY,
         s = _ref2$data.s;
 
-    var y1 = yScaler(isVertical ? end : start);
-    var y2 = start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end);
+    var y1 = yScaler(isVertical ? end : start); //处理z型折线图和堆叠柱图的逻辑冲突
+
+    var y2 = lineType ? start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end) : yScaler(isVertical ? start : end); // const y2 =  yScaler(isVertical ? start : end);
+
     var positionX = xScaler(x) + seriesStep * index - offset / 2;
     if (isNaN(positionX)) return null;
     var position = positionX + seriesWidth / 2;
@@ -137,7 +142,7 @@ var Label = function Label(_ref3) {
     y: y,
     transform: (0, _utils.getTranslate2d)({
       x: translateX,
-      y: translateY * (value > 0 ? 1 : -1)
+      y: translateY * (value >= 0 ? 1 : -1)
     }),
     textAnchor: textAnchor,
     dominantBaseline: dominantBaseline

package/lib/components/LinearGradient.js

@@ -9,8 +9,8 @@ exports["default"] = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-/**
- * svg渐变滤镜
+/**
+ * svg渐变滤镜
  */
 var _default = function _default(_ref) {
   var id = _ref.id,

package/lib/components/PieChart.js

@@ -972,6 +972,7 @@ var RingLabel = function RingLabel(_ref12) {
         type = _ref13$series$color.type,
         pure = _ref13$series$color.pure,
         stops = _ref13$series$color.linear.stops,
+        realData = _ref13.data,
         displayName = _ref13.displayName,
         value = _ref13.value,
         percent = _ref13.percent,
@@ -1035,7 +1036,7 @@ var RingLabel = function RingLabel(_ref12) {
       dx: valueDx(_showName, mode),
       dy: valueDy(_showName, mode, directionY),
       style: (0, _utils.getFontStyle)(valueFont, 'svg')
-    }, value), showSuffix && /*#__PURE__*/_react["default"].createElement("tspan", {
+    }, realData.y), showSuffix && /*#__PURE__*/_react["default"].createElement("tspan", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(valueFont, 'svg')), {}, {
         fontSize: suffixFontSize
       }),

package/lib/components/Tooltip.js

@@ -22,6 +22,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       x = _ref.tickName,
       data = _ref.data,
       series = _ref.series,
+      config = _ref.config,
       _ref$config$tip = _ref.config.tip,
       _ref$config$tip$data = _ref$config$tip.data,
       xAxis = _ref$config$tip$data.xAxis,
@@ -29,11 +30,13 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       align = _ref$config$tip$data$.align,
       font = _ref$config$tip$data$.font,
       translateXAxis = _ref$config$tip$data$.translate,
-      lineHeight = _ref$config$tip$data.lineHeight,
       dataConfig = _ref$config$tip$data.data,
       _ref$config$tip$data$2 = _ref$config$tip$data.data,
+      lineHeight = _ref$config$tip$data$2.lineHeight,
+      iconSize = _ref$config$tip$data$2.iconSize,
       name = _ref$config$tip$data$2.name,
       value = _ref$config$tip$data$2.value,
+      suffix = _ref$config$tip$data$2.suffix,
       image = _ref$config$tip.image,
       margin = _ref$config$tip.margin,
       _ref$config$tip$size = _ref$config$tip.size,
@@ -59,7 +62,6 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     }, (0, _utils.getFontStyle)(font))
   }, formatter ? formatter({
     series: series,
-    lineHeight: lineHeight,
     x: {
       x: x,
       config: xAxis
@@ -91,6 +93,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         icon = _series$find.icon,
         displayName = _series$find.displayName;
 
+    var showSuffix = suffix.show,
+        content = suffix.content,
+        suffiixFont = suffix.font,
+        suffixTranslate = suffix.translate;
+    var tmp = new Map();
+    Object.values(content).forEach(function (item) {
+      tmp.set(item['suffix'].name, item['suffix'].suffix);
+    });
+
     var _icon = (0, _utils.getIcon)(type, icon);
 
     return /*#__PURE__*/React.createElement("dd", {
@@ -102,17 +113,25 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       key: index
     }, /*#__PURE__*/React.createElement("span", {
       style: {
+        border: '1px solid red',
         display: 'flex',
         alignItems: 'center',
         gap: icon.iconGap
       }
     }, /*#__PURE__*/React.createElement("span", {
-      style: _icon
+      style: _objectSpread(_objectSpread({}, _icon), {}, {
+        width: iconSize + 'px',
+        height: iconSize + 'px'
+      })
     }), /*#__PURE__*/React.createElement("span", {
       style: (0, _utils.getFontStyle)(name)
     }, displayName || s)), /*#__PURE__*/React.createElement("span", {
       style: (0, _utils.getFontStyle)(value)
-    }, showY));
+    }, showY, showSuffix && /*#__PURE__*/React.createElement("span", {
+      style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(suffiixFont)), {}, {
+        transform: (0, _utils.getTranslate3d)(suffixTranslate)
+      })
+    }, tmp.get(s))));
   })));
 });
 

package/lib/css/index.module.css

@@ -1,42 +1,42 @@
-.rotateClockwise {
-  animation-name: rotateClockwise;
-}
-
-@keyframes rotateClockwise {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.rotateCounterClockwise {
-  animation-name: rotateCounterClockwise;
-}
-
-@keyframes rotateCounterClockwise {
-  0% {
-    transform: rotate(360deg);
-  }
-  100% {
-    transform: rotate(0deg);
-  }
-}
-
-.showAllStyle {
-  display: grid;
-  width: 100%;
-  grid-template-columns: 50% 25% 25%;
-  align-items: center;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.notShowAllStyle {
-  display: flex;
-  width: 100%;
-  align-items: center;
-  flex-direction: row;
-  justify-content: space-between;
+.rotateClockwise {
+  animation-name: rotateClockwise;
+}
+
+@keyframes rotateClockwise {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.rotateCounterClockwise {
+  animation-name: rotateCounterClockwise;
+}
+
+@keyframes rotateCounterClockwise {
+  0% {
+    transform: rotate(360deg);
+  }
+  100% {
+    transform: rotate(0deg);
+  }
+}
+
+.showAllStyle {
+  display: grid;
+  width: 100%;
+  grid-template-columns: 50% 25% 25%;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+.notShowAllStyle {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
 }

package/lib/css/piechart.module.css

@@ -1,27 +1,27 @@
-/*甜甜圈图专用css*/
-.label-line {
-    stroke-dasharray: 100;
-    stroke-dashoffset: 100;
-    animation: dash 800ms ease forwards;
-  }
-  
-  .label-text {
-    opacity: 0;
-    animation: show 800ms ease forwards;
-  }
-  
-  .inner-arc {
-    animation: dash 2s ease forwards;
-  }
-  
-  @keyframes dash {
-    100% {
-      stroke-dashoffset: 0%;
-    }
-  }
-  
-  @keyframes show {
-    100% {
-      opacity: 1;
-    }
+/*甜甜圈图专用css*/
+.label-line {
+    stroke-dasharray: 100;
+    stroke-dashoffset: 100;
+    animation: dash 800ms ease forwards;
+  }
+  
+  .label-text {
+    opacity: 0;
+    animation: show 800ms ease forwards;
+  }
+  
+  .inner-arc {
+    animation: dash 2s ease forwards;
+  }
+  
+  @keyframes dash {
+    100% {
+      stroke-dashoffset: 0%;
+    }
+  }
+  
+  @keyframes show {
+    100% {
+      opacity: 1;
+    }
   }

package/lib/formatter/legend.js

@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
   var displayName = _ref.displayName,
-      value = _ref.value,
+      data = _ref.data,
       percent = _ref.percent,
       _ref$series = _ref.series,
       seriesColor = _ref$series.color,
@@ -71,7 +71,7 @@ var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
       alignItems: 'center',
       justifyContent: 'flex-start'
     })
-  }, showValue && /*#__PURE__*/React.createElement("span", null, value), showSuffix && /*#__PURE__*/React.createElement("span", {
+  }, showValue && /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
     style: {
       fontSize: fontSize,
       transform: 'translate3d(' + x + 'px, ' + y + 'px, 0px)'

package/lib/hooks/useAnimateData.js

@@ -19,11 +19,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-/**
- * 图表数据动画
- * @param {Array} data data列表
- * @param {boolean} dataAnimation 是否开启数据增长动画
- * @returns 改变后的数据
+/**
+ * 图表数据动画
+ * @param {Array} data data列表
+ * @param {boolean} dataAnimation 是否开启数据增长动画
+ * @returns 改变后的数据
  */
 var _default = function _default(data, dataAnimation) {
   var _useState = (0, _react.useState)([]),

package/lib/hooks/useAxes.js

@@ -28,11 +28,11 @@ var scales = {
   utc: _d3Scale.scaleUtc,
   ordinal: _utils.band
 };
-/**
- * x/y/z轴
- * @param {Array} axes 轴列表数组
- * @param {Object} context 其中需要包括
- * @returns {Map} 返回所有轴
+/**
+ * x/y/z轴
+ * @param {Array} axes 轴列表数组
+ * @param {Object} context 其中需要包括
+ * @returns {Map} 返回所有轴
  */
 
 var _default = function _default(_ref) {

package/lib/hooks/useCarouselAxisX.js

@@ -25,11 +25,11 @@ var initialState = {
   currentIndex: null,
   flag: false
 };
-/**
- * x轴滚动逻辑
- * @param {Object} axis x轴配置项
- * @param {Object} config x轴轮播动画的配置项
- * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
+/**
+ * x轴滚动逻辑
+ * @param {Object} axis x轴配置项
+ * @param {Object} config x轴轮播动画的配置项
+ * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
  */
 
 var _default = function _default(axis, config) {

package/lib/hooks/useExtentData.js

@@ -61,12 +61,12 @@ var stackData = function stackData(data, series) {
   dataMap.clear();
   return [min, max];
 };
-/**
- * 计算轴的domain
- * @param {Array} axes x轴列表
- * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
- * @param {Object} data 数据列表
- * @returns {Array} 返回带domain的轴
+/**
+ * 计算轴的domain
+ * @param {Array} axes x轴列表
+ * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
+ * @param {Object} data 数据列表
+ * @returns {Array} 返回带domain的轴
  */
 
 

package/lib/hooks/useFilterData.js

@@ -56,11 +56,11 @@ var getSelected = function getSelected(selected, name) {
   });
   return tmp;
 };
-/**
- * 图例点击状态管理
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
+/**
+ * 图例点击状态管理
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
  */
 
 

package/lib/hooks/useStackData.js

@@ -89,11 +89,11 @@ var setStackData = function setStackData(data, series, stacks) {
   dataMap.clear();
   return series;
 };
-/**
- * 计算堆叠数据
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
+/**
+ * 计算堆叠数据
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
  */
 
 

package/lib/hooks/useTooltip.js

@@ -14,16 +14,16 @@ var _react = require("react");
 var _utils = require("../utils");
 
 var callback = function callback() {};
-/**
- * 主要用于轴类图表，返回当前选中的是哪一个x
- * @param {Array} svg svg的dom实例
- * @param {Number} marginLeft 左间距
- * @param {Number} marginTop 上间距
- * @param {Number} width 宽
- * @param {Number} height 高
- * @param {Number} axisX 类目轴
- * @param {Object} config 轮播动画参数
- * @returns {Object} 返回被选中的名称，坐标，选中方法
+/**
+ * 主要用于轴类图表，返回当前选中的是哪一个x
+ * @param {Array} svg svg的dom实例
+ * @param {Number} marginLeft 左间距
+ * @param {Number} marginTop 上间距
+ * @param {Number} width 宽
+ * @param {Number} height 高
+ * @param {Number} axisX 类目轴
+ * @param {Object} config 轮播动画参数
+ * @returns {Object} 返回被选中的名称，坐标，选中方法
  */