@tachybase/schema 1.1.16 → 1.1.19

package/lib/core/models/BaseField.d.ts

@@ -53,9 +53,9 @@ export declare class BaseField<Decorator = any, Component = any, TextType = any>
     setDescription: (description?: TextType) => void;
     setDisplay: (type?: FieldDisplayTypes) => void;
     setPattern: (type?: FieldPatternTypes) => void;
-    setComponent: <C extends unknown, ComponentProps extends object = {}>(component?: C, props?: ComponentProps) => void;
+    setComponent: <C extends JSXComponent, ComponentProps extends object = {}>(component?: C, props?: ComponentProps) => void;
     setComponentProps: <ComponentProps extends object = {}>(props?: ComponentProps) => void;
-    setDecorator: <D extends unknown, ComponentProps extends object = {}>(component?: D, props?: ComponentProps) => void;
+    setDecorator: <D extends JSXComponent, ComponentProps extends object = {}>(component?: D, props?: ComponentProps) => void;
     setDecoratorProps: <ComponentProps extends object = {}>(props?: ComponentProps) => void;
     setData: (data: any) => void;
     setContent: (content: any) => void;

package/lib/core/models/Form.d.ts

@@ -52,10 +52,10 @@ export declare class Form<ValueType extends object = any> {
     get readPretty(): boolean;
     set readPretty(readPretty: boolean);
     /** 创建字段 **/
-    createField: <Decorator extends unknown, Component extends unknown>(props: IFieldFactoryProps<Decorator, Component>) => Field<Decorator, Component>;
-    createArrayField: <Decorator extends unknown, Component extends unknown>(props: IFieldFactoryProps<Decorator, Component>) => ArrayField<Decorator, Component>;
-    createObjectField: <Decorator extends unknown, Component extends unknown>(props: IFieldFactoryProps<Decorator, Component>) => ObjectField<Decorator, Component>;
-    createVoidField: <Decorator extends unknown, Component extends unknown>(props: IVoidFieldFactoryProps<Decorator, Component>) => VoidField<Decorator, Component>;
+    createField: <Decorator extends JSXComponent, Component extends JSXComponent>(props: IFieldFactoryProps<Decorator, Component>) => Field<Decorator, Component>;
+    createArrayField: <Decorator extends JSXComponent, Component extends JSXComponent>(props: IFieldFactoryProps<Decorator, Component>) => ArrayField<Decorator, Component>;
+    createObjectField: <Decorator extends JSXComponent, Component extends JSXComponent>(props: IFieldFactoryProps<Decorator, Component>) => ObjectField<Decorator, Component>;
+    createVoidField: <Decorator extends JSXComponent, Component extends JSXComponent>(props: IVoidFieldFactoryProps<Decorator, Component>) => VoidField<Decorator, Component>;
     /** 状态操作模型 **/
     setValues: (values: any, strategy?: IFormMergeStrategy) => void;
     setInitialValues: (initialValues: any, strategy?: IFormMergeStrategy) => void;

package/lib/core/shared/checkers.d.ts

@@ -3,9 +3,9 @@ import { ArrayField, Field, Form, ObjectField, Query, VoidField } from '../model
 import { GeneralField, IFieldState, IFormState, IGeneralFieldState, IVoidFieldState } from '../types';
 export declare const isForm: (node: any) => node is Form;
 export declare const isGeneralField: (node: any) => node is GeneralField;
-export declare const isField: <Decorator extends unknown = any, Component extends unknown = any, TextType = any, ValueType = any>(node: any) => node is Field<Decorator, Component, TextType, ValueType>;
-export declare const isArrayField: <Decorator extends unknown = any, Component extends unknown = any>(node: any) => node is ArrayField<Decorator, Component>;
-export declare const isObjectField: <Decorator extends unknown = any, Component extends unknown = any>(node: any) => node is ObjectField<Decorator, Component>;
+export declare const isField: <Decorator extends JSXComponent = any, Component extends JSXComponent = any, TextType = any, ValueType = any>(node: any) => node is Field<Decorator, Component, TextType, ValueType>;
+export declare const isArrayField: <Decorator extends JSXComponent = any, Component extends JSXComponent = any>(node: any) => node is ArrayField<Decorator, Component>;
+export declare const isObjectField: <Decorator extends JSXComponent = any, Component extends JSXComponent = any>(node: any) => node is ObjectField<Decorator, Component>;
 export declare const isVoidField: <Decorator = any, Component = any, TextType = any>(node: any) => node is VoidField<Decorator, Component, TextType>;
 export declare const isFormState: <T extends Record<any, any> = any>(state: any) => state is IFormState<T>;
 export declare const isFieldState: (state: any) => state is IFieldState;
@@ -13,7 +13,7 @@ export declare const isGeneralFieldState: (node: any) => node is IGeneralFieldSt
 export declare const isArrayFieldState: (state: any) => state is IFieldState;
 export declare const isDataField: (node: any) => node is DataField;
 export declare const isDataFieldState: (node: any) => node is Partial<Pick<Field<any, any, any, any>, import("..").NonFunctionPropertyNames<{
-    value: ValueType;
+    value: string;
     match: (pattern: import("../../path").Pattern) => boolean;
     readonly index: number;
     onInput: (...args: any[]) => Promise<void>;
@@ -50,7 +50,7 @@ export declare const isDataFieldState: (node: any) => node is Partial<Pick<Field
     readonly selfValid: boolean;
     readonly valid: boolean;
     readonly selfInvalid: boolean;
-    initialValue: ValueType;
+    initialValue: string;
     readonly validateStatus: "error" | "warning" | "success" | "validating";
     setDataSource: (dataSource?: import("..").FieldDataSource) => void;
     setFeedback: (feedback?: import("..").IFieldFeedback) => void;
@@ -60,13 +60,13 @@ export declare const isDataFieldState: (node: any) => node is Partial<Pick<Field
     setValidator: (validator?: import("..").FieldValidator) => void;
     setValidatorRule: (name: string, value: any) => void;
     setRequired: (required?: boolean) => void;
-    setValue: (value?: string) => void;
-    setInitialValue: (initialValue?: string) => void;
+    setValue: (value?: ValueType) => void;
+    setInitialValue: (initialValue?: ValueType) => void;
     setLoading: (loading?: boolean) => void;
     setValidating: (validating?: boolean) => void;
     setSubmitting: (submitting?: boolean) => void;
     validate: (triggerType?: import("../..").ValidatorTriggerType) => Promise<void>;
-    submit: <T>(onSubmit?: (values: any) => void | Promise<T>) => Promise<T>;
+    submit: <T>(onSubmit?: (values: any) => Promise<T> | void) => Promise<T>;
     reset: (options?: import("..").IFieldResetOptions) => Promise<void>;
     queryFeedbacks: (search?: import("..").ISearchFeedback) => import("..").IFieldFeedback[];
     modify: () => void;
@@ -87,18 +87,18 @@ export declare const isDataFieldState: (node: any) => node is Partial<Pick<Field
     locate: (address: import("../../path").Pattern) => void;
     readonly records: any[];
     readonly record: any;
-    component: import("..").FieldComponent<Component>;
-    decorator: import("..").FieldDecorator<Decorator>;
+    component: import("..").FieldComponent<any>;
+    decorator: import("..").FieldDecorator<any>;
     readonly parent: GeneralField;
     display: import("..").FieldDisplayTypes;
     readonly destroyed: boolean;
-    setTitle: (title?: string) => void;
-    setDescription: (description?: string) => void;
+    setTitle: (title?: TextType) => void;
+    setDescription: (description?: TextType) => void;
     setDisplay: (type?: import("..").FieldDisplayTypes) => void;
     setPattern: (type?: import("..").FieldPatternTypes) => void;
-    setComponent: <C extends unknown, ComponentProps extends object = {}>(component?: C, props?: ComponentProps) => void;
+    setComponent: <C extends JSXComponent, ComponentProps extends object = {}>(component?: C, props?: ComponentProps) => void;
     setComponentProps: <ComponentProps extends object = {}>(props?: ComponentProps) => void;
-    setDecorator: <D extends unknown, ComponentProps extends object = {}>(component?: D, props?: ComponentProps) => void;
+    setDecorator: <D extends JSXComponent, ComponentProps extends object = {}>(component?: D, props?: ComponentProps) => void;
     setDecoratorProps: <ComponentProps extends object = {}>(props?: ComponentProps) => void;
     setData: (data: any) => void;
     setContent: (content: any) => void;

package/lib/shared/isEmpty.d.ts

@@ -1,3 +1,3 @@
 export declare const isUndef: (val: any) => boolean;
-export declare const isValid: (val: any) => boolean;
+export declare const isValid: (value: any) => value is NonNullable<any>;
 export declare function isEmpty(val: any, strict?: boolean): boolean;

package/lib/shared/isEmpty.js

@@ -27,7 +27,7 @@ var import_instanceof = require("./instanceof");
 const has = Object.prototype.hasOwnProperty;
 const toString = Object.prototype.toString;
 const isUndef = /* @__PURE__ */ __name((val) => val === void 0, "isUndef");
-const isValid = /* @__PURE__ */ __name((val) => val !== void 0 && val !== null, "isValid");
+const isValid = /* @__PURE__ */ __name((value) => value !== void 0 && value !== null, "isValid");
 function isEmpty(val, strict = false) {
   if (val == null) {
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/schema",
-  "version": "1.1.16",
+  "version": "1.1.19",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",