@visactor/vtable 0.17.2-alpha.1 → 0.17.3-alpha.0

package/dist/vtable.js

@@ -56150,13 +56150,13 @@
         else if (direction === 'right' && proxy.colStart - count < proxy.bodyLeftCol) {
             count = proxy.colStart - proxy.bodyLeftCol;
         }
+        if (count === 0) {
+            return;
+        }
         if (count < 0) {
             direction = direction === 'left' ? 'right' : 'left';
             count = -count;
         }
-        if (count <= 0) {
-            return;
-        }
         if (count < proxy.colEnd - proxy.colStart) {
             const startCol = direction === 'left' ? proxy.colStart : proxy.colEnd - count + 1;
             const endCol = direction === 'left' ? proxy.colStart + count - 1 : proxy.colEnd;
@@ -56385,6 +56385,9 @@
         else if (direction === 'down' && proxy.rowStart - count < proxy.bodyTopRow) {
             count = proxy.rowStart - proxy.bodyTopRow;
         }
+        if (count === 0) {
+            return;
+        }
         if (count < 0) {
             direction = direction === 'up' ? 'down' : 'up';
             count = -count;
@@ -58999,7 +59002,7 @@
     }
     function resetResidentHoverIcon(col, row, scene) {
         updateCellRangeIcon(col, row, (icon) => icon.attribute.funcType === IconFuncTypeEnum.dropDown, (icon) => {
-            icon.setAttribute('visibleTime', icon.oldVisibleTime);
+            icon.oldVisibleTime && icon.setAttribute('visibleTime', icon.oldVisibleTime);
             icon.setAttribute('opacity', icon.attribute.visibleTime === 'always' ? 1 : 0);
         }, scene);
     }
@@ -60829,7 +60832,7 @@
                         end: { col: table.colCount - 1, row: cellRange.end.row }
                     });
                 }
-                else {
+                else if (col >= 0 && row >= 0) {
                     state.select.ranges.push({
                         start: { col, row },
                         end: { col, row }
@@ -60837,8 +60840,9 @@
                 }
                 cellPos.col = col;
                 cellPos.row = row;
-                const currentRange = state.select.ranges[state.select.ranges.length - 1];
-                scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
+                const currentRange = state.select.ranges?.[state.select.ranges.length - 1];
+                currentRange &&
+                    scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
             }
         }
         else if (interactionState === InteractionState.grabing && !table.stateManager.isResizeCol()) {
@@ -61887,14 +61891,16 @@
             }
         }
         hideMenu() {
-            this.table.fireListeners(TABLE_EVENT_TYPE.DROPDOWN_MENU_CLEAR, null);
-            this.table.fireListeners(TABLE_EVENT_TYPE.HIDE_MENU, null);
-            this.menu.isShow = false;
-            this.table.scenegraph.component.menu.detach();
-            if (this.residentHoverIcon) {
-                this.table.scenegraph.setIconNormalStyle(this.residentHoverIcon.icon, this.residentHoverIcon.col, this.residentHoverIcon.row);
-                this.table.scenegraph.resetResidentHoverIcon(this.residentHoverIcon.col, this.residentHoverIcon.row);
-                this.residentHoverIcon = null;
+            if (this.menu.isShow) {
+                this.table.fireListeners(TABLE_EVENT_TYPE.DROPDOWN_MENU_CLEAR, null);
+                this.table.fireListeners(TABLE_EVENT_TYPE.HIDE_MENU, null);
+                this.menu.isShow = false;
+                this.table.scenegraph.component.menu.detach();
+                if (this.residentHoverIcon) {
+                    this.table.scenegraph.setIconNormalStyle(this.residentHoverIcon.icon, this.residentHoverIcon.col, this.residentHoverIcon.row);
+                    this.table.scenegraph.resetResidentHoverIcon(this.residentHoverIcon.col, this.residentHoverIcon.row);
+                    this.residentHoverIcon = null;
+                }
             }
         }
         setDropDownMenuHighlight(cells) {
@@ -62603,9 +62609,7 @@
                     }
                 }
             }
-            if (table.editorManager) {
-                table.editorManager.completeEdit();
-            }
+            table.editorManager?.completeEdit(e.nativeEvent);
             stateManager.updateInteractionState(InteractionState.default);
             eventManager.dealTableHover();
         });
@@ -62624,9 +62628,10 @@
             if (table.isPivotChart() && eventArgsSet?.eventArgs?.target.type !== 'chart') {
                 table.scenegraph.updateChartState(null);
             }
-            if (stateManager.menu.isShow && eventArgsSet.eventArgs?.target !== stateManager.residentHoverIcon?.icon) {
+            if (eventArgsSet.eventArgs?.target !== stateManager.residentHoverIcon?.icon) {
                 stateManager.hideMenu();
             }
+            table.editorManager?.completeEdit(e.nativeEvent);
             const hitIcon = eventArgsSet?.eventArgs?.target?.role?.startsWith('icon')
                 ? eventArgsSet.eventArgs.target
                 : undefined;
@@ -62821,9 +62826,10 @@
         });
         table.scenegraph.stage.addEventListener('pointerdown', (e) => {
             const eventArgsSet = getCellEventArgsSet(e);
-            if (stateManager.menu.isShow && eventArgsSet.eventArgs?.target !== stateManager.residentHoverIcon?.icon) {
+            if (eventArgsSet.eventArgs?.target !== stateManager.residentHoverIcon?.icon) {
                 stateManager.hideMenu();
             }
+            table.editorManager?.completeEdit(e.nativeEvent);
         });
         table.scenegraph.stage.addEventListener('pointertap', (e) => {
             const target = e.target;
@@ -62980,11 +62986,7 @@
             if (stateManager.interactionState !== InteractionState.scrolling) {
                 stateManager.updateInteractionState(InteractionState.scrolling);
             }
-            const eventArgsSet = getCellEventArgsSet(e);
-            if (scenegraph.table.stateManager.menu.isShow &&
-                eventArgsSet.eventArgs?.target !== scenegraph.table.stateManager.residentHoverIcon?.icon) {
-                scenegraph.table.stateManager.hideMenu();
-            }
+            scenegraph.table.stateManager.hideMenu();
             scenegraph.table.editorManager?.completeEdit();
         });
         scenegraph.component.vScrollBar.addEventListener('pointerup', () => {
@@ -63005,11 +63007,7 @@
             if (stateManager.interactionState !== InteractionState.scrolling) {
                 stateManager.updateInteractionState(InteractionState.scrolling);
             }
-            const eventArgsSet = getCellEventArgsSet(e);
-            if (scenegraph.table.stateManager.menu.isShow &&
-                eventArgsSet.eventArgs?.target !== scenegraph.table.stateManager.residentHoverIcon?.icon) {
-                scenegraph.table.stateManager.hideMenu();
-            }
+            scenegraph.table.stateManager.hideMenu();
             scenegraph.table.editorManager?.completeEdit();
         });
         scenegraph.component.hScrollBar.addEventListener('pointerup', () => {
@@ -66583,7 +66581,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.17.2-alpha.1";
+        version = "0.17.3-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -68811,6 +68809,18 @@
             }
             return null;
         }
+        getBodyIndexByTableIndex(col, row) {
+            return {
+                col: col - this.rowHeaderLevelCount,
+                row: row - this.columnHeaderLevelCount
+            };
+        }
+        getTableIndexByBodyIndex(col, row) {
+            return {
+                col: col + this.rowHeaderLevelCount,
+                row: row + this.columnHeaderLevelCount
+            };
+        }
     }
 
     var core = /*#__PURE__*/Object.freeze({
@@ -70086,12 +70096,6 @@
                     this.startEditCell(col, row);
                 }
             });
-            document.body.addEventListener('pointerdown', (e) => {
-                const target = e.target;
-                if (this.editingEditor && !this.editingEditor.targetIsOnEditor(target)) {
-                    this.completeEdit();
-                }
-            });
             handler.on(this.table.getElement(), 'wheel', (e) => {
                 this.completeEdit();
             });
@@ -70120,8 +70124,9 @@
                 editor.beginEditing(this.table.getElement(), { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } }, dataValue);
             }
         }
-        completeEdit() {
-            if (this.editingEditor) {
+        completeEdit(e) {
+            const target = e?.target;
+            if (this.editingEditor && (!target || (target && !this.editingEditor.targetIsOnEditor(target)))) {
                 const changedValue = this.editingEditor.getValue();
                 this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
                 this.editingEditor.exit();
@@ -70214,6 +70219,9 @@
             this.renderAsync();
             this.eventManager.updateEventBinder();
         }
+        get columns() {
+            return this.internalProps.columns;
+        }
         get header() {
             return this.internalProps.columns;
         }
@@ -77200,7 +77208,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.17.2-alpha.1";
+    const version = "0.17.3-alpha.0";
     function getIcons() {
         return get$2();
     }