@visactor/vtable 0.24.2-alpha.3 → 0.24.2-alpha.4

package/cjs/PivotTable.js

@@ -348,37 +348,14 @@ class PivotTable extends BaseTable_1.BaseTable {
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
                 var _a;
                 return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
+            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
             return null == treeNode ? void 0 : treeNode.record;
         }
         const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
         return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
     }
     getCellRawRecord(col, row) {
-        var _a;
-        if (this.internalProps.layoutMap.isHeader(col, row)) return;
-        if (this.dataset) {
-            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;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            }));
-            return this.dataset.getAggregator(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row)).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;
-            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                var _a;
-                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, !1);
-            return null == treeNode ? void 0 : treeNode.record;
-        }
-        const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
-        return null === (_a = this.records[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex];
+        return this.getCellOriginRecord(col, row);
     }
     updateSortRules(sortRules) {
         this.internalProps.dataConfig.sortRules = sortRules, this.dataset.updateSortRules(sortRules), 
@@ -532,15 +509,9 @@ class PivotTable extends BaseTable_1.BaseTable {
         this.editorManager.completeEdit();
     }
     getEditor(col, row) {
-        var _a, _b;
-        let editorDefine;
-        if (this.isHeader(col, row) && !this.isCornerHeader(col, row)) {
-            const define = this.getHeaderDefine(col, row);
-            editorDefine = null !== (_a = null == define ? void 0 : define.headerEditor) && void 0 !== _a ? _a : this.options.headerEditor;
-        } else {
-            const define = this.getBodyColumnDefine(col, row);
-            editorDefine = null !== (_b = null == define ? void 0 : define.editor) && void 0 !== _b ? _b : this.options.editor;
-        }
+        var _a;
+        const define = this.getBodyColumnDefine(col, row);
+        let editorDefine = null !== (_a = null == define ? void 0 : define.editor) && void 0 !== _a ? _a : this.options.editor;
         if ("function" == typeof editorDefine) {
             editorDefine = editorDefine({
                 col: col,
@@ -570,12 +541,9 @@ class PivotTable extends BaseTable_1.BaseTable {
     changeCellValue(col, row, value, workOnEditableCell = !1) {
         if (workOnEditableCell && this.isHasEditorDefine(col, row) || !1 === workOnEditableCell) {
             let newValue = value;
-            const oldValue = this.getCellOriginValue(col, row);
-            "number" == typeof this.getCellRawValue(col, row) && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
-            this._changeCellValueToDataSet(col, row, oldValue, newValue);
-            const range = this.getCellRange(col, row);
-            for (let sCol = range.start.col; sCol <= range.end.col; sCol++) for (let sRow = range.start.row; sRow <= range.end.row; sRow++) this.scenegraph.updateCellContent(sCol, sRow);
-            if ("adaptive" === this.widthMode || this.autoFillWidth && this.getAllColsWidth() <= this.tableNoFrameWidth) 0 === this.internalProps._widthResizedColMap.size && this.scenegraph.recalculateColWidths(); else if (!this.internalProps._widthResizedColMap.has(col)) {
+            if ("number" == typeof this.getCellRawValue(col, row) && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
+            this._changeCellValueToDataSet(col, row, newValue), this.scenegraph.updateCellContent(col, row), 
+            "adaptive" === this.widthMode || this.autoFillWidth && this.getAllColsWidth() <= this.tableNoFrameWidth) 0 === this.internalProps._widthResizedColMap.size && this.scenegraph.recalculateColWidths(); else if (!this.internalProps._widthResizedColMap.has(col)) {
                 const oldWidth = this.getColWidth(col), newWidth = (0, compute_col_width_1.computeColWidth)(col, 0, this.rowCount - 1, this, !1);
                 newWidth !== oldWidth && this.scenegraph.updateColWidth(col, newWidth - oldWidth);
             }
@@ -601,10 +569,9 @@ class PivotTable extends BaseTable_1.BaseTable {
             workOnEditableCell && this.isHasEditorDefine(startCol + j, startRow + i) || !1 === workOnEditableCell) {
                 const value = rowValues[j];
                 let newValue = value;
-                const oldValue = this.getCellOriginValue(startCol + j, startRow + i), rawValue = this.getCellRawValue(startCol + j, startRow + i);
+                const rawValue = this.getCellRawValue(startCol + j, startRow + i);
                 "number" == typeof rawValue && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
-                this._changeCellValueToDataSet(startCol + j, startRow + i, oldValue, newValue), 
-                this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
+                this._changeCellValueToDataSet(startCol + j, startRow + i, newValue), this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
                     col: startCol + j,
                     row: startRow + i,
                     rawValue: rawValue,
@@ -629,34 +596,25 @@ class PivotTable extends BaseTable_1.BaseTable {
         }
         this.scenegraph.updateNextFrame();
     }
-    _changeCellValueToDataSet(col, row, oldValue, newValue) {
-        var _a, _b, _c, _d, _e, _f;
+    _changeCellValueToDataSet(col, row, newValue) {
         if (this.dataset) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-            if (this.isHeader(col, row)) this.internalProps.layoutMap.changeTreeNodeTitle(col, row, newValue), 
-            !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 {
-                const colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
-                    var _a;
-                    return null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
-                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-                }));
-                this.dataset.changeTreeNodeValue(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), newValue);
-            }
+            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;
+            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                var _a;
+                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+            }));
+            this.dataset.changeTreeNodeValue(this.internalProps.layoutMap.indicatorsAsCol ? rowKeys : rowKeys.slice(0, -1), this.internalProps.layoutMap.indicatorsAsCol ? colKeys.slice(0, -1) : colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), newValue);
         } else if (this.flatDataToObjects) {
-            const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-            if (this.isHeader(col, row)) this.internalProps.layoutMap.changeTreeNodeTitle(col, row, newValue), 
-            !this.isCornerHeader(col, row) && this.flatDataToObjects.changeRecordFieldValue((null === (_d = cellDimensionPath.colHeaderPaths) || void 0 === _d ? void 0 : _d.length) ? null !== (_e = cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].indicatorKey) && void 0 !== _e ? _e : cellDimensionPath.colHeaderPaths[cellDimensionPath.colHeaderPaths.length - 1].dimensionKey : null !== (_f = cellDimensionPath.rowHeaderPaths[cellDimensionPath.rowHeaderPaths.length - 1].indicatorKey) && void 0 !== _f ? _f : 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;
-                })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
-                    var _a;
-                    return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
-                }));
-                this.flatDataToObjects.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, newValue);
-            }
+            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;
+            })), rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath => {
+                var _a;
+                return null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+            }));
+            this.flatDataToObjects.changeTreeNodeValue(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey, newValue);
         } else {
             const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
             this.records[rowIndex][colIndex] = newValue;