@qin-ui/antd-vue-pro 2.0.16 → 2.0.18

package/es/index.d.ts

@@ -1,5 +1,6 @@
 import { AllowedComponentProps } from 'vue';
 import { App } from 'vue';
+import { ButtonSize } from 'ant-design-vue/es/button';
 import { CascaderProps } from 'ant-design-vue';
 import { CheckboxGroupProps } from 'ant-design-vue';
 import { ColProps } from 'ant-design-vue';
@@ -16,10 +17,15 @@ 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';
@@ -28,20 +34,23 @@ 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 { PaginationProps } from 'ant-design-vue';
+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';
@@ -52,11 +61,15 @@ 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';
@@ -90,10 +103,6 @@ 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 - 基础公共字段类型
  */
@@ -193,10 +202,7 @@ export declare type BaseComponentStringName = Exclude<Field['component'], Render
 export declare const BaseField: DefineComponent<Props, {
 getComponentRef: () => any;
 getComponentComputedProps: () => any;
-}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Props> & Readonly<{}>, {
-path: string;
-component: string | Component;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
+}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {
 componentRef: unknown;
 }, any>;
 
@@ -227,11 +233,7 @@ export declare const BaseForm: <F extends Form<any> = Form>(__VLS_props: NonNull
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 
-export declare const BaseFormItem: DefineComponent<Props_4, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Props_4> & Readonly<{}>, {
-disabled: boolean;
-grid: Grid;
-fields: Fields;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
+export declare const BaseFormItem: DefineComponent<Props_4, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Props_4> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 
 declare type ButtonProps = {
     onClick: () => void;
@@ -264,21 +266,21 @@ 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;
 };
 export default _default;
 
 declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ({
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly "onUpdate:size"?: ((value: ButtonSize) => any) | undefined;
+        readonly "onUpdate:loading"?: ((value: boolean) => any) | undefined;
+    } & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, "onUpdate:size" | "onUpdate:loading"> & ({
+        size?: TableProps["size"];
+        loading?: boolean;
+    } & {
         table?: T;
         search?: () => Promise<unknown>;
         addIndexColumn?: boolean;
@@ -356,7 +358,7 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
             column: Column<T extends Table<infer U extends Data> ? U : never>;
         }) => void;
     }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">;
-    emit: {};
+    emit: ((evt: "update:size", value: ButtonSize) => void) & ((evt: "update:loading", value: boolean) => void);
 }>) => VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
@@ -370,10 +372,6 @@ 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 - 数据对象类型
@@ -462,11 +460,13 @@ export declare type FieldTypeMap<D extends Data = Data> = {
     } & Record<string, any>, D>;
 };
 
-declare type FindBy<D extends Data> = (field: Readonly<Field<D>>) => boolean;
-
-declare type FindBy_2<D extends Data> = (column: Readonly<Column<D>>) => boolean;
-
-export declare type Form<D extends Data = Data> = ReturnType<typeof useFormData<D>> & ReturnType<typeof useFields<D>> & ReturnType<typeof useFormRef>;
+/**
+ * 重新定义 Form 类型：
+ * 1. 将第二个泛型参数 F 默认绑定为本地 Field<D>；
+ * 2. 将 core Form 的第三个泛型参数 I 绑定为本地 UI 库（Ant Design Vue）的 FormInstance，
+ *    使 formRef 的类型变为 Ref<FormInstance | undefined>。
+ */
+export declare type Form<D extends Data = Data, F extends Field<D> = Field<D>> = Form_2<D, F, FormInstance>;
 
 export declare const FORM_ITEM_SLOT_KEYS: readonly ["label", "extra", "help", "tooltip"];
 
@@ -491,25 +491,14 @@ export declare const INJECT_CONFIG: {
     };
 };
 
-export declare const InjectionFormKey: InjectionKey<Form>;
+export { InjectionFormKey }
 
-export declare const InjectionPathKey: InjectionKey<ComputedRef<string | undefined>>;
+export { InjectionPathKey }
 
 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>;
 
 /**
@@ -526,20 +515,10 @@ export { Option_2 as Option }
 
 export declare type Options = Array<Option_2>;
 
-declare type PageParam = Required<Pick<PaginationProps, (typeof pageParamProperty)[number]>>;
-
-declare const pageParamProperty: readonly ["current", "pageSize", "total"];
-
-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<{
@@ -781,16 +760,6 @@ declare type SearchFormProps = {
 
 declare type SelectSlots = CompSlot<keyof InstanceType<typeof Select>['$slots']>;
 
-declare type SetColumn<D extends Data = Data> = (key: Path<D>, column: Column<D> | ((pre: Readonly<Column<D>>) => Column<D>), options?: {
-    /**
-     * 更新方式 rewrite替换重写，merge合并(默认)
-     * @default 'merge'
-     */
-    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'>;
@@ -811,18 +780,10 @@ export declare type Slots = {
 
 declare type SwitchSlots = CompSlot<'checkedChildren' | 'unCheckedChildren'>;
 
-export declare type Table<D extends Data = Data, T extends object = ExtendWithAny<D>> = {
-    columns: Ref<Columns<D>>;
-    dataSource: Ref<T[]>;
-    pageParam: Reactive<PageParam>;
-    searchForm: Form<D>;
-    setColumn: SetColumn<D>;
-    deleteColumn: (path: Path<D> | FindBy_2<D>, options?: UpdateColumnOptions) => void;
-    appendColumn: (path: Path<D> | FindBy_2<D> | undefined, column: Column<D> | Columns<D>, options?: UpdateColumnOptions) => void;
-    prependColumn: (path: Path<D> | FindBy_2<D> | undefined, column: Column<D> | Columns<D>, options?: UpdateColumnOptions) => void;
-    setPageParam: SetPageParam;
-    resetQueryParams: () => void;
-};
+/**
+ * 重新定义 Table 类型，将 Column 类型绑定为 antd-vue-pro 的 Column<D>
+ */
+export declare type Table<D extends Data = Data, T extends object = ExtendWithAny<D>> = Table_2<D, T, Column<D>>;
 
 export declare const TeleportComponentNamePrefix = "TeleportComponent_";
 
@@ -832,128 +793,47 @@ declare type TransferSlots = CompSlot<'footer' | 'render'>;
 
 declare type TreeSelectSlots = CompSlot<'maxTagPlaceholder' | 'notFoundContent' | 'placeholder' | 'searchPlaceholder' | 'suffixIcon' | 'tagRender' | 'title'>;
 
-declare type UpdateColumnOptions = {
-    /**
-     * 是否更新\获取所有符合条件的列，查找条件为函数时默认true, 否则默认false，为false时仅更新第一个匹配到的列
-     */
-    all?: boolean;
-};
-
-declare type UpdateFieldOptions = {
-    /**
-     * 是否更新\获取所有符合条件的字段，查找条件为函数时默认true, 否则默认false，为false时仅更新第一个匹配到的字段
-     */
-    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>>;
 
 /**
- * 表单字段配置处理hook
- * @param {Fields} initFields - 初始字段配置
- * @returns {Object}
- * @property {Ref<Fields>} fields - 字段配置Ref
- * @property {Function} setField - 设置字段配置
- * @property {Function} getField - 获取字段配置
- * @property {Function} deleteField - 删除字段配置
- * @property {Function} appendField - 追加字段配置
- * @property {Function} prependField - 插入字段配置
- * @property {Function} getParentField - 获取字段所属父级字段
+ * 类型断言 re-export @qin-ui/core 的 useFields，
+ * 将泛型参数 F 的默认值覆盖为本地的 Field<D>，
+ * 使得 fields、getField 等方法的类型推断包含 Ant Design Vue 的完整属性签名。
  */
-export declare const useFields: <D extends Data = Data>(initFields?: Fields<D>) => {
-    fields: Ref<Fields<D>, Fields<D>>;
-    getField: {
-        (path: Path<D> | FindBy<D>): Readonly<WithAdditionalMethodsGetter<Field<D>>> | undefined;
-        (path: Path<D> | FindBy<D>, options?: {
-            all?: false;
-        }): Readonly<WithAdditionalMethodsGetter<Field<D>>> | undefined;
-        (path: Path<D> | FindBy<D>, options: {
-            all: true;
-        }): Readonly<WithAdditionalMethodsGetter<Field<D>>>[] | undefined;
-    };
-    setField: (path: Path<D> | FindBy<D>, field: Field<D> | ((preField: Readonly<Field<D>>) => Field<D>), options?: {
-        /**
-         * 字段更新方式 rewrite替换重写，merge合并(默认)
-         * @default 'merge'
-         */
-        updateType?: "rewrite" | "merge";
-    } & UpdateFieldOptions) => void;
-    deleteField: (path: Path<D> | FindBy<D>, options?: UpdateFieldOptions) => void;
-    appendField: (path: Path<D> | FindBy<D> | undefined, field: Field<D> | Fields<D>, options?: UpdateFieldOptions) => void;
-    prependField: (path: Path<D> | FindBy<D> | undefined, field: Field<D> | Fields<D>, options?: UpdateFieldOptions) => void;
-    getParentField: {
-        (path: Path<D> | FindBy<D>): Field<D> | undefined;
-        (path: Path<D> | FindBy<D>, options: {
-            all?: false;
-        }): Field<D> | undefined;
-        (path: Path<D> | FindBy<D>, options: {
-            all: true;
-        }): Field<D>[] | undefined;
-    };
+export declare const useFields: {
+    <D extends Data = Data, F extends Field<D> = Field<D>>(initFields?: F[]): ReturnType<typeof useFields_2<D, F>>;
 };
 
 /**
- * 表单hook
- * @param initFormData 初始表单数据
- * @param initFields 初始字段配置
- * @param root 是否为根级表单
- * @returns {Form<D>} - form表单对象
- * @property {Reactive<D>} formData - 表单数据Reactive<D>
- * @property {Function} getFormData - 获取指定字段数据路径path的值
- * @property {Function} setFormData - 设置指定字段数据路径path的值, path为空时设置所有字段数据
- * @property {Ref<Fields>} fields - 字段配置Ref
- * @property {Function} setField - 设置字段配置
- * @property {Function} getField - 获取字段配置
- * @property {Function} deleteField - 删除字段配置
- * @property {Function} appendField - 追加字段配置
- * @property {Function} prependField - 插入字段配置
- * @property {Function} getParentField - 获取字段所属父级字段
- * @property {Ref<FormInstance | undefined>} formRef - 表单组件实例引用
- * @property {Function} setFormRef - 更新实例引用
+ * 类型断言 re-export @qin-ui/core 的 useForm，
+ * 将默认返回的 Form<D, BaseField<D>> 覆盖为本地的 Form<D, Field<D>>。
  */
-export declare function useForm<D extends Data = Data>(initFormData?: ExtendWithAny<DeepPartial<D>>, initFields?: Fields<D>, root?: boolean): Form<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>;
+};
 
-export declare function useForm<D extends Data = Data>(root?: boolean): Form<D>;
+export { useFormData }
 
 /**
- * 表单数据处理hook
- * @param initFormData 初始表单数据
- * @returns {Object} { formData, getFormData, setFormData }
- * @property {Reactive<D>} formData - 表单数据Reactive<D>
- * @property {Function} getFormData - 获取指定字段数据路径path的值
- * @property {Function} setFormData - 设置指定字段数据路径path的值, path为空时设置所有字段数据
+ * 类型断言 re-export @qin-ui/core 的 useFormRef，
+ * 将 FormInstance 泛型参数绑定为本地 UI 库（Ant Design Vue）的 FormInstance。
  */
-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;
-    };
+export declare const useFormRef: {
+    (): ReturnType<typeof useFormRef_2<FormInstance>>;
 };
 
 /**
- * 表单组件实例引用
- * @returns {Object}
- * @property {Ref<FormInstance | undefined>} formRef - 表单组件实例引用
- * @property {Function} setFormRef - 更新实例引用
+ * 类型断言 re-export @qin-ui/core 的 useTable，
+ * 将默认的 BaseColumn<D> 覆盖为本地的 Column<D>。
  */
-declare const useFormRef: () => {
-    formRef: Ref<FormInstance | undefined, FormInstance | undefined>;
-    setFormRef: (inst: FormInstance) => void;
-};
-
 export declare const useTable: <D extends Data = Data, T extends object = ExtendWithAny<D>>(params: {
     columns?: Columns<D>;
     dataSource?: T[];
     pageParam?: PageParam;
     searchParam?: ExtendWithAny<DeepPartial<D>>;
-    searchFields?: Fields<D>;
+    searchFields?: Fields_2<D>;
 }) => Table<D, T>;
 
 export declare type ValueFormatter = {

package/es/index.js

@@ -1,10 +1,10 @@
 import "./antd-vue-pro.css";
 import _sfc_main from "./form/index.js";
-import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, getInitProps, useFields, useForm, useFormData } from "./form/index.js";
+import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, SlotComponent, TeleportComponentNamePrefix, getInitProps, useFields, useForm, useFormRef } from "./form/index.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
-import { _ as _sfc_main$1 } from "./component-provider/index-D8NF18a1.js";
-import { I } from "./component-provider/index-D8NF18a1.js";
+import { _ as _sfc_main$1 } from "./component-provider/index-BeGPcKnM.js";
+import { a, I, b, f } from "./component-provider/index-BeGPcKnM.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);
@@ -29,9 +29,9 @@ export {
   COMPONENT_MAP,
   ContainerFragment,
   FORM_ITEM_SLOT_KEYS,
-  I as INJECT_CONFIG,
-  InjectionFormKey,
-  InjectionPathKey,
+  a as INJECT_CONFIG,
+  I as InjectionFormKey,
+  b as InjectionPathKey,
   ProComponentProvider,
   ProForm,
   ProTable,
@@ -41,6 +41,7 @@ export {
   getInitProps,
   useFields,
   useForm,
-  useFormData,
+  f as useFormData,
+  useFormRef,
   useTable
 };