@worktile/theia 20.2.8 → 20.2.9

package/fesm2022/worktile-theia.mjs

@@ -10280,17 +10280,16 @@ class TheTable extends TheBaseElement {
             }
             else {
                 if (this.readonly) {
+                    cellsWidth = getColumnsWidth(headerRow);
                     // 预览模式且没有colgroup，使用数据行的宽度计算固定列宽
-                    const dataRow = this.tbodyElement.nativeElement.childNodes[1];
-                    cellsWidth = getColumnsWidth(dataRow);
-                    gridColumns = getGridColumns(dataRow, cellsWidth);
+                    gridColumns = getGridColumns(headerRow, cellsWidth);
                 }
                 else {
                     const columnCount = this.element.children[0].children.length;
                     const percent = +(100 / columnCount).toFixed(4);
                     cellsWidth = new Array(columnCount).fill(percent);
                     gridColumns = getGridColumns(headerRow, cellsWidth, '%');
-                    colControlGridColumns = getGridColumns(colControl, getColumnsWidth(colControl));
+                    colControlGridColumns = gridColumns;
                 }
             }
             const tablePadding = 44;
@@ -10724,7 +10723,7 @@ class TheTable extends TheBaseElement {
             const buffer = this.isInTable ? -TABLE_CONTROL : 0;
             if (this.isStickyTop) {
                 this.getWrapperWidthAndLeft();
-                const controlButtonBorder = 1;
+                const controlButtonBorder = this.element.options?.numberedColumn ? 1 : 0;
                 stickyRows.forEach((element) => {
                     this.renderer.setStyle(element, 'left', `${this.tableWrapperLeft + (this.readonly ? 0 : this.getColControlButtonWidth() - controlButtonBorder)}px`);
                 });
@@ -10799,13 +10798,13 @@ class TheTable extends TheBaseElement {
             return;
         }
         const tableRect = this.nativeElement.getBoundingClientRect();
-        const viewportHeight = this.getViewportHeight();
+        const viewportBottom = this.getViewportBottom();
         const scrollbarBottomPosition = tableRect.bottom;
         // 是否在可视范围内
-        const isScrollbarOutOfView = scrollbarBottomPosition > viewportHeight && tableRect.top < viewportHeight;
-        this.setScrollbarFixed(isScrollbarOutOfView, viewportHeight);
+        const isScrollbarOutOfView = scrollbarBottomPosition > viewportBottom && tableRect.top < viewportBottom;
+        this.setScrollbarFixed(isScrollbarOutOfView, viewportBottom);
     }
-    getViewportHeight() {
+    getViewportBottom() {
         try {
             const scrollContainer = this.contextService.getScrollContainer();
             if (scrollContainer && scrollContainer !== document.documentElement && scrollContainer !== document.body) {
@@ -10826,7 +10825,7 @@ class TheTable extends TheBaseElement {
             return window.innerHeight;
         }
     }
-    setScrollbarFixed(fixed, viewportHeight) {
+    setScrollbarFixed(fixed, viewportBottom) {
         if (!this.horizontalScrollbarContainer || this.disabledHorizontalScrollbarFixed()) {
             return;
         }
@@ -10840,11 +10839,13 @@ class TheTable extends TheBaseElement {
             this.renderer.addClass(scrollbar, 'fixed');
             this.renderer.setStyle(scrollbar, 'left', `${Math.max(0, tableRect.left / scaleX)}px`);
             this.renderer.setStyle(scrollbar, 'width', `${tableRect.width / scaleX}px`);
+            this.renderer.setStyle(scrollbar, 'bottom', `${Math.max(0, window.innerHeight - viewportBottom)}px`);
         }
         else {
             this.renderer.removeClass(scrollbar, 'fixed');
             this.renderer.removeStyle(scrollbar, 'left');
             this.renderer.removeStyle(scrollbar, 'width');
+            this.renderer.removeStyle(scrollbar, 'bottom');
         }
         requestAnimationFrame(() => {
             if (scrollbar.scrollLeft !== currentScrollLeft) {
@@ -11190,7 +11191,8 @@ class TheQuickInsert {
             !this.isRichMediaScope()) {
             const block = Node.ancestor(editor, [editor?.selection?.anchor.path[0]]);
             const rootNode = AngularEditor.toDOMNode(editor, block);
-            this.updatePosition(rootNode.offsetLeft, rootNode.offsetTop);
+            const editorDom = AngularEditor.toDOMNode(editor, editor);
+            this.updatePosition(rootNode.offsetLeft, rootNode.offsetTop + editorDom.offsetTop);
             return;
         }
         this.addHiddenClass();