@nocobase/client-v2 2.1.0-beta.23 → 2.1.0-beta.24

package/es/flow/components/Grid/index.d.ts

@@ -6,21 +6,23 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { GridLayoutV2 } from '@nocobase/flow-engine';
 import React from 'react';
 interface DragOverlayRect {
     readonly top: number;
     readonly left: number;
     readonly width: number;
     readonly height: number;
-    readonly type: 'column' | 'column-edge' | 'row-gap' | 'empty-row' | 'empty-column';
+    readonly type: 'column' | 'column-edge' | 'row-gap' | 'empty-row' | 'empty-column' | 'item-edge';
 }
 interface GridProps {
-    readonly rows: Record<string, string[][]>;
+    readonly rows?: Record<string, string[][]>;
     readonly sizes?: Record<string, number[]>;
+    readonly layout?: GridLayoutV2;
     readonly renderItem: (uid: string) => React.ReactNode;
     readonly rowGap?: number;
     readonly colGap?: number;
     readonly dragOverlayRect?: DragOverlayRect | null;
 }
-export declare function Grid({ rows, sizes, renderItem, rowGap, colGap, dragOverlayRect }: GridProps): React.JSX.Element;
+export declare function Grid({ rows, sizes, layout, renderItem, rowGap, colGap, dragOverlayRect, }: GridProps): React.JSX.Element;
 export {};

package/es/flow/models/base/GridModel.d.ts

@@ -7,8 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DragCancelEvent, DragEndEvent, DragMoveEvent, DragStartEvent } from '@dnd-kit/core';
-import { DragOverlayConfig, FlowModel, GridLayoutData } from '@nocobase/flow-engine';
 import type { FlowModelRendererProps } from '@nocobase/flow-engine';
+import { DragOverlayConfig, FlowModel, GridLayoutData, GridLayoutV2 } from '@nocobase/flow-engine';
 import React from 'react';
 export declare const GRID_FLOW_KEY = "gridSettings";
 export declare const GRID_STEP = "grid";
@@ -33,6 +33,9 @@ export declare class GridModel<T extends {
     private readonly itemExtraToolbarItems;
     private dragState?;
     private _memoItemFlowSettings?;
+    private updateDragPointerPosition;
+    private handleDragScroll;
+    private bindDragDocumentListeners;
     protected deriveRowOrder(rows: Record<string, string[][]>, provided?: string[]): string[];
     normalizeRowsWithOrder(rows: Record<string, string[][]>, provided?: string[]): {
         rows: Record<string, string[][]>;
@@ -40,18 +43,32 @@ export declare class GridModel<T extends {
     };
     orderSizesByRowOrder(sizes: Record<string, number[]>, rowOrder: string[]): Record<string, number[]>;
     private getItemFlowSettings;
+    getItemUids(): string[];
+    protected normalizeLayoutFromSource(source?: Partial<GridLayoutData>): GridLayoutV2;
+    getGridLayout(): GridLayoutV2;
+    syncLayoutProps(layout: GridLayoutV2): void;
+    setGridStepLayout(layout: GridLayoutV2): void;
+    private findLayoutRowByPath;
+    private collectCellItemsForResize;
+    private buildResizedCells;
+    private getResizeRowPath;
+    private getResizeContainerWidth;
+    private resizeGridLayout;
     onMount(): void;
-    saveGridLayout(layout?: GridLayoutData): void;
+    saveGridLayout(layout?: GridLayoutData | GridLayoutV2): void;
     mergeRowsWithItems(rows: Record<string, string[][]>): Record<string, string[][]>;
     resetRows(syncProps?: boolean): void;
     private computePointerPosition;
     private getDragContainer;
     private updateLayoutSnapshot;
     private scheduleSnapshotRefresh;
+    private refreshPreviewFromPointer;
     /**
      * 根据 slot 类型、位置和配置计算最终的 overlay 尺寸和位置
      */
     private computeOverlayRect;
+    private getHitTestSlot;
+    private resolveDragSlot;
     private applyPreview;
     handleDragStart(event: DragStartEvent): void;
     handleDragMove(event: DragMoveEvent): void;

package/es/flow/models/blocks/filter-form/FilterFormGridModel.d.ts

@@ -11,6 +11,7 @@ import React from 'react';
 import { GridModel } from '../../base';
 import { FilterFormItemModel } from './FilterFormItemModel';
 export declare class FilterFormGridModel extends GridModel {
+    private fullLayoutBeforeCollapse?;
     itemSettingsMenuLevel: number;
     itemFlowSettings: {
         showBackground: boolean;