k-vtable 1.0.0 → 1.0.2

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

@@ -124,7 +124,9 @@ export class PivotHeaderLayoutMap {
                 style: seriesNumber.style,
                 format: seriesNumber.format,
                 field: seriesNumber.field,
-                icon: seriesNumber.icon
+                icon: seriesNumber.icon,
+                headerIcon: seriesNumber.headerIcon,
+                isChildNode: !1
             };
         })) : this.rowSeriesNumberColumn = [ {
             id: "",
@@ -137,6 +139,7 @@ export class PivotHeaderLayoutMap {
             format: rowSeriesNumber.format,
             field: "",
             icon: rowSeriesNumber.icon,
+            headerIcon: rowSeriesNumber.headerIcon,
             isChildNode: !1
         } ], this.leftRowSeriesNumberColumn = this.rowSeriesNumberColumn.filter((rowSeriesNumberItem => !0)), 
         this.rightRowSeriesNumberColumn = this.rowSeriesNumberColumn.filter((rowSeriesNumberItem => !1)), 
@@ -692,7 +695,7 @@ export class PivotHeaderLayoutMap {
         if (this.showHeader && this.showRowHeader) {
             if ("tree" === this.rowHierarchyType) {
                 const extensionRowCount = null !== (_b = null === (_a = this.extensionRows) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
-                return this.rowHeaderTitle ? void (this.rowHeaderLevelCount = 2 + extensionRowCount) : void (this.rowHeaderLevelCount = 1 + extensionRowCount);
+                return this.rowHeaderTitle ? void (this.rowHeaderLevelCount = 1 + (this.rowDimensionTree.totalLevel ? 1 : 0) + extensionRowCount) : void (this.rowHeaderLevelCount = (this.rowDimensionTree.totalLevel ? 1 : 0) + extensionRowCount);
             }
             const rowLevelCount = this._getRowHeaderTreeExpandedMaxLevelCount();
             let count = rowLevelCount;
@@ -941,7 +944,7 @@ export class PivotHeaderLayoutMap {
             if (rowPath = [], "tree" === this.rowHierarchyType) {
                 const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
                 let findTree = this.rowDimensionTree, level = 0;
-                for (;findTree; ) {
+                for (;findTree && row_pathIds; ) {
                     const pathIds = [];
                     let cellId = row_pathIds[level];
                     for (pathIds.push(cellId); ;) {
@@ -1247,7 +1250,7 @@ export class PivotHeaderLayoutMap {
     }
     moveHeaderPosition(source, target) {
         var _a, _b;
-        if (((null === (_a = this._table.options.dragOrder) || void 0 === _a ? void 0 : _a.validateDragOrderOnEnd(source, target)) || !(null === (_b = this._table.options.dragOrder) || void 0 === _b ? void 0 : _b.validateDragOrderOnEnd)) && this.canMoveHeaderPosition(source, target) && !this.isCellRangeEqual(source.col, source.row, target.col, target.row)) {
+        if ((!(null === (_a = this._table.options.dragOrder) || void 0 === _a ? void 0 : _a.validateDragOrderOnEnd) || (null === (_b = this._table.options.dragOrder) || void 0 === _b ? void 0 : _b.validateDragOrderOnEnd(source, target))) && this.canMoveHeaderPosition(source, target) && !this.isCellRangeEqual(source.col, source.row, target.col, target.row)) {
             const sourceCellRange = this.getCellRange(source.col, source.row);
             if (this.isColumnHeader(source.col, source.row)) {
                 const sourceSize = sourceCellRange.end.col - sourceCellRange.start.col + 1;
@@ -1339,8 +1342,8 @@ export class PivotHeaderLayoutMap {
         };
         let col, row, defaultCol, defaultRow, needLowestLevel_colPaths = !1, needLowestLevel_rowPaths = !1;
         (null == colHeaderPaths ? void 0 : colHeaderPaths.length) >= 1 && (null == rowHeaderPaths ? void 0 : rowHeaderPaths.length) >= 1 && (needLowestLevel_colPaths = !0, 
-        needLowestLevel_rowPaths = !0), colHeaderPaths.length >= this.columnHeaderLevelCount && (needLowestLevel_colPaths = !0), 
-        rowHeaderPaths.length >= this.rowHeaderLevelCount && (needLowestLevel_rowPaths = !0);
+        needLowestLevel_rowPaths = !0), colHeaderPaths.length >= this._getColumnHeaderTreeExpandedMaxLevelCount() && (needLowestLevel_colPaths = !0), 
+        rowHeaderPaths.length >= this._getRowHeaderTreeExpandedMaxLevelCount() && (needLowestLevel_rowPaths = !0);
         let rowDimensionFinded, colDimensionFinded, rowArr = this.rowTree, colArr = this.columnTree;
         if (colHeaderPaths) for (let i = 0; i < colHeaderPaths.length; i++) {
             const colDimension = colHeaderPaths[i];