@visactor/vtable 0.9.1-alpha.4 → 0.9.1

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

@@ -6,6 +6,8 @@ import { NumberMap } from "../tools/NumberMap";
 
 import { IndicatorDimensionKeyPlaceholder } from "../tools/global";
 
+import { diffCellAddress } from "../tools/diff-cell";
+
 class DimensionTree {
     constructor(tree, hierarchyType = "grid", rowExpandLevel = void 0) {
         this.sizeIncludeParent = !1, this.tree = {
@@ -217,7 +219,7 @@ export class PivotHeaderLayoutMap {
             const prev = _headerCellIds[row - 1];
             for (let col = 0; col < (null == prev ? void 0 : prev.length); col++) newRow[col] = prev[col];
         }(row), header.forEach((hd => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             const id = hd.id, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), cell = {
                 id: id,
                 caption: hd.value,
@@ -228,11 +230,11 @@ export class PivotHeaderLayoutMap {
                 headerType: null !== (_d = null == dimensionInfo ? void 0 : dimensionInfo.headerType) && void 0 !== _d ? _d : "text",
                 headerIcon: null == dimensionInfo ? void 0 : dimensionInfo.headerIcon,
                 define: Object.assign(hd, {
-                    linkJump: "linkJump" in dimensionInfo ? dimensionInfo.linkJump : null,
-                    linkDetect: "linkDetect" in dimensionInfo ? dimensionInfo.linkDetect : null,
-                    templateLink: "templateLink" in dimensionInfo ? dimensionInfo.templateLink : null,
-                    keepAspectRatio: "keepAspectRatio" in dimensionInfo && dimensionInfo.keepAspectRatio,
-                    imageAutoSizing: "imageAutoSizing" in dimensionInfo ? dimensionInfo.imageAutoSizing : null,
+                    linkJump: null == dimensionInfo ? void 0 : dimensionInfo.linkJump,
+                    linkDetect: null == dimensionInfo ? void 0 : dimensionInfo.linkDetect,
+                    templateLink: null == dimensionInfo ? void 0 : dimensionInfo.templateLink,
+                    keepAspectRatio: null !== (_e = null == dimensionInfo ? void 0 : dimensionInfo.keepAspectRatio) && void 0 !== _e && _e,
+                    imageAutoSizing: null == dimensionInfo ? void 0 : dimensionInfo.imageAutoSizing,
                     headerCustomRender: null == dimensionInfo ? void 0 : dimensionInfo.headerCustomRender,
                     headerCustomLayout: null == dimensionInfo ? void 0 : dimensionInfo.headerCustomLayout,
                     dragHeader: null == dimensionInfo ? void 0 : dimensionInfo.dragHeader
@@ -254,7 +256,7 @@ export class PivotHeaderLayoutMap {
             results[id] = cell, this._headerObjects[id] = cell, _headerCellIds[row][colIndex] = id;
             for (let r = row - 1; r >= 0; r--) _headerCellIds[r][colIndex] = roots[r];
             if (hd.hierarchyState === HierarchyState.expand && hd.children) show && colIndex++, 
-            this._addHeadersForTreeMode(_headerCellIds, row, null !== (_e = hd.children) && void 0 !== _e ? _e : [], [ ...roots, id ], totalLevel, show && hd.hierarchyState === HierarchyState.expand).forEach((c => results.push(c))); else {
+            this._addHeadersForTreeMode(_headerCellIds, row, null !== (_f = hd.children) && void 0 !== _f ? _f : [], [ ...roots, id ], totalLevel, show && hd.hierarchyState === HierarchyState.expand).forEach((c => results.push(c))); else {
                 show && colIndex++;
                 for (let r = row + 1; r < _headerCellIds.length; r++) _headerCellIds[r][colIndex] = id;
             }
@@ -492,7 +494,7 @@ export class PivotHeaderLayoutMap {
         for (let i = 0; i < this._columnHeaderCellIds.length; i++) {
             const row = this._columnHeaderCellIds[i];
             for (let j = 0; j < row.length; j++) if (row[j] === id) return {
-                col: j,
+                col: j + this._table.frozenColCount,
                 row: i
             };
         }
@@ -500,7 +502,7 @@ export class PivotHeaderLayoutMap {
             const row = this._rowHeaderCellIds[i];
             for (let j = 0; j < row.length; j++) if (row[j] === id) return {
                 col: j,
-                row: i
+                row: i + this._table.frozenRowCount
             };
         }
         for (let i = 0; i < this._cornerHeaderCellIds.length; i++) {
@@ -652,7 +654,7 @@ export class PivotHeaderLayoutMap {
     }
     toggleHierarchyState(col, row) {
         var _a;
-        const hd = this.getHeader(col, row);
+        const oldRowHeaderCellIds = this._rowHeaderCellIds.slice(0), oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id => this.getHeaderCellAdress(id[0]))), hd = this.getHeader(col, row);
         if (hd.define.hierarchyState = hd.define.hierarchyState === HierarchyState.collapse ? HierarchyState.expand : HierarchyState.collapse, 
         this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, !0), this._rowHeaderCellIds = [], 
         this.rowHeaderObjs = this._addHeadersForTreeMode(this._rowHeaderCellIds, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0), 
@@ -673,8 +675,9 @@ export class PivotHeaderLayoutMap {
             };
             this.rowHeaderObjs.push(cell), this._headerObjects[id] = cell;
         }
-        colIndex = 0, this._rowHeaderCellIds = transpose(this._rowHeaderCellIds), this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, 
-        o)), {}), this._CellHeaderPathMap = new Map;
+        return colIndex = 0, this._rowHeaderCellIds = transpose(this._rowHeaderCellIds), 
+        this._headerObjectMap = this._headerObjects.reduce(((o, e) => (o[e.id] = e, o)), {}), 
+        this._CellHeaderPathMap = new Map, diffCellAddress(oldRowHeaderCellIds, this._rowHeaderCellIds, oldRowHeaderCellPositons, this);
     }
     isHeaderForColWidth(col, row) {
         return this.isHeader(col, row);
@@ -884,4 +887,5 @@ export class PivotHeaderLayoutMap {
             } : void 0;
         }
     }
-}
+}
+//# sourceMappingURL=pivot-header-layout.js.map