@qin-ui/element-plus-pro 1.4.2 → 1.4.4

package/es/index.js

@@ -1,7 +1,7 @@
 import "./element-plus-pro.css";
-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 { inject, computed, toValue, provide, defineComponent, createBlock, renderSlot, openBlock, resolveDynamicComponent, normalizeProps, mergeProps, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, ref, createCommentVNode, createSlots, renderList, createVNode, watch, h, toRaw, unref, useSlots, shallowRef, onUpdated, triggerRef, withModifiers, createElementVNode, normalizeStyle, nextTick, mergeModels, useModel, 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 { useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, useReactiveAttrs, cloneDeep, getObject, omitBy, InjectionFormSlotsKey, isPlainObject, resolveFieldIdentity, normalizePathKey, toPath, isObjectItem, InjectionFormKey, createFormProxy, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, get, pick, callListeners, isPromise, useTable as useTable$1, omit, mergeComponentVars } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
 const _tableProps = ElTable.props || {};
 const _paginationProps = ElPagination.props || {};
@@ -216,7 +216,7 @@ const ensureInjectConfig = (key) => {
   DYNAMIC_INJECT_CONFIG[key] = created;
   return created;
 };
-const _sfc_main$f = /* @__PURE__ */ defineComponent({
+const _sfc_main$g = /* @__PURE__ */ defineComponent({
   ...{ name: "ContainerFragment", inheritAttrs: false },
   __name: "index",
   props: {
@@ -233,7 +233,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$e = /* @__PURE__ */ defineComponent({
+const _sfc_main$f = /* @__PURE__ */ defineComponent({
   ...{ name: "SlotComponent", inheritAttrs: false },
   __name: "index",
   props: {
@@ -321,8 +321,9 @@ const getPlaceholderProps = (key, injectProps, t) => {
 const getInitProps = (field, injectProps = {}, t) => {
   const { component, type } = field;
   if (typeof component === "string") {
-    const k = [component, type].filter(Boolean).join(".");
-    return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
+    const subtypeKey = [component, type].filter(Boolean).join(".");
+    const key = PLACEHOLDER_KEYS[subtypeKey] || RANGE_PLACEHOLDER_KEYS[subtypeKey] ? subtypeKey : component;
+    return { ...injectProps, ...getPlaceholderProps(key, injectProps, t) };
   }
   return {};
 };
@@ -395,7 +396,7 @@ const useLocale = () => {
   };
   return { t, lang };
 };
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
+const _sfc_main$e = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseField", inheritAttrs: false },
   __name: "index",
   props: {
@@ -413,9 +414,11 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     const componentRef = ref();
     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 baseConfigKey = typeof props.component === "string" ? props.component : "";
+    const typeConfigKey = typeVal || (baseConfigKey === "date-picker" ? "date" : "");
+    const subtypeConfigKey = baseConfigKey && typeConfigKey ? `${baseConfigKey}.${typeConfigKey}` : "";
+    const baseInjectConfig = baseConfigKey ? getInjectConfig(baseConfigKey) : void 0;
+    const subtypeInjectConfig = subtypeConfigKey ? getInjectConfig(subtypeConfigKey) : void 0;
     const componentVars = inject(INJECT_COMPONENT_VARS, void 0);
     const value = computed({
       get() {
@@ -447,10 +450,12 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     });
     const parentDisabled = useDisabledContext();
     const groupedAttrs = computed(() => {
-      var _a;
+      var _a, _b;
       const currentInjectProps = {
-        ...toValue(rawInjectComponentProps) || {},
-        ...getObject((_a = toValue(componentVars)) == null ? void 0 : _a[injectConfigKey])
+        ...getObject(baseInjectConfig == null ? void 0 : baseInjectConfig.default),
+        ...getObject(subtypeInjectConfig == null ? void 0 : subtypeInjectConfig.default),
+        ...getObject((_a = toValue(componentVars)) == null ? void 0 : _a[baseConfigKey]),
+        ...getObject((_b = toValue(componentVars)) == null ? void 0 : _b[subtypeConfigKey])
       };
       const initProps = getInitProps(
         {
@@ -468,7 +473,8 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       );
       const mergedProps = mergeProps(
         initProps,
-        attrs,
+        // 未赋值（undefined）的键不作为显式值下发，保留注入默认值与占位符兜底
+        omitBy(attrs, (value2) => value2 === void 0),
         { class: attrs.componentClass, style: attrs.componentStyle },
         { disabled: effectiveDisabled },
         { modelProp: modelPropName }
@@ -502,7 +508,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       getComponentComputedProps: () => groupedAttrs.value.attrs
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(_sfc_main$f, {
+      return openBlock(), createBlock(_sfc_main$g, {
         component: groupedAttrs.value.componentContainer,
         path: props.path
       }, {
@@ -518,7 +524,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(_sfc_main$e, mergeProps({
+                  createVNode(_sfc_main$f, mergeProps({
                     path: props.path
                   }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
@@ -531,6 +537,191 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     };
   }
 });
+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);
+const groupField = (field, rawInjectProps) => {
+  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
+    };
+  }
+  return {
+    path: resolveFieldIdentity(field, ELEMENT_FIELD_IDENTITY_KEYS),
+    gridItemProps: gridItemProps2,
+    formItemProps: formItemProps2,
+    formItemSlots,
+    componentProps,
+    rawField: field
+  };
+};
+function useGroupedField(field) {
+  const config = INJECT_CONFIG["pro-form-item"];
+  const injectFormItemProps = inject(config.injectionKey, config.default);
+  return computed(
+    () => groupField(toValue(field), toValue(injectFormItemProps) || {})
+  );
+}
+const _sfc_main$d = defineComponent({
+  name: "BaseFormItem",
+  inheritAttrs: false,
+  props: {
+    /** 字段配置 */
+    field: { type: Object, required: true },
+    /** 是否启用网格布局 */
+    grid: {
+      type: [Boolean, Object],
+      default: void 0
+    },
+    /** 上层下发的禁用状态 */
+    disabled: { type: Boolean, default: void 0 },
+    /** FormItem 实例登记回调 */
+    setFormItemRef: {
+      type: Function,
+      default: void 0
+    },
+    /** 控件实例登记回调 */
+    setComponentRef: {
+      type: Function,
+      default: void 0
+    }
+  },
+  setup(props) {
+    const grouped = useGroupedField(() => props.field);
+    const enableGrid = computed(() => !!props.grid);
+    const componentKey = computed(() => {
+      const field = props.field;
+      const component = toValue(field.component);
+      if (typeof component !== "string") return "component-object";
+      return `string:${component}:${toValue(field.type) ?? ""}`;
+    });
+    const effectiveDisabled = computed(
+      () => toValue(props.field.disabled) ?? props.disabled
+    );
+    const setItemRef = (el) => {
+      var _a;
+      (_a = props.setFormItemRef) == null ? void 0 : _a.call(
+        props,
+        props.field,
+        el,
+        () => grouped.value.formItemProps
+      );
+    };
+    const setFieldRef = (el) => {
+      var _a;
+      (_a = props.setComponentRef) == null ? void 0 : _a.call(props, props.field, el);
+    };
+    watch(
+      () => props.field,
+      (next, prev) => {
+        var _a, _b;
+        if (!prev || prev === next) return;
+        (_a = props.setFormItemRef) == null ? void 0 : _a.call(props, prev, null, () => grouped.value.formItemProps);
+        (_b = props.setComponentRef) == null ? void 0 : _b.call(props, prev, null);
+      },
+      { flush: "pre" }
+    );
+    const withContainer = (node, component, containerProps) => component ? h(component, containerProps, { default: () => node }) : node;
+    const renderFormItemSlots = (groupedField) => {
+      const slots = {};
+      Object.entries(groupedField.formItemSlots).forEach(([name, slot]) => {
+        slots[name] = (scope) => h(_sfc_main$f, {
+          path: groupedField.path,
+          component: slot,
+          ...scope || {}
+        });
+      });
+      slots.default = () => {
+        const field = props.field;
+        if (field.fields) {
+          return h(_sfc_main$c, {
+            grid: field.grid ?? props.grid,
+            fields: field.fields,
+            disabled: effectiveDisabled.value
+          });
+        }
+        return h(_sfc_main$e, {
+          key: componentKey.value,
+          ref: setFieldRef,
+          ...groupedField.componentProps,
+          path: groupedField.path,
+          disabled: effectiveDisabled.value
+        });
+      };
+      return slots;
+    };
+    return () => {
+      const groupedField = grouped.value;
+      let node = h(
+        ElFormItem,
+        {
+          ...groupedField.formItemProps,
+          ref: setItemRef,
+          prop: normalizePathKey(groupedField.path),
+          path: groupedField.path
+        },
+        renderFormItemSlots(groupedField)
+      );
+      node = withContainer(node, groupedField.container, {
+        path: groupedField.path
+      });
+      node = withContainer(
+        node,
+        enableGrid.value ? ElCol : void 0,
+        groupedField.gridItemProps
+      );
+      return node;
+    };
+  }
+});
+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$d, [["__scopeId", "data-v-6e6641b4"]]);
 const fieldKeyMap = /* @__PURE__ */ new WeakMap();
 let fieldKeySeed = 0;
 const getFieldKey = (field) => {
@@ -544,75 +735,47 @@ const getFieldKey = (field) => {
   }
   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 rowKeyMap = /* @__PURE__ */ new WeakMap();
+let rowKeySeed = 0;
+const getRowKey = (row) => {
+  const raw = toRaw(row);
+  let key = rowKeyMap.get(raw);
+  if (key === void 0) {
+    key = ++rowKeySeed;
+    rowKeyMap.set(raw, key);
+  }
+  return key;
+};
+const isIndexSegment = (segment) => /^(?:0|[1-9]\d*)$/.test(segment);
+const getFieldDataKey = (field, rawFormData) => {
+  const path = resolveFieldIdentity(field, ELEMENT_FIELD_IDENTITY_KEYS);
+  if (!path || rawFormData === null || rawFormData === void 0) {
+    return getFieldKey(field);
+  }
+  const segments = toPath(path);
+  let node = rawFormData;
+  const rowIds = [];
+  let lastRowIndex = -1;
+  for (let i = 0; i < segments.length; i++) {
+    if (Array.isArray(node)) {
+      const segment = segments[i];
+      if (!isIndexSegment(segment)) break;
+      const element = node[Number(segment)];
+      if (element === null || typeof element !== "object") break;
+      rowIds.push(getRowKey(toRaw(element)));
+      lastRowIndex = i;
+      node = element;
+      continue;
+    }
+    if (node === null || typeof node !== "object") break;
+    node = node[segments[i]];
+  }
+  if (lastRowIndex === -1) return getFieldKey(field);
+  const rest = segments.slice(lastRowIndex + 1).join(".");
+  return `data:${rowIds.join("/")}:${rest}`;
+};
 const _sfc_main$c = /* @__PURE__ */ defineComponent({
-  ...{ name: "BaseFormItem", inheritAttrs: false },
+  ...{ name: "BaseFormItems", inheritAttrs: false },
   __name: "index",
   props: {
     grid: { type: [Boolean, Object], default: void 0 },
@@ -630,6 +793,20 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
         )
       )
     );
+    const injectedForm = inject(InjectionFormKey, void 0);
+    const renderedFields = computed(() => {
+      const rawFormData = (injectedForm == null ? void 0 : injectedForm.formData) ? toRaw(injectedForm.formData) : void 0;
+      const seen = /* @__PURE__ */ new Map();
+      return validFields.value.map((field) => {
+        const baseKey = getFieldDataKey(field, rawFormData);
+        const count = seen.get(baseKey) ?? 0;
+        seen.set(baseKey, count + 1);
+        return {
+          field,
+          key: count === 0 ? baseKey : `${String(baseKey)}#${count}`
+        };
+      });
+    });
     const config = INJECT_CONFIG["pro-form"];
     const injectFormConfig = inject(config.injectionKey, config.default);
     const injectGrid = computed(() => {
@@ -662,14 +839,14 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
         }
       }
     };
-    const setFormItemRef = (field, el, formItemProps2) => {
+    const setFormItemRef = (field, el, getFormItemProps) => {
       if (!field || typeof field !== "object") return;
       const raw = toRaw(field);
       if (el) {
         formItemInstanceMap.set(raw, el);
         defineFieldAccessors(raw, {
           getFormItemRef: () => formItemInstanceMap.get(raw),
-          getFormItemComputedProps: () => formItemProps2
+          getFormItemComputedProps: getFormItemProps
         });
       } else {
         formItemInstanceMap.delete(raw);
@@ -698,80 +875,34 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
         delete raw.getComponentComputedProps;
       }
     };
-    const groupedFields = useGroupFieldAttrs(validFields);
     return (_ctx, _cache) => {
-      const _component_BaseFormItem = resolveComponent("BaseFormItem");
-      return openBlock(), createBlock(_sfc_main$f, mergeProps({
-        component: enableGrid.value ? unref(ElRow) : void 0
-      }, computedGridProps.value, { style: { "width": "100%" } }), {
+      return enableGrid.value ? (openBlock(), createBlock(unref(ElRow), mergeProps({ key: 0 }, computedGridProps.value, { style: { "width": "100%" } }), {
         default: withCtx(() => [
-          (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) ?? props.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,
-                          disabled: toValue(item.rawField.disabled) ?? props.disabled
-                        }), null, 16, ["path", "disabled"]))
-                      ]),
-                      _: 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"]);
+          (openBlock(true), createElementBlock(Fragment, null, renderList(renderedFields.value, (item) => {
+            return openBlock(), createBlock(BaseFormItem, {
+              key: item.key,
+              field: item.field,
+              grid: props.grid,
+              disabled: props.disabled,
+              "set-form-item-ref": setFormItemRef,
+              "set-component-ref": setComponentRef
+            }, null, 8, ["field", "grid", "disabled"]);
           }), 128))
         ]),
         _: 1
-      }, 16, ["component"]);
+      }, 16)) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(renderedFields.value, (item) => {
+        return openBlock(), createBlock(BaseFormItem, {
+          key: item.key,
+          field: item.field,
+          grid: props.grid,
+          disabled: props.disabled,
+          "set-form-item-ref": setFormItemRef,
+          "set-component-ref": setComponentRef
+        }, null, 8, ["field", "grid", "disabled"]);
+      }), 128));
     };
   }
 });
-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-a29a46c8"]]);
 const _sfc_main$b = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -794,10 +925,13 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = currentForm.value) == null ? void 0 : _a.formData;
     });
-    const setFormRef = (el) => {
-      var _a, _b;
-      return (_b = (_a = currentForm.value) == null ? void 0 : _a.setFormRef) == null ? void 0 : _b.call(_a, el);
-    };
+    const formRefSetter = computed(() => {
+      const form = currentForm.value;
+      return (el) => {
+        var _a;
+        return (_a = form == null ? void 0 : form.setFormRef) == null ? void 0 : _a.call(form, el);
+      };
+    });
     let formInstanceCounter = 0;
     const formInstanceKeyMap = /* @__PURE__ */ new WeakMap();
     const getFormKey = (f) => {
@@ -837,7 +971,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElForm), mergeProps({
         key: formKey.value,
-        ref: setFormRef,
+        ref: formRefSetter.value,
         model: formData.value
       }, formAttrs.value, {
         class: "pro-form",
@@ -845,7 +979,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
         }, ["prevent"]))
       }), {
         default: withCtx(() => [
-          createVNode(BaseFormItem, {
+          createVNode(_sfc_main$c, {
             fields: fields.value,
             grid: props.grid,
             disabled: formDisabled.value
@@ -1354,7 +1488,7 @@ const renderColumn = (column, ancestors = /* @__PURE__ */ new Set()) => {
   }
   if (typeof column.render === "function") {
     return h(ElTableColumn, vnodeProps, {
-      default: (scope) => h(_sfc_main$e, {
+      default: (scope) => h(_sfc_main$f, {
         component: column.render({
           ...scope,
           column,
@@ -1480,16 +1614,19 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (props.search && attrs.onSearch) {
         warnSearchConfig("duplicate");
       }
-      if (!search) return;
-      const searchPromise = search();
-      if (!isPromise(searchPromise)) {
+      const results = callListeners(search);
+      if (!results.length) return;
+      const promises = results.filter(isPromise);
+      if (!promises.length) {
         warnSearchConfig("not-promise");
         return;
       }
       const seq = ++searchSequence;
       loading.value = true;
       try {
-        await searchPromise;
+        const settled = await Promise.allSettled(promises);
+        const rejected = settled.find((item) => item.status === "rejected");
+        if (rejected) throw rejected.reason;
       } finally {
         if (seq === searchSequence) {
           loading.value = false;
@@ -1657,8 +1794,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       });
     };
     const onPaginationChange = (currentPage, pageSize) => {
-      var _a;
-      (_a = attrs.onChange) == null ? void 0 : _a.call(attrs, currentPage, pageSize);
+      callListeners(attrs.onChange, currentPage, pageSize);
     };
     const searchFormVisible = computed(() => {
       var _a, _b, _c, _d;
@@ -1701,7 +1837,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(_sfc_main$f, {
+        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(_sfc_main$g, {
           key: 0,
           component: computedSearchFormConfig.value.container
         }, {
@@ -1721,7 +1857,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
-        createVNode(_sfc_main$f, { component: computedTableContainer.value }, {
+        createVNode(_sfc_main$g, { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
               _ctx.$slots["button-bar"] ? (openBlock(), createElementBlock("div", _hoisted_2, [
@@ -1782,7 +1918,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-9774f05e"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-6a338bf0"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
@@ -1815,6 +1951,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       (key) => {
         const config = INJECT_CONFIG[key];
         const ignored = config.ignoreProps;
+        const parentConfig = inject(config.injectionKey, void 0);
         provide(
           config.injectionKey,
           computed(
@@ -1823,6 +1960,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               return omit(
                 {
                   ...config.default,
+                  ...toValue(parentConfig) || {},
                   ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
                 },
                 ignored ?? []
@@ -1836,12 +1974,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       Object.keys(props.componentVars).forEach((key) => {
         if (!(key in INJECT_CONFIG)) {
           const config = ensureInjectConfig(key);
+          const parentConfig = inject(config.injectionKey, void 0);
           provide(
             config.injectionKey,
             computed(() => {
               var _a;
               return {
-                ...config.default,
+                ...toValue(parentConfig) || {},
                 ...getObject((_a = props.componentVars) == null ? void 0 : _a[key])
               };
             })
@@ -1849,17 +1988,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    const parentComponentVars = inject(INJECT_COMPONENT_VARS, void 0);
     provide(
       INJECT_COMPONENT_VARS,
-      computed(() => props.componentVars ?? {})
+      computed(
+        () => mergeComponentVars(
+          toValue(parentComponentVars),
+          props.componentVars
+        )
+      )
     );
+    const parentComponents = inject(INJECT_COMPONENTS, void 0);
     provide(
       INJECT_COMPONENTS,
-      computed(() => props.componentMap)
+      computed(() => ({
+        ...toValue(parentComponents) || {},
+        ...props.componentMap ?? {}
+      }))
     );
+    const parentLocale = inject(LOCALE_INJECT_KEY, void 0);
     provide(
       LOCALE_INJECT_KEY,
-      computed(() => props.locale)
+      computed(() => ({
+        ...toValue(parentLocale) || {},
+        ...props.locale ?? {}
+      }))
     );
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default");
@@ -1890,12 +2043,12 @@ const index = {
   }
 };
 export {
-  _sfc_main$f as ContainerFragment,
+  _sfc_main$g as ContainerFragment,
   LOCALE_INJECT_KEY,
   _sfc_main as ProComponentProvider,
   _sfc_main$b as ProForm,
   ProTable,
-  _sfc_main$e as SlotComponent,
+  _sfc_main$f as SlotComponent,
   index as default,
   enUS,
   useFields,