@easyv/charts 1.2.14 → 1.3.0

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/.husky/commit-msg

@@ -1,4 +1,4 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
 yarn commitlint --edit $1

package/CHANGELOG.md

@@ -1,18 +1,18 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-### [1.1.1](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/compare/v1.1.0...v1.1.1) (2022-04-13)
-
-## 1.1.0 (2022-04-02)
-
-
-### Features
-
-* 轴标签，label支持样式传入 ([749a595](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/749a595a96b95917dafdc1766f63efec73398d64))
-* axis轴标签支持点击触发回调 ([1f636e1](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/1f636e1840f4f3b48c2b9765ce6087759d82fb17))
-
-
-### Bug Fixes
-
-* **band组件:** 修复foreignObject在Safari浏览器下的位置诡异偏离问题 ([1a65d54](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/1a65d54abbcf6c9e84cc85cc8b6a9d28b24fa4c4))
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+### [1.1.1](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/compare/v1.1.0...v1.1.1) (2022-04-13)
+
+## 1.1.0 (2022-04-02)
+
+
+### Features
+
+* 轴标签，label支持样式传入 ([749a595](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/749a595a96b95917dafdc1766f63efec73398d64))
+* axis轴标签支持点击触发回调 ([1f636e1](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/1f636e1840f4f3b48c2b9765ce6087759d82fb17))
+
+
+### Bug Fixes
+
+* **band组件:** 修复foreignObject在Safari浏览器下的位置诡异偏离问题 ([1a65d54](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-charts/commit/1a65d54abbcf6c9e84cc85cc8b6a9d28b24fa4c4))

package/lib/components/Axis.js

@@ -59,16 +59,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
+ * }
  */
 
 

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,
@@ -22,12 +22,22 @@ var _default = function _default(_ref) {
       scaler = _ref$axis.scaler,
       step = _ref$axis.step,
       direction = _ref$axis.direction,
+      bandLength = _ref.bandLength,
       _ref$config = _ref.config,
       background = _ref$config.background,
+      paddingInner = _ref$config.seriesIntervalWidth,
       paddingOuter = _ref$config.paddingInner,
       length = _ref.length;
   var isVertical = direction === 'vertical';
-  var bandwidth = (0, _utils.getBandwidth)(step, paddingOuter);
+
+  var _getSeriesInfo = (0, _utils.getSeriesInfo)({
+    step: step,
+    bandLength: bandLength,
+    paddingInner: paddingInner,
+    paddingOuter: paddingOuter
+  }),
+      bandwidth = _getSeriesInfo.width;
+
   var size = isVertical ? {
     width: length,
     height: bandwidth

package/lib/components/Band.js

@@ -111,19 +111,19 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
       direction = _ref3$xAxis.direction,
       yScaler = _ref3.yAxis.scaler;
   if (!data.length) return null;
-  var bandwidth = (0, _utils.getBandwidth)(step, paddingOuter);
 
-  var _getBandSeriesStepAnd = (0, _utils.getBandSeriesStepAndWidth)({
-    width: bandwidth,
+  var _getSeriesInfo = (0, _utils.getSeriesInfo)({
+    step: step,
+    bandLength: bandLength,
     paddingInner: paddingInner,
-    bandLength: bandLength
+    paddingOuter: paddingOuter
   }),
-      seriesStep = _getBandSeriesStepAnd.seriesStep,
-      seriesWidth = _getBandSeriesStepAnd.seriesWidth;
+      seriesWidth = _getSeriesInfo.seriesWidth,
+      seriesStep = _getSeriesInfo.seriesStep,
+      seriesStart = _getSeriesInfo.seriesStart;
 
   var _data = showHighlight ? getHighlightData(data, extent) : data;
 
-  var offset = (seriesWidth + paddingInner * seriesStep) * bandLength - paddingInner * seriesStep;
   var isVertical = direction === 'vertical';
   return /*#__PURE__*/_react["default"].createElement("g", {
     className: "__easyv-band"
@@ -141,7 +141,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
 
     var y1 = yScaler(isVertical ? end : start);
     var y2 = yScaler(isVertical ? start : end);
-    var positionX = xScaler(x) + seriesStep * index - offset / 2;
+    var positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
     if (isNaN(positionX)) return null;
     var positionY = y < 0 ? y1 : y2;
     var attr = getAttr({

package/lib/components/Carousel.js

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

package/lib/components/CartesianChart.js

@@ -44,6 +44,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       animation = _ref$config$chart.animation,
       legend = _ref$config$chart.legend,
       series = _ref$config.series,
+      bandLength = _ref$config.bandLength,
       tooltip = _ref$config.tooltip,
       _ref$config$baseLine = _ref$config.baseLine,
       _ref$config$baseLine$ = _ref$config$baseLine.orientation,
@@ -133,7 +134,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, background && /*#__PURE__*/_react["default"].createElement(_.Background, {
     length: isVertical ? chartWidth : chartHeight,
     axis: axisX,
-    config: background
+    config: background,
+    bandLength: bandLength
   }), (0, _toConsumableArray2["default"])(axes.values()).map(function (item, index) {
     var config = item.axisType == 'x' ? axisX : item;
     return /*#__PURE__*/_react["default"].createElement(_.Axis, (0, _extends2["default"])({
@@ -149,6 +151,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     return yAxis && Component && /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
       key: index
     }, config, {
+      bandLength: bandLength,
       xAxis: axisX,
       yAxis: yAxis,
       triggerClick: onInteraction
@@ -161,6 +164,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     return yAxis && /*#__PURE__*/_react["default"].createElement(_.Label, (0, _extends2["default"])({
       key: index
     }, config, {
+      bandLength: bandLength,
       xAxis: axisX,
       yAxis: yAxis,
       triggerClick: onInteraction

package/lib/components/ConicalGradient.js

@@ -23,8 +23,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/**
- * 饼图装饰内圈
+/**
+ * 饼图装饰内圈
  */
 var _default = function _default(_ref) {
   var width = _ref.width,
@@ -127,8 +127,8 @@ var _default = function _default(_ref) {
     }
   });
 };
-/**
- * ConicalGradient
+/**
+ * ConicalGradient
  */
 
 
@@ -140,11 +140,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);
@@ -154,23 +154,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

@@ -41,7 +41,7 @@ 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 lineType = config.hasOwnProperty('line'); //  堆叠处理
 
   var showIcon = icon && icon.show;
   var showLabel = label && label.show;
@@ -51,17 +51,16 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       width = _useContext.width,
       height = _useContext.height;
 
-  var bandwidth = (0, _utils.getBandwidth)(step, paddingOuter);
-
-  var _getBandSeriesStepAnd = (0, _utils.getBandSeriesStepAndWidth)({
-    width: bandwidth,
+  var _getSeriesInfo = (0, _utils.getSeriesInfo)({
+    step: step,
+    bandLength: bandLength,
     paddingInner: paddingInner,
-    bandLength: bandLength
+    paddingOuter: paddingOuter
   }),
-      seriesStep = _getBandSeriesStepAnd.seriesStep,
-      seriesWidth = _getBandSeriesStepAnd.seriesWidth;
+      seriesStep = _getSeriesInfo.seriesStep,
+      seriesWidth = _getSeriesInfo.seriesWidth,
+      seriesStart = _getSeriesInfo.seriesStart;
 
-  var offset = (seriesWidth + paddingInner * seriesStep) * bandLength - paddingInner * seriesStep;
   var isVertical = direction === 'vertical';
   var _position = label.position;
   return /*#__PURE__*/React.createElement("g", {
@@ -78,11 +77,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         showY = _ref2$data.showY,
         s = _ref2$data.s;
 
-    var y1 = yScaler(isVertical ? end : start); //处理z型折线图和堆叠柱图的逻辑冲突
+    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;
+    var positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
     if (isNaN(positionX)) return null;
     var position = positionX + seriesWidth / 2;
     var labelPosition = isVertical ? getVerticalLabel({
@@ -109,7 +108,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       key: i,
       onClick: triggerClick,
       "data-data": JSON.stringify(data)
-    }, showIcon && /*#__PURE__*/React.createElement(Icon, {
+    }, showIcon && !isNaN(attr.y) && /*#__PURE__*/React.createElement(Icon, {
       cx: attr.x,
       cy: attr.y,
       config: icon