@visactor/vtable 1.11.1-alpha.1 → 1.11.2-alpha.0

package/dist/vtable.js

@@ -34867,6 +34867,10 @@
         updateHeight(height) {
             this._cellHeight = height;
             this._cellWidth = this._originCellWidth;
+            const textMark = this.getChildByName('text', true);
+            if (textMark) {
+                textMark.setAttribute('heightLimit', height);
+            }
             this.layout();
         }
     }
@@ -36226,6 +36230,7 @@
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
                 cornerRadius: cellTheme?.group?.cornerRadius ?? 0,
+                lineDash: cellTheme?.group?.lineDash ?? undefined,
                 y: table.scenegraph.getCellGroupY(row)
             });
             oldCellGroup.forEachChildren((child) => {
@@ -36434,7 +36439,15 @@
     function resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table) {
         const { col, row } = cellGroup;
         const dx = -table.getColsWidth(range.start.col, col - 1);
-        const dy = -table.getRowsHeight(range.start.row, row - 1);
+        let dy = 0;
+        if (table.options.customConfig?._disableColumnAndRowSizeRound) {
+            for (let i = range.start.row; i <= row - 1; i++) {
+                dy -= table.getRowHeight(i);
+            }
+        }
+        else {
+            dy = -table.getRowsHeight(range.start.row, row - 1);
+        }
         cellGroup.forEachChildren((child) => {
             if (typeof child._dx === 'number') {
                 child.skipMergeUpdate = true;
@@ -43889,6 +43902,9 @@
     }
 
     function updateAllSelectComponent(scene) {
+        scene.customSelectedRangeComponents.forEach((selectComp, key) => {
+            updateComponent(selectComp, key, scene);
+        });
         scene.selectingRangeComponents.forEach((selectComp, key) => {
             updateComponent(selectComp, key, scene);
         });
@@ -46454,6 +46470,14 @@
         }
     }
 
+    function temporarilyUpdateSelectRectStyle(rectAttribute, scene) {
+        const { selectedRangeComponents } = scene;
+        selectedRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.setAttributes(rectAttribute);
+        });
+        scene.updateNextFrame();
+    }
+
     registerForVrender();
     container.load(splitModule);
     container.load(textMeasureModule);
@@ -46472,6 +46496,7 @@
         componentGroup;
         selectedRangeComponents;
         selectingRangeComponents;
+        customSelectedRangeComponents;
         lastSelectId;
         component;
         stage;
@@ -46668,6 +46693,7 @@
             this.component.addToGroup(this.componentGroup);
             this.selectedRangeComponents = new Map();
             this.selectingRangeComponents = new Map();
+            this.customSelectedRangeComponents = new Map();
         }
         updateComponent() {
             this.component.updateStyle();
@@ -46806,7 +46832,8 @@
             this.stage.renderNextFrame();
         }
         resetAllSelectComponent() {
-            if (this.table.stateManager.select?.ranges?.length > 0) {
+            if (this.table.stateManager.select?.ranges?.length > 0 ||
+                this.table.stateManager.select?.customSelectRanges?.length > 0) {
                 updateAllSelectComponent(this);
             }
         }
@@ -47863,6 +47890,12 @@
                 dealWithIcon(loadingIcon, iconGraphic, col, row);
             }
         }
+        temporarilyUpdateSelectRectStyle(rectAttribute) {
+            temporarilyUpdateSelectRectStyle(rectAttribute, this);
+        }
+        resetSelectRectStyle() {
+            this.recreateAllSelectRangeComponents();
+        }
     }
 
     function checkCellInSelect(col, row, cellRanges) {
@@ -48893,8 +48926,8 @@
                 return false;
             }
         }
+        state.columnMove.moving = false;
         setTimeout(() => {
-            state.columnMove.moving = false;
             delete state.columnMove.colSource;
             delete state.columnMove.rowSource;
             delete state.columnMove.colTarget;
@@ -49369,6 +49402,18 @@
                 }
             }
         });
+        if (state.table.leftRowSeriesNumberCount === 1) {
+            state.headerCheckedState._vtable_rowSeries_number = false;
+            state._checkboxCellTypeFields.push('_vtable_rowSeries_number');
+            isNeedInitHeaderCheckedStateFromRecord = true;
+        }
+        else if (state.table.leftRowSeriesNumberCount > 1) {
+            for (let i = 0; i < state.table.leftRowSeriesNumberCount; i++) {
+                state.headerCheckedState[`_vtable_rowSeries_number_${i}`] = false;
+                state._checkboxCellTypeFields.push(`_vtable_rowSeries_number_${i}`);
+            }
+            isNeedInitHeaderCheckedStateFromRecord = true;
+        }
         if (isNeedInitHeaderCheckedStateFromRecord) {
             records.forEach((record, index) => {
                 state._checkboxCellTypeFields.forEach(field => {
@@ -49637,6 +49682,35 @@
         }
     }
 
+    function deletaCustomSelectRanges(state) {
+        const { customSelectedRangeComponents } = state.table.scenegraph;
+        customSelectedRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.delete();
+        });
+        customSelectedRangeComponents.clear();
+        state.select.customSelectRanges = [];
+    }
+    function addCustomSelectRanges(customSelectRanges, state) {
+        const { customSelectedRangeComponents } = state.table.scenegraph;
+        customSelectRanges.forEach((customRange) => {
+            const { range, style } = customRange;
+            const rect = createRect({
+                fill: style.cellBgColor ?? false,
+                stroke: style.cellBorderColor ?? false,
+                lineWidth: style.cellBorderLineWidth ?? 0,
+                lineDash: style.cellBorderLineDash ?? [],
+                pickable: false
+            });
+            customSelectedRangeComponents.set(`${range.start.col}-${range.start.row}-${range.end.col}-${range.end.row}`, {
+                rect,
+                role: 'body'
+            });
+        });
+        state.select.customSelectRanges = customSelectRanges;
+        updateAllSelectComponent(state.table.scenegraph);
+        state.table.scenegraph.updateNextFrame();
+    }
+
     class StateManager {
         table;
         interactionState;
@@ -50703,6 +50777,10 @@
                 changeRadioOrder(sourceIndex, targetIndex, this);
             }
         }
+        setCustomSelectRanges(customSelectRanges) {
+            deletaCustomSelectRanges(this);
+            addCustomSelectRanges(customSelectRanges, this);
+        }
     }
 
     function bindMediaClick(table) {
@@ -51021,6 +51099,37 @@
         }
     }
 
+    function fireMoveColEventListeners(table, endMoveColSuccess, e) {
+        if (endMoveColSuccess &&
+            table.stateManager.columnMove?.colSource !== -1 &&
+            table.stateManager.columnMove?.rowSource !== -1 &&
+            table.stateManager.columnMove?.colTarget !== -1 &&
+            table.stateManager.columnMove?.rowTarget !== -1) {
+            if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
+                table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
+                    target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
+                    source: {
+                        col: table.stateManager.columnMove.colSource,
+                        row: table.stateManager.columnMove.rowSource
+                    },
+                    event: e
+                });
+            }
+        }
+        else if (!endMoveColSuccess) {
+            if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL)) {
+                table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
+                    target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
+                    source: {
+                        col: table.stateManager.columnMove.colSource,
+                        row: table.stateManager.columnMove.rowSource
+                    },
+                    event: e
+                });
+            }
+        }
+    }
+
     function bindTableGroupListener(eventManager) {
         const table = eventManager.table;
         const stateManager = table.stateManager;
@@ -51374,32 +51483,8 @@
                     endResizeRow(table);
                 }
                 else if (stateManager.isMoveCol()) {
-                    const eventArgsSet = getCellEventArgsSet(e);
                     const endMoveColSuccess = table.stateManager.endMoveCol();
-                    if (endMoveColSuccess &&
-                        eventArgsSet.eventArgs &&
-                        table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
-                        table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
-                            target: { col: eventArgsSet.eventArgs.col, row: eventArgsSet.eventArgs.row },
-                            source: {
-                                col: table.stateManager.columnMove.colSource,
-                                row: table.stateManager.columnMove.rowSource
-                            },
-                            event: e.nativeEvent
-                        });
-                    }
-                    else if (!endMoveColSuccess) {
-                        if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL)) {
-                            table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
-                                target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
-                                source: {
-                                    col: table.stateManager.columnMove.colSource,
-                                    row: table.stateManager.columnMove.rowSource
-                                },
-                                event: e
-                            });
-                        }
-                    }
+                    fireMoveColEventListeners(table, endMoveColSuccess, e.nativeEvent);
                 }
                 else if (stateManager.isSelecting()) {
                     table.stateManager.endSelectCells();
@@ -52449,34 +52534,7 @@
             }
             else if (stateManager.isMoveCol()) {
                 const endMoveColSuccess = table.stateManager.endMoveCol();
-                if (endMoveColSuccess &&
-                    table.stateManager.columnMove?.colSource !== -1 &&
-                    table.stateManager.columnMove?.rowSource !== -1 &&
-                    table.stateManager.columnMove?.colTarget !== -1 &&
-                    table.stateManager.columnMove?.rowTarget !== -1) {
-                    if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
-                        table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
-                            target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
-                            source: {
-                                col: table.stateManager.columnMove.colSource,
-                                row: table.stateManager.columnMove.rowSource
-                            },
-                            event: e
-                        });
-                    }
-                }
-                else if (!endMoveColSuccess) {
-                    if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL)) {
-                        table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
-                            target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
-                            source: {
-                                col: table.stateManager.columnMove.colSource,
-                                row: table.stateManager.columnMove.rowSource
-                            },
-                            event: e
-                        });
-                    }
-                }
+                fireMoveColEventListeners(table, endMoveColSuccess, e);
             }
             else if (stateManager.isSelecting()) {
                 if (table.stateManager.select?.ranges?.length) {
@@ -52513,6 +52571,10 @@
             else if (stateManager.interactionState === 'grabing' && stateManager.isResizeRow()) {
                 endResizeRow(table);
             }
+            else if (stateManager.isMoveCol()) {
+                const endMoveColSuccess = table.stateManager.endMoveCol();
+                fireMoveColEventListeners(table, endMoveColSuccess, e);
+            }
         };
         eventManager.globalEventListeners.push({
             name: 'pointerup',
@@ -55429,9 +55491,6 @@
             else {
                 this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
             }
-            if (!customStyleId) {
-                this.customCellStyleArrangement.splice(index, 1);
-            }
             this.table.scenegraph.updateNextFrame();
         }
         updateCustomCell(customCellStyle, customCellStyleArrangement) {
@@ -57465,7 +57524,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.11.1-alpha.1";
+        version = "1.11.2-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -61391,17 +61450,17 @@
         handleRowSeriesNumber(rowSeriesNumber) {
             if (rowSeriesNumber) {
                 if (Array.isArray(rowSeriesNumber)) {
-                    this.rowSeriesNumberColumn = rowSeriesNumber.map(seriesNumber => {
+                    this.rowSeriesNumberColumn = rowSeriesNumber.map((seriesNumber, index) => {
                         return {
                             id: this.seqId++,
                             title: seriesNumber.title,
-                            define: seriesNumber,
+                            define: merge({ field: '_vtable_rowSeries_number_' + index }, seriesNumber),
                             cellType: seriesNumber.cellType ?? 'text',
                             headerType: rowSeriesNumber.cellType ?? 'text',
                             style: seriesNumber.style,
                             width: seriesNumber.width,
                             format: seriesNumber.format,
-                            field: seriesNumber.field,
+                            field: seriesNumber.field ?? '_vtable_rowSeries_number_' + index,
                             icon: seriesNumber.icon,
                             headerIcon: seriesNumber.headerIcon,
                             isChildNode: false
@@ -61413,13 +61472,13 @@
                         {
                             id: this.seqId++,
                             title: rowSeriesNumber.title,
-                            define: rowSeriesNumber,
+                            define: merge({ field: '_vtable_rowSeries_number' }, rowSeriesNumber),
                             cellType: rowSeriesNumber.cellType ?? 'text',
                             headerType: rowSeriesNumber.cellType ?? 'text',
                             style: rowSeriesNumber.style,
                             width: rowSeriesNumber.width,
                             format: rowSeriesNumber.format,
-                            field: '',
+                            field: '_vtable_rowSeries_number',
                             icon: rowSeriesNumber.icon,
                             headerIcon: rowSeriesNumber.headerIcon,
                             isChildNode: false
@@ -62061,6 +62120,9 @@
             return this._headerObjectMap[id];
         }
         getHeaderField(col, row) {
+            if (this.isSeriesNumberInHeader(col, row)) {
+                return this.getSeriesNumberHeader(col, row)?.field;
+            }
             const id = this.getCellId(col, row);
             return (this._headerObjectMap[id]?.field ||
                 (this.transpose
@@ -62514,6 +62576,7 @@
     class EditManeger {
         table;
         editingEditor;
+        isValidatingValue = false;
         editCell;
         constructor(table) {
             this.table = table;
@@ -62580,6 +62643,9 @@
             if (!this.editingEditor) {
                 return true;
             }
+            if (this.isValidatingValue) {
+                return false;
+            }
             const target = e?.target;
             const { editingEditor: editor } = this;
             if (target) {
@@ -62594,6 +62660,7 @@
             }
             if (!this.editingEditor.getValue) ;
             if (this.editingEditor.validateValue) {
+                this.isValidatingValue = true;
                 const maybePromiseOrValue = this.editingEditor.validateValue?.();
                 if (isPromise(maybePromiseOrValue)) {
                     return new Promise((resolve, reject) => {
@@ -62604,10 +62671,12 @@
                                 resolve(true);
                             }
                             else {
+                                this.isValidatingValue = false;
                                 resolve(false);
                             }
                         })
                             .catch((err) => {
+                            this.isValidatingValue = false;
                             reject(err);
                         });
                     });
@@ -62637,6 +62706,7 @@
             this.editingEditor.exit?.();
             this.editingEditor.onEnd?.();
             this.editingEditor = null;
+            this.isValidatingValue = false;
         }
         cancelEdit() {
             if (this.editingEditor) {
@@ -76990,6 +77060,11 @@
             this.table.on('selected_clear', () => {
                 this.clearHighlight();
             });
+            this.table.on('mousemove_table', () => {
+                if (this.table.stateManager.select.selecting) {
+                    this.updateHighlight();
+                }
+            });
         }
         clearHighlight() {
             this.colHeaderRange && this.table.arrangeCustomCellStyle({ range: this.colHeaderRange }, undefined);
@@ -77094,7 +77169,7 @@
     }
 
     registerForVrender();
-    const version = "1.11.1-alpha.1";
+    const version = "1.11.2-alpha.0";
     function getIcons() {
         return get$2();
     }