@visactor/vtable 0.24.1-alpha.0 → 0.24.2-alpha.1

package/cjs/PivotTable.js

@@ -107,8 +107,8 @@ class PivotTable extends BaseTable_1.BaseTable {
         })), this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_c = options.columns) || void 0 === _c ? void 0 : _c.length) || options.columnTree ? (0, 
         vutils_1.cloneDeep)(options.columnTree) : [], this.internalProps.rowTree = options.indicatorsAsCol || (null === (_d = options.rows) || void 0 === _d ? void 0 : _d.length) || options.rowTree ? (0, 
         vutils_1.cloneDeep)(options.rowTree) : [], options.records && (this.internalProps.records = options.records), 
-        this.stateManager.initCheckedState(this.internalProps.records), this.pagination = options.pagination, 
-        internalProps.columnResizeType = null !== (_e = options.columnResizeType) && void 0 !== _e ? _e : "column", 
+        this.stateManager.initCheckedState(this.internalProps.records), this.stateManager.updateDrillState(void 0, void 0, !1, !1, -1, -1), 
+        this.pagination = options.pagination, internalProps.columnResizeType = null !== (_e = options.columnResizeType) && void 0 !== _e ? _e : "column", 
         internalProps.dataConfig = (0, vutils_1.cloneDeep)(options.dataConfig), options.rowTree || options.columnTree ? internalProps.enableDataAnalysis = !1 : internalProps.enableDataAnalysis = !0, 
         "tree" === (null == options ? void 0 : options.rowHierarchyType) && "tree" === this.internalProps.layoutMap.rowHierarchyType && this.internalProps.layoutMap.rowExpandLevel === (null == options ? void 0 : options.rowExpandLevel)) {
             const beforeRowDimensions = this.internalProps.layoutMap.rowDimensionTree.tree.children;
@@ -158,15 +158,7 @@ class PivotTable extends BaseTable_1.BaseTable {
         this.refreshRowColCount(), this.scenegraph.createSceneGraph(), this.render());
     }
     refreshHeader() {
-        var _a, _b;
-        const internalProps = this.internalProps;
-        for (let col = 0; col < internalProps.layoutMap.columnWidths.length; col++) {
-            const {width: width, minWidth: minWidth, maxWidth: maxWidth} = null !== (_b = null === (_a = internalProps.layoutMap.columnWidths) || void 0 === _a ? void 0 : _a[col]) && void 0 !== _b ? _b : {};
-            width && ("string" == typeof width && "auto" !== width || "number" == typeof width && width > 0) && this._setColWidth(col, width), 
-            minWidth && ("number" == typeof minWidth && minWidth > 0 || "string" == typeof minWidth) && this.setMinColWidth(col, minWidth), 
-            maxWidth && ("number" == typeof maxWidth && maxWidth > 0 || "string" == typeof maxWidth) && this.setMaxColWidth(col, maxWidth);
-        }
-        this.refreshRowColCount();
+        this.setMinMaxLimitWidth(!0), this.refreshRowColCount();
     }
     refreshRowColCount() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -356,14 +348,37 @@ 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, !1);
+            })), treeNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
             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) {
-        return this.getCellOriginRecord(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];
     }
     updateSortRules(sortRules) {
         this.internalProps.dataConfig.sortRules = sortRules, this.dataset.updateSortRules(sortRules), 
@@ -389,7 +404,7 @@ class PivotTable extends BaseTable_1.BaseTable {
         }
     }
     _moveHeaderPosition(source, target) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         const sourceCellRange = this.getCellRange(source.col, source.row), targetCellRange = this.getCellRange(target.col, target.row), moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
         if (moveContext) {
             if ("column" === moveContext.moveType) {
@@ -397,14 +412,10 @@ class PivotTable extends BaseTable_1.BaseTable {
                     const sourceColumns = this.internalProps.records[row].splice(moveContext.sourceIndex - this.rowHeaderLevelCount, moveContext.sourceSize);
                     sourceColumns.unshift(moveContext.targetIndex - this.rowHeaderLevelCount, 0), Array.prototype.splice.apply(this.internalProps.records[row], sourceColumns);
                 }
-                this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex);
-                for (let col = 0; col < this.internalProps.layoutMap.columnWidths.length; col++) {
-                    const {minWidth: minWidth, maxWidth: maxWidth} = null !== (_d = null === (_c = this.internalProps.layoutMap.columnWidths) || void 0 === _c ? void 0 : _c[col]) && void 0 !== _d ? _d : {};
-                    minWidth && ("number" == typeof minWidth && minWidth > 0 || "string" == typeof minWidth) && this.setMinColWidth(col, minWidth), 
-                    maxWidth && ("number" == typeof maxWidth && maxWidth > 0 || "string" == typeof maxWidth) && this.setMaxColWidth(col, maxWidth);
-                }
+                this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex), 
+                this.setMinMaxLimitWidth();
             } else if ("row" === moveContext.moveType) {
-                if ((null === (_f = null === (_e = this.options.records) || void 0 === _e ? void 0 : _e[0]) || void 0 === _f ? void 0 : _f.constructor) === Array) {
+                if ((null === (_d = null === (_c = this.options.records) || void 0 === _c ? void 0 : _c[0]) || void 0 === _d ? void 0 : _d.constructor) === Array) {
                     const sourceRows = this.internalProps.records.splice(moveContext.sourceIndex - this.columnHeaderLevelCount, moveContext.sourceSize);
                     sourceRows.unshift(moveContext.targetIndex - this.columnHeaderLevelCount, 0), Array.prototype.splice.apply(this.internalProps.records, sourceRows);
                 }
@@ -432,15 +443,15 @@ class PivotTable extends BaseTable_1.BaseTable {
             });
         }
     }
-    _refreshHierarchyState(col, row) {
+    _refreshHierarchyState(col, row, beforeUpdateCell) {
         let notFillWidth = !1, notFillHeight = !1;
         this.stateManager.updateHoverIcon(col, row, void 0, void 0);
         const checkHasChart = this.internalProps.layoutMap.checkHasChart();
         checkHasChart && (this.autoFillWidth && (notFillWidth = this.getAllColsWidth() <= this.tableNoFrameWidth), 
         this.autoFillHeight && (notFillHeight = this.getAllRowsHeight() <= this.tableNoFrameHeight));
         const result = this.internalProps.layoutMap.toggleHierarchyState(col, row);
-        this.refreshRowColCount(), this.clearCellStyleCache(), this.scenegraph.updateHierarchyIcon(col, row), 
-        this.scenegraph.updateRow(result.removeCellPositions, result.addCellPositions, result.updateCellPositions), 
+        beforeUpdateCell && beforeUpdateCell(), this.refreshRowColCount(), this.clearCellStyleCache(), 
+        this.scenegraph.updateHierarchyIcon(col, row), this.scenegraph.updateRow(result.removeCellPositions, result.addCellPositions, result.updateCellPositions), 
         checkHasChart && (this.autoFillWidth && !notFillWidth && (notFillWidth = this.getAllColsWidth() <= this.tableNoFrameWidth), 
         this.autoFillHeight && !notFillHeight && (notFillHeight = this.getAllRowsHeight() <= this.tableNoFrameHeight), 
         ("adaptive" === this.widthMode || notFillWidth || "adaptive" === this.heightMode || notFillHeight) && this.scenegraph.updateChartSize(0));
@@ -521,9 +532,15 @@ class PivotTable extends BaseTable_1.BaseTable {
         this.editorManager.completeEdit();
     }
     getEditor(col, row) {
-        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;
+        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;
+        }
         if ("function" == typeof editorDefine) {
             editorDefine = editorDefine({
                 col: col,
@@ -553,9 +570,11 @@ class PivotTable extends BaseTable_1.BaseTable {
     changeCellValue(col, row, value, workOnEditableCell = !1) {
         if (workOnEditableCell && this.isHasEditorDefine(col, row) || !1 === workOnEditableCell) {
             let newValue = value;
-            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)) {
+            "number" == typeof this.getCellRawValue(col, row) && (0, util_1.isAllDigits)(value) && (newValue = parseFloat(value)), 
+            this._changeCellValueToDataSet(col, row, 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)) {
                 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);
             }
@@ -609,6 +628,7 @@ class PivotTable extends BaseTable_1.BaseTable {
         this.scenegraph.updateNextFrame();
     }
     _changeCellValueToDataSet(col, row, newValue) {
+        var _a, _b, _c;
         if (this.dataset) {
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map((colPath => {
                 var _a;
@@ -619,14 +639,18 @@ class PivotTable extends BaseTable_1.BaseTable {
             }));
             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), 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);
+            if (this.isHeader(col, row)) this.internalProps.layoutMap.changeTreeNodeTitle(col, row, newValue), 
+            this.flatDataToObjects.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, 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);
+            }
         } else {
             const rowIndex = this.getBodyIndexByRow(row), colIndex = this.getBodyIndexByCol(col);
             this.records[rowIndex][colIndex] = newValue;
@@ -650,13 +674,20 @@ class PivotTable extends BaseTable_1.BaseTable {
         return !1;
     }
     changeRecordOrder(source, target) {}
-    setTreeNodeChildren(records, col, row) {
-        const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-        this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length)).children = records, 
-        this._refreshHierarchyState(col, row);
-    }
-    addRecords(records) {
-        this.flatDataToObjects && this.flatDataToObjects.addRecords(records);
+    setTreeNodeChildren(children, records, col, row) {
+        if (this.flatDataToObjects) {
+            const headerPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
+            this.internalProps.layoutMap.getHeadNode(headerPaths.rowHeaderPaths.slice(0, headerPaths.rowHeaderPaths.length)).children = children, 
+            this._refreshHierarchyState(col, row, (() => {
+                this.flatDataToObjects.changeDataConfig({
+                    rows: this.internalProps.layoutMap.fullRowDimensionKeys,
+                    columns: this.internalProps.layoutMap.colDimensionKeys,
+                    indicators: this.internalProps.layoutMap.indicatorKeys,
+                    indicatorsAsCol: this.internalProps.layoutMap.indicatorsAsCol,
+                    indicatorDimensionKey: this.internalProps.layoutMap.indicatorDimensionKey
+                }), this.flatDataToObjects.addRecords(records);
+            }));
+        }
     }
 }