@visactor/vtable 0.15.0 → 0.15.1

package/es/layout/pivot-header-layout.js

@@ -557,9 +557,12 @@ export class PivotHeaderLayoutMap {
     }
     get bottomFrozenRowCount() {
         if (!this._table.isPivotChart()) return this._table.internalProps.bottomFrozenRowCount ? this.rowCount - this.headerLevelCount >= this._table.internalProps.bottomFrozenRowCount ? this._table.internalProps.bottomFrozenRowCount : this.rowCount - this.headerLevelCount : 0;
-        const axisOption = this._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
-        return !1 === (null == axisOption ? void 0 : axisOption.visible) ? 0 : (this.indicatorsAsCol, 
-        1);
+        if (this.indicatorKeys.length >= 1) {
+            const axisOption = this._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
+            return !1 === (null == axisOption ? void 0 : axisOption.visible) ? 0 : (this.indicatorsAsCol, 
+            1);
+        }
+        return 0;
     }
     get rightFrozenColCount() {
         if (!this._table.isPivotChart()) return this._table.internalProps.rightFrozenColCount ? this.colCount - this.rowHeaderLevelCount >= this._table.internalProps.rightFrozenColCount ? this._table.internalProps.rightFrozenColCount : this.colCount - this.rowHeaderLevelCount : 0;
@@ -639,7 +642,7 @@ export class PivotHeaderLayoutMap {
                 id: "",
                 field: void 0,
                 indicatorKey: void 0,
-                cellType: void 0,
+                cellType: "text",
                 define: void 0
             };
         }
@@ -648,7 +651,7 @@ export class PivotHeaderLayoutMap {
             id: "",
             field: void 0,
             indicatorKey: void 0,
-            cellType: void 0,
+            cellType: "text",
             define: void 0
         };
     }
@@ -1082,7 +1085,13 @@ export class PivotHeaderLayoutMap {
         return !!this._table.isPivotChart() && (!!this.isLeftBottomCorner(col, row) || (!!this.isRightBottomCorner(col, row) || !!this.isRightTopCorner(col, row)));
     }
     isAxisCell(col, row) {
-        return !!this._table.isPivotChart() && (!(!this.isBottomFrozenRow(col, row) && !this.isRightFrozenColumn(col, row)) || (!(!this.isRowHeader(col, row) || col !== this.rowHeaderLevelCount - 1) || !(!this.hasTwoIndicatorAxes || !this.indicatorsAsCol || row !== this.columnHeaderLevelCount - 1)));
+        if (!this._table.isPivotChart()) return !1;
+        if (this.indicatorKeys.length >= 1) {
+            if (this.isBottomFrozenRow(col, row) || this.isRightFrozenColumn(col, row)) return !0;
+            if (this.isRowHeader(col, row) && col === this.rowHeaderLevelCount - 1) return !0;
+            if (this.hasTwoIndicatorAxes && this.indicatorsAsCol && row === this.columnHeaderLevelCount - 1) return !0;
+        }
+        return !1;
     }
     getChartAxes(col, row) {
         return getChartAxes(col, row, this);
@@ -1287,7 +1296,8 @@ export class PivotHeaderLayoutMap {
 
 function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
     1 === paddingInner && (paddingInner = 0);
-    return bandSpace(count, paddingInner, paddingOuter) * (bandwidth / (1 - paddingInner));
+    const space = bandSpace(count, paddingInner, paddingOuter), step = bandwidth / (1 - paddingInner);
+    return Math.ceil(space * step);
 }
 
 function bandSpace(count, paddingInner, paddingOuter) {