@qin-ui/antd-vue-pro 2.4.4 → 2.5.0

package/es/index.js

@@ -1,21 +1,25 @@
 import "./antd-vue-pro.css";
-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, normalizeStyle, useModel, watch, mergeModels, onMounted, normalizeClass, nextTick } from "vue";
+import { defineComponent, createBlock, renderSlot, openBlock, resolveDynamicComponent, normalizeProps, mergeProps, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, inject, computed, toValue, ref, createCommentVNode, createSlots, renderList, createVNode, toRaw, resolveComponent, unref, provide, useSlots, shallowRef, onUpdated, triggerRef, createElementVNode, withModifiers, normalizeStyle, nextTick, mergeModels, useModel, watch, getCurrentInstance, onMounted, normalizeClass, guardReactiveProps } 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, cloneDeep, InjectionFormSlotsKey, createFormProxy, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { useForm as useForm$1, resolveLocaleName, zhTW, enUS, zhCN, format, useReactiveAttrs, cloneDeep, getObject, InjectionFormSlotsKey, isPlainObject, resolveFieldIdentity, isObjectItem, toPath, createFormProxy, InjectionFormKey, omitBy, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, pick, isPromise, useTable as useTable$1, omit } 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 { useInjectFormItemContext, useProvideFormItemContext } from "ant-design-vue/es/form/FormItemContext";
+import { useInjectDisabled, useProviderDisabled } from "ant-design-vue/es/config-provider/DisabledContext";
+import { colProps } from "ant-design-vue/es/grid/Col";
+import { formItemProps } from "ant-design-vue/es/form";
 import { tableProps } from "ant-design-vue/es/table";
 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_COMPONENT_VARS = Symbol("COMPONENT_VARS");
 const INJECT_CONFIG = {
   "pro-table": {
     injectionKey: Symbol(""),
+    // 列 / 数据源取自组件绑定或 `:table` 实例，加载态由组件自身状态驱动
+    ignoreProps: ["loading", "columns", "dataSource"],
     default: {
       pagination: {
         showSizeChanger: true,
@@ -32,6 +36,8 @@ const INJECT_CONFIG = {
   },
   "pro-form": {
     injectionKey: Symbol(""),
+    // 表单实例由 `:form` 显式传入
+    ignoreProps: ["form"],
     default: { grid: { gutter: { xs: 8, sm: 16, md: 16, lg: 24 } } }
   },
   "pro-form-item": {
@@ -148,6 +154,40 @@ const ensureInjectConfig = (key) => {
   DYNAMIC_INJECT_CONFIG[key] = created;
   return created;
 };
+const _sfc_main$e = /* @__PURE__ */ defineComponent({
+  ...{ name: "ContainerFragment", inheritAttrs: false },
+  __name: "index",
+  props: {
+    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)), {
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default")
+        ]),
+        _: 3
+      }, 16)) : renderSlot(_ctx.$slots, "default", { key: 1 });
+    };
+  }
+});
+const _sfc_main$d = /* @__PURE__ */ defineComponent({
+  ...{ name: "SlotComponent", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { type: [Object, Function, String, Number, Boolean, null], default: void 0 }
+  },
+  setup(__props) {
+    const props = __props;
+    const isRenderable = (c) => c !== null && c !== void 0 && (typeof c === "function" || typeof c === "object");
+    return (_ctx, _cache) => {
+      return isRenderable(props.component) ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        createTextVNode(toDisplayString(props.component), 1)
+      ], 64));
+    };
+  }
+});
 const FORM_ITEM_SLOT_KEYS = [
   "label",
   "extra",
@@ -172,216 +212,6 @@ const componentMap = {
   "tree-select": TreeSelect,
   "transfer": Transfer
 };
-const formItemPropKeys = Object.keys(formItemProps()).concat([
-  "formItemContainer"
-]);
-const gridItemPropKeys = Object.keys(colProps());
-const gridItemPropKeySet = new Set(gridItemPropKeys);
-const formItemPropKeySet = new Set(formItemPropKeys);
-const formItemSlotKeySet = new Set(FORM_ITEM_SLOT_KEYS);
-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 = {};
-      const componentProps = { slots: {} };
-      const formItemSlots = {};
-      if (isPlainObject(field)) {
-        const { path, name, fields, formItemClass, formItemStyle, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, formItemContainer, ...rest } = field;
-        const {
-          class: injectClassName,
-          style: injectStyle,
-          span: injectSpan,
-          xs,
-          sm,
-          md,
-          lg,
-          xl,
-          xxl,
-          formItemContainer: injectFormItemContainer,
-          ...injectRest
-        } = rawInject;
-        const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, xxl, span: injectSpan };
-        gridItemProps2 = fields ? { span: span ?? 24 } : initGridItemProps;
-        const container = formItemContainer ?? injectFormItemContainer;
-        formItemProps2 = mergeProps(
-          injectRest,
-          { class: injectClassName, style: injectStyle },
-          { class: toValue(formItemClass), style: toValue(formItemStyle) },
-          formItemDataAttrs
-        );
-        Object.keys(rest).forEach((k) => {
-          if (gridItemPropKeySet.has(k)) {
-            gridItemProps2[k] = rest[k];
-          } else if (formItemPropKeySet.has(k)) {
-            formItemProps2[k] = rest[k];
-          } else {
-            componentProps[k] = rest[k];
-          }
-        });
-        Object.assign(componentProps, componentDataAttrs);
-        Object.keys(slots).forEach((k) => {
-          if (formItemSlotKeySet.has(k)) {
-            formItemSlots[k] = slots[k];
-          } else {
-            componentProps.slots[k] = slots[k];
-          }
-        });
-        const raw2 = toValue(name) ?? toValue(path);
-        return {
-          path: Array.isArray(raw2) ? raw2.join(".") : raw2 || "",
-          gridItemProps: gridItemProps2,
-          formItemProps: formItemProps2,
-          formItemSlots,
-          componentProps,
-          formItemContainer: container,
-          rawField: field
-        };
-      }
-      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,
-        formItemProps: formItemProps2,
-        formItemSlots,
-        componentProps,
-        rawField: field
-      };
-    });
-  });
-}
-const _sfc_main$e = /* @__PURE__ */ defineComponent({
-  ...{ name: "BaseFormItem", inheritAttrs: false },
-  __name: "index",
-  props: {
-    grid: { type: [Boolean, Object], default: void 0 },
-    fields: { default: () => [] },
-    disabled: { type: Boolean, default: void 0 }
-  },
-  setup(__props) {
-    const props = __props;
-    const validFields = computed(
-      () => (
-        // hidden 支持 Ref/ComputedRef/getter 等响应式形态（统一使用 toValue 取值）
-        (props.fields ?? []).filter((field) => !toValue(field.hidden))
-      )
-    );
-    useProviderDisabled(computed(() => props.disabled));
-    const config = INJECT_CONFIG["pro-form"];
-    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.value;
-    });
-    const computedGridProps = computed(() => {
-      return enableGrid.value ? { ...getObject(injectGrid.value), ...getObject(props.grid) } : {};
-    });
-    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);
-        delete raw.getFormItemRef;
-        delete raw.getFormItemComputedProps;
-      }
-    };
-    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 = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentRef();
-        };
-        raw.getComponentComputedProps = () => {
-          var _a;
-          return (_a = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentComputedProps();
-        };
-      } else {
-        componentInstanceMap.delete(raw);
-        delete raw.getComponentRef;
-        delete raw.getComponentComputedProps;
-      }
-    };
-    const groupedFields = useGroupFieldAttrs(validFields);
-    return (_ctx, _cache) => {
-      const _component_BaseFormItem = resolveComponent("BaseFormItem");
-      return openBlock(), createBlock(unref(_sfc_main$c), mergeProps({
-        component: enableGrid.value ? unref(Row) : void 0
-      }, computedGridProps.value), {
-        default: withCtx(() => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item, index2) => {
-            return openBlock(), createBlock(unref(_sfc_main$c), mergeProps({
-              key: item.path || index2,
-              component: enableGrid.value ? unref(Col) : void 0
-            }, { ref_for: true }, item.gridItemProps), {
-              default: withCtx(() => [
-                createVNode(unref(_sfc_main$c), {
-                  component: item.formItemContainer,
-                  path: item.path
-                }, {
-                  default: withCtx(() => [
-                    createVNode(unref(FormItem), mergeProps({ ref_for: true }, item.formItemProps, {
-                      ref_for: true,
-                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
-                      name: unref(toPath)(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$d), mergeProps({
-                          key: 1,
-                          ref_for: true,
-                          ref: (el) => setComponentRef(item.rawField, el)
-                        }, { ref_for: true }, item.componentProps, {
-                          path: item.path
-                        }), null, 16, ["path"]))
-                      ]),
-                      _: 2
-                    }, [
-                      renderList(item.formItemSlots, (slot, name) => {
-                        return {
-                          name,
-                          fn: withCtx((scoped) => [
-                            createVNode(unref(_sfc_main$b), mergeProps({
-                              path: item.path,
-                              component: slot
-                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
-                          ])
-                        };
-                      })
-                    ]), 1040, ["name", "path"])
-                  ]),
-                  _: 2
-                }, 1032, ["component", "path"])
-              ]),
-              _: 2
-            }, 1040, ["component"]);
-          }), 128))
-        ]),
-        _: 1
-      }, 16, ["component"]);
-    };
-  }
-});
 function useForm(...args) {
   return useForm$1(...args);
 }
@@ -435,27 +265,41 @@ const useLocale = () => {
   };
   return { t, lang };
 };
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
+const _sfc_main$c = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseField", inheritAttrs: false },
   __name: "index",
   props: {
     component: { default: void 0 },
     path: { default: "" }
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["field-value-change"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const cloneDeepIfObject = (val) => (
+      // 原始值直接传递，引用值克隆快照
+      typeof val === "object" && val !== null ? cloneDeep(val) : val
+    );
     const props = __props;
     const { t } = useLocale();
     const form = useForm(false);
     const componentRef = ref();
+    const emit = __emit;
     const formItemContext = useInjectFormItemContext();
-    const triggerFormItemChange = () => {
-      formItemContext.onFieldChange();
+    useProvideFormItemContext({
+      id: formItemContext.id,
+      onFieldBlur: formItemContext.onFieldBlur,
+      onFieldChange: () => {
+      },
+      clearValidate: formItemContext.clearValidate
+    });
+    const triggerFormItemChange = (value2) => {
+      emit("field-value-change", value2);
     };
-    const attrs = useAttrs();
+    const attrs = useReactiveAttrs();
     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 componentVars = inject(INJECT_COMPONENT_VARS, void 0);
     const value = computed({
       get() {
         var _a;
@@ -472,11 +316,11 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
         const { valueFormatter } = groupedAttrs.value;
         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;
+          const oldVal = setFormatter.length > 1 ? cloneDeepIfObject((_a = form.getFormData) == null ? void 0 : _a.call(form, props.path)) : void 0;
           newVal = setFormatter(val, oldVal);
         }
         (_b = form.setFormData) == null ? void 0 : _b.call(form, props.path, newVal);
-        triggerFormItemChange();
+        triggerFormItemChange(newVal);
         const { onUpdateValue } = groupedAttrs.value;
         if (typeof onUpdateValue === "function") {
           onUpdateValue(val);
@@ -487,7 +331,11 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     });
     const parentDisabled = useInjectDisabled();
     const groupedAttrs = computed(() => {
-      const currentInjectProps = toValue(rawInjectComponentProps) || {};
+      var _a;
+      const currentInjectProps = {
+        ...toValue(rawInjectComponentProps) || {},
+        ...getObject((_a = toValue(componentVars)) == null ? void 0 : _a[injectConfigKey])
+      };
       const initProps = getInitProps(
         { component: props.component, picker: attrs.picker },
         currentInjectProps,
@@ -511,14 +359,14 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
         onUpdateValue
       };
     });
-    const formSlots = inject(InjectionFormSlotsKey, void 0);
+    const injectedFormSlots = inject(InjectionFormSlotsKey, void 0);
     const customComponents = inject(INJECT_COMPONENTS, {});
     const is = computed(() => {
-      var _a;
-      const teleportSlot = props.path && (formSlots == null ? void 0 : formSlots[props.path]);
+      var _a, _b;
+      const teleportSlot = props.path && ((_a = injectedFormSlots == null ? void 0 : injectedFormSlots.value) == null ? void 0 : _a[props.path]);
       if (teleportSlot) return teleportSlot;
       if (typeof props.component === "string") {
-        const resolved = ((_a = toValue(customComponents)) == null ? void 0 : _a[props.component]) || componentMap[props.component];
+        const resolved = ((_b = toValue(customComponents)) == null ? void 0 : _b[props.component]) || componentMap[props.component];
         if (resolved) return resolved;
         warnUnknownComponent(props.component);
         return props.component;
@@ -530,7 +378,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       getComponentComputedProps: () => groupedAttrs.value.attrs
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$c), {
+      return openBlock(), createBlock(_sfc_main$e, {
         component: groupedAttrs.value.componentContainer,
         path: props.path
       }, {
@@ -546,7 +394,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main$b), mergeProps({
+                  createVNode(_sfc_main$d, mergeProps({
                     path: props.path
                   }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
@@ -559,36 +407,252 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$c = /* @__PURE__ */ defineComponent({
-  ...{ name: "ContainerFragment", inheritAttrs: false },
-  __name: "index",
-  props: {
-    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)), {
-        default: withCtx(() => [
-          renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-      }, 16)) : renderSlot(_ctx.$slots, "default", { key: 1 });
-    };
+const fieldKeyMap = /* @__PURE__ */ new WeakMap();
+let fieldKeySeed = 0;
+const getFieldKey = (field) => {
+  if (field === null || typeof field !== "object")
+    return `raw_${String(field)}`;
+  const raw = toRaw(field);
+  let key = fieldKeyMap.get(raw);
+  if (key === void 0) {
+    key = ++fieldKeySeed;
+    fieldKeyMap.set(raw, key);
   }
-});
+  return key;
+};
+const formItemPropKeys = Object.keys(formItemProps()).concat([
+  "formItemContainer"
+]);
+const gridItemPropKeys = Object.keys(colProps());
+const gridItemPropKeySet = new Set(gridItemPropKeys);
+const formItemPropKeySet = new Set(formItemPropKeys);
+const formItemSlotKeySet = new Set(FORM_ITEM_SLOT_KEYS);
+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 = {};
+      const componentProps = { slots: {} };
+      const formItemSlots = {};
+      if (isPlainObject(field)) {
+        const { path: _path, name: _name, fields, formItemClass, formItemStyle, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, formItemContainer, ...rest } = field;
+        const { class: injectClassName, style: injectStyle, span: injectSpan, xs, sm, md, lg, xl, xxl, formItemContainer: injectFormItemContainer, ...injectRest } = rawInject;
+        const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, xxl, span: injectSpan };
+        gridItemProps2 = fields ? { ...initGridItemProps, span: span ?? 24 } : initGridItemProps;
+        const container = formItemContainer ?? injectFormItemContainer;
+        formItemProps2 = mergeProps(
+          injectRest,
+          { class: injectClassName, style: injectStyle },
+          { class: toValue(formItemClass), style: toValue(formItemStyle) },
+          formItemDataAttrs
+        );
+        Object.keys(rest).forEach((k) => {
+          if (gridItemPropKeySet.has(k)) {
+            gridItemProps2[k] = rest[k];
+          } else if (formItemPropKeySet.has(k)) {
+            formItemProps2[k] = rest[k];
+          } else {
+            componentProps[k] = rest[k];
+          }
+        });
+        Object.assign(componentProps, componentDataAttrs);
+        Object.keys(slots).forEach((k) => {
+          if (formItemSlotKeySet.has(k)) {
+            formItemSlots[k] = slots[k];
+          } else {
+            componentProps.slots[k] = slots[k];
+          }
+        });
+        if (formItemSlots.label && formItemProps2.label !== void 0) {
+          delete formItemProps2.label;
+        }
+        const raw2 = resolveFieldIdentity(field);
+        return {
+          path: raw2,
+          gridItemProps: gridItemProps2,
+          formItemProps: formItemProps2,
+          formItemSlots,
+          componentProps,
+          formItemContainer: container,
+          rawField: field,
+          renderKey: getFieldKey(field)
+        };
+      }
+      const raw = resolveFieldIdentity(field);
+      return {
+        path: raw,
+        gridItemProps: gridItemProps2,
+        formItemProps: formItemProps2,
+        formItemSlots,
+        componentProps,
+        rawField: field,
+        renderKey: getFieldKey(field)
+      };
+    });
+  });
+}
 const _sfc_main$b = /* @__PURE__ */ defineComponent({
-  ...{ name: "SlotComponent", inheritAttrs: false },
+  ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, Function, String, Number, Boolean, null], default: void 0 }
+    grid: { type: [Boolean, Object], default: void 0 },
+    fields: { default: () => [] },
+    disabled: { type: Boolean, default: void 0 }
   },
   setup(__props) {
     const props = __props;
+    const validFields = computed(
+      () => (
+        // hidden 支持 Ref / ComputedRef 响应式形态（统一使用 toValue 取值）
+        (props.fields ?? []).filter(
+          (field) => isObjectItem(field) && !toValue(field.hidden)
+        )
+      )
+    );
+    useProviderDisabled(computed(() => props.disabled));
+    const config = INJECT_CONFIG["pro-form"];
+    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.value;
+    });
+    const computedGridProps = computed(() => {
+      return enableGrid.value ? { ...getObject(injectGrid.value), ...getObject(props.grid) } : {};
+    });
+    const formItemInstanceMap = /* @__PURE__ */ new WeakMap();
+    const componentInstanceMap = /* @__PURE__ */ new WeakMap();
+    const warnedFrozenFields = /* @__PURE__ */ new WeakSet();
+    const defineFieldAccessors = (raw, accessors) => {
+      try {
+        for (const [key, getter] of Object.entries(accessors)) {
+          Object.defineProperty(raw, key, {
+            value: getter,
+            enumerable: false,
+            configurable: true,
+            writable: true
+          });
+        }
+      } catch {
+        if (!warnedFrozenFields.has(raw)) {
+          warnedFrozenFields.add(raw);
+          console.warn(
+            "[pro-components] 字段配置对象不可写（如被 Object.freeze），getFormItemRef / getComponentRef 等实例访问器挂载失败。"
+          );
+        }
+      }
+    };
+    const onFieldValueChange = (item) => {
+      var _a, _b;
+      if (((_a = item.formItemProps) == null ? void 0 : _a.autoLink) === false) return;
+      const instance = formItemInstanceMap.get(toRaw(item.rawField));
+      (_b = instance == null ? void 0 : instance.onFieldChange) == null ? void 0 : _b.call(instance);
+    };
+    const setFormItemRef = (field, el, formItemProps2) => {
+      if (!field || typeof field !== "object") return;
+      const raw = toRaw(field);
+      if (el) {
+        formItemInstanceMap.set(raw, el);
+        defineFieldAccessors(raw, {
+          getFormItemRef: () => formItemInstanceMap.get(raw),
+          getFormItemComputedProps: () => formItemProps2
+        });
+      } else {
+        formItemInstanceMap.delete(raw);
+        delete raw.getFormItemRef;
+        delete raw.getFormItemComputedProps;
+      }
+    };
+    const setComponentRef = (field, el) => {
+      if (!field || typeof field !== "object") return;
+      const raw = toRaw(field);
+      if (el) {
+        componentInstanceMap.set(raw, el);
+        defineFieldAccessors(raw, {
+          getComponentRef: () => {
+            var _a;
+            return (_a = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentRef();
+          },
+          getComponentComputedProps: () => {
+            var _a;
+            return (_a = componentInstanceMap.get(raw)) == null ? void 0 : _a.getComponentComputedProps();
+          }
+        });
+      } else {
+        componentInstanceMap.delete(raw);
+        delete raw.getComponentRef;
+        delete raw.getComponentComputedProps;
+      }
+    };
+    const groupedFields = useGroupFieldAttrs(validFields);
     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)
-      ], 64));
+      const _component_BaseFormItem = resolveComponent("BaseFormItem");
+      return openBlock(), createBlock(_sfc_main$e, mergeProps({
+        component: enableGrid.value ? unref(Row) : void 0
+      }, computedGridProps.value), {
+        default: withCtx(() => [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item) => {
+            return openBlock(), createBlock(_sfc_main$e, mergeProps({
+              key: item.renderKey,
+              component: enableGrid.value ? unref(Col) : void 0
+            }, { ref_for: true }, item.gridItemProps), {
+              default: withCtx(() => [
+                createVNode(_sfc_main$e, {
+                  component: item.formItemContainer,
+                  path: item.path
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(FormItem), mergeProps({ ref_for: true }, item.formItemProps, {
+                      ref_for: true,
+                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
+                      name: unref(toPath)(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(_sfc_main$c, mergeProps({
+                          key: 1,
+                          ref_for: true,
+                          ref: (el) => setComponentRef(item.rawField, el)
+                        }, { ref_for: true }, item.componentProps, {
+                          path: item.path,
+                          onFieldValueChange: ($event) => onFieldValueChange(item)
+                        }), null, 16, ["path", "onFieldValueChange"]))
+                      ]),
+                      _: 2
+                    }, [
+                      renderList(item.formItemSlots, (slot, name) => {
+                        return {
+                          name,
+                          fn: withCtx((scoped) => [
+                            createVNode(_sfc_main$d, mergeProps({
+                              path: item.path,
+                              component: slot
+                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
+                          ])
+                        };
+                      })
+                    ]), 1040, ["name", "path"])
+                  ]),
+                  _: 2
+                }, 1032, ["component", "path"])
+              ]),
+              _: 2
+            }, 1040, ["component"]);
+          }), 128))
+        ]),
+        _: 1
+      }, 16, ["component"]);
     };
   }
 });
@@ -596,15 +660,13 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
   props: {
-    grid: { type: [Boolean, Object], default: false },
+    grid: { type: [Boolean, Object], default: void 0 },
     form: { default: void 0 }
   },
   setup(__props) {
     const props = __props;
-    const fallbackForm = props.form ? void 0 : useForm();
-    const currentForm = computed(
-      () => props.form ?? fallbackForm
-    );
+    const fallbackForm = useForm();
+    const currentForm = computed(() => props.form ?? fallbackForm);
     const formProxy = createFormProxy(() => currentForm.value);
     provide(InjectionFormKey, formProxy);
     const fields = computed(() => {
@@ -623,6 +685,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     let formInstanceCounter = 0;
     const formInstanceKeyMap = /* @__PURE__ */ new WeakMap();
     const getFormKey = (f) => {
+      if (f == null) return 0;
       if (!formInstanceKeyMap.has(f)) {
         formInstanceKeyMap.set(f, ++formInstanceCounter);
       }
@@ -631,17 +694,24 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     const formKey = computed(() => getFormKey(currentForm.value));
     const config = INJECT_CONFIG["pro-form"];
     const injectFormConfig = inject(config.injectionKey, config.default);
-    const attrs = useAttrs();
+    const attrs = useReactiveAttrs();
     const injectAttrs = computed(() => {
       const raw = toValue(injectFormConfig);
       const { grid: _injectGrid, ...rest } = raw || {};
       return rest;
     });
     const formAttrs = computed(() => {
-      return mergeProps(injectAttrs.value, camelizeProperties(attrs));
+      return mergeProps(
+        injectAttrs.value,
+        omitBy(camelizeProperties(attrs), (value) => value === void 0)
+      );
     });
     const slots = useSlots();
-    provide(InjectionFormSlotsKey, slots);
+    const formSlotsRef = shallowRef(slots);
+    onUpdated(() => {
+      triggerRef(formSlotsRef);
+    });
+    provide(InjectionFormSlotsKey, formSlotsRef);
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(Form), mergeProps({
         key: formKey.value,
@@ -649,7 +719,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
         model: formData.value
       }, formAttrs.value, { class: "pro-form" }), {
         default: withCtx(() => [
-          createVNode(unref(_sfc_main$e), {
+          createVNode(_sfc_main$b, {
             fields: fields.value,
             grid: props.grid
           }, null, 8, ["fields", "grid"]),
@@ -693,7 +763,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   ...{ name: "SearchForm" },
   __name: "SearchForm",
   props: {
-    form: { default: void 0 },
+    form: {},
     layout: { default: "grid" },
     expand: { type: [Boolean, Object], default: true },
     searchButton: { type: [Object, Function, Boolean], default: void 0 },
@@ -730,13 +800,27 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     const onReset = () => {
       emit("reset");
     };
-    const onSearch = () => {
+    let searchTriggeredInTick = false;
+    const emitSearch = () => {
+      searchTriggeredInTick = true;
+      nextTick(() => {
+        searchTriggeredInTick = false;
+      });
       emit("search");
     };
+    const onSearchSubmit = () => {
+      if (searchTriggeredInTick) return;
+      emitSearch();
+    };
+    const onSearchClick = () => {
+      if (searchTriggeredInTick) return;
+      emitSearch();
+    };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$a), mergeProps(layoutProps.value, {
+      return openBlock(), createBlock(_sfc_main$a, mergeProps(layoutProps.value, {
         form: props.form,
-        class: "pro-table_search-form transition"
+        class: "pro-table_search-form transition",
+        onSubmit: withModifiers(onSearchSubmit, ["prevent"])
       }), {
         default: withCtx(() => [
           createVNode(unref(Space), {
@@ -761,17 +845,16 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
                   }))
                 ], 64)) : createCommentVNode("", true)
               ], true),
-              renderSlot(_ctx.$slots, "search-button", { onSearch }, () => [
+              renderSlot(_ctx.$slots, "search-button", { onSearch: onSearchClick }, () => [
                 props.searchButton !== false ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                   props.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(props.searchButton), {
                     key: 0,
-                    onClick: onSearch
+                    onClick: onSearchClick
                   })) : (openBlock(), createBlock(unref(Button), {
                     key: 1,
                     class: "pro-table_search-form_search-button",
                     type: "primary",
-                    "html-type": "submit",
-                    onClick: onSearch
+                    "html-type": "submit"
                   }, {
                     default: withCtx(() => [
                       createTextVNode(toDisplayString(unref(t)("table.query")), 1)
@@ -815,7 +898,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-66c80dec"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-bf6cca54"]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "DefaultSearchFormContainer",
   setup(__props) {
@@ -830,7 +913,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-c385cd54"]]);
+const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-570a1898"]]);
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "DefaultTableContainer",
   setup(__props) {
@@ -845,7 +928,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-ac3cdb51"]]);
+const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-e5c97b2f"]]);
 const _sfc_main$5 = {};
 const _hoisted_1$2 = {
   focusable: "false",
@@ -864,19 +947,22 @@ function _sfc_render$1(_ctx, _cache) {
 const ColumnHeightOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$1]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "SizeControl",
-  props: {
+  props: /* @__PURE__ */ mergeModels({
+    effectiveSize: { default: void 0 }
+  }, {
     "size": {},
     "sizeModifiers": {}
-  },
+  }),
   emits: ["update:size"],
   setup(__props) {
     const { t } = useLocale();
     const configContext = useConfigContextInject();
+    const props = __props;
     const size = useModel(__props, "size");
     const currentSize = computed(
       () => {
         var _a;
-        return size.value ?? ((_a = configContext.componentSize) == null ? void 0 : _a.value) ?? "large";
+        return props.effectiveSize ?? size.value ?? ((_a = configContext.componentSize) == null ? void 0 : _a.value) ?? "large";
       }
     );
     const onSizeChange = (val) => {
@@ -916,7 +1002,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-2ac95d3b"]]);
+const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-950f061f"]]);
 const _sfc_main$3 = {};
 const _hoisted_1$1 = {
   focusable: "false",
@@ -947,7 +1033,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const checkAll = ref(false);
     const indeterminate = ref(false);
     const checkedColumnsOptions = computed(
-      () => props.columns.flatMap((item) => {
+      () => props.columns.filter(isObjectItem).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 [];
@@ -959,7 +1045,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         return {
           label,
           value: key,
-          checked: !item.hidden || disabled,
+          checked: !toValue(item.hidden) || disabled,
           disabled
         };
       })
@@ -974,11 +1060,12 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         );
       },
       set(val) {
+        const checkedSet = new Set(val);
         checkedColumnsOptions.value.forEach((item) => {
           var _a, _b;
-          if (item.disabled) return;
+          if (item.disabled || item.checked === checkedSet.has(item.value)) return;
           (_b = (_a = props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, item.value, {
-            hidden: !val.includes(item.value)
+            hidden: !checkedSet.has(item.value)
           });
         });
       }
@@ -1097,7 +1184,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-f3a7a234"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-58650608"]]);
 const _hoisted_1 = { class: "pro-table_header" };
 const _hoisted_2 = {
   key: 0,
@@ -1152,18 +1239,40 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         container: container ? container : void 0
       };
     });
-    const attrs = useAttrs();
-    const tableAttrs = computed(() => {
-      return pick(camelizeProperties(attrs), tableProperties);
+    const searchFormProps = computed(() => {
+      const {
+        container: _container,
+        hidden: _hidden,
+        ...rest
+      } = computedSearchFormConfig.value;
+      return rest;
     });
+    const attrs = useReactiveAttrs();
     const size = useModel(__props, "size");
     const loading = useModel(__props, "loading");
     let searchSequence = 0;
+    const SEARCH_WARN_MESSAGES = {
+      duplicate: "同时配置了 :search prop 与 @search 监听，@search 监听不会被执行，请仅保留其一。",
+      "not-promise": "search 未返回 Promise，本次查询不参与 loading 竞态管理（在途请求的 loading 状态保持不变）。"
+    };
+    const warnedSearchReasons = /* @__PURE__ */ new Set();
+    const warnSearchConfig = (reason) => {
+      if (warnedSearchReasons.has(reason)) return;
+      warnedSearchReasons.add(reason);
+      console.warn(`[ProTable] ${SEARCH_WARN_MESSAGES[reason]}`);
+    };
     const _search = async () => {
-      var _a;
+      const search = props.search || attrs.onSearch;
+      if (props.search && attrs.onSearch) {
+        warnSearchConfig("duplicate");
+      }
+      if (!search) return;
+      const searchPromise = search();
+      if (!isPromise(searchPromise)) {
+        warnSearchConfig("not-promise");
+        return;
+      }
       const seq = ++searchSequence;
-      const searchPromise = (_a = props.search || attrs.onSearch) == null ? void 0 : _a();
-      if (!isPromise(searchPromise)) return;
       loading.value = true;
       try {
         await searchPromise;
@@ -1207,13 +1316,37 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current: 1 });
       _search();
     };
+    const instance = getCurrentInstance();
+    const isBoundProp = (name) => {
+      const vnodeProps = (instance == null ? void 0 : instance.vnode.props) || {};
+      const kebab = name.replace(/[A-Z]/g, (char) => `-${char.toLowerCase()}`);
+      return name in vnodeProps || kebab in vnodeProps || `onUpdate:${name}` in vnodeProps;
+    };
+    const camelAttrs = computed(
+      () => camelizeProperties(attrs)
+    );
+    const resolveOwnedProp = (name) => {
+      const attrValue = camelAttrs.value[name];
+      return isBoundProp(name) ? props[name] ?? attrValue : attrValue;
+    };
+    const hasExplicitColumns = computed(
+      () => resolveOwnedProp("columns") !== void 0
+    );
+    const effectiveSize = computed(() => {
+      return size.value ?? injectAttrs.value.size;
+    });
     const computedTableProps = computed(() => {
-      return {
+      const merged = {
         ...injectAttrs.value,
-        ...tableAttrs.value,
-        pagination: void 0,
-        onChange: void 0
+        ...omitBy(
+          pick(camelAttrs.value, tableProperties),
+          (value) => value === void 0
+        )
       };
+      delete merged.onChange;
+      merged.size = effectiveSize.value;
+      merged.loading = void 0;
+      return merged;
     });
     const computedTableContainer = computed(() => {
       const container = props.tableContainer ?? injectProps.value.tableContainer ?? DefaultTableContainer;
@@ -1221,13 +1354,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     });
     const getIndex = (i) => {
       var _a;
+      const pagination = computedPagination.value;
+      if (pagination === false) return i + 1;
       const pageParam = (_a = props.table) == null ? void 0 : _a.pageParam;
-      if (pageParam && computedPagination.value !== false) {
-        const current = pageParam.current ?? 1;
-        const pageSize = pageParam.pageSize ?? 10;
-        return (current - 1) * pageSize + i + 1;
-      }
-      return i + 1;
+      const current = pagination.current ?? (pageParam == null ? void 0 : pageParam.current) ?? 1;
+      const pageSize = pagination.pageSize ?? (pageParam == null ? void 0 : pageParam.pageSize) ?? 10;
+      return (current - 1) * pageSize + i + 1;
     };
     const indexColumn = computed(() => ({
       title: t("table.index"),
@@ -1238,34 +1370,61 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     }));
     const computedColumns = computed(() => {
       var _a;
-      const cols = tableAttrs.value.columns ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? [];
+      const cols = resolveOwnedProp("columns") ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? [];
       const needIndex = props.addIndexColumn ?? injectProps.value.addIndexColumn;
       return needIndex ? [indexColumn.value, ...cols] : cols;
     });
+    const filterVisibleColumns = (columns, ancestors = /* @__PURE__ */ new Set()) => {
+      const list = [];
+      let changed = false;
+      for (const column of columns) {
+        if (!isObjectItem(column) || toValue(column.hidden)) {
+          changed = true;
+          continue;
+        }
+        if (Array.isArray(column.children) && column.children.length > 0) {
+          if (ancestors.has(column)) {
+            changed = true;
+            continue;
+          }
+          ancestors.add(column);
+          const filtered = filterVisibleColumns(column.children, ancestors);
+          ancestors.delete(column);
+          if (filtered.changed) {
+            changed = true;
+            list.push({ ...column, children: filtered.list });
+            continue;
+          }
+        }
+        list.push(column);
+      }
+      return { list, changed };
+    };
     const visibleComputedColumns = computed(() => {
-      return computedColumns.value.filter((item) => !item.hidden);
+      return filterVisibleColumns(computedColumns.value).list;
     });
     const computedDataSource = computed(() => {
       var _a;
-      return tableAttrs.value.dataSource ?? toValue((_a = props.table) == null ? void 0 : _a.dataSource) ?? [];
+      return resolveOwnedProp("dataSource") ?? toValue((_a = props.table) == null ? void 0 : _a.dataSource) ?? [];
     });
     const computedPagination = computed(() => {
-      var _a, _b, _c, _d;
-      if (tableAttrs.value.pagination === false) return false;
-      if (isPlainObject(tableAttrs.value.pagination)) {
+      var _a, _b, _c;
+      const attrsPagination = resolveOwnedProp("pagination");
+      if (attrsPagination === false) return false;
+      if (isPlainObject(attrsPagination)) {
         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 }))
+          ...attrsPagination,
+          showTotal: (attrsPagination == null ? void 0 : attrsPagination.showTotal) ?? (globalPagination == null ? void 0 : globalPagination.showTotal) ?? ((total) => t("pagination.total", { total }))
         };
       }
       if (injectAttrs.value.pagination === false) return false;
       return {
         ...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 }))
+        ...(_b = props.table) == null ? void 0 : _b.pageParam,
+        showTotal: ((_c = injectAttrs.value.pagination) == null ? void 0 : _c.showTotal) ?? ((total) => t("pagination.total", { total }))
       };
     });
     const onTableChange = (...args) => {
@@ -1278,9 +1437,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       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 !!(((_c = computedSearchFormConfig.value) == null ? void 0 : _c.hidden) !== true && ((_d = props.table) == null ? void 0 : _d.searchForm) && fieldList.filter((item) => !toValue(item.hidden)).length > 0);
+      return !!(((_c = computedSearchFormConfig.value) == null ? void 0 : _c.hidden) !== true && ((_d = props.table) == null ? void 0 : _d.searchForm) && fieldList.filter((item) => isObjectItem(item) && !toValue(item.hidden)).length > 0);
     });
-    const computedControl = computed(() => {
+    const resolvedControl = computed(() => {
       const controlConfig = props.control ?? injectProps.value.control;
       if (controlConfig === true) {
         return { sizeControl: true, columnControl: true };
@@ -1293,6 +1452,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         columnControl: (controlConfig == null ? void 0 : controlConfig.columnControl) ?? false
       };
     });
+    const computedControl = computed(
+      () => hasExplicitColumns.value && resolvedControl.value.columnControl ? { ...resolvedControl.value, columnControl: false } : resolvedControl.value
+    );
     const columnControlConfig = computed(() => {
       const cc = computedControl.value.columnControl;
       return typeof cc === "object" ? cc : void 0;
@@ -1311,27 +1473,30 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         class: normalizeClass(["pro-table", unref(attrs).class]),
         style: normalizeStyle(unref(attrs).style)
       }, [
-        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(unref(_sfc_main$c), {
+        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(_sfc_main$e, {
           key: 0,
           component: computedSearchFormConfig.value.container
         }, {
-          default: withCtx(() => [
-            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)
-          ]),
+          default: withCtx(() => {
+            var _a;
+            return [
+              renderSlot(_ctx.$slots, "search-form", normalizeProps(guardReactiveProps({ form: (_a = props.table) == null ? void 0 : _a.searchForm, search: searchPage1st, reset })), () => {
+                var _a2;
+                return [
+                  ((_a2 = props.table) == null ? void 0 : _a2.searchForm) ? (openBlock(), createBlock(SearchForm, mergeProps({
+                    key: 0,
+                    form: props.table.searchForm
+                  }, searchFormProps.value, {
+                    onSearch: searchPage1st,
+                    onReset: reset
+                  }), null, 16, ["form"])) : createCommentVNode("", true)
+                ];
+              }, true)
+            ];
+          }),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
-        createVNode(unref(_sfc_main$c), { component: computedTableContainer.value }, {
+        createVNode(_sfc_main$e, { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
               _ctx.$slots["button-bar"] ? (openBlock(), createElementBlock("div", _hoisted_2, [
@@ -1341,22 +1506,29 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 renderSlot(_ctx.$slots, "toolbar", {}, void 0, true)
               ])) : createCommentVNode("", true),
               computedControl.value.sizeControl ? (openBlock(), createElementBlock("div", _hoisted_4, [
-                createVNode(unref(SizeControl), {
+                createVNode(SizeControl, {
                   size: size.value,
-                  "onUpdate:size": _cache[0] || (_cache[0] = ($event) => size.value = $event)
-                }, null, 8, ["size"])
+                  "onUpdate:size": _cache[0] || (_cache[0] = ($event) => size.value = $event),
+                  "effective-size": effectiveSize.value
+                }, null, 8, ["size", "effective-size"])
               ])) : createCommentVNode("", true),
               computedControl.value.columnControl ? (openBlock(), createElementBlock("div", _hoisted_5, [
-                createVNode(unref(ColumnControl), {
+                createVNode(ColumnControl, {
                   columns: computedColumns.value,
                   table: props.table,
                   "column-control": columnControlConfig.value
                 }, null, 8, ["columns", "table", "column-control"])
               ])) : createCommentVNode("", true)
             ]),
-            renderSlot(_ctx.$slots, "table", {}, () => [
+            renderSlot(_ctx.$slots, "table", normalizeProps(guardReactiveProps({
+              columns: visibleComputedColumns.value,
+              dataSource: computedDataSource.value,
+              pagination: computedPagination.value,
+              loading: loading.value,
+              size: effectiveSize.value,
+              onChange: onTableChange
+            })), () => [
               createVNode(unref(Table), mergeProps({ class: "pro-table_content" }, computedTableProps.value, {
-                size: size.value,
                 loading: loading.value,
                 columns: visibleComputedColumns.value,
                 "data-source": computedDataSource.value,
@@ -1371,7 +1543,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                     ])
                   };
                 })
-              ]), 1040, ["size", "loading", "columns", "data-source", "pagination"])
+              ]), 1040, ["loading", "columns", "data-source", "pagination"])
             ], true)
           ]),
           _: 3
@@ -1380,7 +1552,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-1e72e302"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-e7753db3"]]);
 function useTable(params) {
   return useTable$1(params);
 }
@@ -1400,15 +1572,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     Object.keys(INJECT_CONFIG).forEach(
       (key) => {
         const config = INJECT_CONFIG[key];
+        const ignored = config.ignoreProps;
         provide(
           config.injectionKey,
-          computed(() => {
-            var _a;
-            return {
-              ...config.default,
-              ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
-            };
-          })
+          computed(
+            () => {
+              var _a;
+              return omit(
+                {
+                  ...config.default,
+                  ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
+                },
+                ignored ?? []
+              );
+            }
+          )
         );
       }
     );
@@ -1429,6 +1607,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    provide(
+      INJECT_COMPONENT_VARS,
+      computed(() => props.componentVars ?? {})
+    );
     provide(
       INJECT_COMPONENTS,
       computed(() => props.componentMap)
@@ -1444,7 +1626,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 });
 const index = {
   /**
-   * @qin-ui/antd-vue-pro 安装方法
+   * 安装方法
    * @description 全局注册所有组件（ProForm、ProTable、ProComponentProvider）
    *
    * @param {App} app - Vue 应用实例
@@ -1460,16 +1642,19 @@ const index = {
   install(app) {
     app.component(_sfc_main$a.name, _sfc_main$a);
     app.component(ProTable.name, ProTable);
-    app.component(_sfc_main.name, _sfc_main);
+    app.component(
+      _sfc_main.name ?? "ProComponentProvider",
+      _sfc_main
+    );
   }
 };
 export {
-  _sfc_main$c as ContainerFragment,
+  _sfc_main$e as ContainerFragment,
   LOCALE_INJECT_KEY,
   _sfc_main as ProComponentProvider,
   _sfc_main$a as ProForm,
   ProTable,
-  _sfc_main$b as SlotComponent,
+  _sfc_main$d as SlotComponent,
   index as default,
   enUS2 as enUS,
   useFields,