@nocobase/client 2.0.0-alpha.2 → 2.0.0-alpha.4

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

@@ -7,10 +7,20 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-export declare function Grid(props: {
-    rows: Record<string, string[][]>;
-    sizes?: Record<string, number[]>;
-    renderItem: (uid: string) => React.ReactNode;
-    rowGap?: number;
-    colGap?: number;
-}): React.JSX.Element;
+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';
+}
+interface GridProps {
+    readonly rows: Record<string, string[][]>;
+    readonly sizes?: Record<string, number[]>;
+    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 {};

package/es/flow/components/code-editor/hooks/useCodeRunner.d.ts

@@ -6,14 +6,15 @@
  * 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 { FlowModelContext, JSRunner } from '@nocobase/flow-engine';
 export type RunLog = {
     level: 'log' | 'info' | 'warn' | 'error';
     msg: string;
     line?: number;
     column?: number;
 };
-export declare function useCodeRunner(hostCtx: any, version?: string): {
-    run: (code: string) => Promise<any>;
+export declare function useCodeRunner(hostCtx: FlowModelContext, version?: string): {
+    run: (code: string) => Promise<Awaited<ReturnType<JSRunner['run']>> | undefined>;
     logs: RunLog[];
     clearLogs: () => void;
     running: boolean;

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

@@ -6,10 +6,12 @@
  * 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 { DragOverlayConfig } from '@nocobase/flow-engine';
 import React from 'react';
 import { FilterManager } from '../blocks/filter-manager/FilterManager';
 import { GridModel } from './GridModel';
 export declare class BlockGridModel extends GridModel {
+    dragOverlayConfig: DragOverlayConfig;
     onInit(options: any): void;
     get subModelBaseClasses(): string[];
     get filterManager(): FilterManager;

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

@@ -6,8 +6,8 @@
  * 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 { DragMoveEvent } from '@dnd-kit/core';
-import { FlowModel } from '@nocobase/flow-engine';
+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 React from 'react';
 export declare const GRID_FLOW_KEY = "gridSettings";
@@ -28,16 +28,29 @@ export declare class GridModel<T extends {
     prevMoveDistance: number;
     itemSettingsMenuLevel: number;
     itemFlowSettings: Exclude<FlowModelRendererProps['showFlowSettings'], boolean>;
-    private itemFallback;
-    private itemExtraToolbarItems;
+    dragOverlayConfig?: DragOverlayConfig;
+    private readonly itemFallback;
+    private readonly itemExtraToolbarItems;
+    private dragState?;
     private _memoItemFlowSettings?;
     private getItemFlowSettings;
     onInit(options: any): void;
-    saveGridLayout(): void;
+    saveGridLayout(layout?: GridLayoutData): void;
     mergeRowsWithItems(rows: Record<string, string[][]>): Record<string, string[][]>;
     resetRows(syncProps?: boolean): void;
+    private computePointerPosition;
+    private updateLayoutSnapshot;
+    private scheduleSnapshotRefresh;
+    /**
+     * 根据 slot 类型、位置和配置计算最终的 overlay 尺寸和位置
+     */
+    private computeOverlayRect;
+    private applyPreview;
+    handleDragStart(event: DragStartEvent): void;
     handleDragMove(event: DragMoveEvent): void;
-    handleDragEnd(event: any): void;
+    private finishDrag;
+    handleDragEnd(_event: DragEndEvent): void;
+    handleDragCancel(_event: DragCancelEvent): void;
     renderAddSubModelButton(): JSX.Element;
     getRows(): any;
     getSizes(): any;

package/es/flow/models/blocks/details/DetailsGridModel.d.ts

@@ -6,6 +6,7 @@
  * 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 { DragOverlayConfig } from '@nocobase/flow-engine';
 import React from 'react';
 import { FieldModel, GridModel } from '../../base';
 import { DetailsBlockModel } from './DetailsBlockModel';
@@ -25,5 +26,6 @@ export declare class DetailsGridModel extends GridModel<{
             bottom: number;
         };
     };
+    dragOverlayConfig: DragOverlayConfig;
     renderAddSubModelButton(): React.JSX.Element;
 }

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

@@ -6,6 +6,7 @@
  * 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 { DragOverlayConfig } from '@nocobase/flow-engine';
 import React from 'react';
 import { GridModel } from '../../base';
 import { FilterFormItemModel } from './FilterFormItemModel';
@@ -19,6 +20,7 @@ export declare class FilterFormGridModel extends GridModel {
             bottom: number;
         };
     };
+    dragOverlayConfig: DragOverlayConfig;
     private hiddenRows;
     readonly loading: {
         value: boolean;

package/es/flow/models/blocks/form/FormGridModel.d.ts

@@ -6,6 +6,7 @@
  * 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 { DragOverlayConfig } from '@nocobase/flow-engine';
 import React from 'react';
 import { FieldModel, GridModel } from '../../base';
 import { FormBlockModel } from './FormBlockModel';
@@ -26,5 +27,6 @@ export declare class FormGridModel<T extends DefaultFormGridStructure = DefaultF
             bottom: number;
         };
     };
+    dragOverlayConfig: DragOverlayConfig;
     renderAddSubModelButton(): React.JSX.Element;
 }

package/es/flow/models/utils/resolveRunJsParams.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+import type { FlowContext } from '@nocobase/flow-engine';
+/**
+ * 统一解析预览模式的 code/version：
+ * - 优先读取 ctx.inputArgs.preview.{code,version}
+ * - 其次读取 params.{code,version}
+ * - 最后回退到 defaults
+ */
+export declare function resolveRunJsParams(ctx: FlowContext, params?: Record<string, any>): {
+    code: string;
+    version: string;
+};