@qin-ui/antd-vue-pro 2.0.19 → 2.0.21

package/es/index.d.ts

@@ -17,15 +17,10 @@ import { ComponentProvideOptions } from 'vue';
 import { ComputedRef } from 'vue';
 import { CreateComponentPublicInstanceWithMixins } from 'vue';
 import { CSSProperties } from 'vue';
-import { Data } from '@qin-ui/core';
 import { DatePickerProps } from 'ant-design-vue';
-import { DeepPartial } from '@qin-ui/core';
 import { DefineComponent } from 'vue';
-import { ExtendWithAny } from '@qin-ui/core';
 import { ExtractPropTypes } from 'vue';
 import { FieldData } from 'ant-design-vue/es/form/interface';
-import { Fields as Fields_2 } from '@qin-ui/core';
-import { Form as Form_2 } from '@qin-ui/core';
 import { FormInstance } from 'ant-design-vue';
 import { FormItemInstance } from 'ant-design-vue';
 import { FormItemProps } from 'ant-design-vue';
@@ -34,23 +29,19 @@ import { FormProps as FormProps_2 } from 'ant-design-vue';
 import { GlobalComponents } from 'vue';
 import { GlobalDirectives } from 'vue';
 import { HTMLAttributes } from 'vue';
-import { InjectionFormKey } from '@qin-ui/core';
 import { InjectionKey } from 'vue';
-import { InjectionPathKey } from '@qin-ui/core';
 import { InputNumberProps } from 'ant-design-vue';
 import { InputProps } from 'ant-design-vue';
-import { KeyExpandString } from '@qin-ui/core';
 import { MaybeRef } from 'vue';
 import { Options as Options_2 } from 'scroll-into-view-if-needed';
-import { PageParam } from '@qin-ui/core';
-import { Path } from '@qin-ui/core';
-import { Paths } from '@qin-ui/core';
 import { Plugin as Plugin_2 } from 'vue';
 import { PropType } from 'vue';
 import { PublicProps } from 'vue';
 import { RadioGroupProps } from 'ant-design-vue';
 import { RangePickerProps } from 'ant-design-vue/es/date-picker';
 import { Raw } from 'vue';
+import { Reactive } from 'vue';
+import { Ref } from 'vue';
 import { RenderExpandIconProps } from 'ant-design-vue/es/vc-table/interface';
 import { RequiredMark } from 'ant-design-vue/es/form/Form';
 import { RowProps } from 'ant-design-vue';
@@ -61,15 +52,11 @@ import { ShallowUnwrapRef } from 'vue';
 import { SliderProps } from 'ant-design-vue';
 import { Slot } from 'vue';
 import { SwitchProps } from 'ant-design-vue';
-import { Table as Table_2 } from '@qin-ui/core';
 import { TableProps } from 'ant-design-vue';
 import { TextAreaProps } from 'ant-design-vue';
 import { TimePickerProps } from 'ant-design-vue';
 import { TransferProps } from 'ant-design-vue';
 import { TreeSelectProps } from 'ant-design-vue';
-import { useFields as useFields_2 } from '@qin-ui/core';
-import { useFormData } from '@qin-ui/core';
-import { useFormRef as useFormRef_2 } from '@qin-ui/core';
 import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 import { ValidateMessages } from 'ant-design-vue/es/form/interface';
 import { VNode } from 'vue';
@@ -103,6 +90,10 @@ declare type __VLS_WithTemplateSlots<T, S> = T & {
     };
 };
 
+declare type AllowStringKey<T, Prefix extends string = ''> = {
+    [K in keyof T]: K extends string ? T[K] extends (infer U)[] ? `${Prefix}${K}` | (IsRecord<U> extends true ? AllowStringKey<U, `${Prefix}${K}[index].`> : never) : IsRecord<T[K]> extends true ? `${Prefix}${K}` | AllowStringKey<T[K], `${Prefix}${K}.`> : `${Prefix}${K}` : never;
+}[keyof T];
+
 /**
  * @type {Object} Base - 基础公共字段类型
  */
@@ -194,6 +185,13 @@ export declare interface Base<D extends Data = Data> {
     [key: `data-component-${string}`]: string;
 }
 
+declare interface BaseColumn<D extends Data = Data> {
+    key?: Path<D>;
+    dataIndex?: Path<D> | Path<D>[];
+    children?: BaseColumn<D>[];
+    [key: string]: any;
+}
+
 /**
  * @description 基础组件字符串名称类型
  */
@@ -206,6 +204,13 @@ getComponentComputedProps: () => any;
 componentRef: unknown;
 }, any>;
 
+declare interface BaseField_2<D extends Data = Data> {
+    path?: Path<D> | any;
+    name?: any;
+    fields?: any[];
+    [key: string]: any;
+}
+
 export declare const BaseForm: <F extends Form<any> = Form>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal_2<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal_2<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ({
         grid?: Grid;
@@ -247,8 +252,12 @@ export declare type Column<D extends Data = Data> = Omit<ColumnType, 'dataIndex'
     hidden?: boolean;
 };
 
+declare type ColumnFindBy<D extends Data, C extends BaseColumn<D> = BaseColumn<D>> = (column: Readonly<C>) => boolean;
+
 export declare type Columns<D extends Data = Data> = Array<Column<D>>;
 
+declare type Columns_2<D extends Data = Data, C extends BaseColumn<D> = BaseColumn<D>> = Array<C>;
+
 export declare const COMPONENT_MAP: Map<BaseComponentStringName, Component>;
 
 export declare type ComponentVars = Partial<RequiredComponentVars>;
@@ -266,8 +275,14 @@ export declare type ContainerComponent = Component<PathProps>;
 
 export declare const ContainerFragment: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 
+declare type Data = Record<string, any>;
+
 declare type DatePickerSlots = CompSlot<'dateRender' | 'renderExtraFooter' | 'separator' | 'monthCellRender'>;
 
+declare type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+
 declare const _default: {
     install(app: App): void;
 };
@@ -372,6 +387,10 @@ declare type ExpandButtonProps = ButtonProps & {
     expandStatus: boolean;
 };
 
+declare type ExtendWithAny<D> = {
+    [K in keyof D]: IsRecord<D[K]> extends true ? ExtendWithAny<D[K]> : D[K];
+} & Record<string, any>;
+
 /**
  * @description 字段配置类型，包含所有字段属性和响应式支持
  * @template D - 数据对象类型
@@ -382,12 +401,16 @@ export declare type Field<D extends Data = Data> = {
     } & FieldTypeMap<D>[K];
 }[keyof FieldTypeMap];
 
+declare type FieldFindBy<D extends Data, F extends BaseField_2<D> = BaseField_2<D>> = (field: Readonly<F>) => boolean;
+
 /**
  * @description 字段数组类型
  * @template D - 数据对象类型
  */
 export declare type Fields<D extends Data = Data> = Array<Field<D>>;
 
+declare type Fields_2<D extends Data = Data, F extends BaseField_2<D> = BaseField_2<D>> = F[];
+
 /**
  * @type {FieldTypeMap} 字段类型集合
  */
@@ -468,6 +491,8 @@ export declare type FieldTypeMap<D extends Data = Data> = {
  */
 export declare type Form<D extends Data = Data, F extends Field<D> = Field<D>> = Form_2<D, F, FormInstance>;
 
+declare type Form_2<D extends Data = Data, F extends BaseField_2<D> = BaseField_2<D>, I = any> = ReturnType<typeof useFormData<D>> & ReturnType<typeof useFields_2<D, F>> & ReturnType<typeof useFormRef_2<I>>;
+
 export declare const FORM_ITEM_SLOT_KEYS: readonly ["label", "extra", "help", "tooltip"];
 
 export { FormInstance }
@@ -491,16 +516,31 @@ export declare const INJECT_CONFIG: {
     };
 };
 
-export { InjectionFormKey }
+export declare const InjectionFormKey: InjectionKey<any>;
 
-export { InjectionPathKey }
+export declare const InjectionPathKey: InjectionKey<ComputedRef<string | undefined>>;
 
 declare type InputNumberSlots = CompSlot<'addonAfter' | 'addonBefore' | 'prefix' | 'upIcon' | 'downIcon'>;
 
 declare type InputSlots = CompSlot<'addonAfter' | 'addonBefore' | 'clearIcon' | 'prefix' | 'suffix'>;
 
+declare type IsRecord<T> = T extends object ? T extends ((...args: any[]) => any) | any[] | null ? false : true : false;
+
+declare type JoinPath<Prefix extends any[], Key extends PropertyKey> = [
+...Prefix,
+KeyExpandString<Extract<Key, string>>
+];
+
+declare type KeyExpandString<T extends string> = T | (string & {});
+
+declare type KeyPathString<D extends Data> = KeyExpandString<AllowStringKey<D>>;
+
 declare type MaybeRefOrComputedRef<T = any> = MaybeRef<T> | ComputedRef<T>;
 
+declare type NormalizeField<D extends Data, F extends Field<D>> = [F] extends [never] ? Field<D> : F;
+
+declare type NormalizeField_2<D extends Data, F extends Field<D>> = [F] extends [never] ? Field<D> : F;
+
 /**
  * @description 不支持响应式的属性名
  */
@@ -515,10 +555,23 @@ export { Option_2 as Option }
 
 export declare type Options = Array<Option_2>;
 
+declare interface PageParam {
+    current: number;
+    pageSize: number;
+    total: number;
+    [key: string]: any;
+}
+
+declare type Path<D extends Data = Data> = KeyPathString<D>;
+
 export declare type PathProps = {
     path?: string;
 } & Data;
 
+declare type Paths<T, Prefix extends any[] = []> = T extends object ? {
+    [K in keyof T]: IsRecord<T[K]> extends true ? JoinPath<Prefix, K> | Paths<T[K], JoinPath<Prefix, K>> : JoinPath<Prefix, K>;
+}[keyof T] : never;
+
 declare type PP<T extends Record<string, any>> = Partial<T & AllowedComponentProps>;
 
 export declare const ProComponentProvider: SFCWithInstall<{
@@ -760,6 +813,12 @@ declare type SearchFormProps = {
 
 declare type SelectSlots = CompSlot<keyof InstanceType<typeof Select>['$slots']>;
 
+declare type SetColumn<D extends Data = Data, C extends BaseColumn<D> = BaseColumn<D>> = (key: Path<D>, column: C | ((pre: Readonly<C>) => C), options?: {
+    updateType?: 'rewrite' | 'merge';
+} & UpdateColumnOptions) => void;
+
+declare type SetPageParam = (pageParam: Partial<PageParam> | ((pre: Readonly<PageParam>) => Partial<PageParam>)) => void;
+
 declare type SFCWithInstall<T> = T & Plugin_2;
 
 declare type SliderSlots = CompSlot<'mark'>;
@@ -785,6 +844,19 @@ declare type SwitchSlots = CompSlot<'checkedChildren' | 'unCheckedChildren'>;
  */
 export declare type Table<D extends Data = Data, T extends object = ExtendWithAny<D>> = Table_2<D, T, Column<D>>;
 
+declare type Table_2<D extends Data = Data, T extends object = ExtendWithAny<D>, C extends BaseColumn<D> = BaseColumn<D>> = {
+    columns: Ref<Columns_2<D, C>>;
+    dataSource: Ref<T[]>;
+    pageParam: Reactive<PageParam>;
+    searchForm: Form_2<D>;
+    setColumn: SetColumn<D, C>;
+    deleteColumn: (path: Path<D> | ColumnFindBy<D, C>, options?: UpdateColumnOptions) => void;
+    appendColumn: (path: Path<D> | ColumnFindBy<D, C> | undefined, column: C | Columns_2<D, C>, options?: UpdateColumnOptions) => void;
+    prependColumn: (path: Path<D> | ColumnFindBy<D, C> | undefined, column: C | Columns_2<D, C>, options?: UpdateColumnOptions) => void;
+    setPageParam: SetPageParam;
+    resetQueryParams: () => void;
+};
+
 export declare const TeleportComponentNamePrefix = "TeleportComponent_";
 
 declare type TimePickerSlots = CompSlot<'clearIcon' | 'renderExtraFooter' | 'suffixIcon'>;
@@ -793,6 +865,14 @@ declare type TransferSlots = CompSlot<'footer' | 'render'>;
 
 declare type TreeSelectSlots = CompSlot<'maxTagPlaceholder' | 'notFoundContent' | 'placeholder' | 'searchPlaceholder' | 'suffixIcon' | 'tagRender' | 'title'>;
 
+declare type UpdateColumnOptions = {
+    all?: boolean;
+};
+
+declare type UpdateFieldOptions = {
+    all?: boolean;
+};
+
 /** useFields 返回值类型，F 默认绑定为本地 Field<D> */
 export declare type UseFields<D extends Data = Data, F extends Field<D> = Field<D>> = ReturnType<typeof useFields<D, F>>;
 
@@ -802,7 +882,35 @@ export declare type UseFields<D extends Data = Data, F extends Field<D> = Field<
  * 使得 fields、getField 等方法的类型推断包含 Ant Design Vue 的完整属性签名。
  */
 export declare const useFields: {
-    <D extends Data = Data, F extends Field<D> = Field<D>>(initFields?: F[]): ReturnType<typeof useFields_2<D, F>>;
+    <D extends Data = Data, F extends Field<D> = Field<D>>(initFields?: F[]): ReturnType<typeof useFields_2<D, NormalizeField_2<D, F>>>;
+};
+
+declare const useFields_2: <D extends Data = Data, F extends BaseField_2<D> = BaseField_2<D>>(initFields?: F[]) => {
+    fields: Ref<F[], F[]>;
+    getField: {
+        (path: Path<D> | FieldFindBy<D, F>): Readonly<F> | undefined;
+        (path: Path<D> | FieldFindBy<D, F>, options?: {
+            all?: false;
+        }): Readonly<F> | undefined;
+        (path: Path<D> | FieldFindBy<D, F>, options: {
+            all: true;
+        }): Readonly<F>[] | undefined;
+    };
+    setField: (path: Path<D> | FieldFindBy<D, F>, field: F | ((preField: Readonly<F>) => F), options?: {
+        updateType?: "rewrite" | "merge";
+    } & UpdateFieldOptions) => void;
+    deleteField: (path: Path<D> | FieldFindBy<D, F>, options?: UpdateFieldOptions) => void;
+    appendField: (path: Path<D> | FieldFindBy<D, F> | undefined, field: F | F[], options?: UpdateFieldOptions) => void;
+    prependField: (path: Path<D> | FieldFindBy<D, F> | undefined, field: F | F[], options?: UpdateFieldOptions) => void;
+    getParentField: {
+        (path: Path<D> | FieldFindBy<D, F>): F | undefined;
+        (path: Path<D> | FieldFindBy<D, F>, options: {
+            all?: false;
+        }): F | undefined;
+        (path: Path<D> | FieldFindBy<D, F>, options: {
+            all: true;
+        }): F[] | undefined;
+    };
 };
 
 /**
@@ -810,11 +918,30 @@ export declare const useFields: {
  * 将默认返回的 Form<D, BaseField<D>> 覆盖为本地的 Form<D, Field<D>>。
  */
 export declare const useForm: {
-    <D extends Data = Data, F extends Field<D> = Field<D>>(initFormData?: ExtendWithAny<DeepPartial<D>>, initFields?: F[], root?: boolean): Form<D, F>;
-    <D extends Data = Data, F extends Field<D> = Field<D>>(root?: boolean): Form<D, F>;
+    <D extends Data = Data, F extends Field<D> = Field<D>>(initFormData?: ExtendWithAny<DeepPartial<D>>, initFields?: F[], root?: boolean): Form<D, NormalizeField<D, F>>;
+    <D extends Data = Data, F extends Field<D> = Field<D>>(root?: boolean): Form<D, NormalizeField<D, F>>;
 };
 
-export { useFormData }
+/**
+ * 表单数据处理hook
+ * @param initFormData 初始表单数据
+ * @returns {Object} { formData, getFormData, setFormData }
+ */
+export declare const useFormData: <D extends Data = Data>(initFormData?: ExtendWithAny<DeepPartial<D>>) => {
+    formData: Reactive<ExtendWithAny<D>>;
+    getFormData: {
+        <K extends keyof D>(path: K): D[K];
+        <K extends keyof D & string, K1 extends keyof D[K] & string>(path: `${K}.${K1}`): D[K][K1];
+        <K extends keyof D & string, K1_1 extends keyof D[K] & string, K2 extends keyof D[K][K1_1] & string>(path: `${K}.${K1_1}.${K2}`): D[K][K1_1][K2];
+        (path: Path<D>): any;
+    };
+    setFormData: {
+        (path: Path<D>, value: any): void;
+        (path: Path<D>, value: (v: any) => any): void;
+        (value: ExtendWithAny<DeepPartial<D>>): void;
+        (value: (v: ExtendWithAny<DeepPartial<D>>) => ExtendWithAny<DeepPartial<D>>): void;
+    };
+};
 
 /**
  * 类型断言 re-export @qin-ui/core 的 useFormRef，
@@ -824,6 +951,11 @@ export declare const useFormRef: {
     (): ReturnType<typeof useFormRef_2<FormInstance>>;
 };
 
+declare const useFormRef_2: <F = any>() => {
+    formRef: Ref<F | undefined, F | undefined>;
+    setFormRef: (inst: F) => void;
+};
+
 /**
  * 类型断言 re-export @qin-ui/core 的 useTable，
  * 将默认的 BaseColumn<D> 覆盖为本地的 Column<D>。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.0.19",
+  "version": "2.0.21",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",