@qin-ui/antd-vue-pro 2.4.3 → 2.4.5

package/es/index.js

@@ -1,12 +1,12 @@
 import "./antd-vue-pro.css";
-import { inject, computed, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, toRaw, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, provide, useSlots, createElementVNode, normalizeStyle, useModel, watch, mergeModels, onMounted, normalizeClass, nextTick } from "vue";
+import { defineComponent, createBlock, renderSlot, openBlock, resolveDynamicComponent, normalizeProps, mergeProps, withCtx, createElementBlock, isVNode, Fragment, createTextVNode, toDisplayString, inject, computed, toValue, ref, useAttrs, createCommentVNode, createSlots, renderList, createVNode, resolveComponent, unref, toRaw, provide, useSlots, shallowRef, onUpdated, triggerRef, createElementVNode, normalizeStyle, useModel, watch, mergeModels, onMounted, normalizeClass, nextTick } from "vue";
 import { Transfer, TreeSelect, Slider, Switch, RadioGroup, CheckboxGroup, TimePicker, RangePicker, DatePicker, Cascader, Select, InputNumber, InputPassword, InputSearch, Textarea, Input, Row, Col, FormItem, Form, Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { isPlainObject, getObject, toPath, useForm as useForm$1, resolveLocaleName, zhTW, enUS, zhCN, format, cloneDeep, InjectionFormSlotsKey, createFormProxy, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { useForm as useForm$1, resolveLocaleName, zhTW, enUS, zhCN, format, cloneDeep, InjectionFormSlotsKey, isPlainObject, getObject, toPath, createFormProxy, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
 import { enUS as enUS2, useFormData, zhCN as zhCN2, zhTW as zhTW2 } from "@qin-ui/pro-components-core";
-import { colProps } from "ant-design-vue/es/grid/Col";
-import { formItemProps, useInjectFormItemContext } from "ant-design-vue/es/form";
 import { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
-import { useProviderDisabled, useInjectDisabled } from "ant-design-vue/es/config-provider/DisabledContext";
+import { useInjectFormItemContext, formItemProps } from "ant-design-vue/es/form";
+import { useInjectDisabled, useProviderDisabled } from "ant-design-vue/es/config-provider/DisabledContext";
+import { colProps } from "ant-design-vue/es/grid/Col";
 import { tableProps } from "ant-design-vue/es/table";
 const getPopupContainer = (triggerNode) => {
   var _a;
@@ -148,6 +148,39 @@ const ensureInjectConfig = (key) => {
   DYNAMIC_INJECT_CONFIG[key] = created;
   return created;
 };
+const _sfc_main$e = /* @__PURE__ */ defineComponent({
+  ...{ name: "ContainerFragment", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { type: [Object, Function], default: void 0 }
+  },
+  setup(__props) {
+    const props = __props;
+    return (_ctx, _cache) => {
+      return props.component ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default")
+        ]),
+        _: 3
+      }, 16)) : renderSlot(_ctx.$slots, "default", { key: 1 });
+    };
+  }
+});
+const _sfc_main$d = /* @__PURE__ */ defineComponent({
+  ...{ name: "SlotComponent", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { type: [Object, Function, String, Number, Boolean, null], default: void 0 }
+  },
+  setup(__props) {
+    const props = __props;
+    return (_ctx, _cache) => {
+      return isVNode(props.component) || typeof props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        createTextVNode(toDisplayString(props.component), 1)
+      ], 64));
+    };
+  }
+});
 const FORM_ITEM_SLOT_KEYS = [
   "label",
   "extra",
@@ -172,12 +205,194 @@ const componentMap = {
   "tree-select": TreeSelect,
   "transfer": Transfer
 };
+function useForm(...args) {
+  return useForm$1(...args);
+}
+const PLACEHOLDER_KEYS = {
+  input: "input.placeholder",
+  textarea: "input.placeholder",
+  "input-password": "input.placeholder",
+  "input-number": "input.placeholder",
+  select: "select.placeholder",
+  cascader: "select.placeholder"
+};
+const getPlaceholderProps = (key, injectProps, t) => {
+  const placeholderKey = PLACEHOLDER_KEYS[key];
+  if (!placeholderKey || injectProps.placeholder !== void 0) return {};
+  return { placeholder: t(placeholderKey) };
+};
+const getInitProps = (field, injectProps = {}, t) => {
+  const { component } = field;
+  const picker = component === "date-picker" ? "" : field.picker;
+  if (typeof component === "string") {
+    const k = [component, picker].filter(Boolean).join(".");
+    return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
+  }
+  return {};
+};
+const warnedUnknownComponents = /* @__PURE__ */ new Set();
+function warnUnknownComponent(name) {
+  if (warnedUnknownComponents.has(name)) return;
+  warnedUnknownComponents.add(name);
+  console.warn(
+    `[pro-components] 未识别的组件类型 "${name}"，已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
+  );
+}
+const LOCALE_INJECT_KEY = Symbol("pro-locale");
+const useLocale = () => {
+  const config = useConfigContextInject();
+  const override = inject(LOCALE_INJECT_KEY, void 0);
+  const lang = computed(
+    () => {
+      var _a, _b;
+      return resolveLocaleName((_b = (_a = config.locale) == null ? void 0 : _a.value) == null ? void 0 : _b.locale);
+    }
+  );
+  const pack = computed(
+    () => lang.value === "zh-TW" ? zhTW : lang.value === "en-US" ? enUS : zhCN
+  );
+  const t = (key, params) => {
+    const overrides = toValue(override);
+    const text = (overrides == null ? void 0 : overrides[key]) ?? pack.value[key] ?? key;
+    return format(text, params);
+  };
+  return { t, lang };
+};
+const _sfc_main$c = /* @__PURE__ */ defineComponent({
+  ...{ name: "BaseField", inheritAttrs: false },
+  __name: "index",
+  props: {
+    component: { default: void 0 },
+    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 formItemContext = useInjectFormItemContext();
+    const triggerFormItemChange = () => {
+      formItemContext.onFieldChange();
+    };
+    const attrs = useAttrs();
+    const pickerVal = attrs.picker;
+    const injectConfigKey = typeof props.component === "string" ? [props.component, pickerVal].filter(Boolean).join(".") : "";
+    const componentInjectConfig = injectConfigKey ? getInjectConfig(injectConfigKey) : void 0;
+    const rawInjectComponentProps = componentInjectConfig ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default) : void 0;
+    const value = computed({
+      get() {
+        var _a;
+        let val = (_a = form.getFormData) == null ? void 0 : _a.call(form, props.path);
+        const { valueFormatter } = groupedAttrs.value;
+        if (typeof valueFormatter === "object" && typeof valueFormatter.get === "function") {
+          val = valueFormatter.get(val);
+        }
+        return val;
+      },
+      set(val) {
+        var _a, _b;
+        let newVal = val;
+        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 ? cloneDeepIfObject((_a = form.getFormData) == null ? void 0 : _a.call(form, props.path)) : void 0;
+          newVal = setFormatter(val, oldVal);
+        }
+        (_b = form.setFormData) == null ? void 0 : _b.call(form, props.path, newVal);
+        triggerFormItemChange();
+        const { onUpdateValue } = groupedAttrs.value;
+        if (typeof onUpdateValue === "function") {
+          onUpdateValue(val);
+        } else if (Array.isArray(onUpdateValue)) {
+          onUpdateValue.forEach((listener) => listener(val));
+        }
+      }
+    });
+    const parentDisabled = useInjectDisabled();
+    const groupedAttrs = computed(() => {
+      const currentInjectProps = toValue(rawInjectComponentProps) || {};
+      const initProps = getInitProps(
+        { component: props.component, picker: attrs.picker },
+        currentInjectProps,
+        t
+      );
+      const effectiveModelProp = attrs.modelProp ?? initProps.modelProp ?? "value";
+      const mergedProps = mergeProps(
+        initProps,
+        attrs,
+        { class: attrs.componentClass, style: attrs.componentStyle },
+        { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
+        { modelProp: effectiveModelProp }
+      );
+      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [effectiveModelProp]: _modelVal, [`onUpdate:${effectiveModelProp}`]: onUpdateValue, ...bindAttrs } = mergedProps;
+      return {
+        attrs: bindAttrs,
+        slots,
+        componentContainer,
+        modelProp,
+        valueFormatter,
+        onUpdateValue
+      };
+    });
+    const injectedFormSlots = inject(InjectionFormSlotsKey, void 0);
+    const customComponents = inject(INJECT_COMPONENTS, {});
+    const is = computed(() => {
+      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 = ((_b = toValue(customComponents)) == null ? void 0 : _b[props.component]) || componentMap[props.component];
+        if (resolved) return resolved;
+        warnUnknownComponent(props.component);
+        return props.component;
+      }
+      return props.component;
+    });
+    __expose({
+      getComponentRef: () => componentRef.value,
+      getComponentComputedProps: () => groupedAttrs.value.attrs
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(_sfc_main$e, {
+        component: groupedAttrs.value.componentContainer,
+        path: props.path
+      }, {
+        default: withCtx(() => [
+          is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
+            ref_key: "componentRef",
+            ref: componentRef,
+            [`${groupedAttrs.value.modelProp}`]: value.value,
+            [`onUpdate:${groupedAttrs.value.modelProp}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
+            path: props.path
+          }), createSlots({ _: 2 }, [
+            renderList(groupedAttrs.value.slots, (slot, name) => {
+              return {
+                name,
+                fn: withCtx((scoped) => [
+                  createVNode(_sfc_main$d, mergeProps({
+                    path: props.path
+                  }, scoped, { component: slot }), null, 16, ["path", "component"])
+                ])
+              };
+            })
+          ]), 1040, ["path"])) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 8, ["component", "path"]);
+    };
+  }
+});
 const formItemPropKeys = Object.keys(formItemProps()).concat([
   "formItemContainer"
 ]);
 const gridItemPropKeys = Object.keys(colProps());
 const gridItemPropKeySet = new Set(gridItemPropKeys);
 const formItemPropKeySet = new Set(formItemPropKeys);
+const formItemSlotKeySet = new Set(FORM_ITEM_SLOT_KEYS);
 function useGroupFieldAttrs(validFields) {
   const config = INJECT_CONFIG["pro-form-item"];
   const injectFormItemProps = inject(config.injectionKey, config.default);
@@ -190,21 +405,9 @@ function useGroupFieldAttrs(validFields) {
       const formItemSlots = {};
       if (isPlainObject(field)) {
         const { path, name, fields, formItemClass, formItemStyle, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, formItemContainer, ...rest } = field;
-        const {
-          class: injectClassName,
-          style: injectStyle,
-          span: injectSpan,
-          xs,
-          sm,
-          md,
-          lg,
-          xl,
-          xxl,
-          formItemContainer: injectFormItemContainer,
-          ...injectRest
-        } = rawInject;
+        const { class: injectClassName, style: injectStyle, span: injectSpan, xs, sm, md, lg, xl, xxl, formItemContainer: injectFormItemContainer, ...injectRest } = rawInject;
         const initGridItemProps = span || span === 0 ? { span } : { xs, sm, md, lg, xl, xxl, span: injectSpan };
-        gridItemProps2 = fields ? { span: span ?? 24 } : initGridItemProps;
+        gridItemProps2 = fields ? { ...initGridItemProps, span: span ?? 24 } : initGridItemProps;
         const container = formItemContainer ?? injectFormItemContainer;
         formItemProps2 = mergeProps(
           injectRest,
@@ -223,7 +426,7 @@ function useGroupFieldAttrs(validFields) {
         });
         Object.assign(componentProps, componentDataAttrs);
         Object.keys(slots).forEach((k) => {
-          if (FORM_ITEM_SLOT_KEYS.includes(k)) {
+          if (formItemSlotKeySet.has(k)) {
             formItemSlots[k] = slots[k];
           } else {
             componentProps.slots[k] = slots[k];
@@ -252,7 +455,7 @@ function useGroupFieldAttrs(validFields) {
     });
   });
 }
-const _sfc_main$e = /* @__PURE__ */ defineComponent({
+const _sfc_main$b = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
   props: {
@@ -261,6 +464,17 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     disabled: { type: Boolean, default: void 0 }
   },
   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(
       () => (
@@ -284,15 +498,39 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     });
     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);
-        raw.getFormItemRef = () => formItemInstanceMap.get(raw);
-        raw.getFormItemComputedProps = () => formItemProps2;
+        defineFieldAccessors(raw, {
+          getFormItemRef: () => formItemInstanceMap.get(raw),
+          getFormItemComputedProps: () => formItemProps2
+        });
       } else {
         formItemInstanceMap.delete(raw);
+        delete raw.getFormItemRef;
+        delete raw.getFormItemComputedProps;
       }
     };
     const setComponentRef = (field, el) => {
@@ -300,32 +538,36 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       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();
-        };
+        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) => {
       const _component_BaseFormItem = resolveComponent("BaseFormItem");
-      return openBlock(), createBlock(unref(_sfc_main$c), mergeProps({
+      return openBlock(), createBlock(_sfc_main$e, mergeProps({
         component: enableGrid.value ? unref(Row) : void 0
       }, computedGridProps.value), {
         default: withCtx(() => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item, index2) => {
-            return openBlock(), createBlock(unref(_sfc_main$c), mergeProps({
-              key: item.path || index2,
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item) => {
+            return openBlock(), createBlock(_sfc_main$e, mergeProps({
+              key: item.path || getFieldKey(item.rawField),
               component: enableGrid.value ? unref(Col) : void 0
             }, { ref_for: true }, item.gridItemProps), {
               default: withCtx(() => [
-                createVNode(unref(_sfc_main$c), {
+                createVNode(_sfc_main$e, {
                   component: item.formItemContainer,
                   path: item.path
                 }, {
@@ -342,7 +584,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                           grid: item.rawField.grid ?? props.grid,
                           fields: item.rawField.fields,
                           disabled: toValue(item.rawField.disabled)
-                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$d), mergeProps({
+                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(_sfc_main$c, mergeProps({
                           key: 1,
                           ref_for: true,
                           ref: (el) => setComponentRef(item.rawField, el)
@@ -356,7 +598,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                         return {
                           name,
                           fn: withCtx((scoped) => [
-                            createVNode(unref(_sfc_main$b), mergeProps({
+                            createVNode(_sfc_main$d, mergeProps({
                               path: item.path,
                               component: slot
                             }, { ref_for: true }, scoped), null, 16, ["path", "component"])
@@ -377,209 +619,6 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     };
   }
 });
-function useForm(...args) {
-  return useForm$1(...args);
-}
-const PLACEHOLDER_KEYS = {
-  input: "input.placeholder",
-  textarea: "input.placeholder",
-  "input-password": "input.placeholder",
-  "input-number": "input.placeholder",
-  select: "select.placeholder",
-  cascader: "select.placeholder"
-};
-const getPlaceholderProps = (key, injectProps, t) => {
-  const placeholderKey = PLACEHOLDER_KEYS[key];
-  if (!placeholderKey || injectProps.placeholder !== void 0) return {};
-  return { placeholder: t(placeholderKey) };
-};
-const getInitProps = (field, injectProps = {}, t) => {
-  const { component } = field;
-  const picker = component === "date-picker" ? "" : field.picker;
-  if (typeof component === "string") {
-    const k = [component, picker].filter(Boolean).join(".");
-    return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
-  }
-  return {};
-};
-const warnedUnknownComponents = /* @__PURE__ */ new Set();
-function warnUnknownComponent(name) {
-  if (warnedUnknownComponents.has(name)) return;
-  warnedUnknownComponents.add(name);
-  console.warn(
-    `[pro-components] 未识别的组件类型 "${name}"，已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
-  );
-}
-const LOCALE_INJECT_KEY = Symbol("pro-locale");
-const useLocale = () => {
-  const config = useConfigContextInject();
-  const override = inject(LOCALE_INJECT_KEY, void 0);
-  const lang = computed(
-    () => {
-      var _a, _b;
-      return resolveLocaleName((_b = (_a = config.locale) == null ? void 0 : _a.value) == null ? void 0 : _b.locale);
-    }
-  );
-  const pack = computed(
-    () => lang.value === "zh-TW" ? zhTW : lang.value === "en-US" ? enUS : zhCN
-  );
-  const t = (key, params) => {
-    const overrides = toValue(override);
-    const text = (overrides == null ? void 0 : overrides[key]) ?? pack.value[key] ?? key;
-    return format(text, params);
-  };
-  return { t, lang };
-};
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
-  ...{ name: "BaseField", inheritAttrs: false },
-  __name: "index",
-  props: {
-    component: { default: void 0 },
-    path: { default: "" }
-  },
-  setup(__props, { expose: __expose }) {
-    const props = __props;
-    const { t } = useLocale();
-    const form = useForm(false);
-    const componentRef = ref();
-    const formItemContext = useInjectFormItemContext();
-    const triggerFormItemChange = () => {
-      formItemContext.onFieldChange();
-    };
-    const attrs = useAttrs();
-    const pickerVal = attrs.picker;
-    const injectConfigKey = typeof props.component === "string" ? [props.component, pickerVal].filter(Boolean).join(".") : "";
-    const componentInjectConfig = injectConfigKey ? getInjectConfig(injectConfigKey) : void 0;
-    const rawInjectComponentProps = componentInjectConfig ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default) : void 0;
-    const value = computed({
-      get() {
-        var _a;
-        let val = (_a = form.getFormData) == null ? void 0 : _a.call(form, props.path);
-        const { valueFormatter } = groupedAttrs.value;
-        if (typeof valueFormatter === "object" && typeof valueFormatter.get === "function") {
-          val = valueFormatter.get(val);
-        }
-        return val;
-      },
-      set(val) {
-        var _a, _b;
-        let newVal = val;
-        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;
-          newVal = setFormatter(val, oldVal);
-        }
-        (_b = form.setFormData) == null ? void 0 : _b.call(form, props.path, newVal);
-        triggerFormItemChange();
-      }
-    });
-    const parentDisabled = useInjectDisabled();
-    const groupedAttrs = computed(() => {
-      const currentInjectProps = toValue(rawInjectComponentProps) || {};
-      const initProps = getInitProps(
-        { component: props.component, picker: attrs.picker },
-        currentInjectProps,
-        t
-      );
-      const effectiveModelProp = attrs.modelProp ?? initProps.modelProp ?? "value";
-      const mergedProps = mergeProps(
-        initProps,
-        attrs,
-        { class: attrs.componentClass, style: attrs.componentStyle },
-        { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
-        { modelProp: effectiveModelProp }
-      );
-      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [effectiveModelProp]: _modelVal, [`onUpdate:${effectiveModelProp}`]: _onUpdateModelVal, ...bindAttrs } = mergedProps;
-      return {
-        attrs: bindAttrs,
-        slots,
-        componentContainer,
-        modelProp,
-        valueFormatter
-      };
-    });
-    const formSlots = 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]);
-      if (teleportSlot) return teleportSlot;
-      if (typeof props.component === "string") {
-        const resolved = ((_a = toValue(customComponents)) == null ? void 0 : _a[props.component]) || componentMap[props.component];
-        if (resolved) return resolved;
-        warnUnknownComponent(props.component);
-        return props.component;
-      }
-      return props.component;
-    });
-    __expose({
-      getComponentRef: () => componentRef.value,
-      getComponentComputedProps: () => groupedAttrs.value.attrs
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$c), {
-        component: groupedAttrs.value.componentContainer,
-        path: props.path
-      }, {
-        default: withCtx(() => [
-          is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
-            ref_key: "componentRef",
-            ref: componentRef,
-            [`${groupedAttrs.value.modelProp}`]: value.value,
-            [`onUpdate:${groupedAttrs.value.modelProp}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            path: props.path
-          }), createSlots({ _: 2 }, [
-            renderList(groupedAttrs.value.slots, (slot, name) => {
-              return {
-                name,
-                fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main$b), mergeProps({
-                    path: props.path
-                  }, scoped, { component: slot }), null, 16, ["path", "component"])
-                ])
-              };
-            })
-          ]), 1040, ["path"])) : createCommentVNode("", true)
-        ]),
-        _: 1
-      }, 8, ["component", "path"]);
-    };
-  }
-});
-const _sfc_main$c = /* @__PURE__ */ defineComponent({
-  ...{ name: "ContainerFragment", inheritAttrs: false },
-  __name: "index",
-  props: {
-    component: { type: [Object, Function], default: void 0 }
-  },
-  setup(__props) {
-    const props = __props;
-    return (_ctx, _cache) => {
-      return props.component ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
-        default: withCtx(() => [
-          renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-      }, 16)) : renderSlot(_ctx.$slots, "default", { key: 1 });
-    };
-  }
-});
-const _sfc_main$b = /* @__PURE__ */ defineComponent({
-  ...{ name: "SlotComponent", inheritAttrs: false },
-  __name: "index",
-  props: {
-    component: { type: [Object, Function, String, Number, Boolean, null], default: void 0 }
-  },
-  setup(__props) {
-    const props = __props;
-    return (_ctx, _cache) => {
-      return isVNode(props.component) || typeof props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createTextVNode(toDisplayString(props.component), 1)
-      ], 64));
-    };
-  }
-});
 const _sfc_main$a = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -589,9 +628,9 @@ const _sfc_main$a = /* @__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);
@@ -611,6 +650,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     let formInstanceCounter = 0;
     const formInstanceKeyMap = /* @__PURE__ */ new WeakMap();
     const getFormKey = (f) => {
+      if (f == null) return 0;
       if (!formInstanceKeyMap.has(f)) {
         formInstanceKeyMap.set(f, ++formInstanceCounter);
       }
@@ -629,7 +669,11 @@ const _sfc_main$a = /* @__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(Form), mergeProps({
         key: formKey.value,
@@ -637,7 +681,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
         model: formData.value
       }, formAttrs.value, { class: "pro-form" }), {
         default: withCtx(() => [
-          createVNode(unref(_sfc_main$e), {
+          createVNode(_sfc_main$b, {
             fields: fields.value,
             grid: props.grid
           }, null, 8, ["fields", "grid"]),
@@ -722,7 +766,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       emit("search");
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(_sfc_main$a), mergeProps(layoutProps.value, {
+      return openBlock(), createBlock(_sfc_main$a, mergeProps(layoutProps.value, {
         form: props.form,
         class: "pro-table_search-form transition"
       }), {
@@ -803,7 +847,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-15688cc0"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-2272aa98"]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "DefaultSearchFormContainer",
   setup(__props) {
@@ -962,11 +1006,12 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         );
       },
       set(val) {
+        const checkedSet = new Set(val);
         checkedColumnsOptions.value.forEach((item) => {
           var _a, _b;
-          if (item.disabled) return;
+          if (item.disabled || item.checked === checkedSet.has(item.value)) return;
           (_b = (_a = props.table) == null ? void 0 : _a.setColumn) == null ? void 0 : _b.call(_a, item.value, {
-            hidden: !val.includes(item.value)
+            hidden: !checkedSet.has(item.value)
           });
         });
       }
@@ -1085,7 +1130,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-ca3f82db"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-9152f113"]]);
 const _hoisted_1 = { class: "pro-table_header" };
 const _hoisted_2 = {
   key: 0,
@@ -1147,11 +1192,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;
@@ -1259,7 +1320,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const onTableChange = (...args) => {
       var _a, _b, _c;
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, args[0]);
-      (_c = attrs.onChange) == null ? void 0 : _c.call(attrs, ...args);
+      (_c = attrs.onChange ?? injectProps.value.onChange) == null ? void 0 : _c(...args);
       _search();
     };
     const searchFormVisible = computed(() => {
@@ -1299,7 +1360,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$c), {
+        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(_sfc_main$e, {
           key: 0,
           component: computedSearchFormConfig.value.container
         }, {
@@ -1319,7 +1380,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
-        createVNode(unref(_sfc_main$c), { component: computedTableContainer.value }, {
+        createVNode(_sfc_main$e, { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
               _ctx.$slots["button-bar"] ? (openBlock(), createElementBlock("div", _hoisted_2, [
@@ -1329,13 +1390,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: computedColumns.value,
                   table: props.table,
                   "column-control": columnControlConfig.value
@@ -1368,7 +1429,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3276e1dc"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-a75a38c5"]]);
 function useTable(params) {
   return useTable$1(params);
 }
@@ -1452,12 +1513,12 @@ const index = {
   }
 };
 export {
-  _sfc_main$c as ContainerFragment,
+  _sfc_main$e as ContainerFragment,
   LOCALE_INJECT_KEY,
   _sfc_main as ProComponentProvider,
   _sfc_main$a as ProForm,
   ProTable,
-  _sfc_main$b as SlotComponent,
+  _sfc_main$d as SlotComponent,
   index as default,
   enUS2 as enUS,
   useFields,