@visactor/vtable 1.26.1-alpha.0 → 1.26.2-alpha.1

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.26.1-alpha.0\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.26.2-alpha.1\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}

package/dist/vtable.js

@@ -54387,6 +54387,9 @@
 
     async function dynamicSetX(x, screenLeft, isEnd, proxy) {
         if (!screenLeft) {
+            proxy.updateDeltaX(x);
+            proxy.table.scenegraph.setBodyAndColHeaderX(-x + proxy.deltaX);
+            proxy.table.scenegraph.updateNextFrame();
             return;
         }
         const screenLeftCol = screenLeft.col;
@@ -54697,6 +54700,9 @@
 
     async function dynamicSetY(y, screenTop, isEnd, proxy) {
         if (!screenTop) {
+            proxy.updateDeltaY(y);
+            proxy.updateBody(y - proxy.deltaY);
+            proxy.table.scenegraph.updateNextFrame();
             return;
         }
         const screenTopRow = screenTop.row;
@@ -55611,7 +55617,7 @@
         async setY(y, isEnd = false) {
             const yLimitTop = this.table.getRowsHeight(this.bodyTopRow, this.bodyTopRow + (this.rowEnd - this.rowStart + 1)) / 2;
             const yLimitBottom = this.table.getAllRowsHeight() - yLimitTop;
-            const screenTop = this.table.getTargetRowAt(y + this.table.scenegraph.colHeaderGroup.attribute.height);
+            const screenTop = this.resolveTargetRowInfo(y + this.table.scenegraph.colHeaderGroup.attribute.height);
             if (screenTop) {
                 this.screenTopRow = screenTop.row;
             }
@@ -55639,7 +55645,7 @@
         async setX(x, isEnd = false) {
             const xLimitLeft = this.table.getColsWidth(this.bodyLeftCol, this.bodyLeftCol + (this.colEnd - this.colStart + 1)) / 2;
             const xLimitRight = this.table.getAllColsWidth() - xLimitLeft;
-            const screenLeft = this.table.getTargetColAt(x + this.table.scenegraph.rowHeaderGroup.attribute.width + (this.table.getFrozenColsOffset?.() ?? 0));
+            const screenLeft = this.resolveTargetColInfo(x + this.table.scenegraph.rowHeaderGroup.attribute.width + (this.table.getFrozenColsOffset?.() ?? 0));
             if (screenLeft) {
                 this.screenLeftCol = screenLeft.col;
             }
@@ -55667,6 +55673,26 @@
         async dynamicSetX(x, screenLeft, isEnd = false) {
             dynamicSetX(x, screenLeft, isEnd, this);
         }
+        resolveTargetColInfo(absoluteX) {
+            const offsets = [0, -1, 1, -2, 2];
+            for (let i = 0; i < offsets.length; i++) {
+                const screenLeft = this.table.getTargetColAt(absoluteX + offsets[i]);
+                if (screenLeft) {
+                    return screenLeft;
+                }
+            }
+            return null;
+        }
+        resolveTargetRowInfo(absoluteY) {
+            const offsets = [0, -1, 1, -2, 2];
+            for (let i = 0; i < offsets.length; i++) {
+                const screenTop = this.table.getTargetRowAt(absoluteY + offsets[i]);
+                if (screenTop) {
+                    return screenTop;
+                }
+            }
+            return null;
+        }
         updateBody(y) {
             this.table.scenegraph.setBodyAndRowHeaderY(-y);
         }
@@ -59791,8 +59817,13 @@
             this.table.scenegraph.proxy.setY(-y, isEnd);
         }
         setBodyAndRowHeaderY(y) {
-            const firstBodyCell = this.bodyGroup.firstChild?.firstChild ?? this.rowHeaderGroup.firstChild?.firstChild;
-            const lastBodyCell = this.bodyGroup.firstChild?.lastChild ?? this.rowHeaderGroup.firstChild?.lastChild;
+            const firstBodyColGroup = this.bodyGroup.firstChild;
+            const firstRowHeaderColGroup = this.rowHeaderGroup.firstChild;
+            const firstBodyCell = firstBodyColGroup?.firstChild ?? firstRowHeaderColGroup?.firstChild;
+            let lastBodyCell = (firstBodyColGroup?.lastChild ?? firstRowHeaderColGroup?.lastChild);
+            if (lastBodyCell && lastBodyCell.type !== 'group') {
+                lastBodyCell = lastBodyCell._prev;
+            }
             if (y === 0 &&
                 firstBodyCell &&
                 firstBodyCell.row === this.table.frozenRowCount &&
@@ -59836,7 +59867,10 @@
         }
         setBodyAndColHeaderX(x) {
             const firstBodyCol = this.bodyGroup.firstChild;
-            const lastBodyCol = this.bodyGroup.lastChild;
+            let lastBodyCol = this.bodyGroup.lastChild;
+            if (lastBodyCol && lastBodyCol.type !== 'group') {
+                lastBodyCol = lastBodyCol._prev;
+            }
             if (x === 0 && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0) {
                 x = -firstBodyCol.attribute.x;
             }
@@ -65629,6 +65663,9 @@
         });
     }
     function dblclickHandler(e, table) {
+        if (typeof e.button === 'number' && e.button !== 0) {
+            return;
+        }
         const eventArgsSet = getCellEventArgsSetWithTable(e, table);
         let col = -1;
         let row = -1;
@@ -65990,6 +66027,18 @@
         const table = eventManager.table;
         const stateManager = table.stateManager;
         const handler = table.internalProps.handler;
+        const focusEditingInput = () => {
+            table.editorManager?.editingEditor?.getInputElement?.()?.focus?.();
+        };
+        const afterCompleteEdit = (completeEditResult, onSuccess) => {
+            getPromiseValue(completeEditResult, (isCompleteEdit) => {
+                if (isCompleteEdit === false) {
+                    focusEditingInput();
+                    return;
+                }
+                onSuccess();
+            });
+        };
         handler.on(table.getElement(), 'blur', (e) => {
             const relatedTarget = e.relatedTarget;
             if (relatedTarget) {
@@ -66092,15 +66141,17 @@
                     return;
                 }
                 const isEditingCell = !!table.editorManager?.editingEditor;
-                table.editorManager?.completeEdit();
-                table.getElement().focus();
-                const enableShiftSelectMode = table.options.keyboardOptions?.shiftMultiSelect ?? true;
-                table.selectCell(targetCol, targetRow, e.shiftKey && enableShiftSelectMode);
-                if ((table.options.keyboardOptions?.moveEditCellOnArrowKeys ?? false) && isEditingCell) {
-                    if (table.getEditor(targetCol, targetRow)) {
-                        table.editorManager?.startEditCell(targetCol, targetRow);
+                const completeEditResult = table.editorManager?.completeEdit();
+                afterCompleteEdit(completeEditResult, () => {
+                    table.getElement().focus();
+                    const enableShiftSelectMode = table.options.keyboardOptions?.shiftMultiSelect ?? true;
+                    table.selectCell(targetCol, targetRow, e.shiftKey && enableShiftSelectMode);
+                    if ((table.options.keyboardOptions?.moveEditCellOnArrowKeys ?? false) && isEditingCell) {
+                        if (table.getEditor(targetCol, targetRow)) {
+                            table.editorManager?.startEditCell(targetCol, targetRow);
+                        }
                     }
-                }
+                });
             }
             else if (e.key === 'Escape') {
                 table.editorManager?.cancelEdit();
@@ -66109,17 +66160,19 @@
             else if (e.key === 'Enter') {
                 if (table.editorManager?.editingEditor) {
                     handleKeydownListener(e);
-                    table.editorManager?.completeEdit();
-                    table.getElement().focus();
-                    if (table.options.keyboardOptions?.moveFocusCellOnEnter === true) {
-                        const targetCol = stateManager.select.cellPos.col;
-                        const targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row + 1));
-                        if (isCellDisableSelect(table, targetCol, targetRow)) {
-                            return;
+                    const completeEditResult = table.editorManager?.completeEdit();
+                    afterCompleteEdit(completeEditResult, () => {
+                        table.getElement().focus();
+                        if (table.options.keyboardOptions?.moveFocusCellOnEnter === true) {
+                            const targetCol = stateManager.select.cellPos.col;
+                            const targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row + 1));
+                            if (isCellDisableSelect(table, targetCol, targetRow)) {
+                                return;
+                            }
+                            const enableShiftSelectMode = table.options.keyboardOptions?.shiftMultiSelect ?? true;
+                            table.selectCell(targetCol, targetRow, e.shiftKey && enableShiftSelectMode);
                         }
-                        const enableShiftSelectMode = table.options.keyboardOptions?.shiftMultiSelect ?? true;
-                        table.selectCell(targetCol, targetRow, e.shiftKey && enableShiftSelectMode);
-                    }
+                    });
                     return;
                 }
                 if (table.options.keyboardOptions?.moveFocusCellOnEnter === true) {
@@ -66167,14 +66220,16 @@
                             return;
                         }
                         const isEditingCell = !!table.editorManager?.editingEditor;
-                        table.editorManager?.completeEdit();
-                        table.getElement().focus();
-                        table.selectCell(targetCol, targetRow);
-                        if (isEditingCell) {
-                            if (table.getEditor(targetCol, targetRow)) {
-                                table.editorManager?.startEditCell(targetCol, targetRow);
+                        const completeEditResult = table.editorManager?.completeEdit();
+                        afterCompleteEdit(completeEditResult, () => {
+                            table.getElement().focus();
+                            table.selectCell(targetCol, targetRow);
+                            if (isEditingCell) {
+                                if (table.getEditor(targetCol, targetRow)) {
+                                    table.editorManager?.startEditCell(targetCol, targetRow);
+                                }
                             }
-                        }
+                        });
                     }
                 }
             }
@@ -71962,7 +72017,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.26.1-alpha.0";
+        version = "1.26.2-alpha.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -96535,7 +96590,7 @@
     }
 
     registerForVrender();
-    const version = "1.26.1-alpha.0";
+    const version = "1.26.2-alpha.1";
     function getIcons() {
         return get$2();
     }