tvcharts 0.6.93 → 0.6.94

package/lib/chart/bgColor/BgColorLayout.js

@@ -99,13 +99,14 @@ var bgColorLayout = {
           var rects = rectsByColor[color] || [];
           rects.push({
             x: Math.floor(xPx - leftOffset),
-            y: startY,
-            width: width,
-            height: height
+            y: startY
           });
           rectsByColor[color] = rects;
         }
-        bgColorData.setLayout('rectsByColor', rectsByColor);
+        bgColorData.setLayout({
+          rectsByColor: rectsByColor,
+          height: height
+        });
       }
     };
   }

package/lib/chart/bgColor/BgColorPath.js

@@ -45,11 +45,13 @@ import { __extends } from "tslib";
 /**
  * Line path for bezier and straight line draw
  */
-import * as graphic from "../../util/graphic.js";
+import * as graphic from '../../util/graphic.js';
 var BgColorShape = /** @class */function () {
   function BgColorShape() {
     this.points = [];
     this.isLine = false;
+    this.width = 2;
+    this.height = 2;
   }
   return BgColorShape;
 }();
@@ -57,13 +59,13 @@ var BgColorPath = /** @class */function (_super) {
   __extends(BgColorPath, _super);
   function BgColorPath(opts) {
     var _this = _super.call(this, opts) || this;
-    _this.type = "BarPlot";
+    _this.type = 'BarPlot';
     return _this;
   }
   BgColorPath.prototype.getDefaultStyle = function () {
     return {
-      stroke: "transparent",
-      fill: "#000"
+      stroke: 'transparent',
+      fill: '#000'
     };
   };
   BgColorPath.prototype.getDefaultShape = function () {
@@ -71,13 +73,14 @@ var BgColorPath = /** @class */function (_super) {
   };
   BgColorPath.prototype.buildPath = function (ctx, shape) {
     var points = shape.points,
-      isLine = shape.isLine;
+      isLine = shape.isLine,
+      width = shape.width,
+      height = shape.height;
     if (isLine) {
       for (var index = 0; index < points.length; index++) {
         var point = points[index];
         var x = point.x,
-          y = point.y,
-          height = point.height;
+          y = point.y;
         ctx.moveTo(x, y);
         ctx.lineTo(x, y + height);
       }
@@ -85,9 +88,7 @@ var BgColorPath = /** @class */function (_super) {
       for (var index = 0; index < points.length; index++) {
         var point = points[index];
         var x = point.x,
-          y = point.y,
-          width = point.width,
-          height = point.height;
+          y = point.y;
         ctx.rect(x, y, width, height);
       }
     }

package/lib/chart/bgColor/BgColorView.js

@@ -43,11 +43,11 @@
  */
 import { __extends } from "tslib";
 // FIXME step not support polar
-import { each } from "tvrender/lib/core/util.js";
-import ChartView from "../../view/Chart.js";
-import * as graphic from "../../util/graphic.js";
-import { createClipPath } from "../helper/createClipPathFromCoordSys.js";
-import BgColorPath from "./BgColorPath.js";
+import { each } from 'tvrender/lib/core/util.js';
+import ChartView from '../../view/Chart.js';
+import * as graphic from '../../util/graphic.js';
+import { createClipPath } from '../helper/createClipPathFromCoordSys.js';
+import BgColorPath from './BgColorPath.js';
 var BgColorView = /** @class */function (_super) {
   __extends(BgColorView, _super);
   function BgColorView() {
@@ -61,7 +61,8 @@ var BgColorView = /** @class */function (_super) {
   // }
   BgColorView.prototype.render = function (seriesModel, ecModel, api) {
     var data = seriesModel.getData();
-    var rectsByColor = data.getLayout("rectsByColor");
+    var rectsByColor = data.getLayout('rectsByColor');
+    var height = data.getLayout('height');
     if (!this._bgColorGroup) {
       this._bgColorGroup = new graphic.Group();
       this.group.add(this._bgColorGroup);
@@ -69,23 +70,25 @@ var BgColorView = /** @class */function (_super) {
       this._bgColorGroup.removeAll();
     }
     var bgColorGroup = this._bgColorGroup;
-    var width = Math.ceil(seriesModel.coordinateSystem.getBaseAxis().scale.barSpace);
-    var isLine = width <= 8;
+    var width = Math.ceil(seriesModel.coordinateSystem.getBaseAxis().scale.barSpace) || 5;
+    var isLine = width <= 2;
     each(rectsByColor, function (rects, color) {
       var el = new BgColorPath({
         shape: {
           points: rects,
-          isLine: isLine
+          isLine: isLine,
+          width: width,
+          height: height
         },
         style: {
           fill: isLine ? null : color,
-          stroke: isLine ? color : "transparent",
+          stroke: isLine ? color : 'transparent',
           lineWidth: isLine ? width : void 0
         }
       });
       bgColorGroup.add(el);
     });
-    var clipPath = seriesModel.get("clip", true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
+    var clipPath = seriesModel.get('clip', true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
     if (clipPath) {
       this.group.setClipPath(clipPath);
     } else {
@@ -104,7 +107,7 @@ var BgColorView = /** @class */function (_super) {
   BgColorView.prototype.dispose = function (ecModel, api) {
     this.remove(ecModel, api);
   };
-  BgColorView.type = "bgcolor";
+  BgColorView.type = 'bgcolor';
   return BgColorView;
 }(ChartView);
 export default BgColorView;

package/lib/component/axisPointer/modelHelper.js

@@ -246,8 +246,9 @@ export function fixValue(axisModel) {
   var option = axisPointerModel.option;
   var status = axisPointerModel.get('status');
   var value = axisPointerModel.get('value');
+  var isPercentage = scale.type === 'percentage';
   // Parse init value for category and time axis.
-  if (value != null) {
+  if (value != null && !isPercentage) {
     value = scale.parse(value);
   }
   var useHandle = isHandleTrigger(axisPointerModel);
@@ -256,19 +257,21 @@ export function fixValue(axisModel) {
   if (status == null) {
     option.status = useHandle ? 'show' : 'hide';
   }
-  var extent = scale.getExtent().slice();
-  extent[0] > extent[1] && extent.reverse();
-  if (
-  // Pick a value on axis when initializing.
-  value == null
-  // If both `handle` and `dataZoom` are used, value may be out of axis extent,
-  // where we should re-pick a value to keep `handle` displaying normally.
-  || value > extent[1]) {
-    // Make handle displayed on the end of the axis when init, which looks better.
-    value = extent[1];
-  }
-  if (value < extent[0]) {
-    value = extent[0];
+  if (!isPercentage) {
+    var extent = scale.getExtent().slice();
+    extent[0] > extent[1] && extent.reverse();
+    if (
+    // Pick a value on axis when initializing.
+    value == null
+    // If both `handle` and `dataZoom` are used, value may be out of axis extent,
+    // where we should re-pick a value to keep `handle` displaying normally.
+    || value > extent[1]) {
+      // Make handle displayed on the end of the axis when init, which looks better.
+      value = extent[1];
+    }
+    if (value < extent[0]) {
+      value = extent[0];
+    }
   }
   option.value = value;
   if (useHandle) {

package/lib/coord/cartesian/Grid.js

@@ -369,7 +369,7 @@ var Grid = /** @class */function () {
     }, this);
     function unionExtent(data, axis) {
       var axisDims = getDataDimensionsOnAxis(data, axis.dim);
-      var baseDim = axisDims.includes("close") ? 'close' : 'y';
+      var baseDim = axisDims.includes('close') ? 'close' : 'y';
       var baseValue = data.get(baseDim, 0);
       each(axisDims, function (dim) {
         axis.scale.unionExtentFromData(data, dim, baseValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.6.93",
+  "version": "0.6.94",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [

package/types/src/chart/bgColor/BgColorPath.d.ts

@@ -1,16 +1,16 @@
 /**
  * Line path for bezier and straight line draw
  */
-import * as graphic from "../../util/graphic.js";
-import { PathProps } from "tvrender/lib/graphic/Path.js";
+import * as graphic from '../../util/graphic.js';
+import { PathProps } from 'tvrender/lib/graphic/Path.js';
 declare class BgColorShape {
     points: {
         x: number;
         y: number;
-        width: number;
-        height: number;
     }[];
     isLine: boolean;
+    width: number;
+    height: number;
 }
 interface BgColorProps extends PathProps {
     shape: BgColorShape;

package/types/src/chart/bgColor/BgColorView.d.ts

@@ -1,8 +1,8 @@
-import ChartView from "../../view/Chart.js";
-import HLinesSeriesModel from "./BgColorSeries.js";
-import type GlobalModel from "../../model/Global.js";
-import type ExtensionAPI from "../../core/ExtensionAPI.js";
-import Element from "tvrender/lib/Element.js";
+import ChartView from '../../view/Chart.js';
+import HLinesSeriesModel from './BgColorSeries.js';
+import type GlobalModel from '../../model/Global.js';
+import type ExtensionAPI from '../../core/ExtensionAPI.js';
+import Element from 'tvrender/lib/Element.js';
 declare class BgColorView extends ChartView {
     static readonly type = "bgcolor";
     readonly type = "bgcolor";