@qin-ui/element-plus-pro 1.4.1 → 1.4.3

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, InjectionFormSlotsKey, isPlainObject, resolveFieldIdentity, normalizePathKey, toPath, isObjectItem, InjectionFormKey, createFormProxy, omitBy, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, get, pick, isPromise, useTable as useTable$1, omit } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
 const _tableProps = ElTable.props || {};
 const _paginationProps = ElPagination.props || {};
@@ -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: {
@@ -289,6 +289,8 @@ const PLACEHOLDER_KEYS = {
   "date-picker.week": "date-picker.placeholder",
   "date-picker.month": "date-picker.placeholder",
   "date-picker.months": "date-picker.placeholder",
+  "date-picker.quarter": "date-picker.placeholder",
+  "date-picker.quarters": "date-picker.placeholder",
   "date-picker.year": "date-picker.placeholder",
   "date-picker.years": "date-picker.placeholder",
   "date-picker.datetime": "date-picker.placeholder",
@@ -299,6 +301,7 @@ const RANGE_PLACEHOLDER_KEYS = {
   "date-picker.daterange": ["date-picker.start", "date-picker.end"],
   "date-picker.monthrange": ["date-picker.startMonth", "date-picker.endMonth"],
   "date-picker.yearrange": ["date-picker.startYear", "date-picker.endYear"],
+  "date-picker.quarterrange": ["date-picker.start", "date-picker.end"],
   "date-picker.datetimerange": ["date-picker.startTime", "date-picker.endTime"]
 };
 const getPlaceholderProps = (key, injectProps, t) => {
@@ -331,6 +334,9 @@ function warnUnknownComponent(name) {
     `[pro-components] 未识别的组件类型 "${name}"，已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
   );
 }
+const normalizeDisabled = (value) => value === "" || value === "disabled" ? true : Boolean(value);
+const resolveDisabled = (value) => value === void 0 || value === null ? void 0 : normalizeDisabled(value);
+const resolveEffectiveDisabled = (explicit, inherited, fallback) => resolveDisabled(explicit) ?? (normalizeDisabled(inherited) || normalizeDisabled(fallback));
 const zhCN = {
   ...zhCN$1,
   // 日期/时间选择器占位符（对应 INJECT_CONFIG 中 date-picker.* 的占位默认值）
@@ -389,7 +395,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: {
@@ -455,8 +461,11 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
         t
       );
       const modelPropName = attrs.modelProp ?? initProps.modelProp ?? "modelValue";
-      const normalizeDisabled = (value2) => value2 === "" || value2 === "disabled" ? true : Boolean(value2);
-      const effectiveDisabled = attrs.disabled !== void 0 && attrs.disabled !== null ? normalizeDisabled(attrs.disabled) : normalizeDisabled(parentDisabled.value) || normalizeDisabled(initProps.disabled);
+      const effectiveDisabled = resolveEffectiveDisabled(
+        attrs.disabled,
+        parentDisabled.value,
+        initProps.disabled
+      );
       const mergedProps = mergeProps(
         initProps,
         attrs,
@@ -493,7 +502,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
       }, {
@@ -509,7 +518,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"])
                 ])
@@ -522,6 +531,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) => {
@@ -535,75 +729,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 },
@@ -621,6 +787,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(() => {
@@ -653,14 +833,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);
@@ -689,79 +869,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)
-                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(_sfc_main$d, mergeProps({
-                          key: 1,
-                          ref_for: true,
-                          ref: (el) => setComponentRef(item.rawField, el)
-                        }, { ref_for: true }, item.componentProps, {
-                          path: item.path
-                        }), null, 16, ["path"]))
-                      ]),
-                      _: 2
-                    }, [
-                      renderList(item.formItemSlots, (slot, name) => {
-                        return {
-                          name,
-                          fn: withCtx((scoped) => [
-                            createVNode(_sfc_main$e, mergeProps({
-                              path: item.path,
-                              component: slot
-                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
-                          ])
-                        };
-                      })
-                    ]), 1040, ["prop", "path"])
-                  ]),
-                  _: 2
-                }, 1032, ["component", "path"])
-              ]),
-              _: 2
-            }, 1040, ["component"]);
+          (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-dea0b53c"]]);
 const _sfc_main$b = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -812,6 +947,12 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
         omitBy(camelizeProperties(attrs), (value) => value === void 0)
       );
     });
+    const outerDisabled = useDisabledContext();
+    const formDisabled = computed(() => {
+      const explicit = resolveDisabled(toValue(formAttrs.value.disabled));
+      if (explicit !== void 0) return explicit;
+      return outerDisabled.value ? true : void 0;
+    });
     const slots = useSlots();
     const formSlotsRef = shallowRef(slots);
     onUpdated(() => {
@@ -829,10 +970,11 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
         }, ["prevent"]))
       }), {
         default: withCtx(() => [
-          createVNode(BaseFormItem, {
+          createVNode(_sfc_main$c, {
             fields: fields.value,
-            grid: props.grid
-          }, null, 8, ["fields", "grid"]),
+            grid: props.grid,
+            disabled: formDisabled.value
+          }, null, 8, ["fields", "grid", "disabled"]),
           renderSlot(_ctx.$slots, "default")
         ]),
         _: 3
@@ -1337,7 +1479,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,
@@ -1623,15 +1765,21 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       };
     });
     const showPagination = computed(() => computedPagination.value !== false);
+    let sizeChangeWindow = false;
     const onCurrentChange = (current) => {
       var _a, _b;
+      if (sizeChangeWindow) return;
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current });
       _search();
     };
     const onSizeChange = (pageSize) => {
       var _a, _b;
+      sizeChangeWindow = true;
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { pageSize, current: 1 });
       _search();
+      nextTick(() => {
+        sizeChangeWindow = false;
+      });
     };
     const onPaginationChange = (currentPage, pageSize) => {
       var _a;
@@ -1678,7 +1826,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
         }, {
@@ -1698,7 +1846,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, [
@@ -1759,7 +1907,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d092780c"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-9774f05e"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
@@ -1867,12 +2015,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,