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

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, defineComponent, createBlock, renderSlot, openBlock, resolveDynamicComponent, normalizeProps, mergeProps, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, ref, useAttrs, createCommentVNode, createSlots, renderList, createVNode, resolveComponent, unref, toRaw, provide, useSlots, shallowRef, onUpdated, triggerRef, 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, localeContextKey, useLocale as useLocale$1, ElRow, ElForm, ElSpace, ElButton, 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, cloneDeep, InjectionFormSlotsKey, isPlainObject, getObject, normalizePathKey, 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 { useFormData } from "@qin-ui/pro-components-core";
 const _tableProps = ElTable.props || {};
 const _paginationProps = ElPagination.props || {};
@@ -201,6 +201,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,220 +250,6 @@ 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"]]);
 function useForm(...args) {
   return useForm$1(...args);
 }
@@ -550,7 +368,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,6 +376,10 @@ 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);
@@ -583,7 +405,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);
@@ -625,14 +447,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 +466,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 +482,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,38 +495,244 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
-  ...{ name: "ContainerFragment", inheritAttrs: false },
+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 ? { ...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];
+          }
+        });
+        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$c = /* @__PURE__ */ defineComponent({
+  ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, Function] }
+    grid: { type: [Boolean, Object], default: void 0 },
+    fields: { default: () => [] }
   },
   setup(__props) {
+    let fieldKeySeed = 0;
+    const fieldKeyMap = /* @__PURE__ */ new WeakMap();
+    const getFieldKey = (field) => {
+      const raw = toRaw(field);
+      let key = fieldKeyMap.get(raw);
+      if (key === void 0) {
+        key = ++fieldKeySeed;
+        fieldKeyMap.set(raw, key);
+      }
+      return key;
+    };
+    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 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.path || getFieldKey(item.rawField),
+              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
+                        }, null, 8, ["grid", "fields"])) : (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-6f664240"]]);
 const _sfc_main$b = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -714,9 +742,9 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const fallbackForm = props.form ? void 0 : useForm();
+    let fallbackForm;
     const currentForm = computed(
-      () => props.form ?? fallbackForm
+      () => props.form ?? (fallbackForm ?? (fallbackForm = useForm()))
     );
     const formProxy = createFormProxy(() => currentForm.value);
     provide(InjectionFormKey, formProxy);
@@ -736,6 +764,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);
       }
@@ -754,7 +783,11 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       return mergeProps(injectAttrs.value, camelizeProperties(attrs));
     });
     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 +799,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"]),
@@ -849,9 +882,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       emit("search");
     };
     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(onSearch, ["prevent"])
       }), {
         default: withCtx(() => [
           createVNode(unref(ElSpace), {
@@ -885,8 +919,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                     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 +963,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-746ff159"]]);
 const _sfc_main$8 = {};
 const _hoisted_1$4 = { class: "pro-table_search-form-container" };
 function _sfc_render$3(_ctx, _cache) {
@@ -1085,11 +1118,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,7 +1238,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-a2cc0fcb"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-55e837c0"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -1213,9 +1247,21 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const getColumnKey = (column, index2) => {
+    let columnKeySeed = 0;
+    const columnKeyMap = /* @__PURE__ */ new WeakMap();
+    const getStableColumnKey = (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 === void 0 || rawKey === null) return `__col_${index2}`;
+      if (rawKey === void 0 || rawKey === null)
+        return getStableColumnKey(column);
       return normalizePathKey(rawKey);
     };
     const getCellValue = (row, column) => {
@@ -1239,9 +1285,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _component_TableColumnRenderer = resolveComponent("TableColumnRenderer", true);
-      return openBlock(true), createElementBlock(Fragment, null, renderList(normalizedColumns.value, (column, index2) => {
+      return openBlock(true), createElementBlock(Fragment, null, renderList(normalizedColumns.value, (column) => {
         return openBlock(), createElementBlock(Fragment, {
-          key: getColumnKey(column, index2)
+          key: getColumnKey(column)
         }, [
           column.children && column.children.length > 0 ? (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
             key: 0,
@@ -1260,7 +1306,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             default: withCtx((scope) => {
               var _a;
               return [
-                createVNode(unref(_sfc_main$c), {
+                createVNode(_sfc_main$e, {
                   component: (_a = column.render) == null ? void 0 : _a.call(column, {
                     ...scope,
                     column,
@@ -1379,11 +1425,27 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const size = useModel(__props, "size");
     const loading = useModel(__props, "loading");
     let searchSequence = 0;
+    let warnedSearchConfig = false;
+    const warnSearchConfig = (reason) => {
+      if (warnedSearchConfig) return;
+      warnedSearchConfig = true;
+      console.warn(`[ProTable] ${reason}`);
+    };
     const _search = async () => {
       var _a;
-      const seq = ++searchSequence;
+      if (props.search && attrs.onSearch) {
+        warnSearchConfig(
+          "同时配置了 :search prop 与 @search 监听，@search 监听不会被执行，请仅保留其一。"
+        );
+      }
       const searchPromise = (_a = props.search || attrs.onSearch) == null ? void 0 : _a();
-      if (!isPromise(searchPromise)) return;
+      if (!isPromise(searchPromise)) {
+        warnSearchConfig(
+          "search 未返回 Promise，本次查询不参与 loading 竞态管理（在途请求的 loading 状态保持不变）。"
+        );
+        return;
+      }
+      const seq = ++searchSequence;
       loading.value = true;
       try {
         await searchPromise;
@@ -1453,9 +1515,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return source;
     });
     const computedDataSource = computed(() => {
-      var _a, _b;
+      var _a;
       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) ?? [];
+      return props.data ?? attrsData ?? toValue((_a = props.table) == null ? void 0 : _a.data) ?? [];
     });
     const computedTableProps = computed(() => {
       const merged = {
@@ -1550,7 +1612,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
         }, {
@@ -1570,7 +1632,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 +1642,13 @@ 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"])
               ])) : 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,7 +1692,7 @@ 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-6ec2beda"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
@@ -1725,12 +1787,12 @@ const index = {
   }
 };
 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,