@visactor/vtable 1.26.6 → 1.26.8

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

@@ -26,12 +26,15 @@ class PivotHeaderLayoutMap {
         this.leftRowSeriesNumberColumnCount = 0, this.rightRowSeriesNumberColumnCount = 0, 
         this._useGetBodyCache = !1, this._getBodyCache = new Map, this._useHeaderPathCache = !1, 
         this._colHeaderPathCache = new Map, this._rowHeaderPathCache = new Map, this.matchDimensionPath = (paths, treeNodes, needLowestLevel, checkAxisNode = !1, pathIndex = 0) => {
+            var _a, _b;
             if (pathIndex >= paths.length) return;
             const currentPath = paths[pathIndex];
             for (let j = 0; j < treeNodes.length; j++) {
                 const dimension = treeNodes[j];
-                if (!(0, vutils_1.isValid)(currentPath.indicatorKey) && dimension.dimensionKey === currentPath.dimensionKey && dimension.value === currentPath.value || (0, 
+                if (!(0, vutils_1.isValid)(currentPath.indicatorKey) && dimension.dimensionKey === currentPath.dimensionKey && ((0, 
+                vutils_1.isValid)(currentPath.dataValue) ? (null !== (_a = dimension.dataValue) && void 0 !== _a ? _a : dimension.value) === currentPath.dataValue : dimension.value === currentPath.value) || (0, 
                 vutils_1.isValid)(currentPath.indicatorKey) && dimension.indicatorKey === currentPath.indicatorKey && ((0, 
+                vutils_1.isValid)(currentPath.dataValue) && (null !== (_b = dimension.dataValue) && void 0 !== _b ? _b : dimension.value) === currentPath.dataValue || (0, 
                 vutils_1.isValid)(dimension.value) && (0, vutils_1.isValid)(currentPath.value) && currentPath.value === dimension.value || !(0, 
                 vutils_1.isValid)(dimension.value) || !(0, vutils_1.isValid)(currentPath.value))) {
                     const children = dimension.children;
@@ -1046,16 +1049,16 @@ class PivotHeaderLayoutMap {
             const colHeaderPath = {};
             colHeaderPath.dimensionKey = colHeader.dimensionKey, colHeaderPath.indicatorKey = colHeader.indicatorKey, 
             colHeaderPath.value = null !== (_a = colHeader.value) && void 0 !== _a ? _a : colHeader.indicatorKey ? null !== (_c = null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "" : colHeader.value, 
-            colHeaderPath.virtual = colHeader.virtual, colHeaderPath.role = colHeader.role, 
-            headerPaths.colHeaderPaths.push(colHeaderPath);
+            colHeaderPath.dataValue = colHeader.dataValue, colHeaderPath.virtual = colHeader.virtual, 
+            colHeaderPath.role = colHeader.role, headerPaths.colHeaderPaths.push(colHeaderPath);
         })), null === (_b = headerPathsWidthNode.rowHeaderPaths) || void 0 === _b || _b.forEach((rowHeader => {
             var _a, _b, _c;
             if ("axis" !== rowHeader.dimensionKey) {
                 const rowHeaderPath = {};
                 rowHeaderPath.dimensionKey = rowHeader.dimensionKey, rowHeaderPath.indicatorKey = rowHeader.indicatorKey, 
                 rowHeaderPath.value = null !== (_a = rowHeader.value) && void 0 !== _a ? _a : rowHeader.indicatorKey ? null !== (_c = null === (_b = this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "" : rowHeader.value, 
-                rowHeaderPath.virtual = rowHeader.virtual, rowHeaderPath.role = rowHeader.role, 
-                headerPaths.rowHeaderPaths.push(rowHeaderPath);
+                rowHeaderPath.dataValue = rowHeader.dataValue, rowHeaderPath.virtual = rowHeader.virtual, 
+                rowHeaderPath.role = rowHeader.role, headerPaths.rowHeaderPaths.push(rowHeaderPath);
             }
         })), headerPaths;
     }
@@ -1488,18 +1491,23 @@ class PivotHeaderLayoutMap {
         null !== (_f = null == rowHeaderPaths ? void 0 : rowHeaderPaths.length) && void 0 !== _f && _f && rowHeaderPaths.length >= this._getRowHeaderTreeExpandedMaxLevelCount() && (needLowestLevel_rowPaths = !0), 
         colHeaderPaths && (colDimensionFinded = this.matchDimensionPath(colHeaderPaths, this.columnTree, needLowestLevel_colPaths)), 
         (null == rowHeaderPaths ? void 0 : rowHeaderPaths.length) >= 1) if ("tree" === this.rowHierarchyType) {
-            const rowDimension = rowHeaderPaths[rowHeaderPaths.length - 1], cellIDs = this.headerObjects.filter((hd => ((null == hd ? void 0 : hd.field) === rowDimension.dimensionKey || (null == hd ? void 0 : hd.field) === rowDimension.indicatorKey) && (null == hd ? void 0 : hd.title) === rowDimension.value)).map((hd => hd.id)), findedCellIdPath = this._rowHeaderCellIds.filter((rowHdCellIDs => cellIDs.indexOf(rowHdCellIDs[rowHdCellIDs.length - 1]) >= 0)).find((pathIds => {
-                const fullCellIds = this.findFullCellIds(pathIds);
-                return fullCellIds.length === rowHeaderPaths.length && fullCellIds.every((id => {
-                    const curHd = this._headerObjectMap[id];
-                    return rowHeaderPaths.find((rowDimensionPath => rowDimensionPath.dimensionKey === curHd.field && rowDimensionPath.value === curHd.title));
-                }));
+            const rowDimension = rowHeaderPaths[rowHeaderPaths.length - 1], cellIDs = this.headerObjects.filter((hd => {
+                var _a, _b, _c;
+                return ((null == hd ? void 0 : hd.field) === rowDimension.dimensionKey || (null == hd ? void 0 : hd.field) === rowDimension.indicatorKey) && ((0, 
+                vutils_1.isValid)(rowDimension.dataValue) ? (null !== (_c = null !== (_a = hd.dataValue) && void 0 !== _a ? _a : null === (_b = hd.define) || void 0 === _b ? void 0 : _b.dataValue) && void 0 !== _c ? _c : hd.title) === rowDimension.dataValue : (null == hd ? void 0 : hd.title) === rowDimension.value);
+            })).map((hd => hd.id)), findedCellIdPath = this._rowHeaderCellIds.filter((rowHdCellIDs => cellIDs.indexOf(rowHdCellIDs[rowHdCellIDs.length - 1]) >= 0)).find((pathIds => {
+                const fullCellIds = this.findFullCellIds(pathIds), matchHeaderPath = (curHd, rowDimensionPath) => {
+                    var _a, _b, _c;
+                    return rowDimensionPath.dimensionKey === curHd.field && ((0, vutils_1.isValid)(rowDimensionPath.dataValue) ? (null !== (_c = null !== (_a = curHd.dataValue) && void 0 !== _a ? _a : null === (_b = curHd.define) || void 0 === _b ? void 0 : _b.dataValue) && void 0 !== _c ? _c : curHd.title) === rowDimensionPath.dataValue : rowDimensionPath.value === curHd.title);
+                };
+                return fullCellIds.length === rowHeaderPaths.length && (rowHeaderPaths.some((rowDimensionPath => (0, 
+                vutils_1.isValid)(rowDimensionPath.dataValue))) ? fullCellIds.every(((id, index) => matchHeaderPath(this._headerObjectMap[id], rowHeaderPaths[index]))) : fullCellIds.every((id => rowHeaderPaths.some((rowDimensionPath => matchHeaderPath(this._headerObjectMap[id], rowDimensionPath))))));
             }));
-            row = this._rowHeaderCellIds.indexOf(findedCellIdPath) + this.columnHeaderLevelCount;
+            findedCellIdPath && (row = this._rowHeaderCellIds.indexOf(findedCellIdPath) + this.columnHeaderLevelCount);
         } else rowDimensionFinded = this.matchDimensionPath(rowHeaderPaths, this.rowTree, needLowestLevel_rowPaths, !0);
         if (forceBody || !needLowestLevel_colPaths || !needLowestLevel_rowPaths || (rowDimensionFinded || (0, 
         vutils_1.isValid)(row)) && colDimensionFinded) {
-            if (rowDimensionFinded || forceBody) {
+            if (rowDimensionFinded || forceBody && !(0, vutils_1.isValid)(row)) {
                 row = this.columnHeaderLevelCount;
                 const {startInTotal: startInTotal, afterSpanLevel: afterSpanLevel} = null !== (_g = rowDimensionFinded) && void 0 !== _g ? _g : defaultDimension;
                 if (row += null != startInTotal ? startInTotal : 0, "grid" === this.rowHierarchyType) {
@@ -1789,7 +1797,10 @@ class PivotHeaderLayoutMap {
         let collectedValues, height;
         isHeatmap && path[path.length - 1].indicatorKey && path.pop();
         for (const key in this.dataset.collectValuesBy) if ("yField" === this.dataset.collectValuesBy[key].type && !this.dataset.collectValuesBy[key].range) {
-            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
+            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => {
+                var _a;
+                return null !== (_a = pathObj.dataValue) && void 0 !== _a ? _a : pathObj.value;
+            })).join(this.dataset.stringJoinChar)];
             break;
         }
         if (this._chartItemBandSize) height = scaleWholeRangeSize(null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
@@ -1804,7 +1815,10 @@ class PivotHeaderLayoutMap {
         const path = this.getCellHeaderPaths(col, this.columnHeaderLevelCount).colHeaderPaths;
         let collectedValues, width;
         for (const key in this.dataset.collectValuesBy) if ("xField" === this.dataset.collectValuesBy[key].type && !this.dataset.collectValuesBy[key].range) {
-            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
+            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => {
+                var _a;
+                return null !== (_a = pathObj.dataValue) && void 0 !== _a ? _a : pathObj.value;
+            })).join(this.dataset.stringJoinChar)];
             break;
         }
         if (this._chartItemBandSize) width = scaleWholeRangeSize(null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
@@ -1834,13 +1848,15 @@ class PivotHeaderLayoutMap {
     getColKeysPath(col, row) {
         const path = this.getCellHeaderPaths(col, row), colKey = [];
         return path.colHeaderPaths.length && path.colHeaderPaths.forEach((path => {
-            path.dimensionKey && colKey.push(path.value);
+            var _a;
+            path.dimensionKey && colKey.push(null !== (_a = path.dataValue) && void 0 !== _a ? _a : path.value);
         })), null == colKey ? void 0 : colKey.join(this.dataset.stringJoinChar);
     }
     getRowKeysPath(col, row) {
         const path = this.getCellHeaderPaths(col, row), rowKey = [];
         return path.rowHeaderPaths.length && path.rowHeaderPaths.forEach((path => {
-            path.dimensionKey && rowKey.push(path.value);
+            var _a;
+            path.dimensionKey && rowKey.push(null !== (_a = path.dataValue) && void 0 !== _a ? _a : path.value);
         })), null == rowKey ? void 0 : rowKey.join(this.dataset.stringJoinChar);
     }
     getIndicatorInfo(indicatorKey, indicatorValue = "") {