@visactor/vtable 1.26.7 → 1.26.8

package/cjs/PivotTable.d.ts

@@ -92,7 +92,7 @@ export declare class PivotTable extends BaseTable implements PivotTableAPI {
     getEditor(col: number, row: number): IEditor<any, any>;
     isHasEditorDefine(col: number, row: number): boolean;
     changeCellValue(col: number, row: number, value: string | undefined, workOnEditableCell?: boolean): void;
-    changeCellValues(startCol: number, startRow: number, values: string[][], workOnEditableCell?: boolean): void;
+    changeCellValues(startCol: number, startRow: number, values: (string | number)[][], workOnEditableCell?: boolean, triggerEvent?: boolean, _noTriggerChangeCellValuesEvent?: boolean, shouldCancel?: () => boolean): boolean[][];
     private _changeCellValueToDataSet;
     _hasCustomRenderOrLayout(): boolean;
     changeRecordOrder(source: number, target: number): void;

package/cjs/PivotTable.js

@@ -269,27 +269,27 @@ class PivotTable extends BaseTable_1.BaseTable {
                 if (cellDimensionPath) {
                     let indicatorPosition;
                     const colKeys = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual)).map(((colPath, index) => {
-                        var _a;
+                        var _a, _b;
                         return colPath.indicatorKey && (indicatorPosition = {
                             position: "col",
                             index: index
-                        }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                        }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                     })), rowKeys = null === (_c = cellDimensionPath.rowHeaderPaths) || void 0 === _c ? void 0 : _c.filter((path => !path.virtual)).map(((rowPath, index) => {
-                        var _a;
+                        var _a, _b;
                         return rowPath.indicatorKey && (indicatorPosition = {
                             position: "row",
                             index: index
-                        }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                        }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                     })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
                     if (aggregator.records && aggregator.records.length >= 1) return aggregator.records[0][field];
                 }
             } else if (this.flatDataToObjects) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                    var _a;
-                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
                 if (null == treeNode ? void 0 : treeNode.record) return null == treeNode ? void 0 : treeNode.record[field];
             }
@@ -324,27 +324,27 @@ class PivotTable extends BaseTable_1.BaseTable {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
             let indicatorPosition;
             const colKeys = null === (_c = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual))) || void 0 === _c ? void 0 : _c.map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = null === (_e = null === (_d = cellDimensionPath.rowHeaderPaths) || void 0 === _d ? void 0 : _d.filter((path => !path.virtual))) || void 0 === _e ? void 0 : _e.map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition), {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row);
             return aggregator.formatValue ? aggregator.formatValue(col, row, this) : "function" == typeof fieldFormat ? fieldFormat(null == aggregator ? void 0 : aggregator.value(), col, row, this) : null !== (_f = null == aggregator ? void 0 : aggregator.value()) && void 0 !== _f ? _f : "";
         }
         if (this.flatDataToObjects) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), valueNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey), {fieldFormat: fieldFormat} = this.internalProps.layoutMap.getBody(col, row);
             return "function" == typeof fieldFormat ? fieldFormat(null == valueNode ? void 0 : valueNode.value, col, row, this) : null !== (_g = null == valueNode ? void 0 : valueNode.value) && void 0 !== _g ? _g : "";
         }
@@ -363,27 +363,27 @@ class PivotTable extends BaseTable_1.BaseTable {
         if (this.dataset) {
             let indicatorPosition;
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual)).map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = null === (_c = cellDimensionPath.rowHeaderPaths) || void 0 === _c ? void 0 : _c.filter((path => !path.virtual)).map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
             return aggregator.value ? aggregator.value() : void 0;
         }
         if (this.flatDataToObjects) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
             return null == treeNode ? void 0 : treeNode.value;
         }
@@ -402,27 +402,27 @@ class PivotTable extends BaseTable_1.BaseTable {
         if (this.dataset) {
             let indicatorPosition;
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual)).map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = null === (_c = cellDimensionPath.rowHeaderPaths) || void 0 === _c ? void 0 : _c.filter((path => !path.virtual)).map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !1, indicatorPosition);
             return aggregator.value ? aggregator.value() : void 0;
         }
         if (this.flatDataToObjects) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                var _a;
-                return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                var _a, _b;
+                return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
             return null == treeNode ? void 0 : treeNode.value;
         }
@@ -437,27 +437,27 @@ class PivotTable extends BaseTable_1.BaseTable {
             if (this.dataset) {
                 let indicatorPosition;
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual)).map(((colPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return colPath.indicatorKey && (indicatorPosition = {
                         position: "col",
                         index: index
-                    }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = null === (_c = cellDimensionPath.rowHeaderPaths) || void 0 === _c ? void 0 : _c.filter((path => !path.virtual)).map(((rowPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return rowPath.indicatorKey && (indicatorPosition = {
                         position: "row",
                         index: index
-                    }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 }));
                 return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition).records;
             }
             if (this.flatDataToObjects) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                    var _a;
-                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
                 return null == treeNode ? void 0 : treeNode.record;
             }
@@ -473,27 +473,27 @@ class PivotTable extends BaseTable_1.BaseTable {
             if (this.dataset) {
                 let indicatorPosition;
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = null === (_b = cellDimensionPath.colHeaderPaths) || void 0 === _b ? void 0 : _b.filter((path => !path.virtual)).map(((colPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return colPath.indicatorKey && (indicatorPosition = {
                         position: "col",
                         index: index
-                    }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = null === (_c = cellDimensionPath.rowHeaderPaths) || void 0 === _c ? void 0 : _c.filter((path => !path.virtual)).map(((rowPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return rowPath.indicatorKey && (indicatorPosition = {
                         position: "row",
                         index: index
-                    }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 }));
                 return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !1, indicatorPosition).records;
             }
             if (this.flatDataToObjects) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                    var _a;
-                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
                 return null == treeNode ? void 0 : treeNode.record;
             }
@@ -915,8 +915,10 @@ class PivotTable extends BaseTable_1.BaseTable {
             }), this.scenegraph.updateNextFrame();
         }
     }
-    changeCellValues(startCol, startRow, values, workOnEditableCell = !1) {
+    changeCellValues(startCol, startRow, values, workOnEditableCell = !1, triggerEvent = !0, _noTriggerChangeCellValuesEvent, shouldCancel) {
         var _a, _b;
+        const changedCellResults = [];
+        if (null == shouldCancel ? void 0 : shouldCancel()) return changedCellResults;
         let pasteColEnd = startCol, pasteRowEnd = startRow;
         const beforeChangeValues = [], oldValues = [];
         for (let i = 0; i < values.length && !(startRow + i > this.rowCount - 1); i++) {
@@ -930,7 +932,7 @@ class PivotTable extends BaseTable_1.BaseTable {
             }
         }
         for (let i = 0; i < values.length && !(startRow + i > this.rowCount - 1); i++) {
-            pasteRowEnd = startRow + i;
+            changedCellResults[i] = [], pasteRowEnd = startRow + i;
             const rowValues = values[i];
             let thisRowPasteColEnd = startCol;
             for (let j = 0; j < rowValues.length && !(startCol + j > this.colCount - 1); j++) if (thisRowPasteColEnd = startCol + j, 
@@ -938,17 +940,17 @@ class PivotTable extends BaseTable_1.BaseTable {
                 const value = rowValues[j];
                 let newValue = value;
                 const oldValue = oldValues[i][j], rawValue = beforeChangeValues[i][j];
-                "number" == typeof rawValue && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
-                this._changeCellValueToDataSet(startCol + j, startRow + i, oldValue, newValue);
+                "number" == typeof rawValue && "string" == typeof value && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
+                changedCellResults[i][j] = !0, this._changeCellValueToDataSet(startCol + j, startRow + i, oldValue, newValue);
                 const changedValue = this.getCellOriginValue(startCol + j, startRow + i);
-                changedValue !== oldValue && this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
+                changedValue !== oldValue && triggerEvent && this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
                     col: startCol + j,
                     row: startRow + i,
                     rawValue: rawValue,
                     currentValue: oldValue,
                     changedValue: changedValue
                 });
-            }
+            } else changedCellResults[i][j] = !1;
             pasteColEnd = Math.max(pasteColEnd, thisRowPasteColEnd);
         }
         const startRange = this.getCellRange(startCol, startRow), range = this.getCellRange(pasteColEnd, pasteRowEnd);
@@ -966,7 +968,7 @@ class PivotTable extends BaseTable_1.BaseTable {
             }
             this.scenegraph.updateRowsHeight(rows, deltaYs);
         }
-        this.scenegraph.updateNextFrame();
+        return this.scenegraph.updateNextFrame(), changedCellResults;
     }
     _changeCellValueToDataSet(col, row, oldValue, newValue) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -979,17 +981,17 @@ class PivotTable extends BaseTable_1.BaseTable {
             !this.isCornerHeader(col, row) && this.dataset.changeRecordFieldValue((null === (_a = cellDimensionPath.colHeaderPaths) || void 0 === _a ? void 0 : _a.length) ? null !== (_b = cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].indicatorKey) && void 0 !== _b ? _b : cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].dimensionKey : null !== (_c = cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].indicatorKey) && void 0 !== _c ? _c : cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].dimensionKey, oldValue, newValue); else {
                 let indicatorPosition;
                 const colKeys = null === (_d = cellDimensionPath.colHeaderPaths) || void 0 === _d ? void 0 : _d.filter((path => !path.virtual)).map(((colPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return colPath.indicatorKey && (indicatorPosition = {
                         position: "col",
                         index: index
-                    }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = null === (_e = cellDimensionPath.rowHeaderPaths) || void 0 === _e ? void 0 : _e.filter((path => !path.virtual)).map(((rowPath, index) => {
-                    var _a;
+                    var _a, _b;
                     return rowPath.indicatorKey && (indicatorPosition = {
                         position: "row",
                         index: index
-                    }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 }));
                 this.dataset.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), newValue, indicatorPosition);
             }
@@ -998,11 +1000,11 @@ class PivotTable extends BaseTable_1.BaseTable {
             if (this.isHeader(col, row)) this.internalProps.layoutMap.changeTreeNodeTitle(col, row, newValue), 
             !this.isCornerHeader(col, row) && this.flatDataToObjects.changeRecordFieldValue((null === (_f = cellDimensionPath.colHeaderPaths) || void 0 === _f ? void 0 : _f.length) ? null !== (_g = cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].indicatorKey) && void 0 !== _g ? _g : cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].dimensionKey : null !== (_h = cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].indicatorKey) && void 0 !== _h ? _h : cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].dimensionKey, oldValue, newValue); else {
                 const colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                    var _a;
-                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
                 })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                    var _a, _b;
+                    return null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
                 }));
                 this.flatDataToObjects.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, newValue);
             }