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

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/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/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/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 {};