feat: linear bar add barpadding option

Author: LonelySnowman

packages/vchart/src/chart/histogram/base/histogram-base-transformer.ts

@@ -9,6 +9,6 @@ export class BaseHistogramChartSpecTransformer<T extends IHistogramChartSpec> ex
   }
 
   protected _getDefaultSeriesSpec(spec: T): any {
-    return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground']);
+    return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground', 'barPadding']);
   }
 }

packages/vchart/src/series/bar/bar.ts

@@ -381,6 +381,31 @@ export class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends Cartes
     return this.dataToPositionY1(datum);
   }
 
+  protected _getLinearBarRange = (x: number, x1: number) => {
+    const realBarWidth = x1 - x;
+    if (this._spec.barPadding) {
+      const tempX = x + this._spec.barPadding;
+      const tempX1 = x1 - this._spec.barPadding;
+      if (tempX < tempX1) {
+        x = tempX;
+        x1 = tempX1;
+      }
+    }
+
+    const curBarWidth = x1 - x;
+    if (this._spec.barMinWidth) {
+      const barMinWidth = getActualNumValue(this._spec.barMinWidth, realBarWidth);
+      if (curBarWidth < barMinWidth) {
+        const widthDiff = barMinWidth - curBarWidth;
+        const halfWidthDiff = widthDiff / 2;
+        x -= halfWidthDiff;
+        x1 += halfWidthDiff;
+      }
+    }
+
+    return [x, x1];
+  };
+
   protected _getBarXStart = (datum: Datum, scale: IBaseScale, useWholeRange?: boolean) => {
     if (this._shouldDoPreCalculate()) {
       this._calculateStackRectPosition(false);
@@ -403,6 +428,12 @@ export class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends Cartes
     return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
   };
 
+  protected _getLinearBarXRange = (datum: Datum, scale: IBaseScale, useWholeRange?: boolean) => {
+    const x = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+    const x1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+    return this._getLinearBarRange(Math.min(x, x1), Math.max(x, x1));
+  };
+
   protected _getBarYStart = (datum: Datum, scale: IBaseScale) => {
     if (this._shouldDoPreCalculate()) {
       this._calculateStackRectPosition(true);
@@ -425,6 +456,12 @@ export class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends Cartes
     return valueInScaleRange(this._dataToPosY1(datum), scale);
   };
 
+  protected _getLinearBarYRange = (datum: Datum, scale: IBaseScale, useWholeRange?: boolean) => {
+    const y = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+    const y1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+    return this._getLinearBarRange(Math.min(y, y1), Math.max(y, y1));
+  };
+
   initBandRectMarkStyle() {
     const xScale = this._xAxisHelper?.getScale?.(0);
     const yScale = this._yAxisHelper?.getScale?.(0);
@@ -543,8 +580,8 @@ export class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends Cartes
     if (this.direction === Direction.horizontal) {
       const yChannels = isValid(this._fieldY2)
         ? {
-            y: (datum: Datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
-            y1: (datum: Datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
+            y: (datum: Datum) => this._getLinearBarYRange(datum, yScale, true)[0],
+            y1: (datum: Datum) => this._getLinearBarYRange(datum, yScale, true)[1]
           }
         : {
             y: (datum: Datum) =>
@@ -575,8 +612,8 @@ export class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends Cartes
     } else {
       const xChannels = isValid(this._fieldX2)
         ? {
-            x: (datum: Datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
-            x1: (datum: Datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
+            x: (datum: Datum) => this._getLinearBarXRange(datum, xScale, true)[0],
+            x1: (datum: Datum) => this._getLinearBarXRange(datum, xScale, true)[1]
           }
         : {
             x: (datum: Datum) =>

packages/vchart/src/series/bar/interface.ts

@@ -119,6 +119,11 @@ export interface IBarSeriesSpec
    * 圆角支持回调配置 @since 1.12.4
    */
   stackCornerRadius?: number | number[] | IStackCornerRadiusCallback;
+
+  /**
+   * 柱条间 padding 值
+   */
+  barPadding?: number;
 }
 
 export interface IBarBackgroundSpec {