Merge branch 'VisActor:develop' into fix/3975

Author: PoorShawn

common/changes/@visactor/vtable/fix-canvas-range_2025-06-06-06-51.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix node-canvas range in PivotChart #3997",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}

common/changes/@visactor/vtable/fix-mobileModeOnPCbrower_2025-06-03-12-15.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: when pointer up set isDown false\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}

packages/vtable/src/components/menu/dom/logic/MenuElement.ts

@@ -572,8 +572,13 @@ export class MenuElement {
     const rootElement = this._rootElement;
     // const element = table.getElement();
     const element = table.internalProps.menu.parentElement ?? table.getElement();
-    const { width: containerWidth, left: containerLeft, top: containerTop } = element.getBoundingClientRect();
-    const { x: rootLeft, y: rootTop, width: rootWidth } = rootElement.getBoundingClientRect();
+    const {
+      width: containerWidth,
+      height: containerHeight,
+      left: containerLeft,
+      top: containerTop
+    } = element.getBoundingClientRect();
+    const { x: rootLeft, y: rootTop, width: rootWidth, height: rootHeight } = rootElement.getBoundingClientRect();
 
     if (secondElement) {
       // if (secondElement.parentElement !== rootElement) {
@@ -589,12 +594,20 @@ export class MenuElement {
       secondElement.style.maxWidth = `${maxWidth}px`;
       //计算弹出框的宽度
       const secondElementWidth = secondElement.clientWidth;
-      // const secondElementHeight = secondElement.clientHeight;
+      const secondElementHeight = secondElement.clientHeight;
 
       const secondElementTop = y - 4 - containerTop;
       const secondElementLeft = x - containerLeft;
 
-      secondElement.style.top = `${secondElementTop}px`;
+      let topStyle = secondElementTop;
+      // 判断如果超出下范围则靠上边显示
+      if (topStyle + secondElementHeight > containerHeight) {
+        const secondElementItem = secondElement.firstElementChild;
+        topStyle = topStyle - secondElementHeight + secondElementItem.clientHeight + 4;
+      }
+
+      secondElement.style.top = `${topStyle}px`;
+
       let leftStyle = secondElementLeft;
 
       // 判断如果超出右范围则靠左边显示

packages/vtable/src/core/BaseTable.ts

@@ -4260,8 +4260,24 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
     this.render();
     const stage = this.scenegraph.stage;
     if (stage) {
-      const contentWidth = this.tableX + this.getAllColsWidth();
-      const contentHeight = this.tableY + this.getAllRowsHeight();
+      let contentWidth = this.tableX + this.getAllColsWidth();
+      let contentHeight = this.tableY + this.getAllRowsHeight();
+      if (this.internalProps.legends) {
+        this.internalProps.legends.forEach(legend => {
+          if (legend.orient === 'right') {
+            contentWidth = Math.max(contentWidth, legend.legendComponent.globalAABBBounds.x2);
+          } else if (legend.orient === 'bottom') {
+            contentHeight = Math.max(contentHeight, legend.legendComponent.globalAABBBounds.y2);
+          }
+        });
+      }
+      if (this.internalProps.title) {
+        if (this.internalProps.title._titleOption.orient === 'right') {
+          contentWidth = Math.max(contentWidth, this.internalProps.title.getComponentGraphic().globalAABBBounds.x2);
+        } else if (this.internalProps.title._titleOption.orient === 'bottom') {
+          contentHeight = Math.max(contentHeight, this.internalProps.title.getComponentGraphic().globalAABBBounds.y2);
+        }
+      }
       if (contentWidth >= this.canvasWidth && contentHeight >= this.canvasHeight) {
         stage.render();
         const buffer = stage.window.getImageBuffer(type);

packages/vtable/src/data/DataSource.ts

@@ -1209,6 +1209,9 @@ export class DataSource extends EventTarget implements DataSourceAPI {
     this._sourceLength = this._source?.length || 0;
     this.sortedIndexMap.clear();
     this.currentIndexedData = Array.from({ length: this._sourceLength }, (_, i) => i);
+    if (this.rowHierarchyType === 'tree') {
+      this.initTreeHierarchyState();
+    }
     if (!this.userPagination) {
       this.pagination.perPageCount = this._sourceLength;
       this.pagination.totalCount = this._sourceLength;

packages/vtable/src/event/listener/container-dom.ts

@@ -705,6 +705,7 @@ export function bindContainerDomListener(eventManager: EventManager) {
         });
       }
     }
+    stateManager.updateInteractionState(InteractionState.default);
   };
   eventManager.globalEventListeners.push({
     name: 'pointerup',

packages/vtable/src/event/listener/table-group.ts

@@ -635,6 +635,7 @@ export function bindTableGroupListener(eventManager: EventManager) {
       }
     }
     setTimeout(() => {
+      eventManager.isDown = false;
       eventManager.isTouchdown = false;
       eventManager.isTouchMove = false;
       eventManager.isDraging = false;

packages/vtable/src/event/scroll.ts

@@ -22,14 +22,14 @@ export function handleWhell(event: FederatedWheelEvent, state: StateManager, isW
       state.updateInteractionState(InteractionState.scrolling);
     }
   }
-
+  const autoHide = state.table.options.theme?.scrollStyle?.visible === 'scrolling';
   if (optimizedDeltaX) {
     state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event);
-    state.showHorizontalScrollBar(true);
+    state.showHorizontalScrollBar(autoHide);
   }
   if (optimizedDeltaY) {
     state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event);
-    state.showVerticalScrollBar(true);
+    state.showVerticalScrollBar(autoHide);
   }
   isWheelEvent && state.resetInteractionState(state.interactionStateBeforeScroll);
   if (

packages/vtable/src/event/self-event-listener/base-table/right-button-click.ts

@@ -10,7 +10,16 @@ export function rightButtonClickEvent(table: BaseTableAPI) {
     if (ranges.length > 0) {
       for (let i = 0; i < ranges.length; i++) {
         const range = ranges[i];
-        if (col >= range.start.col && col <= range.end.col && row >= range.start.row && row <= range.end.row) {
+        const startCol = range.start.col;
+        const endCol = range.end.col;
+        const startRow = range.start.row;
+        const endRow = range.end.row;
+        if (
+          (col >= startCol && col <= endCol && row >= startRow && row <= endRow) || // 左上向右下选择
+          (col >= endCol && col <= startCol && row >= endRow && row <= startRow) || // 右下向左上选择
+          (col >= startCol && col <= endCol && row >= endRow && row <= startRow) || // 左下向右上选择
+          (col >= endCol && col <= startCol && row >= startRow && row <= endRow) // 右上向左下选择
+        ) {
           cellInRange = true;
           break;
         }