@visactor/vtable 1.13.3-alpha.6 → 1.14.0

package/dist/vtable.js

@@ -12229,10 +12229,7 @@
         const {
           context: context
         } = drawContext;
-        context.highPerformanceSave();
-        const t1 = graphic.parent.globalTransMatrix,
-          t2 = graphic.stage.window.getViewBoxTransform().clone().multiply(t1.a, t1.b, t1.c, t1.d, t1.e, t1.f);
-        if (graphic.parent && context.setTransformFromMatrix(t2, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
+        if (context.highPerformanceSave(), context.transformFromMatrix(graphic.transMatrix, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
           tempDirtyBounds.copy(drawContribution.dirtyBounds), tempBackupDirtyBounds.copy(drawContribution.backupDirtyBounds);
           const m = graphic.globalTransMatrix.getInverse();
           drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
@@ -50225,7 +50222,7 @@
             isNeedInitHeaderCheckedStateFromRecord = true;
         }
         if (isNeedInitHeaderCheckedStateFromRecord) {
-            initRecordCheckState(state);
+            initRecordCheckState(records, state);
         }
     }
     function updateHeaderCheckedState(field, state, col, row) {
@@ -50245,7 +50242,7 @@
             const mergeCell = state.table.transpose
                 ? state.table.getCustomMerge(tableIndex, row)
                 : state.table.getCustomMerge(col, tableIndex);
-            const data = state.table.dataSource.get(index);
+            const data = state.table.dataSource?.get(index);
             if (mergeCell || data.vtableMerge) {
                 return;
             }
@@ -50405,14 +50402,24 @@
         });
         return result;
     }
-    function initRecordCheckState(state) {
+    function initRecordCheckState(records, state) {
         const table = state.table;
-        const start = table.internalProps.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount;
-        const end = table.internalProps.transpose ? table.colCount : table.rowCount;
+        const start = table.isPivotTable()
+            ? 0
+            : table.internalProps.transpose
+                ? table.rowHeaderLevelCount
+                : table.columnHeaderLevelCount;
+        const end = table.isPivotTable()
+            ? isArray$1(records)
+                ? records.length
+                : 0
+            : table.internalProps.transpose
+                ? table.colCount
+                : table.rowCount;
         for (let index = 0; index + start < end; index++) {
-            const record = table.dataSource.get(index);
+            const record = table.isPivotTable() ? records[index] : table.dataSource.get(index);
             state._checkboxCellTypeFields.forEach(field => {
-                const value = record[field];
+                const value = record && record[field];
                 let isChecked;
                 if (isObject$4(value)) {
                     isChecked = value.checked;
@@ -50434,7 +50441,7 @@
                         isChecked = globalChecked;
                     }
                 }
-                const dataIndex = state.table.dataSource.getIndexKey(index).toString();
+                const dataIndex = table.isPivotTable() ? index.toString() : state.table.dataSource.getIndexKey(index).toString();
                 if (!state.checkedState.get(dataIndex)) {
                     state.checkedState.set(dataIndex, {});
                 }
@@ -58043,7 +58050,7 @@
         const { targetRange, targetTicks } = getTargetRangeAndTicks(col, row, index, isZeroAlign, isTickAlign, range, indicatorKeys, subAxisPosition, path, layout);
         if (index !== 0 && targetTicks) {
             const getAxisDomainRangeAndLabels = Factory.getFunction('getAxisDomainRangeAndLabels');
-            const { range: newRange, ticks: newTicks } = getAxisDomainRangeAndLabels(range.min, range.max, isZeroAlign, position === 'bottom' || position === 'top'
+            const { range: newRange, ticks: newTicks } = getAxisDomainRangeAndLabels(range.min, range.max, merge({}, axisOption, { nice: true, tick: { forceTickCount: targetTicks.length } }), isZeroAlign, position === 'bottom' || position === 'top'
                 ? layout._table.getColWidth(col) || layout._table.tableNoFrameWidth
                 : layout._table.getRowHeight(row) || layout._table.tableNoFrameHeight, {
                 targetTicks,
@@ -58175,7 +58182,7 @@
             });
             this.table.scenegraph.updateNextFrame();
         }
-        arrangeCustomCellStyle(cellPos, customStyleId) {
+        arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
             const index = this.customCellStyleArrangement.findIndex(style => {
                 if (style.cellPosition.range && cellPos.range) {
                     return (style.cellPosition.range.start.col === cellPos.range.start.col &&
@@ -58208,7 +58215,6 @@
                 this.customCellStyleArrangement.splice(index, 1);
             }
             const style = this.getCustomCellStyleOption(customStyleId)?.style;
-            let forceFastUpdate;
             if (style) {
                 forceFastUpdate = true;
                 for (const key in style) {
@@ -58520,7 +58526,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.13.3-alpha.6";
+        version = "1.14.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -59035,16 +59041,15 @@
                             element.parentElement.offsetHeight -
                                 parseInt(computedStyle.paddingTop || '0px', 10) -
                                 parseInt(computedStyle.paddingBottom || '0px', 20);
-                        widthWithoutPadding = (widthWithoutPadding ?? 1) - (this.options.tableSizeAntiJitter ? 1 : 0);
-                        heightWithoutPadding = (heightWithoutPadding ?? 1) - (this.options.tableSizeAntiJitter ? 1 : 0);
                     }
                 }
-                element.style.width = (widthWithoutPadding && `${widthWithoutPadding - padding.left - padding.right}px`) || '0px';
-                element.style.height =
-                    (heightWithoutPadding && `${heightWithoutPadding - padding.top - padding.bottom}px`) || '0px';
+                const width1 = widthWithoutPadding ?? 1 - 1;
+                const height1 = heightWithoutPadding ?? 1 - 1;
+                element.style.width = (width1 && `${width1 - padding.left - padding.right}px`) || '0px';
+                element.style.height = (height1 && `${height1 - padding.top - padding.bottom}px`) || '0px';
                 const { canvas } = this.internalProps;
-                widthP = (canvas.parentElement?.offsetWidth ?? 1) - (this.options.tableSizeAntiJitter ? 1 : 0);
-                heightP = (canvas.parentElement?.offsetHeight ?? 1) - (this.options.tableSizeAntiJitter ? 1 : 0);
+                widthP = canvas.parentElement?.offsetWidth ?? 1 - 1;
+                heightP = canvas.parentElement?.offsetHeight ?? 1 - 1;
                 if (this?.scenegraph?.stage) {
                     this.scenegraph.stage.resize(widthP, heightP);
                 }
@@ -61089,8 +61094,8 @@
         registerCustomCellStyle(customStyleId, customStyle) {
             this.customCellStylePlugin?.registerCustomCellStyle(customStyleId, customStyle);
         }
-        arrangeCustomCellStyle(cellPos, customStyleId) {
-            this.customCellStylePlugin?.arrangeCustomCellStyle(cellPos, customStyleId);
+        arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
+            this.customCellStylePlugin?.arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate);
         }
         isSeriesNumber(col, row) {
             return this.internalProps.layoutMap.isSeriesNumber(col, row);
@@ -63583,7 +63588,7 @@
         }
     }
 
-    class EditManeger {
+    class EditManager {
         table;
         editingEditor;
         isValidatingValue = false;
@@ -63677,20 +63682,16 @@
             }
             if (!this.editingEditor.getValue) ;
             if (this.editingEditor.validateValue) {
-                const maybePromiseOrValue = this.editingEditor.validateValue?.();
+                this.isValidatingValue = true;
+                const newValue = this.editingEditor.getValue();
+                const oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row);
+                const maybePromiseOrValue = this.editingEditor.validateValue?.(newValue, oldValue, this.editCell, this.table);
                 if (isPromise(maybePromiseOrValue)) {
                     this.isValidatingValue = true;
                     return new Promise((resolve, reject) => {
                         maybePromiseOrValue
                             .then(result => {
-                            if (result) {
-                                this.doExit();
-                                resolve(true);
-                            }
-                            else {
-                                this.isValidatingValue = false;
-                                resolve(false);
-                            }
+                            dealWithValidateValue(result, this, oldValue, resolve);
                         })
                             .catch((err) => {
                             this.isValidatingValue = false;
@@ -63698,11 +63699,7 @@
                         });
                     });
                 }
-                else if (maybePromiseOrValue) {
-                    this.doExit();
-                    return true;
-                }
-                return false;
+                return dealWithValidateValue(maybePromiseOrValue, this, oldValue);
             }
             this.doExit();
             return true;
@@ -63733,6 +63730,35 @@
             }
         }
     }
+    function dealWithValidateValue(validateValue, editManager, oldValue, resolve) {
+        editManager.isValidatingValue = false;
+        if (validateValue === 'validate-exit') {
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        else if (validateValue === 'invalidate-exit') {
+            editManager.editingEditor.setValue(oldValue);
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        else if (validateValue === 'validate-not-exit') {
+            resolve?.(false);
+            return false;
+        }
+        else if (validateValue === 'invalidate-not-exit') {
+            resolve?.(false);
+            return false;
+        }
+        else if (validateValue === true) {
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        resolve?.(false);
+        return false;
+    }
 
     function getGroupByDataConfig(groupByOption) {
         if (isString$2(groupByOption)) {
@@ -63873,7 +63899,10 @@
                             isCanChange = true;
                         }
                         else {
-                            isCanChange = maybePromiseOrValue;
+                            isCanChange =
+                                maybePromiseOrValue === true ||
+                                    maybePromiseOrValue === 'validate-exit' ||
+                                    maybePromiseOrValue === 'invalidate-exit';
                         }
                     }
                 }
@@ -64513,7 +64542,7 @@
             this.showHeader = options.showHeader ?? true;
             this.transpose = options.transpose ?? false;
             if (Env.mode !== 'node') {
-                this.editorManager = new EditManeger(this);
+                this.editorManager = new EditManager(this);
             }
             this.refreshHeader();
             this.internalProps.useOneRowHeightFillAll = false;
@@ -71009,7 +71038,7 @@
             scaleTicks = scale.forceTicks(target?.targetTicks?.length ?? axisOption?.tick?.forceTickCount);
         }
         else {
-            scaleTicks = scale.ticks(axisOption?.tick?.tickCount ?? DEFAULT_CONTINUOUS_TICK_COUNT, {
+            scaleTicks = scale.ticks(isNumber$2(axisOption?.tick?.tickCount) ? axisOption.tick.tickCount : DEFAULT_CONTINUOUS_TICK_COUNT, {
                 noDecimals: axisOption?.tick?.noDecimals
             });
         }
@@ -75977,7 +76006,7 @@
                     this.pivotSortState = options.pivotSortState;
                 }
                 if (Env.mode !== 'node') {
-                    this.editorManager = new EditManeger(this);
+                    this.editorManager = new EditManager(this);
                 }
                 this.refreshHeader();
                 this.internalProps.useOneRowHeightFillAll = false;
@@ -79019,7 +79048,7 @@
     }
 
     registerForVrender();
-    const version = "1.13.3-alpha.6";
+    const version = "1.14.0";
     function getIcons() {
         return get$2();
     }