@dazhicheng/ui 1.6.31 → 1.6.32

package/dist/components/tt-form/src/types.d.ts

@@ -142,11 +142,11 @@ export type FormActions = FormContext<GenericObject> & {
  */
 export type FormValuesInput<TValues extends Record<string, any> = Record<string, any>> = Partial<TValues> & Record<string, unknown>;
 /** 表单 schema 回调的公共参数类型 */
-export type CustomRenderType<TValues extends Record<string, any> = Record<string, any>> = ((value: TValues, formApi: ExtendedFormApi<TValues>) => Component | VNodeChild) | string;
+export type CustomRenderType<TValues extends Record<string, any> = Record<string, any>> = ((value: TValues, formApi: ExtendedFormApi<any>) => Component | VNodeChild) | string;
 export type FormSchemaRuleType = "required" | "selectRequired" | null | (Record<never, never> & string) | ZodTypeAny;
-export type FormItemDependenciesCondition<TResult = boolean | PromiseLike<boolean>, TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<TValues>) => TResult;
-export type FormItemDependenciesConditionWithRules<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<TValues>) => FormSchemaRuleType | PromiseLike<FormSchemaRuleType>;
-export type FormItemDependenciesConditionWithProps<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<TValues>) => MaybeComponentProps | PromiseLike<MaybeComponentProps>;
+export type FormItemDependenciesCondition<TResult = boolean | PromiseLike<boolean>, TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<any>) => TResult;
+export type FormItemDependenciesConditionWithRules<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<any>) => FormSchemaRuleType | PromiseLike<FormSchemaRuleType>;
+export type FormItemDependenciesConditionWithProps<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<any>) => MaybeComponentProps | PromiseLike<MaybeComponentProps>;
 export interface FormItemDependencies<TValues extends Record<string, any> = Record<string, any>> {
     /**
      * 组件参数
@@ -197,7 +197,7 @@ export interface FormItemDependencies<TValues extends Record<string, any> = Reco
  * - 允许声明 `triggerFields` 作为依赖触发源
  */
 export type ArrayRegisterDependencies<TValues extends Record<string, any> = Record<string, any>> = Pick<FormItemDependencies<TValues>, "if" | "show" | "rules" | "disabled" | "triggerFields">;
-export type ComponentProps<TValues extends Record<string, any> = Record<string, any>> = ((value: TValues, formApi: ExtendedFormApi<TValues>) => MaybeComponentProps) | MaybeComponentProps;
+export type ComponentProps<TValues extends Record<string, any> = Record<string, any>> = ((value: TValues, formApi: ExtendedFormApi<any>) => MaybeComponentProps) | MaybeComponentProps;
 export interface FormCommonConfig<TValues extends Record<string, any> = Record<string, any>> {
     /**
      * 在Label后显示一个冒号
@@ -269,7 +269,7 @@ export interface FormCommonConfig<TValues extends Record<string, any> = Record<s
      */
     wrapperClass?: string;
 }
-export type RenderComponentContentType<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<TValues>) => Record<string, any>;
+export type RenderComponentContentType<TValues extends Record<string, any> = Record<string, any>> = (value: TValues, formApi: ExtendedFormApi<any>) => Record<string, any>;
 export type HandleSubmitFn<TValues extends Record<string, any> = Record<string, any>> = (values: TValues) => Promise<void> | void;
 export type HandleResetFn<TValues extends Record<string, any> = Record<string, any>> = (values: TValues) => Promise<void> | void;
 export type FieldMappingTime = [

package/dist/hooks/usePanelSelectSchemas.d.ts

@@ -3,16 +3,16 @@ import { Recordable } from '../../../utils/src';
 import { MaybeRef, Ref } from 'vue';
 import { BasicDataCode, BasicDataOption, PanelSelectGroupBy } from './basicDataCodes';
 import { BasicDataOptionsMap } from './useBasicDataOptions';
-type FieldComponentProps = Recordable | ((values: Recordable, actions: any, options: BasicDataOption[]) => Recordable);
-export interface PanelSelectFieldOnChangeContext {
-    values: Recordable;
+type FieldComponentProps<TValues extends Recordable = Recordable> = Recordable | ((values: TValues, actions: any, options: BasicDataOption[]) => Recordable);
+export interface PanelSelectFieldOnChangeContext<TValues extends Recordable = Recordable> {
+    values: TValues;
     actions: any;
     fieldName: string;
     code: BasicDataCode;
     options: BasicDataOption[];
     currentOption: BasicDataOption[] | BasicDataOption | undefined;
 }
-export interface PanelSelectExcludeConfig {
+export interface PanelSelectExcludeConfig<TValues extends Recordable = Recordable> {
     /** 排除字段名 */
     fieldName: string;
     /** 排除字段标签，默认取 CODE_REGISTRY.defaultExcludeLabel */
@@ -23,12 +23,12 @@ export interface PanelSelectExcludeConfig {
     showAll?: boolean;
     showAllField?: string | number;
     multiple?: boolean;
-    componentProps?: FieldComponentProps;
-    dependencies?: TtFormSchema["dependencies"];
-    onChange?: (value: unknown, context: PanelSelectFieldOnChangeContext) => void;
-    rules?: TtFormSchema["rules"];
+    componentProps?: FieldComponentProps<TValues>;
+    dependencies?: TtFormSchema<TValues>["dependencies"];
+    onChange?: (value: unknown, context: PanelSelectFieldOnChangeContext<TValues>) => void;
+    rules?: TtFormSchema<TValues>["rules"];
 }
-export interface PanelSelectFieldConfig {
+export interface PanelSelectFieldConfig<TValues extends Recordable = Recordable> {
     code: BasicDataCode;
     /**
      * 返回解构名。
@@ -40,16 +40,16 @@ export interface PanelSelectFieldConfig {
     multiple?: boolean;
     showAll?: boolean;
     showAllField?: string | number;
-    componentProps?: FieldComponentProps;
-    dependencies?: TtFormSchema["dependencies"];
-    onChange?: (value: unknown, context: PanelSelectFieldOnChangeContext) => void;
-    rules?: TtFormSchema["rules"];
+    componentProps?: FieldComponentProps<TValues>;
+    dependencies?: TtFormSchema<TValues>["dependencies"];
+    onChange?: (value: unknown, context: PanelSelectFieldOnChangeContext<TValues>) => void;
+    rules?: TtFormSchema<TValues>["rules"];
     /** 表单项描述，透传到 TtFormSchema.description */
-    description?: TtFormSchema["description"];
+    description?: TtFormSchema<TValues>["description"];
     /** 与另一字段互斥：填对方的 fieldName */
     mutexWith?: string;
     /** 同 code 数据源的排除字段联动 */
-    exclude?: PanelSelectExcludeConfig;
+    exclude?: PanelSelectExcludeConfig<TValues>;
     /**
      * 分组方式。
      * - 洲默认 `none`；机场/城市默认 `country`；国家/区域默认 `continent`
@@ -59,7 +59,7 @@ export interface PanelSelectFieldConfig {
      */
     groupBy?: PanelSelectGroupBy;
     /** 自定义过滤完整 options（过滤在分组前执行，入参为扁平 options） */
-    customOptions?: (values: Recordable, options: BasicDataOption[]) => BasicDataOption[];
+    customOptions?: (values: TValues, options: BasicDataOption[]) => BasicDataOption[];
 }
 export interface UsePanelSelectSchemasOptions {
     dataSource?: MaybeRef<BasicDataOptionsMap | undefined>;
@@ -95,7 +95,7 @@ export interface UsePanelSelectSchemasOptions {
  * ]);
  * ```
  */
-export declare function usePanelSelectSchemas(fields: PanelSelectFieldConfig[], options?: UsePanelSelectSchemasOptions): Record<string, TtFormSchema> & {
+export declare function usePanelSelectSchemas<TValues extends Recordable = Recordable>(fields: PanelSelectFieldConfig<TValues>[], options?: UsePanelSelectSchemasOptions): Record<string, TtFormSchema<TValues>> & {
     dataSource: Ref<Record<BasicDataCode, BasicDataOption[]>>;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.31",
+  "version": "1.6.32",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",