tsai
/
vue-vben-admin
mirror of https://github.com/vbenjs/vue-vben-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: 函数式 componentProps 按已注册 component 的 Props 校验返回值

pull/7765/head
dullathanol 5 months ago
parent
a6433c2b50
commit
6ab06584eb
6 changed files with 102 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      apps/web-antd/src/adapter/form-schema.ts
  2. 25
      apps/web-antdv-next/src/adapter/form-schema.ts
  3. 25
      apps/web-ele/src/adapter/form-schema.ts
  4. 25
      apps/web-naive/src/adapter/form-schema.ts
  5. 25
      apps/web-tdesign/src/adapter/form-schema.ts
  6. 25
      playground/src/adapter/form-schema.ts

25
apps/web-antd/src/adapter/form-schema.ts
View File

@ -32,19 +32,28 @@ import type {
import type { ComponentType } from './component';
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiCascader: ApiComponentSharedProps & CascaderProps;
ApiSelect: ApiComponentSharedProps & SelectProps;
ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
@ -79,12 +88,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

25
apps/web-antdv-next/src/adapter/form-schema.ts
View File

@ -32,19 +32,28 @@ import type {
import type { ComponentType } from './component';
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiCascader: ApiComponentSharedProps & CascaderProps;
ApiSelect: ApiComponentSharedProps & SelectProps;
ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
@ -79,12 +88,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

25
apps/web-ele/src/adapter/form-schema.ts
View File

@ -27,19 +27,28 @@ import type { ComponentType } from './component';
type ElTreeSelectSchemaProps = InstanceType<typeof ElTreeSelect>['$props'];
type ElTimePickerSchemaProps = InstanceType<typeof ElTimePicker>['$props'];
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiSelect: ApiComponentSharedProps & SelectV2Props;
ApiTreeSelect: ApiComponentSharedProps & ElTreeSelectSchemaProps;
Checkbox: CheckboxProps;
@ -63,12 +72,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

25
apps/web-naive/src/adapter/form-schema.ts
View File

@ -24,19 +24,28 @@ import type {
import type { ComponentType } from './component';
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiSelect: ApiComponentSharedProps & SelectProps;
ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
Checkbox: CheckboxProps;
@ -60,12 +69,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

25
apps/web-tdesign/src/adapter/form-schema.ts
View File

@ -30,19 +30,28 @@ import type {
import type { ComponentType } from './component';
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiSelect: ApiComponentSharedProps & SelectProps;
ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
AutoComplete: AutoCompleteProps;
@ -73,12 +82,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

25
playground/src/adapter/form-schema.ts
View File

@ -32,19 +32,28 @@ import type {
import type { ComponentType } from './component';
type ComponentPropsFnArgs = Parameters<
Extract<
NonNullable<CoreFormSchema<ComponentType>['componentProps']>,
(...args: any) => any
>
>;
/**
* 对象形式：使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交是为了满足核心库 `MaybeComponentProps` 的索引签名。
* 函数形式：通过联合 `CoreFormSchema['componentProps']`，与表单核心对动态 `componentProps` 的约定保持一致。
* 使用适配器里为各 `component` 声明的 Props 类型 `P`；
* 与 `Record<string, any>` 相交以兼容核心库 `MaybeComponentProps` 的索引签名。
*/
type SchemaComponentProps<P> =
| CoreFormSchema<ComponentType>['componentProps']
type ComponentProps<P> =
| ((
value: ComponentPropsFnArgs[0],
actions: ComponentPropsFnArgs[1],
) => P & Record<string, any>)
| (P & Record<string, any>);
/**
* 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
*/
interface FormSchemaComponentPropsMap {
interface ComponentPropsMap {
ApiCascader: ApiComponentSharedProps & CascaderProps;
ApiSelect: ApiComponentSharedProps & SelectProps;
ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
@ -79,12 +88,12 @@ type BaseSchema = Omit<
'component' | 'componentProps'
>;
type RegisteredName = keyof FormSchemaComponentPropsMap;
type RegisteredName = keyof ComponentPropsMap;
type DiscriminatedFormSchema = {
[K in RegisteredName]: BaseSchema & {
component: K;
componentProps?: SchemaComponentProps<FormSchemaComponentPropsMap[K]>;
componentProps?: ComponentProps<ComponentPropsMap[K]>;
};
}[RegisteredName];

Write Preview
Loading…
Cancel
Save