@nocobase/client-v2 2.1.0-alpha.45 → 2.1.0-alpha.47

package/es/authRedirect.d.ts

@@ -17,6 +17,18 @@ type LocationLike = {
     search?: string;
     hash?: string;
 };
+/**
+ * The runtime URL segment under which the modern (v2) client is served.
+ * Injected by the server as `window.__nocobase_modern_client_prefix__`. Falls
+ * back to the trailing segment of `window.__nocobase_public_path__`, then to
+ * the default `v`. Returns a bare segment (no slashes).
+ */
+export declare function getModernClientPrefix(): string;
+/**
+ * Strip the trailing modern-client prefix segment from a public path,
+ * recovering the app root public path (e.g. `/nocobase/v/` -> `/nocobase/`).
+ */
+export declare function stripModernClientPrefix(publicPath?: string): string;
 export declare function getV2EffectiveBasePath(app: AppLike): string;
 declare function getDefaultV2AdminRedirectPath(app: AppLike): string;
 /**

package/es/collection-manager/filter-operators/index.d.ts

@@ -16,6 +16,7 @@ export type FieldFilterOperatorList<TMeta = unknown> = FieldFilterOperator<TMeta
 export type FieldFilterable<TMeta = unknown> = {
     operators?: FieldFilterOperatorList<TMeta>;
     operatorGroup?: string;
+    operatorOverrides?: FieldFilterOperator<TMeta>[];
     children?: unknown[];
     nested?: boolean;
     [key: string]: unknown;

package/es/components/form/TypedVariableInput.d.ts

@@ -0,0 +1,75 @@
+/**
+ * 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';
+import React from 'react';
+import { type VariableDelimiters } from './VariableInput';
+/**
+ * Constant types this input can edit. Subset of v1 `Variable.Input`
+ * `useTypedConstant` — drops `'object'` (no v2 JSON editor yet) and `'null'`
+ * (handled by the dedicated `nullable` prop).
+ */
+export type TypedConstantType = 'string' | 'number' | 'boolean' | 'date';
+/**
+ * One allowed constant type. Either a bare type name (`'number'`) or a
+ * `[type, editorProps]` pair (`['number', { min: 1, max: 65535 }]`) where
+ * `editorProps` is forwarded to the antd editor for that type — same
+ * shape as v1 `useTypedConstant`.
+ */
+export type TypedConstantSpec = TypedConstantType | [TypedConstantType, Record<string, unknown>];
+export interface TypedVariableInputProps {
+    /**
+     * Stored value. A `{{ ... }}` string is treated as a variable reference;
+     * anything else is a constant of the inferred type.
+     */
+    value?: unknown;
+    onChange?: (next: unknown) => void;
+    /**
+     * Allowed constant types. The `Constant` switcher entry always exposes a
+     * typed submenu (matching v1 `Variable.Input`) so users can see what type
+     * the constant is, even when only one type is permitted. Default: all four
+     * supported types.
+     */
+    types?: TypedConstantSpec[];
+    /**
+     * Restrict the variable picker to specific top-level meta-tree namespaces
+     * (e.g. `['$env']`). When omitted, every registered top-level property is
+     * exposed — matching `VariableInput`'s default behaviour.
+     */
+    namespaces?: string[];
+    /** Additional leaves appended to the picker after the namespace-filtered nodes. */
+    extraNodes?: MetaTreeNode[];
+    /**
+     * When true (default), the switcher exposes a `Null` option that resets the
+     * value to `null`. When false, the value is constrained to one of the
+     * allowed types or a variable reference.
+     */
+    nullable?: boolean;
+    /** Variable-token delimiters. Default `['{{', '}}']` — see `VariableInput`. */
+    delimiters?: VariableDelimiters;
+    disabled?: boolean;
+    placeholder?: string;
+    style?: React.CSSProperties;
+    className?: string;
+}
+/**
+ * Constant-or-variable input. Port of v1 `Variable.Input` typed-constant
+ * Cascader pattern (the `[Null | Constant<type> | Variable<…namespaces>]`
+ * switcher). Use this when a field can accept either a typed literal
+ * (number, boolean, date, string) or a variable reference like
+ * `{{ $env.SMTP_PORT }}` — see `plugin-notification-email`'s port / secure
+ * fields for the canonical example.
+ *
+ * Pure literal fields should keep using the antd primitive
+ * (`InputNumber`, `Select`, `DatePicker`). Pure variable fields should keep
+ * using `EnvVariableInput` / `VariableInput`. This component carries the
+ * Cascader switcher overhead, so reach for it only when the field
+ * genuinely accepts both shapes.
+ */
+export declare function TypedVariableInput(props: TypedVariableInputProps): React.JSX.Element;
+export default TypedVariableInput;

package/es/components/form/filter/CollectionFilterItem.d.ts

@@ -33,6 +33,10 @@ export interface CollectionFilterItemProps {
     noIgnore?: boolean;
     /** Translator; defaults to identity so callers can omit it. */
     t?: (key: string) => string;
+    /** Optional v2 app registry used to resolve plugin-provided operator components. */
+    app?: {
+        getComponent?: (name: string) => React.ComponentType<any> | undefined;
+    };
 }
 /**
  * Filter row bound directly to a `Collection`, with no `FlowModel` dependency. Use this from settings pages or other surfaces that need a filter UI but don't have (and shouldn't synthesise) a block model just to satisfy `FilterItem`. Pair with `FilterContainer` via either an inline wrapper or `createCollectionFilterItem(collection)`.
@@ -43,7 +47,7 @@ export declare const CollectionFilterItem: FC<CollectionFilterItemProps>;
 /**
  * Convenience factory returning a `FilterContainer`-compatible `FilterItem` component bound to a specific collection. Avoids creating an inline closure on every parent render, which would otherwise reset any focused inner antd control.
  */
-export declare function createCollectionFilterItem(collection: Collection, bound?: Pick<CollectionFilterItemProps, 'filterableFieldNames' | 'nonfilterableFieldNames' | 'noIgnore' | 't'>): React.FC<{
+export declare function createCollectionFilterItem(collection: Collection, bound?: Pick<CollectionFilterItemProps, 'filterableFieldNames' | 'nonfilterableFieldNames' | 'noIgnore' | 't' | 'app'>): React.FC<{
     value: CollectionFilterItemValue;
 }>;
 export default CollectionFilterItem;

package/es/components/form/filter/FilterValueInput.d.ts

@@ -8,6 +8,9 @@
  */
 import React from 'react';
 import type { FilterOperator, FilterOption } from '../../../flow/components/filter/useFilterOptions';
+type ComponentRegistryApp = {
+    getComponent?: (name: string) => React.ComponentType<any> | undefined;
+};
 export interface FilterValueInputProps {
     /** The currently selected leaf field option from the field picker. */
     field?: FilterOption;
@@ -21,6 +24,8 @@ export interface FilterValueInputProps {
     t?: (key: string) => string;
     /** Optional placeholder for the fallback `Input`. */
     placeholder?: string;
+    /** Optional v2 app registry used to resolve plugin-provided operator components. */
+    app?: ComponentRegistryApp;
 }
 /**
  * Interface-aware value renderer for filter rows. Returns `null` for `noValue` operators (`$empty`, `$notEmpty`). Otherwise dispatches the effective `x-component` (operator schema > field uiSchema > Input) to a small registry of antd controls.

package/es/components/form/index.d.ts

@@ -15,4 +15,5 @@ export * from './FileSizeInput';
 export * from './JsonTextArea';
 export * from './PasswordInput';
 export * from './RemoteSelect';
+export * from './TypedVariableInput';
 export * from './VariableInput';

package/es/flow/admin-shell/admin-layout/AdminLayoutMenuModels.d.ts

@@ -45,6 +45,7 @@ export declare class AdminLayoutMenuItemModel extends FlowModel<AdminLayoutMenuI
      * @returns {boolean} 是否需要走 FlowModel 默认保存链路
      */
     hasPersistableInstanceFlows(): boolean;
+    serialize(): ReturnType<FlowModel['serialize']>;
     setHidden(value: boolean): void;
     protected renderHiddenInConfig(): React.ReactNode | undefined;
     createMenuRoute(route: NocoBaseDesktopRoute, options?: {

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

@@ -13,5 +13,6 @@ export declare const ConditionBuilder: React.MemoExoticComponent<import("@formil
     value: FilterGroupType;
     onChange: (value: FilterGroupType) => void;
     extraMetaTree?: MetaTreeNode[];
+    maxAssociationFieldDepth?: number;
 }>>;
 export declare const commonConditionHandler: (ctx: any, params: any) => void;

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/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/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/internal/utils/operatorSchemaHelper.d.ts

@@ -6,10 +6,33 @@
  * 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 React, { type ComponentType, type CSSProperties } from 'react';
+type OperatorMeta = {
+    value?: string;
+    schema?: {
+        'x-component'?: string;
+        'x-component-props'?: Record<string, unknown>;
+    };
+};
+type ComponentRegistry = {
+    getComponent?: (name: string) => ComponentType<Record<string, unknown>> | undefined;
+};
+type OperatorComponentRenderOptions = {
+    app?: ComponentRegistry;
+    fieldModel: unknown;
+    operator: string;
+    operators?: OperatorMeta[];
+    propsPriority?: 'field' | 'operator';
+    style?: CSSProperties;
+};
+export declare function pickOperatorStyle(value: unknown): CSSProperties | undefined;
 /**
  * 根据操作符的 schema 定位组件及其 props。
  */
-export declare function resolveOperatorComponent(app: any, operator: string, operators?: Array<any>): {
-    Comp: any;
-    props: Record<string, any>;
+export declare function resolveOperatorComponent(app: ComponentRegistry | undefined, operator: string, operators?: OperatorMeta[]): {
+    Comp: React.ComponentType<Record<string, unknown>>;
+    props: Record<string, unknown>;
 };
+export declare function restoreOperatorComponentRender(fieldModel?: unknown): boolean;
+export declare function applyOperatorComponentRender({ app, fieldModel, operator, operators, propsPriority, style, }: OperatorComponentRenderOptions): boolean;
+export {};

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/blocks/assign-form/assignFieldValuesFlow.d.ts

@@ -23,6 +23,9 @@ type AssignFieldValuesModel = {
     uid: string;
     assignFormUid?: string;
     context?: AssignFieldValuesContext;
+    subModels?: {
+        assignForm?: AssignFormModel;
+    };
     getStepParams?: (flowKey: string, stepKey: string) => {
         assignedValues?: AssignedValues;
     } | undefined;
@@ -77,7 +80,12 @@ export declare function createAssignFieldValuesStep(options: AssignFieldValuesSt
         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;
 };

package/es/flow/models/blocks/filter-manager/utils.d.ts

@@ -7,8 +7,29 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { FlowModel } from '@nocobase/flow-engine';
+import { type FieldFilterable, type FieldFilterOperator } from '../../../../collection-manager/filter-operators';
 import { BlockGridModel } from '../../base';
-export declare function getDefaultOperator(model: any): any;
+type FilterFormFieldMeta = {
+    filterable?: FieldFilterable<unknown> | false;
+    interface?: string;
+    type?: string;
+};
+type FilterFormOperatorModel = FlowModel & {
+    operator?: string;
+    collectionField?: FilterFormFieldMeta;
+    filterField?: FilterFormFieldMeta;
+    subModels?: {
+        field?: {
+            operator?: string;
+        };
+    };
+    getStepParams?: (flowKey: string, stepKey: string) => {
+        value?: string;
+    } | undefined;
+};
+export declare function getFilterFormOperatorList(model: FlowModel): FieldFilterOperator<unknown>[];
+export declare function getFilterFormOperatorMeta(model: FlowModel, operator?: any): FieldFilterOperator<unknown>;
+export declare function getDefaultOperator(model: FilterFormOperatorModel): any;
 /**
  * 判断筛选值是否为空
  *
@@ -19,3 +40,4 @@ export declare function getDefaultOperator(model: any): any;
  */
 export declare function isFilterValueEmpty(value: any): boolean;
 export declare function getAllDataModels(gridModel: BlockGridModel): FlowModel[];
+export {};

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;