@qin-ui/antd-vue-pro 2.3.4 → 2.4.0

package/es/index.js

@@ -1,14 +1,17 @@
 import "./antd-vue-pro.css";
-import { inject, computed, mergeProps, toValue, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, provide, useSlots, reactive, createElementVNode, onBeforeUnmount, watch, watchEffect, normalizeStyle, nextTick, useModel, onMounted, mergeModels, normalizeClass, guardReactiveProps } from "vue";
+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, createElementVNode, onBeforeUnmount, watch, watchEffect, normalizeStyle, useModel, onMounted, mergeModels, normalizeClass, guardReactiveProps, nextTick } from "vue";
 import { Transfer, TreeSelect, Slider, Switch, RadioGroup, CheckboxGroup, TimePicker, RangePicker, DatePicker, Cascader, Select, InputNumber, InputPassword, InputSearch, Textarea, Input, Row, Col, FormItem, Form, Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { isPlainObject, getObject, toPath, useForm as useForm$1, resolveLocaleName, zhTW, enUS, zhCN, format, omit, InjectionFormSlotsKey, cloneDeep, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, pick, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { isPlainObject, getObject, toPath, useForm as useForm$1, resolveLocaleName, zhTW, enUS, zhCN, format, cloneDeep, InjectionFormSlotsKey, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
 import { enUS as enUS2, useFormData, zhCN as zhCN2, zhTW as zhTW2 } from "@qin-ui/pro-components-core";
 import { colProps } from "ant-design-vue/es/grid/Col";
 import { formItemProps, useInjectFormItemContext } from "ant-design-vue/es/form";
 import { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
 import { useProviderDisabled, useInjectDisabled } from "ant-design-vue/es/config-provider/DisabledContext";
 import { tableProps } from "ant-design-vue/es/table";
-const getPopupContainer = (triggerNode) => triggerNode.closest("form[class*='-form']");
+const getPopupContainer = (triggerNode) => {
+  var _a;
+  return ((_a = triggerNode.closest) == null ? void 0 : _a.call(triggerNode, "form[class*='-form']")) || (typeof document !== "undefined" ? document.body : void 0);
+};
 const INJECT_COMPONENTS = Symbol("INJECT_COMPONENTS");
 const INJECT_CONFIG = {
   "pro-table": {
@@ -177,6 +180,7 @@ function useGroupFieldAttrs(validFields) {
   const config = INJECT_CONFIG["pro-form-item"];
   const injectFormItemProps = inject(config.injectionKey, config.default);
   return computed(() => {
+    const rawInject = toValue(injectFormItemProps) || {};
     return validFields.value.map((field) => {
       let gridItemProps2 = {};
       let formItemProps2 = {};
@@ -195,7 +199,7 @@ function useGroupFieldAttrs(validFields) {
           xl,
           xxl,
           ...injectRest
-        } = injectFormItemProps;
+        } = rawInject;
         const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, xxl, span: injectSpan };
         gridItemProps2 = fields ? { span: span ?? 24 } : initGridItemProps;
         formItemProps2 = mergeProps(
@@ -248,46 +252,58 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
-    grid: { type: [Boolean, Object], default: () => void 0 },
+    grid: { type: [Boolean, Object], default: void 0 },
     fields: { default: () => [] },
-    disabled: { type: Boolean, default: () => void 0 }
+    disabled: { type: Boolean, default: void 0 }
   },
   setup(__props) {
-    const validFields = computed(() => {
-      var _a, _b;
-      return (_b = (_a = __props.fields).filter) == null ? void 0 : _b.call(_a, (field) => !field.hidden);
-    });
-    useProviderDisabled(computed(() => __props.disabled));
+    const props = __props;
+    const validFields = computed(
+      () => (props.fields ?? []).filter((field) => !field.hidden)
+    );
+    useProviderDisabled(computed(() => props.disabled));
     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) => {
@@ -309,25 +325,23 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(unref(FormItem), mergeProps({ ref_for: true }, item.formItemProps, {
                       ref_for: true,
-                      ref: (el) => formItemRefs[index2] = el,
+                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
                       name: unref(toPath)(item.path),
-                      path: item.path,
-                      onVnodeMounted: ($event) => onFormItemMounted(index2, item.formItemProps)
+                      path: item.path
                     }), createSlots({
                       default: withCtx(() => [
                         item.rawField.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
                           key: 0,
-                          grid: item.rawField.grid ?? __props.grid,
+                          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$d), 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
                     }, [
@@ -342,7 +356,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                           ])
                         };
                       })
-                    ]), 1040, ["name", "path", "onVnodeMounted"])
+                    ]), 1040, ["name", "path"])
                   ]),
                   _: 2
                 }, 1032, ["component", "path"])
@@ -372,14 +386,11 @@ 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 } = field;
   const picker = component === "date-picker" ? "" : field.picker;
   if (typeof component === "string") {
     const k = [component, picker].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 {};
@@ -408,25 +419,27 @@ const _sfc_main$d = /* @__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 formItemContext = useInjectFormItemContext();
     const triggerFormItemChange = () => {
       formItemContext.onFieldChange();
     };
     const attrs = useAttrs();
-    function getOldValue() {
-      return cloneDeep(getFormData == null ? void 0 : getFormData(__props.path));
-    }
+    const pickerVal = attrs.picker;
+    const injectConfigKey = typeof props.component === "string" ? [props.component, pickerVal].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);
@@ -434,38 +447,36 @@ const _sfc_main$d = /* @__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);
         triggerFormItemChange();
       }
     });
     const parentDisabled = useInjectDisabled();
     const groupedAttrs = computed(() => {
+      const currentInjectProps = toValue(rawInjectComponentProps) || {};
       const initProps = getInitProps(
-        {
-          component: __props.component,
-          picker: attrs.picker
-        },
+        { component: props.component, picker: attrs.picker },
+        currentInjectProps,
         t
       );
+      const effectiveModelProp = attrs.modelProp ?? initProps.modelProp ?? "value";
       const mergedProps = mergeProps(
         initProps,
         attrs,
         { class: attrs.componentClass, style: attrs.componentStyle },
         { class: initProps.componentClass, style: initProps.componentStyle },
         { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
-        { modelProp: attrs.modelProp ?? initProps.modelProp ?? "value" }
+        { modelProp: effectiveModelProp }
       );
-      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, ...rest } = mergedProps;
-      const bindAttrs = omit(rest, [modelProp, `onUpdate:${modelProp}`]);
+      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [effectiveModelProp]: _modelVal, [`onUpdate:${effectiveModelProp}`]: _onUpdateModelVal, ...bindAttrs } = mergedProps;
       return {
         attrs: bindAttrs,
         slots,
@@ -477,12 +488,17 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     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,
@@ -491,7 +507,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$c), {
         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, {
@@ -499,13 +515,15 @@ const _sfc_main$d = /* @__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$b), mergeProps({ path: __props.path }, scoped, { component: slot }), null, 16, ["path", "component"])
+                  createVNode(unref(_sfc_main$b), mergeProps({
+                    path: props.path
+                  }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
               };
             })
@@ -520,11 +538,12 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
   ...{ name: "ContainerFragment", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, Function] }
+    component: { type: [Object, Function], default: void 0 }
   },
   setup(__props) {
+    const props = __props;
     return (_ctx, _cache) => {
-      return __props.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
+      return props.component ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -537,12 +556,13 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
   ...{ name: "SlotComponent", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, Function, String, Number, Boolean, null] }
+    component: { type: [Object, Function, String, Number, Boolean, null], default: void 0 }
   },
   setup(__props) {
+    const props = __props;
     return (_ctx, _cache) => {
-      return isVNode(__props.component) || typeof __props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createTextVNode(toDisplayString(__props.component), 1)
+      return isVNode(props.component) || typeof props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        createTextVNode(toDisplayString(props.component), 1)
       ], 64));
     };
   }
@@ -552,30 +572,78 @@ const _sfc_main$a = /* @__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 config = INJECT_CONFIG["pro-form"];
-    const { grid: _injectGrid, ...injectAttrs } = inject(
-      config.injectionKey,
-      config.default
+    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 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(Form), mergeProps({
-        ref: (el) => {
-          var _a;
-          return (_a = unref(setFormRef)) == null ? void 0 : _a(el);
-        },
-        model: unref(formData)
-      }, mergeProps(injectAttrs, unref(camelizeProperties)(_ctx.$attrs)), { class: "pro-form" }), {
+        key: formKey.value,
+        ref: setFormRef,
+        model: formData.value
+      }, mergeProps(injectAttrs.value, unref(camelizeProperties)(_ctx.$attrs)), { class: "pro-form" }), {
         default: withCtx(() => [
           createVNode(unref(_sfc_main$e), {
-            fields: unref(fields),
-            grid: __props.grid
+            fields: fields.value,
+            grid: props.grid
           }, null, 8, ["fields", "grid"]),
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -617,7 +685,7 @@ const _sfc_main$8 = /* @__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 },
@@ -631,6 +699,7 @@ const _sfc_main$8 = /* @__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);
@@ -651,43 +720,43 @@ const _sfc_main$8 = /* @__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]"
         );
@@ -697,13 +766,15 @@ const _sfc_main$8 = /* @__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();
           },
@@ -718,10 +789,13 @@ const _sfc_main$8 = /* @__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;
+        },
+        () => {
+          var _a, _b;
+          return (_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value;
         },
-        () => formRef.value,
-        () => __props.expand
+        () => props.expand
       ],
       () => {
         updateHeights();
@@ -729,7 +803,10 @@ const _sfc_main$8 = /* @__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();
@@ -748,10 +825,10 @@ const _sfc_main$8 = /* @__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;
@@ -764,23 +841,21 @@ const _sfc_main$8 = /* @__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, __props.rowGap],
+          gutter: [props.columnGap, props.rowGap],
           style: { flex: 1, marginRight: "12px" }
         },
-        style: {
-          display: "flex",
-          overflow: "hidden",
-          height: `${expandStatus.value ? proFormHeight.value : collapseHeight.value}px`
-        }
+        style: { display: "flex", overflow: "hidden", height: heightStyle }
       } : {
         layout: "inline",
-        style: { gap: `${__props.rowGap}px ${__props.columnGap}px` },
+        style: { gap: `${props.rowGap}px ${props.columnGap}px` },
         grid: false
-      }
-    );
+      };
+    });
     const onReset = () => {
       emit("reset");
     };
@@ -789,7 +864,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$a), mergeProps(layoutProps.value, {
-        form: __props.form,
+        form: props.form,
         class: "pro-table_search-form transition"
       }), {
         default: withCtx(() => [
@@ -798,9 +873,9 @@ const _sfc_main$8 = /* @__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(Button), {
@@ -815,9 +890,9 @@ const _sfc_main$8 = /* @__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(Button), {
@@ -834,9 +909,12 @@ const _sfc_main$8 = /* @__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
@@ -866,7 +944,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-7bd701e4"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-9dca0a5d"]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "DefaultSearchFormContainer",
   setup(__props) {
@@ -921,11 +999,15 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   },
   emits: ["update:size"],
   setup(__props) {
-    var _a;
     const { t } = useLocale();
     const configContext = useConfigContextInject();
     const size = useModel(__props, "size");
-    size.value = size.value ?? ((_a = configContext.componentSize) == null ? void 0 : _a.value) ?? "large";
+    const currentSize = computed(
+      () => {
+        var _a;
+        return size.value ?? ((_a = configContext.componentSize) == null ? void 0 : _a.value) ?? "large";
+      }
+    );
     const onSizeChange = (val) => {
       size.value = val.key;
     };
@@ -942,7 +1024,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         overlay: withCtx(() => [
           createVNode(unref(Menu), {
             style: { "width": "100px", "text-align": "center" },
-            "selected-keys": size.value ? [size.value] : [],
+            "selected-keys": [currentSize.value],
             items: sizeOptions.value,
             onClick: onSizeChange
           }, null, 8, ["selected-keys", "items"])
@@ -963,7 +1045,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-a718ce24"]]);
+const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-2ac95d3b"]]);
 const _sfc_main$3 = {};
 const _hoisted_1$1 = {
   focusable: "false",
@@ -984,23 +1066,25 @@ const _sfc_main$2 = /* @__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 checkedColumnsOptions = computed(
-      () => __props.columns.flatMap((item) => {
+      () => props.columns.flatMap((item) => {
         var _a, _b, _c, _d, _e, _f;
         const rawKey = item.key ?? (Array.isArray(item.dataIndex) ? item.dataIndex.join(".") : item.dataIndex);
         if (!rawKey || !item.title) return [];
         const key = String(rawKey);
-        if ((_b = (_a = __props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some((ek) => String(ek) === key)) return [];
-        const disabled = ((_d = (_c = __props.columnControl) == null ? void 0 : _c.disabledKeys) == null ? void 0 : _d.some((dk) => String(dk) === key)) ?? false;
-        const label = ((_f = (_e = __props.columnControl) == null ? void 0 : _e.labels) == null ? void 0 : _f[key]) ?? (typeof item.title === "string" ? item.title : key);
+        if ((_b = (_a = props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some((ek) => String(ek) === key))
+          return [];
+        const disabled = ((_d = (_c = props.columnControl) == null ? void 0 : _c.disabledKeys) == null ? void 0 : _d.some((dk) => String(dk) === key)) ?? false;
+        const label = ((_f = (_e = props.columnControl) == null ? void 0 : _e.labels) == null ? void 0 : _f[key]) ?? (typeof item.title === "string" ? item.title : key);
         return {
           label,
           value: key,
@@ -1022,7 +1106,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         checkedColumnsOptions.value.forEach((item) => {
           var _a, _b;
           if (item.disabled) return;
-          (_b = (_a = __props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, item.value, {
+          (_b = (_a = props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, item.value, {
             hidden: !val.includes(item.value)
           });
         });
@@ -1056,20 +1140,20 @@ const _sfc_main$2 = /* @__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, _b2;
-        (_b2 = (_a2 = __props.table) == null ? void 0 : _a2.setColumn) == null ? void 0 : _b2.call(_a2, String(key), { hidden: false });
+        (_b2 = (_a2 = props.table) == null ? void 0 : _a2.setColumn) == null ? void 0 : _b2.call(_a2, 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, _b;
-          (_b = (_a = __props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, String(key), { hidden: false });
+          (_b = (_a = props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, String(key), { hidden: false });
         });
       },
       { deep: true }
@@ -1089,7 +1173,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             default: withCtx(() => {
               var _a, _b;
               return [
-                !((_a = __props.columnControl) == null ? void 0 : _a.disableCheckAll) ? (openBlock(), createBlock(unref(MenuItem), {
+                !((_a = props.columnControl) == null ? void 0 : _a.disableCheckAll) ? (openBlock(), createBlock(unref(MenuItem), {
                   key: 0,
                   onClick: onCheckAllChange
                 }, {
@@ -1149,7 +1233,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-9899456e"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-04235d0e"]]);
 const _hoisted_1 = { class: "pro-table_header" };
 const _hoisted_2 = {
   key: 0,
@@ -1171,32 +1255,36 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProTable", 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 }
   }, {
     "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 injectAttrs = pick(injectProps, tableProperties);
+    const injectAttrs = computed(
+      () => pick(injectProps.value, tableProperties)
+    );
     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
       };
     });
@@ -1204,21 +1292,23 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const tableAttrs = computed(() => {
       return pick(camelizeProperties(attrs), tableProperties);
     });
-    const { columns, dataSource, 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();
       });
@@ -1233,75 +1323,93 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       ...tableSlots
     } = slots;
     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 computedTableProps = computed(() => {
       return {
-        ...injectAttrs,
+        ...injectAttrs.value,
         ...tableAttrs.value,
         pagination: void 0,
         onChange: 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 indexColumn = () => ({
+    const renderIndex = ({ index: index2 }) => index2 + 1;
+    const indexColumn = computed(() => ({
       title: t("table.index"),
       dataIndex: "_index",
+      key: "_index",
       width: 80,
-      customRender: ({ index: index2 }) => index2 + 1
+      customRender: renderIndex
+    }));
+    const computedColumns = computed(() => {
+      var _a;
+      const cols = tableAttrs.value.columns ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? [];
+      const needIndex = props.addIndexColumn ?? injectProps.value.addIndexColumn;
+      return needIndex ? [indexColumn.value, ...cols] : cols;
     });
-    const computedColumns = computed(
-      () => [
-        ...__props.addIndexColumn ?? injectProps.addIndexColumn ? [indexColumn()] : [],
-        ...tableAttrs.value.columns ?? (columns == null ? void 0 : columns.value) ?? []
-      ]
-    );
     const visibleComputedColumns = computed(() => {
       return computedColumns.value.filter((item) => !item.hidden);
     });
     const computedDataSource = computed(() => {
-      return tableAttrs.value.dataSource ?? (dataSource == null ? void 0 : dataSource.value);
+      var _a;
+      return tableAttrs.value.dataSource ?? toValue((_a = props.table) == null ? void 0 : _a.dataSource) ?? [];
     });
     const computedPagination = computed(() => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       if (tableAttrs.value.pagination === false) return false;
+      if (isPlainObject(tableAttrs.value.pagination)) {
+        const globalPagination = injectAttrs.value.pagination === false ? {} : injectAttrs.value.pagination;
+        return {
+          ...globalPagination,
+          ...(_a = props.table) == null ? void 0 : _a.pageParam,
+          ...tableAttrs.value.pagination,
+          showTotal: ((_b = tableAttrs.value.pagination) == null ? void 0 : _b.showTotal) ?? (globalPagination == null ? void 0 : globalPagination.showTotal) ?? ((total) => t("pagination.total", { total }))
+        };
+      }
+      if (injectAttrs.value.pagination === false) return false;
       return {
-        ...injectAttrs.pagination,
-        ...pageParam,
-        ...tableAttrs.value.pagination,
-        showTotal: ((_a = tableAttrs.value.pagination) == null ? void 0 : _a.showTotal) ?? (injectAttrs.pagination === false ? void 0 : (_b = injectAttrs.pagination) == null ? void 0 : _b.showTotal) ?? ((total) => t("pagination.total", { total }))
+        ...injectAttrs.value.pagination,
+        ...(_c = props.table) == null ? void 0 : _c.pageParam,
+        showTotal: ((_d = injectAttrs.value.pagination) == null ? void 0 : _d.showTotal) ?? ((total) => t("pagination.total", { total }))
       };
     });
     const onTableChange = (...args) => {
-      var _a;
-      setPageParam == null ? void 0 : setPageParam(args[0]);
-      (_a = attrs.onChange) == null ? void 0 : _a.call(attrs, ...args);
+      var _a, _b, _c;
+      (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, args[0]);
+      (_c = attrs.onChange) == null ? void 0 : _c.call(attrs, ...args);
       _search();
     };
     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;
+      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) && fieldList.filter((item) => !item.hidden).length > 0);
     });
     const computedControl = computed(() => {
-      const mergedControl = __props.control ?? injectProps.control;
-      if (typeof mergedControl === "boolean") {
-        return { sizeControl: mergedControl, columnControl: mergedControl };
+      const controlConfig = props.control ?? injectProps.value.control;
+      if (controlConfig === true) {
+        return { sizeControl: true, columnControl: true };
+      }
+      if (controlConfig === false) {
+        return { sizeControl: false, columnControl: false };
       }
-      const c = mergedControl;
-      const sizeControl = c.sizeControl ?? true;
-      const columnControl = c.columnControl ?? true;
-      return { sizeControl: !!sizeControl, columnControl };
+      return {
+        sizeControl: !!(controlConfig == null ? void 0 : controlConfig.sizeControl),
+        columnControl: (controlConfig == null ? void 0 : controlConfig.columnControl) ?? false
+      };
     });
     const columnControlConfig = computed(() => {
       const cc = computedControl.value.columnControl;
       return typeof cc === "object" ? cc : void 0;
     });
     onMounted(() => {
-      if (__props.immediateSearch ?? injectProps.immediateSearch) {
+      if (props.immediateSearch ?? injectProps.value.immediateSearch) {
         _search();
       }
     });
@@ -1315,15 +1423,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),
@@ -1345,7 +1456,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               computedControl.value.columnControl ? (openBlock(), createElementBlock("div", _hoisted_5, [
                 createVNode(unref(ColumnControl), {
                   columns: computedColumns.value,
-                  table: __props.table,
+                  table: props.table,
                   "column-control": columnControlConfig.value
                 }, null, 8, ["columns", "table", "column-control"])
               ])) : createCommentVNode("", true)
@@ -1376,7 +1487,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-ff6f01f4"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-5ce28f7b"]]);
 function useTable(params) {
   return useTable$1(params);
 }
@@ -1387,16 +1498,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) {