@easyv/charts 1.0.69 → 1.0.73

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
+ * }
  */
 
 
@@ -184,6 +184,9 @@ var Label = function Label(_ref5) {
   var translateText = 'translate(' + x + ', ' + y + ')';
   return /*#__PURE__*/_react["default"].createElement("text", {
     className: className,
+    style: {
+      whiteSpace: "pre"
+    },
     dominantBaseline: dominantBaseline,
     textAnchor: textAnchor,
     fontFamily: fontFamily,

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/Band.js

@@ -89,7 +89,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
       _ref3$config$paddingI = _ref3$config.paddingInner,
       paddingOuter = _ref3$config$paddingI === void 0 ? 0 : _ref3$config$paddingI,
       style = _ref3$config.style,
+      fillType = _ref3$config.fillType,
+      url = _ref3$config.url,
+      size = _ref3$config.size,
       fill = _ref3$config.fill,
+      opacity = _ref3$config.opacity,
       _ref3$config$highligh = _ref3$config.highlight,
       showHighlight = _ref3$config$highligh.show,
       extent = _ref3$config$highligh.extent,
@@ -152,7 +156,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
       style: {
         width: '100%',
         height: '100%',
-        background: (0, _utils.getBandBackground)(pattern, extent === flag ? highlightFill : fill),
+        opacity: opacity,
+        background: fillType == 'pattern' ? "50% 50% / ".concat(size.width, "px ").concat(size.height, "px repeat ") + 'url(' + url + ')' : (0, _utils.getBandBackground)(pattern, extent === flag ? highlightFill : fill),
         borderRadius: style == 'square' ? '0 0 0 0' : getBorderRadius({
           isVertical: isVertical,
           positive: y > 0,

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

@@ -157,19 +157,29 @@ var Icon = function Icon(_ref4) {
       inner = _ref4$config.inner,
       outer = _ref4$config.outer,
       color = _ref4$config.color,
-      radius = _ref4$config.radius;
+      radius = _ref4$config.radius,
+      image = _ref4$config.image,
+      _ref4$config$size = _ref4$config.size,
+      width = _ref4$config$size.width,
+      height = _ref4$config$size.height;
   return mode == 'single' ? /*#__PURE__*/React.createElement(Circle, {
     cx: cx,
     cy: cy,
     color: color,
     radius: radius
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
+  }) : mode == 'double' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
   }, inner)), /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
-  }, outer)));
+  }, outer))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("image", {
+    width: width,
+    height: height,
+    x: cx - width / 2,
+    y: cy - height / 2,
+    xlinkHref: window.appConfig.ASSETS_URL + image
+  }));
 };
 
 var Circle = function Circle(_ref5) {

package/lib/components/Line.js

@@ -45,9 +45,16 @@ var getLineData = function getLineData(data, connectNulls) {
 
 var Area = function Area(_ref2) {
   var data = _ref2.data,
+      config = _ref2.config,
       _ref2$config = _ref2.config,
       id = _ref2$config.id,
       fill = _ref2$config.fill,
+      type = _ref2$config.type,
+      url = _ref2$config.url,
+      opacity = _ref2$config.opacity,
+      _ref2$config$size = _ref2$config.size,
+      patternW = _ref2$config$size.width,
+      patternH = _ref2$config$size.height,
       curve = _ref2$config.curve,
       tension = _ref2$config.tension,
       xScaler = _ref2.xScaler,
@@ -76,7 +83,17 @@ var Area = function Area(_ref2) {
     d: areaGen(data),
     stroke: "none",
     fill: 'url(#' + id + ')'
-  }), /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement(_.LinearGradient, {
+  }), /*#__PURE__*/_react["default"].createElement("defs", null, type && type == 'pattern' ? /*#__PURE__*/_react["default"].createElement("pattern", {
+    id: id,
+    patternUnits: "userSpaceOnUse",
+    width: patternW,
+    height: patternH
+  }, url && /*#__PURE__*/_react["default"].createElement("image", {
+    opacity: opacity,
+    width: patternW,
+    height: patternH,
+    xlinkHref: window.appConfig.ASSETS_URL + url
+  })) : /*#__PURE__*/_react["default"].createElement(_.LinearGradient, {
     id: id,
     colors: area,
     rotate: 0

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

@@ -887,7 +887,7 @@ var Label = function Label(_ref10) {
 
     var _showValue = showValue && (value || showSuffix);
 
-    return show && (_showName || showPercent || _showValue) && /*#__PURE__*/_react["default"].createElement("g", {
+    return show && (_showName || showPercent || showValue) && /*#__PURE__*/_react["default"].createElement("g", {
       key: index
     }, /*#__PURE__*/_react["default"].createElement("path", {
       className: animation ? _piechartModule["default"]['label-line'] : "",
@@ -908,7 +908,7 @@ var Label = function Label(_ref10) {
       textAnchor: x3 >= 0 ? 'start' : 'end'
     }, _showName && /*#__PURE__*/_react["default"].createElement("tspan", {
       style: (0, _utils.getFontStyle)(nameFont, 'svg')
-    }, displayName + (showValue || showPercent ? ':' : '')), _showValue && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("tspan", {
+    }, displayName + (showValue || showPercent ? ':' : '')), showValue && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("tspan", {
       x: !!(_showName && mode == 'vertical') ? _x : '',
       dx: valueDx(_showName, mode),
       dy: !!(_showName && mode == 'vertical') ? '1.5em' : '',

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: 40% 30% 30%;
-  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: 40% 30% 30%;
+  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

@@ -73,7 +73,7 @@ var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
       alignItems: 'center',
       justifyContent: 'flex-start'
     })
-  }, showValue && /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
     style: {
       whiteSpace: "nowrap",
       fontSize: fontSize,

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) {
@@ -45,7 +45,9 @@ var _default = function _default(_ref) {
     var tmp = new Map();
     var xAxisPositions = [];
     axes.forEach(function (item) {
-      var type = item.type,
+      var _item$config$label$sh = item.config.label.showLast,
+          showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
+          type = item.type,
           orientation = item.orientation,
           ticks = item.ticks,
           _item$tickCount = item.tickCount,
@@ -76,7 +78,7 @@ var _default = function _default(_ref) {
 
       if (type === 'ordinal') {
         if (carousel === false) {
-          _ticks = (0, _utils2.getTicksOfAxis)(_ticks, +tickCount);
+          _ticks = (0, _utils.getTicksOfAxis)(_ticks, +tickCount, showLast);
         }
       } else {
         if (auto === false) {

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} 返回被选中的名称，坐标，选中方法
  */