@nocobase/client-v2 2.1.0-beta.38 → 2.1.0-beta.40

package/es/collection-manager/interfaces/phone.d.ts

@@ -35,15 +35,6 @@ export declare class PhoneFieldInterface extends CollectionFieldInterface {
             'x-decorator': string;
             'x-component': string;
             'x-disabled': string;
-            'x-reactions': {
-                dependencies: string[];
-                when: string;
-                fulfill: {
-                    state: {
-                        value: boolean;
-                    };
-                };
-            }[];
         };
         'uiSchema.title': {
             type: string;
@@ -64,22 +55,7 @@ export declare class PhoneFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
 }

package/es/collection-manager/interfaces/properties/index.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { ISchema } from '@formily/react';
-export * as operators from './operators';
 export declare const type: ISchema;
 export declare const unique: {
     type: string;
@@ -15,15 +14,6 @@ export declare const unique: {
     'x-decorator': string;
     'x-component': string;
     'x-disabled': string;
-    'x-reactions': {
-        dependencies: string[];
-        when: string;
-        fulfill: {
-            state: {
-                value: boolean;
-            };
-        };
-    }[];
 };
 export declare const primaryKey: {
     type: string;
@@ -31,15 +21,6 @@ export declare const primaryKey: {
     'x-decorator': string;
     'x-component': string;
     'x-disabled': string;
-    'x-reactions': {
-        dependencies: string[];
-        when: string;
-        fulfill: {
-            state: {
-                value: boolean;
-            };
-        };
-    }[];
 };
 export declare const autoIncrement: {
     type: string;
@@ -48,15 +29,6 @@ export declare const autoIncrement: {
     'x-decorator': string;
     'x-component': string;
     'x-disabled': string;
-    'x-reactions': {
-        dependencies: string[];
-        when: string;
-        fulfill: {
-            state: {
-                value: boolean;
-            };
-        };
-    }[];
 };
 export declare const autoFill: {
     type: string;

package/es/collection-manager/interfaces/radioGroup.d.ts

@@ -100,35 +100,7 @@ export declare class RadioGroupFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    mode: any;
-                };
-            };
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    mode: string;
-                };
-            };
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-            schema?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
 }

package/es/collection-manager/interfaces/richText.d.ts

@@ -6,7 +6,6 @@
  * 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 { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 export declare class RichTextFieldInterface extends CollectionFieldInterface {
     name: string;
@@ -43,68 +42,7 @@ export declare class RichTextFieldInterface extends CollectionFieldInterface {
             description: string;
         };
     };
-    schemaInitialize(schema: ISchema, { block }: {
-        block: any;
-    }): void;
-    validateSchema: (fieldSchema: any) => {
-        max: {
-            type: string;
-            title: string;
-            minimum: number;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                precision: number;
-            };
-            'x-reactions': string;
-        };
-        min: {
-            type: string;
-            title: string;
-            minimum: number;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                precision: number;
-            };
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        selfErrors: string;
-                    };
-                };
-            };
-        };
-    };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            schema: {
-                type: string;
-                'x-component': string;
-            };
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                type: string;
-                'x-component': string;
-            };
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            schema: {
-                type: string;
-                'x-component': string;
-            };
-            selected?: undefined;
-        })[];
+        operators: string;
     };
 }

package/es/collection-manager/interfaces/select.d.ts

@@ -6,7 +6,6 @@
  * 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 { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 export declare class SelectFieldInterface extends CollectionFieldInterface {
     name: string;
@@ -26,19 +25,19 @@ export declare class SelectFieldInterface extends CollectionFieldInterface {
     availableTypes: string[];
     hasDefaultValue: boolean;
     properties: {
-        'uiSchema.enum': import("@formily/react").Stringify<{
+        'uiSchema.enum': import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
             [key: `x-${string}`]: any;
             [key: `x-${number}`]: any;
             version?: string;
-            name?: import("@formily/react").SchemaKey;
+            name?: import("@formily/json-schema").SchemaKey;
             title?: any;
             description?: any;
             default?: any;
             readOnly?: boolean;
             writeOnly?: boolean;
-            type?: import("@formily/react").SchemaTypes;
-            enum?: import("@formily/react").SchemaEnum<any>;
+            type?: import("@formily/json-schema").SchemaTypes;
+            enum?: import("@formily/json-schema").SchemaEnum<any>;
             const?: any;
             multipleOf?: number;
             maximum?: number;
@@ -57,12 +56,12 @@ export declare class SelectFieldInterface extends CollectionFieldInterface {
             format?: string;
             $ref?: string;
             $namespace?: string;
-            definitions?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            properties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            items?: import("@formily/react").SchemaItems<any, any, any, any, any, any, any, any>;
-            additionalItems?: import("@formily/react").Stringify<any>;
-            patternProperties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            additionalProperties?: import("@formily/react").Stringify<any>;
+            definitions?: import("@formily/json-schema").SchemaProperties<any, any, any, any, any, any, any, any>;
+            properties?: import("@formily/json-schema").SchemaProperties<any, any, any, any, any, any, any, any>;
+            items?: import("@formily/json-schema").SchemaItems<any, any, any, any, any, any, any, any>;
+            additionalItems?: import("@formily/json-schema").Stringify<any>;
+            patternProperties?: import("@formily/json-schema").SchemaProperties<any, any, any, any, any, any, any, any>;
+            additionalProperties?: import("@formily/json-schema").Stringify<any>;
             "x-value"?: any;
             "x-index"?: number;
             "x-pattern"?: any;
@@ -72,7 +71,7 @@ export declare class SelectFieldInterface extends CollectionFieldInterface {
             "x-decorator-props"?: any;
             "x-component"?: any;
             "x-component-props"?: any;
-            "x-reactions"?: import("@formily/react").SchemaReactions<any>;
+            "x-reactions"?: import("@formily/json-schema").SchemaReactions<any>;
             "x-content"?: any;
             "x-data"?: any;
             "x-visible"?: boolean;
@@ -102,38 +101,7 @@ export declare class SelectFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    mode: any;
-                };
-            };
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    mode: string;
-                };
-            };
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-            schema?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
-    schemaInitialize(schema: ISchema, { block }: {
-        block: any;
-    }): void;
 }

package/es/collection-manager/interfaces/snowflake-id.d.ts

@@ -48,15 +48,6 @@ export declare class SnowflakeIdFieldInterface extends CollectionFieldInterface
                     'x-decorator': string;
                     'x-component': string;
                     'x-disabled': string;
-                    'x-reactions': {
-                        dependencies: string[];
-                        when: string;
-                        fulfill: {
-                            state: {
-                                value: boolean;
-                            };
-                        };
-                    }[];
                 };
                 unique: {
                     type: string;
@@ -64,15 +55,6 @@ export declare class SnowflakeIdFieldInterface extends CollectionFieldInterface
                     'x-decorator': string;
                     'x-component': string;
                     'x-disabled': string;
-                    'x-reactions': {
-                        dependencies: string[];
-                        when: string;
-                        fulfill: {
-                            state: {
-                                value: boolean;
-                            };
-                        };
-                    }[];
                 };
             };
         };
@@ -95,22 +77,7 @@ export declare class SnowflakeIdFieldInterface extends CollectionFieldInterface
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-        })[];
+        operators: string;
     };
     description: string;
     titleUsable: boolean;

package/es/collection-manager/interfaces/tableoid.d.ts

@@ -45,15 +45,6 @@ export declare class TableoidFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    mode: string;
-                };
-            };
-        }[];
+        operators: string;
     };
 }

package/es/collection-manager/interfaces/textarea.d.ts

@@ -6,7 +6,6 @@
  * 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 { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 export declare class TextareaFieldInterface extends CollectionFieldInterface {
     name: string;
@@ -52,56 +51,7 @@ export declare class TextareaFieldInterface extends CollectionFieldInterface {
             description: string;
         };
     };
-    schemaInitialize(schema: ISchema, { block }: {
-        block: any;
-    }): void;
-    validateSchema: (fieldSchema: any) => {
-        max: {
-            type: string;
-            title: string;
-            minimum: number;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                precision: number;
-            };
-            'x-reactions': string;
-        };
-        min: {
-            type: string;
-            title: string;
-            minimum: number;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                precision: number;
-            };
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        selfErrors: string;
-                    };
-                };
-            };
-        };
-    };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-        })[];
+        operators: string;
     };
 }

package/es/collection-manager/interfaces/time.d.ts

@@ -43,22 +43,7 @@ export declare class TimeFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
 }

package/es/collection-manager/interfaces/types.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { ISchema } from '@formily/react';
+import type { FieldFilterable, FieldFilterOperator } from '../filter-operators';
 interface IDefault {
     type: string;
     uiSchema?: ISchema;
@@ -16,22 +17,12 @@ export interface IField extends ISchema {
     group?: string;
     order?: number;
     default?: IDefault;
-    operators?: any[];
+    operators?: FieldFilterOperator[];
     /**
      * - 如果该值为空，则在 Filter 组件中该字段会被过滤掉
      * - 如果该值为空，则不会在变量列表中看到该字段
      */
-    filterable?: {
-        /**
-         * 字段所支持的操作符，会在 Filter 组件中显示，比如设置 `数据范围` 的时候可以看见
-         */
-        operators?: any[];
-        /**
-         * 为当前字段添加子选项，这个子选项会在 Filter 组件中显示，比如设置 `数据范围` 的时候可以看见
-         */
-        children?: any[];
-        [key: string]: any;
-    };
+    filterable?: FieldFilterable;
     titleUsable?: boolean;
     [key: string]: any;
 }

package/es/collection-manager/interfaces/unixTimestamp.d.ts

@@ -75,50 +75,7 @@ export declare class UnixTimestampFieldInterface extends CollectionFieldInterfac
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            onlyFilterAction: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            onlyFilterAction: boolean;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            selected?: undefined;
-            onlyFilterAction?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-            schema?: undefined;
-            onlyFilterAction?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
 }

package/es/collection-manager/interfaces/updatedAt.d.ts

@@ -47,50 +47,7 @@ export declare class UpdatedAtFieldInterface extends CollectionFieldInterface {
         };
     };
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            onlyFilterAction: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            onlyFilterAction: boolean;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            schema: {
-                'x-component': string;
-                'x-component-props': {
-                    isRange: boolean;
-                };
-            };
-            selected?: undefined;
-            onlyFilterAction?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-            schema?: undefined;
-            onlyFilterAction?: undefined;
-        })[];
+        operators: string;
     };
     titleUsable: boolean;
 }

package/es/collection-manager/interfaces/updatedBy.d.ts

@@ -6,7 +6,6 @@
  * 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 { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 export declare class UpdatedByFieldInterface extends CollectionFieldInterface {
     name: string;
@@ -56,8 +55,5 @@ export declare class UpdatedByFieldInterface extends CollectionFieldInterface {
         nested: boolean;
         children: any[];
     };
-    schemaInitialize(schema: ISchema, { block }: {
-        block: any;
-    }): void;
     description: string;
 }

package/es/collection-manager/interfaces/url.d.ts

@@ -6,7 +6,6 @@
  * 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 { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 export declare class UrlFieldInterface extends CollectionFieldInterface {
     name: string;
@@ -26,9 +25,6 @@ export declare class UrlFieldInterface extends CollectionFieldInterface {
         value: string;
     }[];
     availableTypes: string[];
-    schemaInitialize(schema: ISchema, { block }: {
-        block: any;
-    }): void;
     validationType: string;
     availableValidationOptions: string[];
     properties: {
@@ -52,21 +48,6 @@ export declare class UrlFieldInterface extends CollectionFieldInterface {
     };
     titleUsable: boolean;
     filterable: {
-        operators: ({
-            label: string;
-            value: string;
-            selected: boolean;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            selected?: undefined;
-            noValue?: undefined;
-        } | {
-            label: string;
-            value: string;
-            noValue: boolean;
-            selected?: undefined;
-        })[];
+        operators: string;
     };
 }