@nocobase/client-v2 2.1.0-alpha.26 → 2.1.0-alpha.27

package/es/BaseApplication.d.ts

@@ -121,6 +121,7 @@ export declare abstract class BaseApplication<TOptions extends BaseApplicationOp
      * 注册两边共享的默认 providers。
      */
     protected addBaseProviders(): void;
+    protected addFinalProviders(): void;
     addReactRouterComponents(): void;
     addRoutes(): void;
     updateFavicon(favicon?: string): void;

package/es/flow/actions/dataScopeFilter.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare function normalizeDataScopeFilter(rawFilter: any, resolvedFilter: any): any;

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/components/code-editor/types.d.ts

@@ -15,6 +15,7 @@ import { RunLog } from './hooks/useCodeRunner';
 export interface EditorRef {
     write(document: string): void;
     read(): string;
+    run?(): Promise<unknown>;
     buttonGroupHeight?: number;
     snippetEntries: SnippetEntry[];
     logs: RunLog[];

package/es/flow/internal/utils/rebuildFieldSubModel.d.ts

@@ -9,8 +9,9 @@
 /**
  * 通用的字段子模型重建工具：
  * - 保留原有 uid
- * - 通过 FieldModel 入口 + fieldBinding.use 动态选择目标字段类
+ * - 直接重建为目标字段类，保持与 defineChildren 初始创建逻辑一致
  * - 支持同步父项模式（pattern）
+ * - 同一字段模型类型下保留已有字段设置；切换到其他字段模型类型时丢弃不兼容设置
  * - 重建后触发 beforeRender（useCache: false）
  */
 import { FieldModel } from '../../models/base/FieldModel';

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;

package/es/flow/models/fields/JSFieldModel.d.ts

@@ -17,6 +17,9 @@ import { FieldModel } from '../base/FieldModel';
  */
 export declare class JSFieldModel extends FieldModel {
     private _mountedOnce;
+    private _lastRenderedElement?;
+    private _pendingRenderedElement?;
+    private _lastRunJs?;
     getInputArgs(): {
         collectionName: any;
         associationName: string;
@@ -36,6 +39,8 @@ export declare class JSFieldModel extends FieldModel {
     /**
      * 渲染一个占位容器，供 JS 脚本写入内容
      */
+    private getRunJsCode;
+    private refreshRenderedElement;
     render(): React.JSX.Element;
     /**
      * 组件挂载后，如果容器引用已就绪，强制重跑一次 beforeRender flows 以把 HTML 写入当前 DOM。