@qin-ui/element-plus-pro 1.2.4 → 1.3.0

package/es/index.js

@@ -1,25 +1,22 @@
 import "./element-plus-pro.css";
-import { inject, computed, provide, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, useSlots, reactive, withModifiers, createElementVNode, onBeforeUnmount, watch, watchEffect, withKeys, normalizeStyle, nextTick, useModel, onMounted, mergeModels, resolveDirective, normalizeClass, withDirectives, guardReactiveProps } from "vue";
-import { ElTable, ElPagination, useFormDisabled, ElCol, ElFormItem, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn } from "element-plus";
-import { isPlainObject, getObject, toPath, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, omit, InjectionFormSlotsKey, cloneDeep, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, get, pick, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { inject, computed, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, toRaw, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, provide, useSlots, withModifiers, createElementVNode, onBeforeUnmount, watch, watchEffect, normalizeStyle, useModel, onMounted, mergeModels, resolveDirective, normalizeClass, withDirectives, guardReactiveProps, nextTick } from "vue";
+import { ElTable, ElPagination, useFormDisabled, ElCol, ElFormItem, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, localeContextKey, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElLoading } from "element-plus";
+import { isPlainObject, getObject, normalizePathKey, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, cloneDeep, InjectionFormSlotsKey, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, get, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
 const tableProps = () => ElTable.props || {};
 const paginationProps = () => ElPagination.props || {};
 const gridItemProps = () => ElCol.props || {};
 const formItemProps = () => ElFormItem.props || {};
-const DisabledContextKey = Symbol("pro-form-disabled-context");
+const DisabledContextKey = Symbol.for("pro-form-disabled-context");
 const useDisabledContext = () => {
   const formDisabled = useFormDisabled();
-  return inject(
-    DisabledContextKey,
-    computed(() => !!formDisabled.value)
-  );
-};
-const useDisabledContextProvider = (disabled) => {
-  provide(
-    DisabledContextKey,
-    computed(() => !!toValue(disabled))
-  );
+  const customDisabled = inject(DisabledContextKey, void 0);
+  return computed(() => {
+    if (customDisabled !== void 0 && toValue(customDisabled) !== void 0) {
+      return Boolean(toValue(customDisabled));
+    }
+    return Boolean(formDisabled.value);
+  });
 };
 const INJECT_CONFIG = {
   "pro-table": {
@@ -205,12 +202,15 @@ const componentMap = {
   "tree-select": ElTreeSelect,
   "transfer": ElTransfer
 };
-const formItemPropKeys = Object.keys(formItemProps());
+const formItemPropKeys = Object.keys(formItemProps()).filter(
+  (k) => k !== "disabled"
+);
 const gridItemPropKeys = Object.keys(gridItemProps());
 function useGroupFieldAttrs(validFields) {
   const config = INJECT_CONFIG["pro-form-item"];
   const injectFormItemProps = inject(config.injectionKey, config.default);
   return computed(() => {
+    const rawInjectProps = toValue(injectFormItemProps) || {};
     return validFields.value.map((field) => {
       let gridItemProps2 = {};
       let formItemProps2 = {};
@@ -229,7 +229,7 @@ function useGroupFieldAttrs(validFields) {
           lg,
           xl,
           ...injectRest
-        } = injectFormItemProps;
+        } = rawInjectProps;
         const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, span: injectSpan };
         gridItemProps2 = fields ? { span: span ?? 24 } : initGridItemProps;
         formItemProps2 = mergeProps(
@@ -256,7 +256,7 @@ function useGroupFieldAttrs(validFields) {
             componentProps.slots[k] = slots[k];
           }
         });
-        const raw2 = toValue(path) ?? toValue(name);
+        const raw2 = toValue(name) ?? toValue(path);
         return {
           path: Array.isArray(raw2) ? raw2.join(".") : raw2 || "",
           gridItemProps: gridItemProps2,
@@ -267,7 +267,7 @@ function useGroupFieldAttrs(validFields) {
           rawField: field
         };
       }
-      const raw = toValue(field == null ? void 0 : field.path) ?? toValue(field == null ? void 0 : field.name);
+      const raw = toValue(field == null ? void 0 : field.name) ?? toValue(field == null ? void 0 : field.path);
       return {
         path: Array.isArray(raw) ? raw.join(".") : raw || "",
         gridItemProps: gridItemProps2,
@@ -283,46 +283,56 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
-    grid: { type: [Boolean, Object], default: () => void 0 },
-    fields: { default: () => [] },
-    disabled: { type: Boolean, default: () => void 0 }
+    grid: { type: [Boolean, Object], default: void 0 },
+    fields: { default: () => [] }
   },
   setup(__props) {
-    const validFields = computed(() => {
-      var _a, _b;
-      return (_b = (_a = __props.fields).filter) == null ? void 0 : _b.call(_a, (field) => !field.hidden);
-    });
-    useDisabledContextProvider(computed(() => __props.disabled));
+    const props = __props;
+    const validFields = computed(
+      () => (props.fields ?? []).filter((field) => !field.hidden)
+    );
     const config = INJECT_CONFIG["pro-form"];
-    const { grid: injectGrid } = inject(config.injectionKey, config.default);
+    const injectFormConfig = inject(config.injectionKey, config.default);
+    const injectGrid = computed(() => {
+      var _a;
+      return (_a = toValue(injectFormConfig)) == null ? void 0 : _a.grid;
+    });
     const enableGrid = computed(() => {
-      if (__props.grid !== void 0) return !!__props.grid;
-      return !!injectGrid;
+      if (props.grid !== void 0) return !!props.grid;
+      return !!injectGrid.value;
     });
     const computedGridProps = computed(() => {
-      return enableGrid.value ? { ...getObject(injectGrid), ...getObject(__props.grid) } : {};
+      return enableGrid.value ? { ...getObject(injectGrid.value), ...getObject(props.grid) } : {};
     });
-    const formItemRefs = [];
-    const componentRefs = [];
-    const onFormItemMounted = (index2, formItemProps2) => {
-      const field = validFields.value[index2];
-      Object.assign(field, {
-        getFormItemRef: () => formItemRefs[index2],
-        getFormItemComputedProps: () => formItemProps2
-      });
+    const formItemInstanceMap = /* @__PURE__ */ new WeakMap();
+    const componentInstanceMap = /* @__PURE__ */ new WeakMap();
+    const setFormItemRef = (field, el, formItemProps2) => {
+      if (!field || typeof field !== "object") return;
+      const raw = toRaw(field);
+      if (el) {
+        formItemInstanceMap.set(raw, el);
+        raw.getFormItemRef = () => formItemInstanceMap.get(raw);
+        raw.getFormItemComputedProps = () => formItemProps2;
+      } else {
+        formItemInstanceMap.delete(raw);
+      }
     };
-    const onComponentMounted = (index2) => {
-      const field = validFields.value[index2];
-      Object.assign(field, {
-        getComponentRef: () => {
+    const setComponentRef = (field, el) => {
+      if (!field || typeof field !== "object") return;
+      const raw = toRaw(field);
+      if (el) {
+        componentInstanceMap.set(raw, el);
+        raw.getComponentRef = () => {
           var _a;
-          return (_a = componentRefs[index2]) == null ? void 0 : _a.getComponentRef();
-        },
-        getComponentComputedProps: () => {
+          return (_a = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentRef();
+        };
+        raw.getComponentComputedProps = () => {
           var _a;
-          return (_a = componentRefs[index2]) == null ? void 0 : _a.getComponentComputedProps();
-        }
-      });
+          return (_a = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentComputedProps();
+        };
+      } else {
+        componentInstanceMap.delete(raw);
+      }
     };
     const groupedFields = useGroupFieldAttrs(validFields);
     return (_ctx, _cache) => {
@@ -344,25 +354,22 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(unref(ElFormItem), mergeProps({ ref_for: true }, item.formItemProps, {
                       ref_for: true,
-                      ref: (el) => formItemRefs[index2] = el,
-                      prop: unref(toPath)(item.path).join("."),
-                      path: item.path,
-                      onVnodeMounted: ($event) => onFormItemMounted(index2, item.formItemProps)
+                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
+                      prop: unref(normalizePathKey)(item.path),
+                      path: item.path
                     }), createSlots({
                       default: withCtx(() => [
                         item.rawField.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
                           key: 0,
-                          grid: item.rawField.grid ?? __props.grid,
-                          fields: item.rawField.fields,
-                          disabled: toValue(item.rawField.disabled)
-                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$e), mergeProps({
+                          grid: item.rawField.grid ?? props.grid,
+                          fields: item.rawField.fields
+                        }, null, 8, ["grid", "fields"])) : (openBlock(), createBlock(unref(_sfc_main$e), mergeProps({
                           key: 1,
                           ref_for: true,
-                          ref: (el) => componentRefs[index2] = el
+                          ref: (el) => setComponentRef(item.rawField, el)
                         }, { ref_for: true }, item.componentProps, {
-                          path: item.path,
-                          onVnodeMounted: ($event) => onComponentMounted(index2)
-                        }), null, 16, ["path", "onVnodeMounted"]))
+                          path: item.path
+                        }), null, 16, ["path"]))
                       ]),
                       _: 2
                     }, [
@@ -377,7 +384,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                           ])
                         };
                       })
-                    ]), 1040, ["prop", "path", "onVnodeMounted"])
+                    ]), 1040, ["prop", "path"])
                   ]),
                   _: 2
                 }, 1032, ["component", "path"])
@@ -398,7 +405,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-295cd434"]]);
+const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-3cc74dbb"]]);
 function useForm(...args) {
   return useForm$1(...args);
 }
@@ -443,13 +450,10 @@ const getPlaceholderProps = (key, injectProps, t) => {
   if (!placeholderKey || injectProps.placeholder !== void 0) return {};
   return { placeholder: t(placeholderKey) };
 };
-const getInitProps = (field, t) => {
+const getInitProps = (field, injectProps = {}, t) => {
   const { component, type } = field;
   if (typeof component === "string") {
     const k = [component, type].filter(Boolean).join(".");
-    const config = getInjectConfig(k);
-    if (!config) return getPlaceholderProps(k, {}, t);
-    const injectProps = inject(config.injectionKey, config.default);
     return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
   }
   return {};
@@ -495,9 +499,13 @@ const enUS = {
 };
 const LOCALE_INJECT_KEY = Symbol("pro-locale");
 const useLocale = () => {
+  const elLocaleContext = inject(localeContextKey, void 0);
   const { lang: elLang } = useLocale$1();
   const override = inject(LOCALE_INJECT_KEY, void 0);
-  const lang = computed(() => resolveLocaleName(elLang.value));
+  const lang = computed(() => {
+    if (!elLocaleContext) return "zh-CN";
+    return resolveLocaleName(elLang.value);
+  });
   const pack = computed(
     () => lang.value === "zh-TW" ? zhTW : lang.value === "en-US" ? enUS : zhCN
   );
@@ -512,21 +520,23 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseField", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { default: () => void 0 },
+    component: { default: void 0 },
     path: { default: "" }
   },
   setup(__props, { expose: __expose }) {
+    const props = __props;
     const { t } = useLocale();
     const form = useForm(false);
-    const { getFormData, setFormData } = form;
     const componentRef = ref();
     const attrs = useAttrs();
-    function getOldValue() {
-      return cloneDeep(getFormData == null ? void 0 : getFormData(__props.path));
-    }
+    const typeVal = attrs.type;
+    const injectConfigKey = typeof props.component === "string" ? [props.component, typeVal].filter(Boolean).join(".") : "";
+    const componentInjectConfig = injectConfigKey ? getInjectConfig(injectConfigKey) : void 0;
+    const rawInjectComponentProps = componentInjectConfig ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default) : void 0;
     const value = computed({
       get() {
-        let val = getFormData == null ? void 0 : getFormData(__props.path);
+        var _a;
+        let val = (_a = form.getFormData) == null ? void 0 : _a.call(form, props.path);
         const { valueFormatter } = groupedAttrs.value;
         if (typeof valueFormatter === "object" && typeof valueFormatter.get === "function") {
           val = valueFormatter.get(val);
@@ -534,59 +544,61 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         return val;
       },
       set(val) {
+        var _a, _b;
         let newVal = val;
         const { valueFormatter } = groupedAttrs.value;
-        if (valueFormatter) {
-          if (typeof valueFormatter === "function") {
-            newVal = valueFormatter(val, getOldValue());
-          } else if (typeof valueFormatter.set === "function") {
-            newVal = valueFormatter.set(val, getOldValue());
-          }
+        const setFormatter = typeof valueFormatter === "function" ? valueFormatter : typeof valueFormatter === "object" && typeof (valueFormatter == null ? void 0 : valueFormatter.set) === "function" ? valueFormatter.set : void 0;
+        if (setFormatter) {
+          const oldVal = setFormatter.length > 1 ? cloneDeep((_a = form.getFormData) == null ? void 0 : _a.call(form, props.path)) : void 0;
+          newVal = setFormatter(val, oldVal);
         }
-        setFormData == null ? void 0 : setFormData(__props.path, newVal);
+        (_b = form.setFormData) == null ? void 0 : _b.call(form, props.path, newVal);
       }
     });
     const parentDisabled = useDisabledContext();
     const groupedAttrs = computed(() => {
+      const currentInjectProps = toValue(rawInjectComponentProps) || {};
       const initProps = getInitProps(
         {
-          component: __props.component,
+          component: props.component,
           type: attrs.type
         },
+        currentInjectProps,
         t
       );
       const modelPropName = attrs.modelProp ?? initProps.modelProp ?? "modelValue";
+      const effectiveDisabled = attrs.disabled !== void 0 ? Boolean(attrs.disabled) : Boolean(parentDisabled.value || initProps.disabled);
       const mergedProps = mergeProps(
         initProps,
         attrs,
         { class: attrs.componentClass, style: attrs.componentStyle },
         { class: initProps.componentClass, style: initProps.componentStyle },
-        { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
+        { disabled: effectiveDisabled },
         { modelProp: modelPropName }
       );
-      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, ...rest } = mergedProps;
-      const modelBindingProp = modelProp ?? "modelValue";
-      const bindAttrs = omit(rest, [
-        modelBindingProp,
-        `onUpdate:${modelBindingProp}`
-      ]);
+      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [modelPropName]: _modelVal, [`onUpdate:${modelPropName}`]: _onUpdateModelVal, ...bindAttrs } = mergedProps;
       return {
         attrs: bindAttrs,
         slots,
         componentContainer,
-        modelProp: modelBindingProp,
+        modelProp: modelPropName,
         valueFormatter
       };
     });
     const formSlots = inject(InjectionFormSlotsKey, void 0);
     const customComponents = inject(INJECT_COMPONENTS, {});
     const is = computed(() => {
-      const teleportSlot = __props.path && (formSlots == null ? void 0 : formSlots[__props.path]);
+      const teleportSlot = props.path && (formSlots == null ? void 0 : formSlots[props.path]);
       if (teleportSlot) return teleportSlot;
-      if (typeof __props.component === "string") {
-        return customComponents[__props.component] || componentMap[__props.component] || __props.component;
+      if (typeof props.component === "string") {
+        const resolved = customComponents[props.component] || componentMap[props.component];
+        if (resolved) return resolved;
+        console.warn(
+          `[pro-components] 未识别的组件类型 "${props.component}"，已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
+        );
+        return props.component;
       }
-      return __props.component;
+      return props.component;
     });
     __expose({
       getComponentRef: () => componentRef.value,
@@ -595,7 +607,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$d), {
         component: groupedAttrs.value.componentContainer,
-        path: __props.path
+        path: props.path
       }, {
         default: withCtx(() => [
           is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
@@ -603,13 +615,15 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
             ref: componentRef,
             [`${groupedAttrs.value.modelProp}`]: value.value,
             [`onUpdate:${groupedAttrs.value.modelProp}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            path: __props.path
+            path: props.path
           }), createSlots({ _: 2 }, [
             renderList(groupedAttrs.value.slots, (slot, name) => {
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main$c), mergeProps({ path: __props.path }, scoped, { component: slot }), null, 16, ["path", "component"])
+                  createVNode(unref(_sfc_main$c), mergeProps({
+                    path: props.path
+                  }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
               };
             })
@@ -656,36 +670,83 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     grid: { type: [Boolean, Object], default: false },
-    form: { default: () => ({}) }
+    form: { default: void 0 }
   },
   setup(__props) {
-    provide(InjectionFormKey, __props.form);
-    const { formData, fields, setFormRef } = __props.form;
-    const _fields = computed(() => fields.value);
+    const props = __props;
+    const fallbackForm = props.form ? void 0 : useForm();
+    const currentForm = computed(
+      () => props.form ?? fallbackForm
+    );
+    const formProxy = new Proxy({}, {
+      get(_, prop) {
+        const target = currentForm.value;
+        const val = target == null ? void 0 : target[prop];
+        if (typeof val === "function") {
+          return (...args) => {
+            var _a, _b;
+            return (_b = (_a = currentForm.value) == null ? void 0 : _a[prop]) == null ? void 0 : _b.call(_a, ...args);
+          };
+        }
+        return val;
+      },
+      set(_, prop, value) {
+        if (currentForm.value) {
+          currentForm.value[prop] = value;
+        }
+        return true;
+      },
+      has(_, prop) {
+        return Boolean(currentForm.value && prop in currentForm.value);
+      }
+    });
+    provide(InjectionFormKey, formProxy);
+    const fields = computed(() => {
+      var _a;
+      const f = (_a = currentForm.value) == null ? void 0 : _a.fields;
+      return (Array.isArray(f) ? f : f == null ? void 0 : f.value) ?? [];
+    });
+    const formData = computed(() => {
+      var _a;
+      return (_a = currentForm.value) == null ? void 0 : _a.formData;
+    });
+    const setFormRef = (el) => {
+      var _a, _b;
+      return (_b = (_a = currentForm.value) == null ? void 0 : _a.setFormRef) == null ? void 0 : _b.call(_a, el);
+    };
+    let formInstanceCounter = 0;
+    const formInstanceKeyMap = /* @__PURE__ */ new WeakMap();
+    const getFormKey = (f) => {
+      if (!formInstanceKeyMap.has(f)) {
+        formInstanceKeyMap.set(f, ++formInstanceCounter);
+      }
+      return formInstanceKeyMap.get(f);
+    };
+    const formKey = computed(() => getFormKey(currentForm.value));
     const config = INJECT_CONFIG["pro-form"];
+    const injectFormConfig = inject(config.injectionKey, config.default);
     const attrs = useAttrs();
-    const { grid: _injectGrid, ...injectAttrs } = inject(
-      config.injectionKey,
-      config.default
-    );
+    const injectAttrs = computed(() => {
+      const raw = toValue(injectFormConfig);
+      const { grid: _injectGrid, ...rest } = raw || {};
+      return rest;
+    });
     const slots = useSlots();
-    provide(InjectionFormSlotsKey, reactive(slots));
+    provide(InjectionFormSlotsKey, slots);
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElForm), mergeProps({
-        ref: (el) => {
-          var _a;
-          return (_a = unref(setFormRef)) == null ? void 0 : _a(el);
-        },
-        model: unref(formData)
-      }, mergeProps(injectAttrs, unref(camelizeProperties)(unref(attrs))), {
+        key: formKey.value,
+        ref: setFormRef,
+        model: formData.value
+      }, mergeProps(injectAttrs.value, unref(camelizeProperties)(unref(attrs))), {
         class: "pro-form",
         onSubmit: _cache[0] || (_cache[0] = withModifiers(() => {
         }, ["prevent"]))
       }), {
         default: withCtx(() => [
           createVNode(unref(BaseFormItem), {
-            fields: _fields.value,
-            grid: __props.grid
+            fields: fields.value,
+            grid: props.grid
           }, null, 8, ["fields", "grid"]),
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -720,7 +781,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   ...{ name: "SearchForm" },
   __name: "SearchForm",
   props: {
-    form: {},
+    form: { default: void 0 },
     layout: { default: "grid" },
     expand: { type: [Boolean, Object], default: true },
     searchButton: { type: [Object, Function, Boolean], default: void 0 },
@@ -734,6 +795,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   emits: ["search", "reset"],
   setup(__props, { emit: __emit }) {
     const { t } = useLocale();
+    const props = __props;
     const emit = __emit;
     const proFormHeight = ref("unset");
     const collapseHeight = ref(0);
@@ -754,45 +816,45 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       cleanupObservers();
     });
     const computedExpand = computed(() => {
-      if (!__props.expand) return false;
-      if (__props.expand === true) return { minExpandRows: 2, expandStatus: false };
+      if (!props.expand) return false;
+      if (props.expand === true) return { minExpandRows: 2, expandStatus: false };
       return {
-        minExpandRows: Math.max(Math.floor(__props.expand.minExpandRows ?? 2), 1),
-        expandStatus: __props.expand.expandStatus ?? false
+        minExpandRows: Math.max(Math.floor(props.expand.minExpandRows ?? 2), 1),
+        expandStatus: props.expand.expandStatus ?? false
       };
     });
     const showExpandToggle = ref(false);
     const expandStatus = ref(true);
-    const { formRef, getFormData } = __props.form;
     const updateHeights = () => {
-      var _a, _b, _c, _d, _e, _f;
-      if (!__props.expand || !formRef.value) return;
-      const proFormEl = (_a = formRef.value) == null ? void 0 : _a.$el;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (!props.expand || !((_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value)) return;
+      const proFormEl = (_c = props.form.formRef.value) == null ? void 0 : _c.$el;
       if (!proFormEl) return;
-      const itemHeight = (_d = (_c = (_b = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _b.getBoundingClientRect) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.height;
+      const itemHeight = (_f = (_e = (_d = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _d.getBoundingClientRect) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.height;
       if (itemHeight && itemHeight > 0) {
         rowHeight.value = itemHeight;
       }
-      const naturalHeight = proFormEl.scrollHeight || ((_f = (_e = proFormEl.getBoundingClientRect) == null ? void 0 : _e.call(proFormEl)) == null ? void 0 : _f.height) || 0;
+      const naturalHeight = proFormEl.scrollHeight || ((_h = (_g = proFormEl.getBoundingClientRect) == null ? void 0 : _g.call(proFormEl)) == null ? void 0 : _h.height) || 0;
       if (naturalHeight > 0) {
         proFormHeight.value = naturalHeight;
       }
     };
+    const isManualToggle = ref(false);
     const changeExpandStatus = () => {
+      isManualToggle.value = true;
       expandStatus.value = !expandStatus.value;
-      nextTick(() => {
-        updateHeights();
-      });
     };
     const hasFieldValue = (val) => val !== null && val !== void 0 && val !== "" && !(Array.isArray(val) && val.length === 0) && !(typeof val === "object" && Object.keys(val).length === 0);
     const setInitExpandStatus = () => {
-      var _a;
-      expandStatus.value = false;
-      if (formRef.value && __props.expand) {
-        const formEl = formRef.value.$el;
-        const formItemsEl = (_a = formEl == null ? void 0 : formEl.querySelectorAll) == null ? void 0 : _a.call(
+      var _a, _b, _c;
+      if (isManualToggle.value) return;
+      const initStatus = computedExpand.value ? computedExpand.value.expandStatus : false;
+      expandStatus.value = initStatus;
+      if (((_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value) && computedExpand.value) {
+        const formEl = props.form.formRef.value.$el;
+        const formItemsEl = (_c = formEl == null ? void 0 : formEl.querySelectorAll) == null ? void 0 : _c.call(
           formEl,
-          "[class*='-form-item'] > [path]"
+          "[class*='-form-item'] [path]"
         );
         if (!formItemsEl || formItemsEl.length === 0) return;
         if (intersectionObserver) {
@@ -800,13 +862,15 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         }
         intersectionObserver = new IntersectionObserver(
           (entries) => {
+            if (isManualToggle.value) return;
             expandStatus.value = entries.some((e) => {
+              var _a2, _b2;
               if (e.intersectionRatio === 0) {
                 const path = e.target.getAttribute("path");
-                const searchFieldValue = path ? getFormData == null ? void 0 : getFormData(path) : void 0;
+                const searchFieldValue = path ? (_b2 = (_a2 = props.form) == null ? void 0 : _a2.getFormData) == null ? void 0 : _b2.call(_a2, path) : void 0;
                 return hasFieldValue(searchFieldValue);
               }
-              return __props.expand.expandStatus;
+              return computedExpand.value ? computedExpand.value.expandStatus : false;
             });
             intersectionObserver == null ? void 0 : intersectionObserver.disconnect();
           },
@@ -821,10 +885,13 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       [
         () => {
           var _a, _b, _c;
-          return (_c = (_b = (_a = __props.form) == null ? void 0 : _a.fields.value) == null ? void 0 : _b.filter((f) => !f.hidden)) == null ? void 0 : _c.length;
+          return (_c = (_b = (_a = props.form) == null ? void 0 : _a.fields.value) == null ? void 0 : _b.filter((f) => !f.hidden)) == null ? void 0 : _c.length;
         },
-        () => formRef.value,
-        () => __props.expand
+        () => {
+          var _a, _b;
+          return (_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value;
+        },
+        () => props.expand
       ],
       () => {
         updateHeights();
@@ -832,7 +899,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       { flush: "post", immediate: true }
     );
     watch(
-      () => formRef.value,
+      () => {
+        var _a, _b;
+        return (_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value;
+      },
       (val) => {
         if (resizeObserver) {
           resizeObserver.disconnect();
@@ -851,10 +921,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     watchEffect(
       () => {
         if (typeof proFormHeight.value !== "number") return;
-        if (__props.layout === "grid" && computedExpand.value) {
+        if (props.layout === "grid" && computedExpand.value) {
           const { minExpandRows } = computedExpand.value;
           collapseHeight.value = Math.min(
-            minExpandRows * rowHeight.value + (minExpandRows - 1) * __props.rowGap,
+            minExpandRows * rowHeight.value + (minExpandRows - 1) * props.rowGap,
             +proFormHeight.value
           );
           showExpandToggle.value = +proFormHeight.value - collapseHeight.value > 1;
@@ -867,28 +937,30 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       },
       { flush: "post" }
     );
-    const layoutProps = computed(
-      () => __props.layout === "grid" ? {
+    const layoutProps = computed(() => {
+      const currentHeight = expandStatus.value ? proFormHeight.value : collapseHeight.value;
+      const heightStyle = currentHeight !== "unset" && currentHeight !== void 0 ? `${currentHeight}px` : void 0;
+      return props.layout === "grid" ? {
         grid: {
-          gutter: __props.columnGap,
-          style: { rowGap: `${__props.rowGap}px` }
+          gutter: props.columnGap,
+          style: { rowGap: `${props.rowGap}px` }
         },
         style: {
           display: "flex",
           overflow: "hidden",
-          columnGap: `${__props.columnGap}px`,
-          height: `${expandStatus.value ? proFormHeight.value : collapseHeight.value}px`
+          columnGap: `${props.columnGap}px`,
+          height: heightStyle
         }
       } : {
         inline: true,
         style: {
           display: "flex",
           flexWrap: "wrap",
-          gap: `${__props.rowGap}px ${__props.columnGap}px`
+          gap: `${props.rowGap}px ${props.columnGap}px`
         },
         grid: false
-      }
-    );
+      };
+    });
     const onReset = () => {
       emit("reset");
     };
@@ -897,9 +969,8 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$b), mergeProps(layoutProps.value, {
-        form: __props.form,
-        class: "pro-table_search-form transition",
-        onKeyup: withKeys(onSearch, ["enter"])
+        form: props.form,
+        class: "pro-table_search-form transition"
       }), {
         default: withCtx(() => [
           createVNode(unref(ElSpace), {
@@ -907,9 +978,9 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
             class: "pro-table_search-form_button-group"
           }, {
             default: withCtx(() => [
-              renderSlot(_ctx.$slots, "reset-button", { onClick: onReset }, () => [
-                __props.resetButton !== false ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  __props.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.resetButton), {
+              renderSlot(_ctx.$slots, "reset-button", { onReset }, () => [
+                props.resetButton !== false ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                  props.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(props.resetButton), {
                     key: 0,
                     onClick: onReset
                   })) : (openBlock(), createBlock(unref(ElButton), {
@@ -924,9 +995,9 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                   }))
                 ], 64)) : createCommentVNode("", true)
               ], true),
-              renderSlot(_ctx.$slots, "search-button", { onClick: onSearch }, () => [
-                __props.searchButton !== false ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  __props.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.searchButton), {
+              renderSlot(_ctx.$slots, "search-button", { onSearch }, () => [
+                props.searchButton !== false ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                  props.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(props.searchButton), {
                     key: 0,
                     onClick: onSearch
                   })) : (openBlock(), createBlock(unref(ElButton), {
@@ -943,9 +1014,12 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                   }))
                 ], 64)) : createCommentVNode("", true)
               ], true),
-              renderSlot(_ctx.$slots, "expand-button", { onClick: changeExpandStatus }, () => [
-                __props.expandButton !== false && showExpandToggle.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  __props.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.expandButton), {
+              renderSlot(_ctx.$slots, "expand-button", {
+                expandStatus: expandStatus.value,
+                changeExpandStatus
+              }, () => [
+                props.expandButton !== false && showExpandToggle.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                  props.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(props.expandButton), {
                     key: 0,
                     "expand-status": expandStatus.value,
                     onClick: changeExpandStatus
@@ -975,7 +1049,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-20c91e48"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-54c7c01c"]]);
 const _sfc_main$8 = {};
 const _hoisted_1$4 = { class: "pro-table_search-form-container" };
 function _sfc_render$3(_ctx, _cache) {
@@ -1018,7 +1092,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const { t } = useLocale();
     const size = useModel(__props, "size");
-    size.value = size.value ?? "default";
+    const currentSize = computed(() => size.value ?? "default");
     const items = computed(() => [
       { label: t("table.sizeDefault"), key: "default" },
       { label: t("table.sizeMiddle"), key: "large" },
@@ -1036,7 +1110,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 return openBlock(), createBlock(unref(ElDropdownItem), {
                   key: item.key,
                   command: item.key,
-                  disabled: item.key === size.value
+                  disabled: item.key === currentSize.value
                 }, {
                   default: withCtx(() => [
                     createTextVNode(toDisplayString(item.label), 1)
@@ -1064,7 +1138,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-b114045c"]]);
+const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-e31e9c15"]]);
 const _sfc_main$4 = {};
 const _hoisted_1$1 = {
   focusable: "false",
@@ -1085,27 +1159,27 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "ColumnControl",
   props: {
     columns: {},
-    table: { default: () => void 0 },
-    columnControl: { default: () => void 0 }
+    table: { default: void 0 },
+    columnControl: { default: void 0 }
   },
   setup(__props) {
+    const props = __props;
     const { t } = useLocale();
-    const open = ref(false);
     const checkAll = ref(false);
     const indeterminate = ref(false);
     const getColumnKey = (column, index2) => {
-      const key = column.key ?? column.prop;
-      if (key === void 0 || key === null) return `__col_${index2}`;
-      return Array.isArray(key) ? key.join(".") : String(key);
+      const rawKey = column.key ?? column.prop;
+      if (rawKey === void 0 || rawKey === null) return `__col_${index2}`;
+      return normalizePathKey(rawKey);
     };
     const checkedColumnsOptions = computed(
-      () => __props.columns.map((item, index2) => {
+      () => props.columns.map((item, index2) => {
         var _a, _b, _c, _d;
         const key = getColumnKey(item, index2);
-        const excluded = (_b = (_a = __props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some(
+        const excluded = (_b = (_a = props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some(
           (ek) => String(ek) === key
         );
-        const disabled = (_d = (_c = __props.columnControl) == null ? void 0 : _c.disabledKeys) == null ? void 0 : _d.some(
+        const disabled = (_d = (_c = props.columnControl) == null ? void 0 : _c.disabledKeys) == null ? void 0 : _d.some(
           (dk) => String(dk) === key
         );
         const label = String(
@@ -1134,7 +1208,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         checkedColumnsOptions.value.forEach((item) => {
           var _a;
           if (item.disabled) return;
-          (_a = __props.table) == null ? void 0 : _a.setColumn(item.value, {
+          (_a = props.table) == null ? void 0 : _a.setColumn(item.value, {
             hidden: !val.includes(item.value)
           });
         });
@@ -1170,20 +1244,20 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     );
     onMounted(() => {
       var _a, _b;
-      (_b = (_a = __props.columnControl) == null ? void 0 : _a.disabledKeys) == null ? void 0 : _b.forEach((key) => {
+      (_b = (_a = props.columnControl) == null ? void 0 : _a.disabledKeys) == null ? void 0 : _b.forEach((key) => {
         var _a2;
-        (_a2 = __props.table) == null ? void 0 : _a2.setColumn(String(key), { hidden: false });
+        (_a2 = props.table) == null ? void 0 : _a2.setColumn(String(key), { hidden: false });
       });
     });
     watch(
       () => {
         var _a;
-        return (_a = __props.columnControl) == null ? void 0 : _a.disabledKeys;
+        return (_a = props.columnControl) == null ? void 0 : _a.disabledKeys;
       },
       (keys) => {
         keys == null ? void 0 : keys.forEach((key) => {
           var _a;
-          (_a = __props.table) == null ? void 0 : _a.setColumn(String(key), { hidden: false });
+          (_a = props.table) == null ? void 0 : _a.setColumn(String(key), { hidden: false });
         });
       },
       { deep: true }
@@ -1191,16 +1265,14 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElDropdown), {
         trigger: "click",
-        "hide-on-click": false,
-        visible: open.value,
-        onVisibleChange: _cache[0] || (_cache[0] = (val) => open.value = val)
+        "hide-on-click": false
       }, {
         dropdown: withCtx(() => [
           createVNode(unref(ElDropdownMenu), null, {
             default: withCtx(() => {
               var _a;
               return [
-                !((_a = __props.columnControl) == null ? void 0 : _a.disableCheckAll) ? (openBlock(), createBlock(unref(ElDropdownItem), {
+                !((_a = props.columnControl) == null ? void 0 : _a.disableCheckAll) ? (openBlock(), createBlock(unref(ElDropdownItem), {
                   key: 0,
                   disabled: true,
                   divided: false
@@ -1256,39 +1328,41 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           })
         ]),
         _: 1
-      }, 8, ["visible"]);
+      });
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-97c582f9"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-f98ee06d"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
   props: {
-    columns: {}
+    columns: { default: () => [] }
   },
   setup(__props) {
+    const props = __props;
     const getColumnKey = (column, index2) => {
-      const key = column.key ?? column.prop;
-      if (key === void 0 || key === null) return `__col_${index2}`;
-      return Array.isArray(key) ? key.join(".") : String(key);
+      const rawKey = column.key ?? column.prop;
+      if (rawKey === void 0 || rawKey === null) return `__col_${index2}`;
+      return normalizePathKey(rawKey);
     };
     const getCellValue = (row, column) => {
       const path = column.prop;
       if (!path) return void 0;
-      return get(row, toPath(path));
+      return get(row, path);
     };
     const normalizedColumns = computed(() => {
-      return __props.columns.filter((column) => !column.hidden);
+      return props.columns.filter((column) => !column.hidden);
     });
     const getColumnProps = (column) => {
       const { hidden, render, key, children, ...rest } = column;
-      const prop = column.prop ? String(column.prop) : void 0;
+      const prop = column.prop ? normalizePathKey(column.prop) : void 0;
+      const columnKey = key ? normalizePathKey(key) : prop;
       return {
         ...rest,
         label: column.label ?? column.title,
         prop,
-        columnKey: key ? String(key) : prop
+        columnKey
       };
     };
     return (_ctx, _cache) => {
@@ -1351,19 +1425,25 @@ const _hoisted_5 = {
   class: "pro-table_header_column-control"
 };
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
-  ...{ name: "ProTable", inheritAttrs: false },
+  ...{
+    name: "ProTable",
+    directives: {
+      loading: ElLoading.directive
+    },
+    inheritAttrs: false
+  },
   __name: "ProTable",
   props: /* @__PURE__ */ mergeModels({
-    table: { default: () => void 0 },
+    table: { default: void 0 },
     search: { type: Function, default: void 0 },
-    addIndexColumn: { type: Boolean, default: () => void 0 },
-    immediateSearch: { type: Boolean, default: () => void 0 },
-    control: { type: [Boolean, Object], default: () => void 0 },
-    searchFormConfig: { default: () => void 0 },
+    addIndexColumn: { type: Boolean, default: void 0 },
+    immediateSearch: { type: Boolean, default: void 0 },
+    control: { type: [Boolean, Object], default: void 0 },
+    searchFormConfig: { default: void 0 },
     tableContainer: { type: [Object, Function, Boolean], default: void 0 },
-    columns: { default: () => void 0 },
-    data: { default: () => void 0 },
-    pagination: { type: [Boolean, Object], default: () => void 0 },
+    columns: { default: void 0 },
+    data: { default: void 0 },
+    pagination: { type: [Boolean, Object], default: void 0 },
     size: {},
     width: {},
     height: {},
@@ -1371,61 +1451,63 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     fit: { type: Boolean },
     stripe: { type: Boolean },
     border: { type: Boolean },
-    rowKey: { type: [String, Function] },
+    rowKey: {},
     context: {},
     showHeader: { type: Boolean },
     showSummary: { type: Boolean },
     sumText: {},
-    summaryMethod: { type: Function },
-    rowClassName: { type: [String, Function] },
-    rowStyle: { type: [Object, Function] },
-    cellClassName: { type: [String, Function] },
-    cellStyle: { type: [Object, Function] },
-    headerRowClassName: { type: [String, Function] },
-    headerRowStyle: { type: [Object, Function] },
-    headerCellClassName: { type: [String, Function] },
-    headerCellStyle: { type: [Object, Function] },
+    summaryMethod: {},
+    rowClassName: {},
+    rowStyle: {},
+    cellClassName: {},
+    cellStyle: {},
+    headerRowClassName: {},
+    headerRowStyle: {},
+    headerCellClassName: {},
+    headerCellStyle: {},
     highlightCurrentRow: { type: Boolean },
     currentRowKey: {},
     emptyText: {},
     expandRowKeys: {},
     defaultExpandAll: { type: Boolean },
-    rowExpandable: { type: Function },
+    rowExpandable: {},
     defaultSort: {},
     tooltipEffect: {},
     tooltipOptions: {},
-    spanMethod: { type: Function },
+    spanMethod: {},
     selectOnIndeterminate: { type: Boolean },
     indent: {},
     treeProps: {},
     lazy: { type: Boolean },
-    load: { type: Function },
+    load: {},
     className: {},
     style: { type: [Boolean, null, String, Object, Array] },
     tableLayout: {},
     scrollbarAlwaysOn: { type: Boolean },
     flexible: { type: Boolean },
     showOverflowTooltip: { type: [Boolean, Object] },
-    tooltipFormatter: { type: Function },
+    tooltipFormatter: {},
     appendFilterPanelTo: {},
     scrollbarTabindex: {},
     nativeScrollbar: { type: Boolean }
   }, {
     "size": {},
     "sizeModifiers": {},
-    "loading": { type: Boolean },
+    "loading": { type: Boolean, ...{ default: false } },
     "loadingModifiers": {}
   }),
   emits: ["update:size", "update:loading"],
   setup(__props) {
+    const props = __props;
     const { t } = useLocale();
     const config = INJECT_CONFIG["pro-table"];
-    const injectProps = inject(config.injectionKey, config.default);
+    const injectPropsRaw = inject(config.injectionKey, config.default);
+    const injectProps = computed(() => toValue(injectPropsRaw) || {});
     const tableProperties = Object.keys(tableProps());
     const paginationProperties = Object.keys(paginationProps());
     const attrs = useAttrs();
     const injectTableAttrs = computed(() => {
-      return pick(injectProps, tableProperties);
+      return pick(injectProps.value, tableProperties);
     });
     const attrsTableProps = computed(() => {
       return pick(
@@ -1433,27 +1515,23 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         tableProperties
       );
     });
-    const {
-      columns: tableColumns,
-      data: tableData,
-      searchForm,
-      pageParam,
-      setPageParam
-    } = __props.table || {};
     const size = useModel(__props, "size");
     const loading = useModel(__props, "loading");
     const _search = async () => {
       var _a;
-      try {
+      const searchPromise = (_a = props.search || attrs.onSearch) == null ? void 0 : _a();
+      if (isPromise(searchPromise)) {
         loading.value = true;
-        await ((_a = __props.search) == null ? void 0 : _a.call(__props));
-      } finally {
-        loading.value = false;
+        try {
+          await searchPromise;
+        } finally {
+          loading.value = false;
+        }
       }
     };
     const reset = () => {
-      var _a;
-      (_a = __props.table) == null ? void 0 : _a.resetQueryParams();
+      var _a, _b;
+      (_b = (_a = props.table) == null ? void 0 : _a.resetQueryParams) == null ? void 0 : _b.call(_a);
       nextTick(() => {
         _search();
       });
@@ -1475,31 +1553,43 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     });
     const tableSlotNames = computed(() => Object.keys(tableSlots.value));
     const searchPage1st = () => {
-      setPageParam == null ? void 0 : setPageParam({ current: 1 });
+      var _a, _b;
+      (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current: 1 });
       _search();
     };
     const computedSearchFormConfig = computed(() => {
       var _a, _b;
-      const container = ((_a = __props.searchFormConfig) == null ? void 0 : _a.container) ?? ((_b = injectProps.searchFormConfig) == null ? void 0 : _b.container) ?? DefaultSearchFormContainer;
+      const container = ((_a = props.searchFormConfig) == null ? void 0 : _a.container) ?? ((_b = injectProps.value.searchFormConfig) == null ? void 0 : _b.container) ?? DefaultSearchFormContainer;
       return {
-        ...injectProps.searchFormConfig,
-        ...getObject(__props.searchFormConfig),
+        ...injectProps.value.searchFormConfig,
+        ...getObject(props.searchFormConfig),
         container: container ? container : void 0
       };
     });
     const computedTableContainer = computed(() => {
-      const container = __props.tableContainer ?? injectProps.tableContainer ?? DefaultTableContainer;
+      const container = props.tableContainer ?? injectProps.value.tableContainer ?? DefaultTableContainer;
       return container ? container : void 0;
     });
+    const getIndex = (i) => {
+      var _a;
+      if (((_a = props.table) == null ? void 0 : _a.pageParam) && computedPagination.value !== false) {
+        const current = props.table.pageParam.current ?? 1;
+        const pageSize = props.table.pageParam.pageSize ?? 10;
+        return (current - 1) * pageSize + i + 1;
+      }
+      return i + 1;
+    };
     const normalizedRawColumns = computed(() => {
-      const source = __props.columns ?? (tableColumns == null ? void 0 : tableColumns.value) ?? [];
-      if (__props.addIndexColumn ?? injectProps.addIndexColumn) {
+      var _a;
+      const source = props.columns ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? [];
+      if (props.addIndexColumn ?? injectProps.value.addIndexColumn) {
         return [
           {
             key: "_index",
             type: "index",
             label: t("table.index"),
-            width: 80
+            width: 80,
+            index: getIndex
           },
           ...source
         ];
@@ -1507,8 +1597,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return source;
     });
     const computedDataSource = computed(() => {
+      var _a, _b;
       const attrsData = attrsTableProps.value.data;
-      return __props.data ?? attrsData ?? (tableData == null ? void 0 : tableData.value) ?? [];
+      return props.data ?? attrsData ?? toValue((_a = props.table) == null ? void 0 : _a.dataSource) ?? toValue((_b = props.table) == null ? void 0 : _b.data) ?? [];
     });
     const computedTableProps = computed(() => {
       const merged = {
@@ -1519,23 +1610,42 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return merged;
     });
     const computedPagination = computed(() => {
-      if (__props.pagination === false) return false;
-      const pageConfig = __props.pagination ?? {};
+      var _a, _b;
+      const attrsPagination = attrsTableProps.value.pagination;
+      if (props.pagination === false || attrsPagination === false) {
+        return false;
+      }
+      const hasUserPagination = isPlainObject(props.pagination) || isPlainObject(attrsPagination);
+      if (hasUserPagination) {
+        const pageConfig = props.pagination ?? attrsPagination ?? {};
+        const globalPagination = injectProps.value.pagination === false ? {} : injectProps.value.pagination || {};
+        const pageParam2 = (_a = props.table) == null ? void 0 : _a.pageParam;
+        return {
+          ...globalPagination,
+          ...pick(pageConfig, paginationProperties),
+          currentPage: (pageParam2 == null ? void 0 : pageParam2.current) ?? pageConfig.currentPage ?? 1,
+          pageSize: (pageParam2 == null ? void 0 : pageParam2.pageSize) ?? pageConfig.pageSize ?? 10,
+          total: (pageParam2 == null ? void 0 : pageParam2.total) ?? pageConfig.total ?? 0
+        };
+      }
+      if (injectProps.value.pagination === false) return false;
+      const pageParam = (_b = props.table) == null ? void 0 : _b.pageParam;
       return {
-        ...injectProps.pagination,
-        ...pick(pageConfig, paginationProperties),
-        currentPage: pageConfig.currentPage ?? (pageParam == null ? void 0 : pageParam.current) ?? 1,
-        pageSize: pageConfig.pageSize ?? (pageParam == null ? void 0 : pageParam.pageSize) ?? 10,
-        total: pageConfig.total ?? (pageParam == null ? void 0 : pageParam.total) ?? 0
+        ...injectProps.value.pagination,
+        currentPage: (pageParam == null ? void 0 : pageParam.current) ?? 1,
+        pageSize: (pageParam == null ? void 0 : pageParam.pageSize) ?? 10,
+        total: (pageParam == null ? void 0 : pageParam.total) ?? 0
       };
     });
     const showPagination = computed(() => computedPagination.value !== false);
     const onCurrentChange = (current) => {
-      setPageParam == null ? void 0 : setPageParam({ current });
+      var _a, _b;
+      (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current });
       _search();
     };
     const onSizeChange = (pageSize) => {
-      setPageParam == null ? void 0 : setPageParam({ pageSize, current: 1 });
+      var _a, _b;
+      (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { pageSize, current: 1 });
       _search();
     };
     const onPaginationChange = (currentPage, pageSize) => {
@@ -1543,17 +1653,19 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       (_a = attrs.onChange) == null ? void 0 : _a.call(attrs, currentPage, pageSize);
     };
     const showSearch = computed(() => {
-      var _a, _b;
-      return !!(searchFormSlot || ((_a = computedSearchFormConfig.value) == null ? void 0 : _a.hidden) !== true && searchForm && ((_b = searchForm.fields.value.filter((item) => !item.hidden)) == null ? void 0 : _b.length) > 0);
+      var _a, _b, _c, _d, _e;
+      const searchFields = (_b = (_a = props.table) == null ? void 0 : _a.searchForm) == null ? void 0 : _b.fields;
+      const fieldList = (Array.isArray(searchFields) ? searchFields : searchFields == null ? void 0 : searchFields.value) ?? [];
+      return !!(searchFormSlot || ((_c = computedSearchFormConfig.value) == null ? void 0 : _c.hidden) !== true && ((_d = props.table) == null ? void 0 : _d.searchForm) && ((_e = fieldList.filter((item) => !item.hidden)) == null ? void 0 : _e.length) > 0);
     });
     const computedControl = computed(() => {
-      const mergedControl = __props.control ?? injectProps.control;
+      const mergedControl = props.control ?? injectProps.value.control;
       if (typeof mergedControl === "boolean") {
         return { sizeControl: mergedControl, columnControl: mergedControl };
       }
       const c = mergedControl;
-      const sizeControl = c.sizeControl ?? true;
-      const columnControl = c.columnControl ?? true;
+      const sizeControl = (c == null ? void 0 : c.sizeControl) ?? false;
+      const columnControl = (c == null ? void 0 : c.columnControl) ?? false;
       return { sizeControl: !!sizeControl, columnControl };
     });
     const columnControlConfig = computed(() => {
@@ -1564,7 +1676,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return size.value ?? attrsTableProps.value.size ?? injectTableAttrs.value.size;
     });
     onMounted(() => {
-      if (__props.immediateSearch ?? injectProps.immediateSearch) {
+      if (props.immediateSearch ?? injectProps.value.immediateSearch) {
         _search();
       }
     });
@@ -1579,15 +1691,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           component: computedSearchFormConfig.value.container
         }, {
           default: withCtx(() => [
-            renderSlot(_ctx.$slots, "search-form", {}, () => [
-              unref(searchForm) ? (openBlock(), createBlock(SearchForm, mergeProps({
-                key: 0,
-                form: unref(searchForm)
-              }, computedSearchFormConfig.value, {
-                onSearch: searchPage1st,
-                onReset: reset
-              }), null, 16, ["form"])) : createCommentVNode("", true)
-            ], true)
+            renderSlot(_ctx.$slots, "search-form", {}, () => {
+              var _a;
+              return [
+                ((_a = props.table) == null ? void 0 : _a.searchForm) ? (openBlock(), createBlock(SearchForm, mergeProps({
+                  key: 0,
+                  form: props.table.searchForm
+                }, computedSearchFormConfig.value, {
+                  onSearch: searchPage1st,
+                  onReset: reset
+                }), null, 16, ["form"])) : createCommentVNode("", true)
+              ];
+            }, true)
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
@@ -1609,7 +1724,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               computedControl.value.columnControl ? (openBlock(), createElementBlock("div", _hoisted_5, [
                 createVNode(unref(ColumnControl), {
                   columns: normalizedRawColumns.value.filter((item) => item.key !== "_index"),
-                  table: __props.table,
+                  table: props.table,
                   "column-control": columnControlConfig.value
                 }, null, 8, ["columns", "table", "column-control"])
               ])) : createCommentVNode("", true)
@@ -1651,7 +1766,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-127db81d"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-e1546aaf"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
@@ -1673,16 +1788,42 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   __name: "index",
   props: {
-    componentVars: {},
-    componentMap: {},
-    locale: {}
+    componentVars: { default: void 0 },
+    componentMap: { default: void 0 },
+    locale: { default: void 0 }
   },
   setup(__props) {
     const props = __props;
+    Object.keys(INJECT_CONFIG).forEach(
+      (key) => {
+        const config = INJECT_CONFIG[key];
+        provide(
+          config.injectionKey,
+          computed(() => {
+            var _a;
+            return {
+              ...config.default,
+              ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
+            };
+          })
+        );
+      }
+    );
     if (props.componentVars) {
-      Object.entries(props.componentVars).forEach(([key, val]) => {
-        const config = ensureInjectConfig(key);
-        provide(config.injectionKey, { ...config.default, ...getObject(val) });
+      Object.keys(props.componentVars).forEach((key) => {
+        if (!(key in INJECT_CONFIG)) {
+          const config = ensureInjectConfig(key);
+          provide(
+            config.injectionKey,
+            computed(() => {
+              var _a;
+              return {
+                ...config.default,
+                ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
+              };
+            })
+          );
+        }
       });
     }
     if (props.componentMap) {