@qin-ui/antd-vue-pro 2.0.7 → 2.0.9

package/es/antd-vue-pro.css

@@ -36,17 +36,17 @@
 .control-icon[data-v-88c80679] :hover {
   color: #1677ff;
 }
-.pro-table .pro-table-header[data-v-a9d8c25c] {
+.pro-table .pro-table-header[data-v-eb2f3860] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table .pro-table-header[data-v-a9d8c25c]:empty {
+.pro-table .pro-table-header[data-v-eb2f3860]:empty {
   display: none;
 }
-.pro-table .pro-table-header + .pro-table-content[data-v-a9d8c25c] {
+.pro-table .pro-table-header + .pro-table-content[data-v-eb2f3860] {
   margin-top: 16px;
 }
-.pro-table[data-v-a9d8c25c] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-eb2f3860] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/form/index.js

@@ -15,7 +15,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    provide(FORM, props.form);
+    provide(InjectionFormKey, props.form);
     const { formData, fields, setFormRef } = props.form;
     const config = INJECT_CONFIG["pro-form"];
     const { grid: _injectGrid, ...injectAttrs } = inject(
@@ -69,8 +69,8 @@ const COMPONENT_MAP = /* @__PURE__ */ new Map([
   ["transfer", Transfer]
 ]);
 const TeleportComponentNamePrefix = "TeleportComponent_";
-const FORM = Symbol("form");
-const PATH = Symbol("path");
+const InjectionFormKey = Symbol("form");
+const InjectionPathKey = Symbol("path");
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -81,7 +81,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const namePath = computed(() => {
       return Array.isArray(props.path) ? props.path.join(".") : props.path;
     });
-    provide(PATH, namePath);
+    provide(InjectionPathKey, namePath);
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default", { path: namePath.value });
     };
@@ -424,8 +424,13 @@ const useFields = (initFields) => {
     getParentField
   };
 };
-const useFormData = (initFormData = {}) => {
-  const formData = reactive(initFormData);
+const InjectionFormDataKey = Symbol("form-data");
+const useFormData = (initFormData) => {
+  if (!initFormData) {
+    const injectFormDataStore = inject(InjectionFormDataKey, void 0);
+    if (injectFormDataStore) return injectFormDataStore;
+  }
+  const formData = reactive(initFormData ?? {});
   function getFormData(path) {
     if (!path) return void 0;
     return get(formData, path);
@@ -457,7 +462,9 @@ const useFormData = (initFormData = {}) => {
       Object.assign(formData, value);
     }
   }
-  return { formData, getFormData, setFormData };
+  const formDataStore = { formData, getFormData, setFormData };
+  provide(InjectionFormDataKey, formDataStore);
+  return formDataStore;
 };
 const useFormRef = () => {
   const formRef = ref();
@@ -476,7 +483,7 @@ function useForm(...args) {
     root = args[2] ?? root;
   }
   if (!root) {
-    const injectForm = inject(FORM);
+    const injectForm = inject(InjectionFormKey);
     if (injectForm) return injectForm;
   }
   return {
@@ -637,9 +644,9 @@ export {
   _sfc_main$3 as BaseFormItem,
   COMPONENT_MAP,
   _sfc_main$1 as ContainerFragment,
-  FORM,
   FORM_ITEM_SLOT_KEYS,
-  PATH,
+  InjectionFormKey,
+  InjectionPathKey,
   _sfc_main as SlotComponent,
   TeleportComponentNamePrefix,
   _sfc_main$6 as default,

package/es/index.d.ts

@@ -365,96 +365,7 @@ 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> & ({
         table?: T;
-        search?: (params: T["searchForm"]["formData"] & Required<Pick<Partial<ExtractPropTypes<    {
-        total: NumberConstructor;
-        defaultCurrent: NumberConstructor;
-        disabled: {
-        type: BooleanConstructor;
-        default: boolean;
-        };
-        current: NumberConstructor;
-        defaultPageSize: NumberConstructor;
-        pageSize: NumberConstructor;
-        hideOnSinglePage: {
-        type: BooleanConstructor;
-        default: boolean;
-        };
-        showSizeChanger: {
-        type: BooleanConstructor;
-        default: boolean;
-        };
-        pageSizeOptions: {
-        type: PropType<(string | number)[]>;
-        default: (string | number)[];
-        };
-        buildOptionText: {
-        type: PropType<(opt: {
-        value: any;
-        }) => any>;
-        default: (opt: {
-        value: any;
-        }) => any;
-        };
-        showQuickJumper: {
-        type: PropType<boolean | {
-        goButton?: any;
-        }>;
-        default: boolean | {
-        goButton?: any;
-        };
-        };
-        showTotal: {
-        type: PropType<(total: number, range: [number, number]) => any>;
-        default: (total: number, range: [number, number]) => any;
-        };
-        size: {
-        type: PropType<"default" | "small">;
-        default: "default" | "small";
-        };
-        simple: {
-        type: BooleanConstructor;
-        default: boolean;
-        };
-        locale: ObjectConstructor;
-        prefixCls: StringConstructor;
-        selectPrefixCls: StringConstructor;
-        totalBoundaryShowSizeChanger: NumberConstructor;
-        selectComponentClass: StringConstructor;
-        itemRender: {
-        type: PropType<(opt: {
-        page: number;
-        type: "page" | "prev" | "next" | "jump-prev" | "jump-next";
-        originalElement: any;
-        }) => any>;
-        default: (opt: {
-        page: number;
-        type: "page" | "prev" | "next" | "jump-prev" | "jump-next";
-        originalElement: any;
-        }) => any;
-        };
-        role: StringConstructor;
-        responsive: BooleanConstructor;
-        showLessItems: {
-        type: BooleanConstructor;
-        default: boolean;
-        };
-        onChange: {
-        type: PropType<(page: number, pageSize: number) => void>;
-        default: (page: number, pageSize: number) => void;
-        };
-        onShowSizeChange: {
-        type: PropType<(current: number, size: number) => void>;
-        default: (current: number, size: number) => void;
-        };
-        'onUpdate:current': {
-        type: PropType<(current: number) => void>;
-        default: (current: number) => void;
-        };
-        'onUpdate:pageSize': {
-        type: PropType<(size: number) => void>;
-        default: (size: number) => void;
-        };
-        }>>, "current" | "pageSize">>) => Promise<unknown>;
+        search?: () => Promise<unknown>;
         addIndexColumn?: boolean;
         immediateSearch?: boolean;
         control?: boolean | Partial<{
@@ -544,8 +455,6 @@ 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 const FORM: InjectionKey<Form>;
-
 export declare type Form<D extends Data = Data> = ReturnType<typeof useFormData<D>> & ReturnType<typeof useFields<D>> & ReturnType<typeof useFormRef>;
 
 export declare const FORM_ITEM_SLOT_KEYS: readonly ["label", "extra", "help", "tooltip"];
@@ -569,6 +478,10 @@ export declare const INJECT_CONFIG: {
     };
 };
 
+export declare const InjectionFormKey: InjectionKey<Form>;
+
+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'>;
@@ -604,8 +517,6 @@ declare type PageParam = Required<Pick<PaginationProps, (typeof pageParamPropert
 
 declare const pageParamProperty: readonly ["current", "pageSize", "total"];
 
-export declare const PATH: InjectionKey<ComputedRef<string | undefined>>;
-
 declare type Path<D extends Data = Data> = KeyPathString<D>;
 
 export declare type PathProps = {

package/es/index.js

@@ -1,6 +1,6 @@
 import "./antd-vue-pro.css";
 import _sfc_main from "./form/index.js";
-import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM, FORM_ITEM_SLOT_KEYS, PATH, SlotComponent, TeleportComponentNamePrefix, useFields, useForm, useFormData } from "./form/index.js";
+import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, useFields, useForm, useFormData } 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-DXPHmG1H.js";
@@ -28,10 +28,10 @@ export {
   BaseFormItem,
   COMPONENT_MAP,
   ContainerFragment,
-  FORM,
   FORM_ITEM_SLOT_KEYS,
   I as INJECT_CONFIG,
-  PATH,
+  InjectionFormKey,
+  InjectionPathKey,
   ProComponentProvider,
   ProForm,
   ProTable,

package/es/table/index.js

@@ -466,11 +466,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const loading = useModel(attrs, "loading");
     const _search = async () => {
       var _a;
-      const { current = 0, pageSize = 0 } = pageParam || {};
-      const param = { ...searchForm == null ? void 0 : searchForm.formData, current, pageSize };
       try {
         loading.value = true;
-        await ((_a = props.search) == null ? void 0 : _a.call(props, param));
+        await ((_a = props.search) == null ? void 0 : _a.call(props));
       } finally {
         loading.value = false;
       }
@@ -622,7 +620,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a9d8c25c"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb2f3860"]]);
 const getDefaultPageParam = () => ({ current: 1, pageSize: 10, total: 0 });
 const pageParamProperty = ["current", "pageSize", "total"];
 const useTable = (params) => {

package/package.json

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