@nocobase/client 1.2.24-alpha → 1.2.26-alpha

package/es/data-source/data-block/DataBlockProvider.d.ts

@@ -8,6 +8,7 @@
  */
 import React, { FC, ReactNode } from 'react';
 import { UseRequestOptions, UseRequestService } from '../../api-client';
+import { FilterParam } from '../../filter-provider/FilterProvider';
 import { Designable } from '../../schema-component';
 import { CollectionOptions } from '../collection';
 import { CollectionRecord } from '../collection-record';
@@ -21,6 +22,7 @@ export interface AllDataBlockProps {
     action?: 'list' | 'get';
     params?: {
         filterByTk?: string | number;
+        filter?: FilterParam;
         [index: string]: any;
     };
     parentRecord?: CollectionRecord;
@@ -77,9 +79,7 @@ export declare const AssociationOrCollectionProvider: (props: {
     children: ReactNode;
     allowNull?: boolean;
 }) => React.JSX.Element;
-export declare const DataBlockProvider: FC<DataBlockProviderProps & {
-    children?: ReactNode;
-}>;
+export declare const DataBlockProvider: FC<Partial<AllDataBlockProps>>;
 export declare const useDataBlock: <T extends {}>() => DataBlockContextValue<T>;
 export declare const useDataBlockProps: <T extends {}>() => AllDataBlockProps & T;
 export {};

package/es/filter-provider/FilterProvider.d.ts

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-import { CollectionFieldOptions_deprecated, useCollection_deprecated } from '../collection-manager';
+import { CollectionFieldOptions_deprecated } from '../collection-manager';
+import { Collection } from '../data-source/collection/Collection';
 declare enum FILTER_OPERATOR {
     AND = "$and",
     OR = "$or"
@@ -25,7 +26,6 @@ export interface ForeignKeyField {
     reverseKey: null | string;
     [key: string]: any;
 }
-type Collection = ReturnType<typeof useCollection_deprecated>;
 export interface DataBlock {
     /** 唯一标识符，schema 中的 name 值 */
     uid: string;
@@ -69,7 +69,7 @@ export declare const FilterBlockProvider: React.FC;
 export declare const DataBlockCollector: ({ children, params, }: {
     children: React.ReactNode;
     params?: {
-        filter: FilterParam;
+        filter?: FilterParam;
     };
 }) => React.JSX.Element;
 /**

package/es/filter-provider/utils.d.ts

@@ -8,7 +8,8 @@
  */
 import { Schema } from '@formily/react';
 import { FilterTarget } from '../block-provider/hooks';
-import { CollectionFieldOptions_deprecated, Collection_deprecated, FieldOptions, useCollection_deprecated } from '../collection-manager';
+import { CollectionFieldOptions_deprecated, FieldOptions } from '../collection-manager';
+import { Collection } from '../data-source/collection/Collection';
 import { DataBlock } from './FilterProvider';
 export declare enum FilterBlockType {
     FORM = 0,
@@ -18,7 +19,7 @@ export declare enum FilterBlockType {
 }
 export declare const mergeFilter: (filters: any[], op?: string) => any;
 export declare const getSupportFieldsByAssociation: (inheritCollectionsChain: string[], block: DataBlock) => CollectionFieldOptions_deprecated[];
-export declare const getSupportFieldsByForeignKey: (filterBlockCollection: ReturnType<typeof useCollection_deprecated>, block: DataBlock) => import("./FilterProvider").ForeignKeyField[];
+export declare const getSupportFieldsByForeignKey: (filterBlockCollection: Collection, block: DataBlock) => import("./FilterProvider").ForeignKeyField[];
 /**
  * 根据筛选区块类型筛选出支持的数据区块（同表或具有关系字段的表）
  * @param filterBlockType
@@ -32,9 +33,9 @@ export declare const transformToFilter: (values: Record<string, any>, operators:
         };
     }[];
 };
-export declare const useAssociatedFields: () => import("..").CollectionFieldOptions[];
+export declare const useAssociatedFields: () => import("../data-source/collection/Collection").CollectionFieldOptions[];
 export declare const isAssocField: (field?: FieldOptions) => boolean;
-export declare const isSameCollection: (c1: Collection_deprecated, c2: Collection_deprecated) => boolean;
+export declare const isSameCollection: (c1: Collection, c2: Collection) => boolean;
 export declare const useFilterAPI: () => {
     /** 当前区块是否已连接其它区块 */
     isConnected: boolean;