@nocobase/client-v2 2.1.0-alpha.40 → 2.1.0-alpha.46

package/es/flow/components/FieldAssignRulesEditor.d.ts

@@ -9,7 +9,7 @@
 import type { FilterGroupType } from '@nocobase/utils/client';
 import React from 'react';
 import { FieldAssignValueInput } from './FieldAssignValueInput';
-import type { FieldAssignCascaderOption } from './fieldAssignOptions';
+import { type FieldAssignCascaderOption } from './fieldAssignOptions';
 export type AssignMode = 'default' | 'assign';
 type CollectionFieldLike = {
     name?: unknown;
@@ -17,6 +17,7 @@ type CollectionFieldLike = {
     type?: unknown;
     interface?: unknown;
     uiSchema?: unknown;
+    target?: unknown;
     targetKey?: unknown;
     targetCollectionTitleFieldName?: unknown;
     targetCollection?: any;
@@ -66,6 +67,7 @@ export interface FieldAssignRulesEditorProps {
     onSyncAssociationTitleField?: (params: SyncAssociationTitleFieldParams) => Promise<void> | void;
     /** 在日期字段下启用“日期变量替换 Constant 位”。 */
     enableDateVariableAsConstant?: boolean;
+    maxAssociationFieldDepth?: number;
 }
 export declare const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps>;
 export {};

package/es/flow/components/FieldAssignValueInput.d.ts

@@ -52,6 +52,7 @@ interface Props {
      * 默认 false，保持历史行为。
      */
     enableDateVariableAsConstant?: boolean;
+    maxAssociationFieldDepth?: number;
 }
 export declare function mergeItemMetaTreeForAssignValue(baseTree: MetaTreeNode[], extraTree: MetaTreeNode[]): MetaTreeNode[];
 export declare function resolveAssignValueFieldPath(itemModel: any): string | undefined;

package/es/flow/components/FlowRoute.d.ts

@@ -6,7 +6,16 @@
  * 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 FlowEngine } from '@nocobase/flow-engine';
 import React from 'react';
+import { type BaseLayoutModel } from '../admin-shell/BaseLayoutModel';
+export type LegacyPageBehavior = 'redirect' | 'notFound' | 'bridge';
+export type FlowRouteProps = {
+    pageUid?: string;
+    active?: boolean;
+    getLayoutModel?: (flowEngine: FlowEngine) => BaseLayoutModel | undefined;
+    legacyPageBehavior?: LegacyPageBehavior;
+};
 /**
  * 管理后台动态页面路由组件。
  *
@@ -22,7 +31,7 @@ import React from 'react';
  * @throws {Error} 当缺少 `route.params.name` 时抛出异常
  */
 declare const FlowRoute: {
-    (): React.JSX.Element;
+    (props?: FlowRouteProps): React.JSX.Element;
     displayName: string;
 };
 export default FlowRoute;

package/es/flow/components/fieldAssignOptions.d.ts

@@ -15,9 +15,19 @@ export type FieldAssignCascaderOption = {
     loading?: boolean;
     children?: FieldAssignCascaderOption[];
 };
+type CollectionLike = {
+    getField?: (name: string) => unknown;
+    getFields?: () => unknown[];
+};
+export declare function buildFieldAssignCascaderOptionsFromCollection(collection: CollectionLike | null, t: (key: string) => string, options?: {
+    associationDepth?: number;
+    maxAssociationFieldDepth?: number;
+}): FieldAssignCascaderOption[];
 export declare function collectFieldAssignCascaderOptions(options: {
     formBlockModel: any;
     t: (key: string) => string;
     /** 子表单模型递归深度（FormItemModel 层级）；默认不限制（只受实际配置与循环引用约束） */
     maxFormItemDepth?: number;
+    maxAssociationFieldDepth?: number;
 }): FieldAssignCascaderOption[];
+export {};

package/es/flow/components/filter/LinkageFilterItem.d.ts

@@ -20,6 +20,7 @@ export interface LinkageFilterItemProps {
     model: FlowModel;
     /** 向变量树额外注入节点（置于根部） */
     extraMetaTree?: MetaTreeNode[];
+    maxAssociationFieldDepth?: number;
 }
 type OperatorMeta = {
     value: string;

package/es/flow/components/filter/VariableFilterItem.d.ts

@@ -30,6 +30,7 @@ export interface VariableFilterItemProps {
      */
     rightMetaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
     ignoreFieldNames?: string[];
+    maxAssociationFieldDepth?: number;
 }
 /**
  * 上下文筛选项组件

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

@@ -14,3 +14,5 @@ export { VariableFilterItem } from './VariableFilterItem';
 export type { VariableFilterItemProps, VariableFilterItemValue } from './VariableFilterItem';
 export { LinkageFilterItem } from './LinkageFilterItem';
 export type { LinkageFilterItemProps, LinkageFilterItemValue } from './LinkageFilterItem';
+export { useFilterOptions } from './useFilterOptions';
+export type { FilterOption, UseFilterOptionsArgs } from './useFilterOptions';

package/es/flow/components/filter/metaTreeAssociationDepth.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { MetaTreeNode } from '@nocobase/flow-engine';
+export declare function limitAssociationMetaTree(nodes: MetaTreeNode[] | undefined, options?: {
+    associationDepth?: number;
+    maxAssociationDepth?: number;
+}): MetaTreeNode[];

package/es/flow/components/filter/useFilterOptions.d.ts

@@ -0,0 +1,66 @@
+/**
+ * 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 { Collection } from '@nocobase/flow-engine';
+/**
+ * One operator entry on a `FilterOption`. Mirrors v1's interface-defined operator shape so the v2 filter value renderer can pick up the same per-operator value-side schema (e.g. datetime operators wanting the smart date picker, array/enum operators wanting a tag-mode Select).
+ */
+export type FilterOperator = {
+    value: string;
+    label: string;
+    /**
+     * Per-operator override for the value-side renderer. Wins over the field's own `uiSchema` when set. The `x-component` string is looked up against the v2 filter component registry.
+     */
+    schema?: {
+        'x-component'?: string;
+        'x-component-props'?: Record<string, any>;
+    } & Record<string, any>;
+    /** Operator takes no right-hand value (e.g. `$empty`, `$notEmpty`). */
+    noValue?: boolean;
+    [key: string]: any;
+};
+/** Single field-tree node returned by `useFilterOptions`. */
+export type FilterOption = {
+    name: string;
+    type?: string;
+    target?: string;
+    title: string;
+    schema?: Record<string, any>;
+    operators?: FilterOperator[];
+    children?: FilterOption[];
+};
+export interface UseFilterOptionsArgs {
+    /**
+     * **Preferred way to restrict fields**, alongside `nonfilterableFieldNames`.
+     *
+     * Whitelist of root-level field names to expose. Empty/undefined means "all filterable fields". The whitelist applies only at depth 1 — nested fields under an allowed association field are always included, matching the legacy v1 `Filter.Action` behaviour.
+     */
+    filterableFieldNames?: string[];
+    /**
+     * **Preferred way to restrict fields**, alongside `filterableFieldNames`.
+     *
+     * Blacklist of root-level field names to drop. Mirrors v1's `nonfilterable: [...]` schema prop on `Filter.Action`. Applies at depth 1 only, same as the whitelist. When both `filterableFieldNames` and `nonfilterableFieldNames` are provided, both apply: the final field set is `(whitelist or all) minus blacklist`.
+     */
+    nonfilterableFieldNames?: string[];
+    /**
+     * Bypass the `filterableFieldNames` whitelist (mirrors v1 `noIgnore`).
+     *
+     * Legacy escape hatch from v1 schemas — prefer adjusting `filterableFieldNames` / `nonfilterableFieldNames` instead. Kept only for parity with existing v1 schemas that already set `noIgnore`.
+     */
+    noIgnore?: boolean;
+    /** Translator used for field/operator labels. Defaults to identity. */
+    t?: (key: string) => string;
+}
+/**
+ * v2 equivalent of v1's `useFilterOptions`/`useFilterFieldOptions`. Walks a `Collection`'s fields and returns the nested option tree consumed by antd `Cascader` in `CollectionFilterItem` (and any other v2 filter surface that wants the same field picker).
+ *
+ * Mirrors v1 in two ways that matter:
+ * - association fields (belongsTo / hasMany / m2m / etc.) are kept and recursed into via `fieldsToOptions`'s `nested` branch — so picking `user.username` is a first-class action, just like the legacy cascader.
+ * - the whitelist applies at depth 1 only, so capping the root field list (e.g. to `['lockedTs', 'unlockTs', 'user']`) doesn't accidentally hide the nested `user.username` / `user.nickname` leaves.
+ */
+export declare function useFilterOptions(collection: Collection | undefined, args?: UseFilterOptionsArgs): FilterOption[];

package/es/flow/index.d.ts

@@ -23,7 +23,11 @@ export * from './utils';
 export * from './actions';
 export * from './system-settings';
 export * from './admin-shell/admin-layout';
+export * from './admin-shell/BaseLayoutModel';
+export * from './admin-shell/BaseLayoutRouteCoordinator';
 export * from './admin-shell/AdminLayoutRouteCoordinator';
+export * from './admin-shell/useLayoutRoutePage';
+export * from './admin-shell/useAdminLayoutRoutePage';
 export * from '../settings-center';
 export { openViewFlow } from './flows/openViewFlow';
 export { editMarkdownFlow } from './flows/editMarkdownFlow';

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

@@ -9,41 +9,10 @@
 import { FlowModel, FlowModelContext } from '@nocobase/flow-engine';
 export declare class AssociationFieldGroupModel extends FlowModel {
     static itemModelName: string;
+    static maxAssociationFieldDepth: number;
     static defineChildren(ctx: FlowModelContext): {
         key: string;
         label: string;
-        children: () => ({
-            key: string;
-            label: string;
-            type: string;
-            children: {
-                key: string;
-                label: string;
-                useModel: string;
-                toggleable: (subModel: any) => boolean;
-                createModelOptions: {
-                    stepParams: {
-                        fieldSettings: {
-                            init: {
-                                dataSourceKey: any;
-                                collectionName: any;
-                                fieldPath: string;
-                                associationPathName: any;
-                            };
-                        };
-                    };
-                    subModels: {
-                        field: {
-                            use: string;
-                        };
-                    };
-                };
-            }[];
-        } | {
-            key: string;
-            label: string;
-            type: string;
-            children: any[];
-        })[];
+        children: () => any;
     }[];
 }

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

@@ -32,9 +32,11 @@ export declare class PageModel extends FlowModel<PageModelStructure> {
     private getEnableTabs;
     private getActiveTabKey;
     private scheduleActiveLifecycleRefresh;
+    activateCurrentTab(forceRefresh?: boolean): void;
+    deactivateCurrentTab(): void;
     onMount(): void;
     protected onUnmount(): void;
-    invokeTabModelLifecycleMethod(tabActiveKey: string, method: 'onActive' | 'onInactive', forceRefresh?: boolean): void;
+    invokeTabModelLifecycleMethod(tabActiveKey: string | undefined, method: 'onActive' | 'onInactive', forceRefresh?: boolean): void;
     /**
      * Resolve configured document title template and update browser tab title.
      * Priority:

package/es/flow/models/blocks/assign-form/assignFieldValuesFlow.d.ts

@@ -0,0 +1,92 @@
+/**
+ * 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 FlowModelContext } from '@nocobase/flow-engine';
+import React from 'react';
+import { AssignFormModel } from './AssignFormModel';
+export declare const ASSIGN_FIELD_VALUES_STEP_KEY = "assignFieldValues";
+type AssignedValues = Record<string, unknown>;
+type AssignFieldValuesCollection = {
+    dataSourceKey?: string;
+    name?: string;
+};
+type AssignFieldValuesContext = FlowModelContext & {
+    collection?: AssignFieldValuesCollection;
+    flowSettingsEnabled?: boolean;
+};
+type AssignFieldValuesModel = {
+    uid: string;
+    assignFormUid?: string;
+    context?: AssignFieldValuesContext;
+    subModels?: {
+        assignForm?: AssignFormModel;
+    };
+    getStepParams?: (flowKey: string, stepKey: string) => {
+        assignedValues?: AssignedValues;
+    } | undefined;
+    setStepParams?: (flowKey: string, stepKey: string, params: {
+        assignedValues: AssignedValues;
+    }) => void;
+};
+type AssignFieldValuesStepOptions = {
+    settingsFlowKey: string;
+    title?: string;
+    tipComponent?: React.ComponentType;
+    validateBeforeSave?: boolean;
+    clearRecordContext?: boolean;
+};
+export declare function createAssignFormSubModelOptions(ctx: AssignFieldValuesContext): {
+    async: boolean;
+    use: string;
+    stepParams: {
+        resourceSettings: {
+            init: {
+                dataSourceKey: string;
+                collectionName: string;
+            };
+        };
+    };
+};
+export declare function getAssignFieldValuesDefaultParams(ctx: {
+    model: Pick<AssignFieldValuesModel, 'getStepParams'>;
+}, settingsFlowKey: string): {
+    assignedValues: AssignedValues;
+};
+export declare function resolveAssignFieldValues(ctx: {
+    message?: {
+        error?: (message: string) => void;
+    };
+    t?: (message: string) => string;
+}, rawAssignedValues: unknown, logName?: string): Promise<AssignedValues | null>;
+export declare function mergeAssignFieldValues<T extends Record<string, unknown>>(values: T, assignedValues?: AssignedValues | null): T;
+export declare function createAssignFieldValuesStep(options: AssignFieldValuesStepOptions): {
+    title: string;
+    uiSchema(): {
+        tip: {
+            'x-decorator': string;
+            'x-component': React.ComponentType<{}>;
+        };
+        editor: {
+            'x-decorator': string;
+            'x-component': () => React.JSX.Element;
+        };
+    };
+    beforeParamsSave(ctx: {
+        model: AssignFieldValuesModel;
+        engine: {
+            getModel?: (uid: string, fromRoot?: boolean) => AssignFormModel | undefined;
+            findModelByParentId?: (parentId: string, subKey: string) => AssignFormModel | undefined | null;
+        };
+    }, params?: {
+        assignedValues?: AssignedValues;
+    }, previousParams?: {
+        assignedValues?: AssignedValues;
+    }): Promise<void>;
+    handler(): void;
+};
+export {};

package/es/flow/models/blocks/assign-form/index.d.ts

@@ -9,3 +9,4 @@
 export * from './AssignFormModel';
 export * from './AssignFormGridModel';
 export * from './AssignFormItemModel';
+export * from './assignFieldValuesFlow';

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

@@ -10,4 +10,5 @@ import { ActionGroupModel } from '../../base/ActionGroupModel';
 import { FormActionModel } from './FormActionModel';
 export declare class FormActionGroupModel extends ActionGroupModel {
     static baseClass: typeof FormActionModel;
+    static defineChildren(ctx: any): Promise<any[]>;
 }

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

@@ -6,12 +6,19 @@
  * 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 { DefaultStructure } from '@nocobase/flow-engine';
 import { ButtonProps } from 'antd';
 import { AxiosRequestConfig } from 'axios';
 import { ActionModel } from '../../base/ActionModelCore';
-export declare class FormActionModel extends ActionModel {
+import { AssignFormModel } from '../assign-form/AssignFormModel';
+export declare class FormActionModel<T extends DefaultStructure = DefaultStructure> extends ActionModel<T> {
 }
-export declare class FormSubmitActionModel extends FormActionModel {
+export declare class FormSubmitActionModel extends FormActionModel<{
+    subModels: {
+        assignForm: AssignFormModel;
+    };
+}> {
+    assignFormUid?: string;
     defaultProps: ButtonProps;
     /**
      * 简化设置保存请求配置的方式

package/es/flow/models/blocks/table/TableBlockModel.d.ts

@@ -61,8 +61,18 @@ export declare class TableBlockModel extends CollectionBlockModel<TableBlockMode
             cell: React.MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
         };
     };
+    isRowSelectionEnabled(): boolean;
+    isShowIndexEnabled(): boolean;
+    getRecordIndex(record: Record<string, unknown>, index: number): string | number;
+    getLeftAuxiliaryColumn(): {
+        key: string;
+        width: number;
+        align: "center";
+        render: (_value: unknown, record: Record<string, unknown>, index: number) => React.JSX.Element;
+    };
     renderCell: (checked: any, record: any, index: any, originNode: any) => any;
     renderConfigureActions(): React.JSX.Element;
+    shouldRenderAction(action: ActionModel, isConfigMode: boolean): boolean;
     pagination(): import("antd").PaginationProps;
     renderComponent(): React.JSX.Element;
 }

package/es/flow/models/blocks/table/TableColumnModel.d.ts

@@ -10,6 +10,8 @@ import { DisplayItemModel, FlowModelContext, ModelRenderMode } from '@nocobase/f
 import { TableColumnProps } from 'antd';
 import React from 'react';
 export declare function FieldDeletePlaceholder(props: any): React.JSX.Element;
+export declare const TABLE_COLUMN_MIN_WIDTH = 10;
+export declare function normalizeTableColumnWidth(width: number | null | undefined): number;
 export declare const CustomWidth: ({ setOpen, t, handleChange, defaultValue }: {
     setOpen: any;
     t: any;

package/es/flow/models/fields/AssociationFieldModel/SubTableFieldModel/index.d.ts

@@ -8,7 +8,7 @@ export declare class SubTableFieldModel extends AssociationFieldModel {
     updateAssociation: boolean;
     setCurrentPage: any;
     currentPageSize: any;
-    getCurrentValue: () => any[];
+    getCurrentValue(): any[];
     get collection(): any;
     getColumns(): any;
     render(): React.JSX.Element;

package/es/flow-compat/passwordUtils.d.ts

@@ -6,4 +6,4 @@
  * 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 const getStrength: (val: any) => 60 | 0 | 20 | 100 | 80 | 40;
+export declare const getStrength: (val: any) => 60 | 0 | 100 | 80 | 40 | 20;

package/es/index.d.ts

@@ -24,12 +24,18 @@ export * from './WebSocketClient';
 export * from './RouterManager';
 export * from './PluginManager';
 export * from './PluginSettingsManager';
+export * from './layout-manager';
 export * from './hooks';
 export { default as languageCodes } from './locale/languageCodes';
 export * from './nocobase-buildin-plugin';
 export * from './collection-field-interface/CollectionFieldInterface';
 export * from './collection-field-interface/CollectionFieldInterfaceManager';
+export * from './collection-manager/field-configure';
+export * from './collection-manager/field-validation';
+export * from './collection-manager/filter-operators';
 export * from './collection-manager/interfaces';
+export * from './collection-manager/template-fields';
+export * from './data-source';
 export * from './flow';
 export { DEFAULT_DATA_SOURCE_KEY, isTitleField, isTitleFieldInterface } from './flow-compat';
 export { default as AntdAppProvider } from './theme/AntdAppProvider';