@qin-ui/element-plus-pro 1.3.4 → 1.4.0

package/es/index.js

@@ -1,7 +1,7 @@
 import "./element-plus-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, createTextVNode, toDisplayString, provide, useSlots, withModifiers, createElementVNode, normalizeStyle, useModel, watch, mergeModels, onMounted, resolveDirective, normalizeClass, withDirectives, guardReactiveProps, nextTick } from "vue";
-import { ElTable, ElPagination, ElCol, ElFormItem, useFormDisabled, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, localeContextKey, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElLoading } from "element-plus";
-import { isPlainObject, getObject, normalizePathKey, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, cloneDeep, InjectionFormSlotsKey, createFormProxy, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, get, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { inject, computed, toValue, provide, defineComponent, createBlock, renderSlot, openBlock, resolveDynamicComponent, normalizeProps, mergeProps, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, ref, createCommentVNode, createSlots, renderList, createVNode, toRaw, resolveComponent, unref, useSlots, shallowRef, onUpdated, triggerRef, withModifiers, createElementVNode, normalizeStyle, nextTick, mergeModels, useModel, watch, h, onMounted, resolveDirective, normalizeClass, withDirectives, guardReactiveProps, effect, stop, Comment, Text } from "vue";
+import { ElTable, ElPagination, ElCol, ElFormItem, useFormDisabled, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, localeContextKey, useLocale as useLocale$1, ElRow, ElForm, ElSpace, ElButton, useSize, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElLoading } from "element-plus";
+import { useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, useReactiveAttrs, cloneDeep, getObject, InjectionFormSlotsKey, isPlainObject, resolveFieldIdentity, isObjectItem, normalizePathKey, createFormProxy, InjectionFormKey, omitBy, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, get, pick, isPromise, useTable as useTable$1, omit } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
 const _tableProps = ElTable.props || {};
 const _paginationProps = ElPagination.props || {};
@@ -14,17 +14,30 @@ const formItemProps = () => _formItemProps;
 const DisabledContextKey = Symbol.for("pro-form-disabled-context");
 const useDisabledContext = () => {
   const formDisabled = useFormDisabled();
-  const customDisabled = inject(DisabledContextKey, void 0);
+  const customDisabled = inject(
+    DisabledContextKey,
+    void 0
+  );
   return computed(() => {
-    if (customDisabled !== void 0 && toValue(customDisabled) !== void 0) {
-      return Boolean(toValue(customDisabled));
-    }
+    const custom = toValue(customDisabled);
+    if (custom !== void 0) return Boolean(custom);
     return Boolean(formDisabled.value);
   });
 };
+const useDisabledContextProvider = (disabled) => {
+  const parentDisabled = useDisabledContext();
+  provide(
+    DisabledContextKey,
+    computed(() => toValue(disabled) ?? parentDisabled.value)
+  );
+};
+const useProviderDisabled = useDisabledContextProvider;
+const INJECT_COMPONENT_VARS = Symbol("COMPONENT_VARS");
 const INJECT_CONFIG = {
   "pro-table": {
     injectionKey: Symbol(""),
+    // 数据取自 `:table` 实例或显式 `:data`；列与加载态非类型面成员，同样在注入层忽略
+    ignoreProps: ["loading", "columns", "data"],
     default: {
       pagination: {
         layout: "total, sizes, prev, pager, next, jumper",
@@ -41,6 +54,8 @@ const INJECT_CONFIG = {
   },
   "pro-form": {
     injectionKey: Symbol(""),
+    // 表单实例由 `:form` 显式传入
+    ignoreProps: ["form"],
     default: { grid: { gutter: 24 } }
   },
   "pro-form-item": {
@@ -201,6 +216,38 @@ const ensureInjectConfig = (key) => {
   DYNAMIC_INJECT_CONFIG[key] = created;
   return created;
 };
+const _sfc_main$f = /* @__PURE__ */ defineComponent({
+  ...{ name: "ContainerFragment", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { type: [Object, Function] }
+  },
+  setup(__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$e = /* @__PURE__ */ defineComponent({
+  ...{ name: "SlotComponent", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { type: [Object, Function, String, Number, Boolean, null] }
+  },
+  setup(__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", "error"];
 const componentMap = {
   "input": ElInput,
@@ -218,222 +265,14 @@ const componentMap = {
   "tree-select": ElTreeSelect,
   "transfer": ElTransfer
 };
-const formItemPropKeys = Object.keys(formItemProps()).filter(
-  (k) => k !== "disabled"
-);
-const gridItemPropKeys = Object.keys(gridItemProps());
-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 rawInjectProps = 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, formItemContainer, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, ...rest } = field;
-        const {
-          class: injectClassName,
-          style: injectStyle,
-          span: injectSpan,
-          formItemContainer: injectFormItemContainer,
-          xs,
-          sm,
-          md,
-          lg,
-          xl,
-          ...injectRest
-        } = rawInjectProps;
-        const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, span: injectSpan };
-        gridItemProps2 = fields ? { span: span ?? 24 } : initGridItemProps;
-        formItemProps2 = mergeProps(
-          injectRest,
-          { class: injectClassName, style: injectStyle },
-          { class: toValue(formItemClass), style: toValue(formItemStyle) },
-          formItemDataAttrs
-        );
-        const container = formItemContainer ?? injectFormItemContainer;
-        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,
-          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$f = /* @__PURE__ */ defineComponent({
-  ...{ name: "BaseFormItem", inheritAttrs: false },
-  __name: "index",
-  props: {
-    grid: { type: [Boolean, Object], default: void 0 },
-    fields: { default: () => [] }
-  },
-  setup(__props) {
-    const props = __props;
-    const validFields = computed(
-      () => (
-        // hidden 支持 Ref/ComputedRef/getter 等响应式形态（统一使用 toValue 取值）
-        (props.fields ?? []).filter((field) => !toValue(field.hidden))
-      )
-    );
-    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$d), mergeProps({
-        component: enableGrid.value ? unref(ElRow) : void 0
-      }, computedGridProps.value, { style: { "width": "100%" } }), {
-        default: withCtx(() => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item, index2) => {
-            return openBlock(), createBlock(unref(_sfc_main$d), mergeProps({
-              key: item.path || index2,
-              component: enableGrid.value ? unref(ElCol) : void 0
-            }, { ref_for: true }, item.gridItemProps), {
-              default: withCtx(() => [
-                createVNode(unref(_sfc_main$d), {
-                  component: item.container,
-                  path: item.path
-                }, {
-                  default: withCtx(() => [
-                    createVNode(unref(ElFormItem), mergeProps({ ref_for: true }, item.formItemProps, {
-                      ref_for: true,
-                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
-                      prop: unref(normalizePathKey)(item.path),
-                      path: item.path
-                    }), createSlots({
-                      default: withCtx(() => [
-                        item.rawField.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
-                          key: 0,
-                          grid: item.rawField.grid ?? props.grid,
-                          fields: item.rawField.fields
-                        }, null, 8, ["grid", "fields"])) : (openBlock(), createBlock(unref(_sfc_main$e), 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$c), mergeProps({
-                              path: item.path,
-                              component: slot
-                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
-                          ])
-                        };
-                      })
-                    ]), 1040, ["prop", "path"])
-                  ]),
-                  _: 2
-                }, 1032, ["component", "path"])
-              ]),
-              _: 2
-            }, 1040, ["component"]);
-          }), 128))
-        ]),
-        _: 1
-      }, 16, ["component"]);
-    };
-  }
-});
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-42bb0876"]]);
+const ELEMENT_FIELD_IDENTITY_KEYS = ["prop", "path"];
 function useForm(...args) {
-  return useForm$1(...args);
+  if (args.length === 1 && typeof args[0] === "boolean") {
+    return useForm$1(args[0]);
+  }
+  return useForm$1(args[0], args[1], args[2], {
+    fieldIdentityKeys: ELEMENT_FIELD_IDENTITY_KEYS
+  });
 }
 const PLACEHOLDER_KEYS = {
   input: "input.placeholder",
@@ -537,7 +376,7 @@ const useLocale = () => {
   const { lang: elLang } = useLocale$1();
   const override = inject(LOCALE_INJECT_KEY, void 0);
   const lang = computed(() => {
-    if (!elLocaleContext) return "zh-CN";
+    if (toValue(elLocaleContext) == null) return "zh-CN";
     return resolveLocaleName(elLang.value);
   });
   const pack = computed(
@@ -550,7 +389,7 @@ const useLocale = () => {
   };
   return { t, lang };
 };
-const _sfc_main$e = /* @__PURE__ */ defineComponent({
+const _sfc_main$d = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseField", inheritAttrs: false },
   __name: "index",
   props: {
@@ -558,15 +397,20 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     path: { default: "" }
   },
   setup(__props, { expose: __expose }) {
+    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 attrs = useAttrs();
+    const attrs = useReactiveAttrs();
     const typeVal = attrs.type;
     const injectConfigKey = typeof props.component === "string" ? [props.component, typeVal].filter(Boolean).join(".") : "";
     const componentInjectConfig = injectConfigKey ? getInjectConfig(injectConfigKey) : void 0;
     const rawInjectComponentProps = componentInjectConfig ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default) : void 0;
+    const componentVars = inject(INJECT_COMPONENT_VARS, void 0);
     const value = computed({
       get() {
         var _a;
@@ -583,7 +427,7 @@ const _sfc_main$e = /* @__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);
@@ -597,7 +441,11 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     });
     const parentDisabled = useDisabledContext();
     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,
@@ -607,7 +455,8 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         t
       );
       const modelPropName = attrs.modelProp ?? initProps.modelProp ?? "modelValue";
-      const effectiveDisabled = attrs.disabled !== void 0 ? Boolean(attrs.disabled) : Boolean(parentDisabled.value || initProps.disabled);
+      const normalizeDisabled = (value2) => value2 === "" || value2 === "disabled" ? true : Boolean(value2);
+      const effectiveDisabled = attrs.disabled !== void 0 && attrs.disabled !== null ? normalizeDisabled(attrs.disabled) : normalizeDisabled(parentDisabled.value) || normalizeDisabled(initProps.disabled);
       const mergedProps = mergeProps(
         initProps,
         attrs,
@@ -625,14 +474,14 @@ const _sfc_main$e = /* @__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;
@@ -644,7 +493,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       getComponentComputedProps: () => groupedAttrs.value.attrs
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$d), {
+      return openBlock(), createBlock(_sfc_main$f, {
         component: groupedAttrs.value.componentContainer,
         path: props.path
       }, {
@@ -660,7 +509,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main$c), mergeProps({
+                  createVNode(_sfc_main$e, mergeProps({
                     path: props.path
                   }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
@@ -673,51 +522,260 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
-  ...{ name: "ContainerFragment", inheritAttrs: false },
+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());
+const gridItemPropKeys = Object.keys(gridItemProps());
+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 rawInjectProps = toValue(injectFormItemProps) || {};
+    return validFields.value.map((field) => {
+      let gridItemProps2 = {};
+      let formItemProps2 = {};
+      const componentProps = { slots: {} };
+      const formItemSlots = {};
+      if (isPlainObject(field)) {
+        const { path: _path, prop: _prop, fields, formItemClass, formItemStyle, formItemContainer, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, ...rest } = field;
+        const { class: injectClassName, style: injectStyle, span: injectSpan, formItemContainer: injectFormItemContainer, xs, sm, md, lg, xl, ...injectRest } = rawInjectProps;
+        const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, span: injectSpan };
+        gridItemProps2 = fields ? { ...initGridItemProps, span: span ?? 24 } : initGridItemProps;
+        formItemProps2 = mergeProps(
+          injectRest,
+          { class: injectClassName, style: injectStyle },
+          { class: toValue(formItemClass), style: toValue(formItemStyle) },
+          formItemDataAttrs
+        );
+        const container = formItemContainer ?? injectFormItemContainer;
+        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];
+          }
+        });
+        return {
+          path: resolveFieldIdentity(field, ELEMENT_FIELD_IDENTITY_KEYS),
+          gridItemProps: gridItemProps2,
+          formItemProps: formItemProps2,
+          formItemSlots,
+          componentProps,
+          container,
+          rawField: field,
+          renderKey: getFieldKey(field)
+        };
+      }
+      return {
+        path: resolveFieldIdentity(field, ELEMENT_FIELD_IDENTITY_KEYS),
+        gridItemProps: gridItemProps2,
+        formItemProps: formItemProps2,
+        formItemSlots,
+        componentProps,
+        rawField: field,
+        renderKey: getFieldKey(field)
+      };
+    });
+  });
+}
+const _sfc_main$c = /* @__PURE__ */ defineComponent({
+  ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, Function] }
+    grid: { type: [Boolean, Object], default: void 0 },
+    fields: { default: () => [] },
+    disabled: { type: Boolean, default: void 0 }
   },
   setup(__props) {
+    const props = __props;
+    useProviderDisabled(computed(() => props.disabled));
+    const validFields = computed(
+      () => (
+        // hidden 支持 Ref / ComputedRef 响应式形态（统一使用 toValue 取值）
+        (props.fields ?? []).filter(
+          (field) => isObjectItem(field) && !toValue(field.hidden)
+        )
+      )
+    );
+    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 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 __props.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
+      const _component_BaseFormItem = resolveComponent("BaseFormItem");
+      return openBlock(), createBlock(_sfc_main$f, mergeProps({
+        component: enableGrid.value ? unref(ElRow) : void 0
+      }, computedGridProps.value, { style: { "width": "100%" } }), {
         default: withCtx(() => [
-          renderSlot(_ctx.$slots, "default")
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item) => {
+            return openBlock(), createBlock(_sfc_main$f, mergeProps({
+              key: item.renderKey,
+              component: enableGrid.value ? unref(ElCol) : void 0
+            }, { ref_for: true }, item.gridItemProps), {
+              default: withCtx(() => [
+                createVNode(_sfc_main$f, {
+                  component: item.container,
+                  path: item.path
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(ElFormItem), mergeProps({ ref_for: true }, item.formItemProps, {
+                      ref_for: true,
+                      ref: (el) => setFormItemRef(item.rawField, el, item.formItemProps),
+                      prop: unref(normalizePathKey)(item.path),
+                      path: item.path
+                    }), createSlots({
+                      default: withCtx(() => [
+                        item.rawField.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
+                          key: 0,
+                          grid: item.rawField.grid ?? props.grid,
+                          fields: item.rawField.fields,
+                          disabled: toValue(item.rawField.disabled)
+                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(_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(_sfc_main$e, mergeProps({
+                              path: item.path,
+                              component: slot
+                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
+                          ])
+                        };
+                      })
+                    ]), 1040, ["prop", "path"])
+                  ]),
+                  _: 2
+                }, 1032, ["component", "path"])
+              ]),
+              _: 2
+            }, 1040, ["component"]);
+          }), 128))
         ]),
-        _: 3
-      }, 16)) : renderSlot(_ctx.$slots, "default", { key: 1 });
+        _: 1
+      }, 16, ["component"]);
     };
   }
 });
-const _sfc_main$c = /* @__PURE__ */ defineComponent({
-  ...{ name: "SlotComponent", inheritAttrs: false },
-  __name: "index",
-  props: {
-    component: { type: [Object, Function, String, Number, Boolean, null] }
-  },
-  setup(__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 _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
   }
-});
+  return target;
+};
+const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-237594c9"]]);
 const _sfc_main$b = /* @__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(() => {
@@ -736,6 +794,7 @@ const _sfc_main$b = /* @__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);
       }
@@ -744,17 +803,24 @@ const _sfc_main$b = /* @__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(ElForm), mergeProps({
         key: formKey.value,
@@ -766,7 +832,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
         }, ["prevent"]))
       }), {
         default: withCtx(() => [
-          createVNode(unref(BaseFormItem), {
+          createVNode(BaseFormItem, {
             fields: fields.value,
             grid: props.grid
           }, null, 8, ["fields", "grid"]),
@@ -778,7 +844,9 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
   }
 });
 function useFields(initFields) {
-  return useFields$1(initFields);
+  return useFields$1(initFields, {
+    fieldIdentityKeys: ELEMENT_FIELD_IDENTITY_KEYS
+  });
 }
 function useFormRef() {
   return useFormRef$1();
@@ -803,7 +871,7 @@ const _sfc_main$9 = /* @__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 },
@@ -845,13 +913,27 @@ const _sfc_main$9 = /* @__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$b), mergeProps(layoutProps.value, {
+      return openBlock(), createBlock(_sfc_main$b, 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(ElSpace), {
@@ -876,17 +958,16 @@ const _sfc_main$9 = /* @__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(ElButton), {
                     key: 1,
                     class: "pro-table_search-form_search-button",
                     type: "primary",
-                    "native-type": "submit",
-                    onClick: onSearch
+                    "native-type": "submit"
                   }, {
                     default: withCtx(() => [
                       createTextVNode(toDisplayString(unref(t)("table.query")), 1)
@@ -930,7 +1011,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-a74f63bd"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-419025fd"]]);
 const _sfc_main$8 = {};
 const _hoisted_1$4 = { class: "pro-table_search-form-container" };
 function _sfc_render$3(_ctx, _cache) {
@@ -965,15 +1046,21 @@ function _sfc_render$1(_ctx, _cache) {
 const ColumnHeightOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$1]]);
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "SizeControl",
-  props: {
+  props: /* @__PURE__ */ mergeModels({
+    effectiveSize: { default: void 0 }
+  }, {
     "size": {},
     "sizeModifiers": {}
-  },
+  }),
   emits: ["update:size"],
   setup(__props) {
     const { t } = useLocale();
+    const props = __props;
     const size = useModel(__props, "size");
-    const currentSize = computed(() => size.value ?? "default");
+    const hostSize = useSize();
+    const currentSize = computed(
+      () => (props.effectiveSize ?? size.value ?? hostSize.value) || "default"
+    );
     const items = computed(() => [
       { label: t("table.sizeDefault"), key: "default" },
       { label: t("table.sizeMiddle"), key: "large" },
@@ -1019,7 +1106,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-e31e9c15"]]);
+const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-61d0ef11"]]);
 const _sfc_main$4 = {};
 const _hoisted_1$1 = {
   focusable: "false",
@@ -1048,16 +1135,16 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     const { t } = useLocale();
     const checkAll = ref(false);
     const indeterminate = ref(false);
-    const getColumnKey = (column) => {
-      const rawKey = column.key ?? column.prop;
+    const getColumnKey2 = (column) => {
+      const rawKey = column.key || column.prop;
       if (rawKey === void 0 || rawKey === null || rawKey === "")
         return void 0;
       return normalizePathKey(rawKey);
     };
     const checkedColumnsOptions = computed(
-      () => props.columns.flatMap((item) => {
+      () => props.columns.filter(isObjectItem).flatMap((item) => {
         var _a, _b, _c, _d, _e, _f;
-        const key = getColumnKey(item);
+        const key = getColumnKey2(item);
         if (key === void 0) return [];
         if (key === "__INDEX__" || item.type === "index" || ((_b = (_a = props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some((ek) => String(ek) === key)))
           return [];
@@ -1069,7 +1156,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         return {
           label,
           value: key,
-          checked: !item.hidden || !!disabled,
+          checked: !toValue(item.hidden) || !!disabled,
           disabled: !!disabled,
           column: item
         };
@@ -1085,11 +1172,12 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         );
       },
       set(val) {
+        const checkedSet = new Set(val);
         checkedColumnsOptions.value.forEach((item) => {
           var _a;
-          if (item.disabled) return;
+          if (item.disabled || item.checked === checkedSet.has(item.value)) return;
           (_a = props.table) == null ? void 0 : _a.setColumn(item.value, {
-            hidden: !val.includes(item.value)
+            hidden: !checkedSet.has(item.value)
           });
         });
       }
@@ -1204,79 +1292,76 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-a2cc0fcb"]]);
-const _sfc_main$2 = /* @__PURE__ */ defineComponent({
-  ...{ name: "TableColumnRenderer" },
-  __name: "TableColumnRenderer",
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-4d2b4f1c"]]);
+let columnKeySeed = 0;
+const columnKeyMap = /* @__PURE__ */ new WeakMap();
+const getStableColumnKey = (column) => {
+  if (column === null || typeof column !== "object")
+    return `raw_${String(column)}`;
+  const raw = toRaw(column);
+  let key = columnKeyMap.get(raw);
+  if (key === void 0) {
+    key = ++columnKeySeed;
+    columnKeyMap.set(raw, key);
+  }
+  return key;
+};
+const getColumnKey = (column) => {
+  const rawKey = column.key || column.prop;
+  if (!rawKey) return getStableColumnKey(column);
+  return normalizePathKey(rawKey);
+};
+const getCellValue = (row, column) => {
+  const path = column.prop;
+  if (!path) return void 0;
+  return get(row, path);
+};
+const getColumnProps = (column) => {
+  const { hidden, render, key, children, ...rest } = column;
+  const prop = column.prop ? normalizePathKey(column.prop) : void 0;
+  const columnKey = key ? normalizePathKey(key) : prop;
+  return {
+    ...rest,
+    label: column.label ?? column.title,
+    prop,
+    columnKey
+  };
+};
+const renderColumn = (column, ancestors = /* @__PURE__ */ new Set()) => {
+  const hasChildren = Array.isArray(column.children) && column.children.length > 0;
+  const vnodeProps = { key: getColumnKey(column), ...getColumnProps(column) };
+  if (hasChildren) {
+    const nextAncestors = new Set(ancestors).add(column);
+    return h(ElTableColumn, vnodeProps, {
+      default: () => column.children.filter(
+        (child) => isObjectItem(child) && !nextAncestors.has(child) && !toValue(child.hidden)
+      ).map((child) => renderColumn(child, nextAncestors))
+    });
+  }
+  if (typeof column.render === "function") {
+    return h(ElTableColumn, vnodeProps, {
+      default: (scope) => h(_sfc_main$e, {
+        component: column.render({
+          ...scope,
+          column,
+          cellValue: getCellValue(scope.row, column)
+        })
+      })
+    });
+  }
+  return h(ElTableColumn, vnodeProps);
+};
+const _sfc_main$2 = defineComponent({
+  name: "TableColumnRenderer",
+  inheritAttrs: false,
   props: {
-    columns: { default: () => [] }
+    columns: {
+      type: Array,
+      default: () => []
+    }
   },
-  setup(__props) {
-    const props = __props;
-    const getColumnKey = (column, index2) => {
-      const rawKey = column.key ?? column.prop;
-      if (rawKey === void 0 || rawKey === null) return `__col_${index2}`;
-      return normalizePathKey(rawKey);
-    };
-    const getCellValue = (row, column) => {
-      const path = column.prop;
-      if (!path) return void 0;
-      return get(row, path);
-    };
-    const normalizedColumns = computed(() => {
-      return props.columns.filter((column) => !column.hidden);
-    });
-    const getColumnProps = (column) => {
-      const { hidden, render, key, children, ...rest } = column;
-      const prop = column.prop ? normalizePathKey(column.prop) : void 0;
-      const columnKey = key ? normalizePathKey(key) : prop;
-      return {
-        ...rest,
-        label: column.label ?? column.title,
-        prop,
-        columnKey
-      };
-    };
-    return (_ctx, _cache) => {
-      const _component_TableColumnRenderer = resolveComponent("TableColumnRenderer", true);
-      return openBlock(true), createElementBlock(Fragment, null, renderList(normalizedColumns.value, (column, index2) => {
-        return openBlock(), createElementBlock(Fragment, {
-          key: getColumnKey(column, index2)
-        }, [
-          column.children && column.children.length > 0 ? (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
-            key: 0,
-            ref_for: true
-          }, getColumnProps(column)), {
-            default: withCtx(() => [
-              createVNode(_component_TableColumnRenderer, {
-                columns: column.children
-              }, null, 8, ["columns"])
-            ]),
-            _: 2
-          }, 1040)) : typeof column.render === "function" ? (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
-            key: 1,
-            ref_for: true
-          }, getColumnProps(column)), {
-            default: withCtx((scope) => {
-              var _a;
-              return [
-                createVNode(unref(_sfc_main$c), {
-                  component: (_a = column.render) == null ? void 0 : _a.call(column, {
-                    ...scope,
-                    column,
-                    cellValue: getCellValue(scope.row, column)
-                  })
-                }, null, 8, ["component"])
-              ];
-            }),
-            _: 2
-          }, 1040)) : (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
-            key: 2,
-            ref_for: true
-          }, getColumnProps(column)), null, 16))
-        ], 64);
-      }), 128);
-    };
+  setup(props) {
+    return () => props.columns.filter((column) => isObjectItem(column) && !toValue(column.hidden)).map((column) => renderColumn(column));
   }
 });
 const _hoisted_1 = { class: "pro-table_header" };
@@ -1331,59 +1416,63 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const config = INJECT_CONFIG["pro-table"];
     const injectPropsRaw = inject(config.injectionKey, config.default);
     const injectProps = computed(() => toValue(injectPropsRaw) || {});
-    const attrs = useAttrs();
-    const PRO_TABLE_EXCLUDED_ATTR_KEYS = /* @__PURE__ */ new Set([
+    const attrs = useReactiveAttrs();
+    const PRO_TABLE_CONSUMED_ATTR_KEYS = /* @__PURE__ */ new Set([
       "class",
       "style",
       "onSearch",
-      "onChange",
-      "onUpdate:size",
-      "onUpdate:loading",
-      "data",
-      "columns",
-      "size",
-      "pagination"
-    ]);
-    const PRO_TABLE_PROVIDER_KEYS = /* @__PURE__ */ new Set([
-      "pagination",
-      "searchFormConfig",
-      "control",
-      "immediateSearch",
-      "addIndexColumn",
-      "tableContainer"
+      "onChange"
     ]);
+    const PRO_TABLE_PROP_KEYS = new Set(Object.keys(props));
     const injectTableAttrs = computed(() => {
       const tableConfig = {};
       for (const [key, value] of Object.entries(injectProps.value)) {
-        if (!PRO_TABLE_PROVIDER_KEYS.has(key)) {
+        if (!PRO_TABLE_PROP_KEYS.has(key)) {
           tableConfig[key] = value;
         }
       }
       return tableConfig;
     });
     const attrsTableProps = computed(() => {
-      return pick(
-        camelizeProperties(attrs),
-        tableProperties
+      return omitBy(
+        pick(camelizeProperties(attrs), tableProperties),
+        (value) => value === void 0
       );
     });
     const restTableAttrs = computed(() => {
       const rest = {};
       for (const [key, value] of Object.entries(attrs)) {
-        if (!PRO_TABLE_EXCLUDED_ATTR_KEYS.has(key)) {
+        if (!PRO_TABLE_CONSUMED_ATTR_KEYS.has(key)) {
           rest[key] = value;
         }
       }
-      return rest;
+      return omitBy(rest, (value) => value === void 0);
     });
     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;
@@ -1407,7 +1496,47 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       "table"
     ];
     const slots = useSlots();
-    const forwardedSlotNames = () => Object.keys(slots).filter((name) => !customSlotNames.includes(name));
+    const hasRenderableContent = (nodes) => {
+      if (nodes === null || nodes === void 0 || nodes === false) return false;
+      if (typeof nodes === "string") return nodes.trim() !== "";
+      if (typeof nodes === "number") return true;
+      if (Array.isArray(nodes)) return nodes.some(hasRenderableContent);
+      const vnode = nodes;
+      if (vnode.type === Comment) return false;
+      if (vnode.type === Text) return String(vnode.children ?? "").trim() !== "";
+      if (vnode.type === Fragment) return hasRenderableContent(vnode.children);
+      return true;
+    };
+    const evaluateSlotContent = () => {
+      let hasContent = false;
+      const runner = effect(() => {
+        var _a;
+        try {
+          hasContent = hasRenderableContent((_a = slots.default) == null ? void 0 : _a.call(slots));
+        } catch {
+          hasContent = true;
+        }
+      });
+      stop(runner);
+      return hasContent;
+    };
+    let defaultSlotChecked = false;
+    const checkDefaultSlot = () => {
+      if (defaultSlotChecked) return;
+      if (!Object.prototype.hasOwnProperty.call(slots, "default")) return;
+      defaultSlotChecked = true;
+      if (evaluateSlotContent()) {
+        console.warn(
+          "[pro-components] ProTable 的 default 插槽保留用于列渲染，已忽略传入的 default 插槽内容；自定义区域请使用 search-form / button-bar / toolbar / table 具名插槽。"
+        );
+      }
+    };
+    const forwardedSlotNames = () => {
+      checkDefaultSlot();
+      return Object.keys(slots).filter(
+        (name) => name !== "default" && !customSlotNames.includes(name)
+      );
+    };
     const searchPage1st = () => {
       var _a, _b;
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current: 1 });
@@ -1422,22 +1551,31 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         container: container ? container : void 0
       };
     });
+    const searchFormProps = computed(() => {
+      const {
+        container: _container,
+        hidden: _hidden,
+        ...rest
+      } = computedSearchFormConfig.value;
+      return rest;
+    });
     const computedTableContainer = computed(() => {
       const container = props.tableContainer ?? injectProps.value.tableContainer ?? DefaultTableContainer;
       return container ? container : void 0;
     });
     const getIndex = (i) => {
       var _a;
-      if (((_a = props.table) == null ? void 0 : _a.pageParam) && computedPagination.value !== false) {
-        const current = props.table.pageParam.current ?? 1;
-        const pageSize = props.table.pageParam.pageSize ?? 10;
-        return (current - 1) * pageSize + i + 1;
-      }
-      return i + 1;
+      const pagination = computedPagination.value;
+      if (pagination === false) return i + 1;
+      const pageParam = (_a = props.table) == null ? void 0 : _a.pageParam;
+      const current = pagination.currentPage ?? (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 hasExplicitColumns = computed(() => props.columns !== void 0);
     const normalizedRawColumns = computed(() => {
       var _a;
-      const source = props.columns ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? [];
+      const source = (props.columns ?? toValue((_a = props.table) == null ? void 0 : _a.columns) ?? []).filter(isObjectItem);
       if (props.addIndexColumn ?? injectProps.value.addIndexColumn) {
         return [
           {
@@ -1453,31 +1591,21 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return source;
     });
     const computedDataSource = computed(() => {
-      var _a, _b;
-      const attrsData = attrsTableProps.value.data;
-      return props.data ?? attrsData ?? toValue((_a = props.table) == null ? void 0 : _a.dataSource) ?? toValue((_b = props.table) == null ? void 0 : _b.data) ?? [];
+      var _a;
+      return props.data ?? toValue((_a = props.table) == null ? void 0 : _a.data) ?? [];
     });
     const computedTableProps = computed(() => {
-      const merged = {
+      return {
         ...injectTableAttrs.value,
         ...restTableAttrs.value,
         ...attrsTableProps.value
       };
-      delete merged.data;
-      delete merged.columns;
-      delete merged.size;
-      delete merged.pagination;
-      return merged;
     });
     const computedPagination = computed(() => {
       var _a, _b;
-      const attrsPagination = attrsTableProps.value.pagination;
-      if (props.pagination === false || attrsPagination === false) {
-        return false;
-      }
-      const hasUserPagination = isPlainObject(props.pagination) || isPlainObject(attrsPagination);
-      if (hasUserPagination) {
-        const pageConfig = props.pagination ?? attrsPagination ?? {};
+      if (props.pagination === false) return false;
+      if (isPlainObject(props.pagination)) {
+        const pageConfig = props.pagination;
         const globalPagination = injectProps.value.pagination === false ? {} : injectProps.value.pagination || {};
         const pageParam2 = (_a = props.table) == null ? void 0 : _a.pageParam;
         return {
@@ -1513,12 +1641,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       (_a = attrs.onChange) == null ? void 0 : _a.call(attrs, currentPage, pageSize);
     };
     const searchFormVisible = computed(() => {
-      var _a, _b, _c, _d, _e;
+      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) && ((_e = fieldList.filter((item) => !toValue(item.hidden))) == null ? void 0 : _e.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 mergedControl = props.control ?? injectProps.value.control;
       if (typeof mergedControl === "boolean") {
         return { sizeControl: mergedControl, columnControl: mergedControl };
@@ -1528,12 +1656,15 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       const columnControl = (c == null ? void 0 : c.columnControl) ?? false;
       return { sizeControl: !!sizeControl, columnControl };
     });
+    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;
     });
     const resolvedSize = computed(() => {
-      return size.value ?? attrsTableProps.value.size ?? injectTableAttrs.value.size;
+      return size.value ?? injectProps.value.size;
     });
     onMounted(() => {
       if (props.immediateSearch ?? injectProps.value.immediateSearch) {
@@ -1550,7 +1681,7 @@ 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$d), {
+        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(_sfc_main$f, {
           key: 0,
           component: computedSearchFormConfig.value.container
         }, {
@@ -1561,7 +1692,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 ((_a = props.table) == null ? void 0 : _a.searchForm) ? (openBlock(), createBlock(SearchForm, mergeProps({
                   key: 0,
                   form: props.table.searchForm
-                }, computedSearchFormConfig.value, {
+                }, searchFormProps.value, {
                   onSearch: searchPage1st,
                   onReset: reset
                 }), null, 16, ["form"])) : createCommentVNode("", true)
@@ -1570,7 +1701,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
-        createVNode(unref(_sfc_main$d), { component: computedTableContainer.value }, {
+        createVNode(_sfc_main$f, { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
               _ctx.$slots["button-bar"] ? (openBlock(), createElementBlock("div", _hoisted_2, [
@@ -1580,13 +1711,14 @@ 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": resolvedSize.value
+                }, null, 8, ["size", "effective-size"])
               ])) : createCommentVNode("", true),
               computedControl.value.columnControl ? (openBlock(), createElementBlock("div", _hoisted_5, [
-                createVNode(unref(ColumnControl), {
+                createVNode(ColumnControl, {
                   columns: normalizedRawColumns.value.filter((item) => item.key !== "__INDEX__"),
                   table: props.table,
                   "column-control": columnControlConfig.value
@@ -1630,13 +1762,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-c108fd78"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d092780c"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
     ...rest,
     dataSource: data,
-    columns
+    columns,
+    fieldIdentityKeys: ELEMENT_FIELD_IDENTITY_KEYS
   });
   const { dataSource, ...tableWithoutDataSource } = coreTable;
   const table = {
@@ -1661,15 +1794,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 ?? []
+              );
+            }
+          )
         );
       }
     );
@@ -1690,6 +1829,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    provide(
+      INJECT_COMPONENT_VARS,
+      computed(() => props.componentVars ?? {})
+    );
     provide(
       INJECT_COMPONENTS,
       computed(() => props.componentMap)
@@ -1705,11 +1848,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 });
 const index = {
   /**
-   * @qin-ui/element-plus-pro 安装方法
-   * @description 全局注册所有组件（ProForm、ProTable、ProComponentProvider）
+   * 安装方法：全局注册 ProForm / ProTable / ProComponentProvider
    *
+   * @description 供 `app.use(ProComponents)` 调用
    * @param {App} app - Vue 应用实例
-   *
    * @example
    * ```ts
    * import { createApp } from 'vue'
@@ -1721,16 +1863,19 @@ const index = {
   install(app) {
     app.component(_sfc_main$b.name, _sfc_main$b);
     app.component(ProTable.name, ProTable);
-    app.component(_sfc_main.name, _sfc_main);
+    app.component(
+      _sfc_main.name ?? "ProComponentProvider",
+      _sfc_main
+    );
   }
 };
 export {
-  _sfc_main$d as ContainerFragment,
+  _sfc_main$f as ContainerFragment,
   LOCALE_INJECT_KEY,
   _sfc_main as ProComponentProvider,
   _sfc_main$b as ProForm,
   ProTable,
-  _sfc_main$c as SlotComponent,
+  _sfc_main$e as SlotComponent,
   index as default,
   enUS,
   useFields,