@qin-ui/element-plus-pro 1.3.0 → 1.3.1

package/es/index.js

@@ -1,12 +1,16 @@
 import "./element-plus-pro.css";
-import { inject, computed, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, toRaw, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, provide, useSlots, withModifiers, createElementVNode, onBeforeUnmount, watch, watchEffect, normalizeStyle, useModel, onMounted, mergeModels, resolveDirective, normalizeClass, withDirectives, guardReactiveProps, nextTick } from "vue";
-import { ElTable, ElPagination, useFormDisabled, ElCol, ElFormItem, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, localeContextKey, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElLoading } from "element-plus";
-import { isPlainObject, getObject, normalizePathKey, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, cloneDeep, InjectionFormSlotsKey, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, get, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { inject, computed, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, toRaw, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, createTextVNode, toDisplayString, provide, useSlots, withModifiers, createElementVNode, normalizeStyle, useModel, watch, mergeModels, onMounted, resolveDirective, normalizeClass, withDirectives, guardReactiveProps, nextTick } from "vue";
+import { ElTable, ElPagination, ElCol, ElFormItem, useFormDisabled, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, localeContextKey, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElLoading } from "element-plus";
+import { isPlainObject, getObject, normalizePathKey, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, cloneDeep, InjectionFormSlotsKey, createFormProxy, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, useSearchFormExpand, get, pick, isPromise, useTable as useTable$1 } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
-const tableProps = () => ElTable.props || {};
-const paginationProps = () => ElPagination.props || {};
-const gridItemProps = () => ElCol.props || {};
-const formItemProps = () => ElFormItem.props || {};
+const _tableProps = ElTable.props || {};
+const _paginationProps = ElPagination.props || {};
+const _gridItemProps = ElCol.props || {};
+const _formItemProps = ElFormItem.props || {};
+const tableProps = () => _tableProps;
+const paginationProps = () => _paginationProps;
+const gridItemProps = () => _gridItemProps;
+const formItemProps = () => _formItemProps;
 const DisabledContextKey = Symbol.for("pro-form-disabled-context");
 const useDisabledContext = () => {
   const formDisabled = useFormDisabled();
@@ -68,7 +72,7 @@ const INJECT_CONFIG = {
     injectionKey: Symbol(""),
     default: {
       max: 10 ** 15 - 1,
-      min: -1000000000000001,
+      min: -999999999999999,
       controls: false,
       style: { width: "100%" }
     }
@@ -206,6 +210,8 @@ const formItemPropKeys = Object.keys(formItemProps()).filter(
   (k) => k !== "disabled"
 );
 const gridItemPropKeys = Object.keys(gridItemProps());
+const gridItemPropKeySet = new Set(gridItemPropKeys);
+const formItemPropKeySet = new Set(formItemPropKeys);
 function useGroupFieldAttrs(validFields) {
   const config = INJECT_CONFIG["pro-form-item"];
   const injectFormItemProps = inject(config.injectionKey, config.default);
@@ -240,9 +246,9 @@ function useGroupFieldAttrs(validFields) {
         );
         const container = formItemContainer ?? injectFormItemContainer;
         Object.keys(rest).forEach((k) => {
-          if (gridItemPropKeys.includes(k)) {
+          if (gridItemPropKeySet.has(k)) {
             gridItemProps2[k] = rest[k];
-          } else if (formItemPropKeys.includes(k)) {
+          } else if (formItemPropKeySet.has(k)) {
             formItemProps2[k] = rest[k];
           } else {
             componentProps[k] = rest[k];
@@ -289,7 +295,10 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const validFields = computed(
-      () => (props.fields ?? []).filter((field) => !field.hidden)
+      () => (
+        // hidden 支持 Ref/ComputedRef/getter 等响应式形态（统一使用 toValue 取值）
+        (props.fields ?? []).filter((field) => !toValue(field.hidden))
+      )
     );
     const config = INJECT_CONFIG["pro-form"];
     const injectFormConfig = inject(config.injectionKey, config.default);
@@ -405,7 +414,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-3cc74dbb"]]);
+const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-e8f152ee"]]);
 function useForm(...args) {
   return useForm$1(...args);
 }
@@ -458,6 +467,14 @@ const getInitProps = (field, 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 zhCN = {
   ...zhCN$1,
   // 日期/时间选择器占位符（对应 INJECT_CONFIG 中 date-picker.* 的占位默认值）
@@ -572,7 +589,6 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         initProps,
         attrs,
         { class: attrs.componentClass, style: attrs.componentStyle },
-        { class: initProps.componentClass, style: initProps.componentStyle },
         { disabled: effectiveDisabled },
         { modelProp: modelPropName }
       );
@@ -588,14 +604,13 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     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 = customComponents[props.component] || componentMap[props.component];
+        const resolved = ((_a = toValue(customComponents)) == null ? void 0 : _a[props.component]) || componentMap[props.component];
         if (resolved) return resolved;
-        console.warn(
-          `[pro-components] 未识别的组件类型 "${props.component}"，已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
-        );
+        warnUnknownComponent(props.component);
         return props.component;
       }
       return props.component;
@@ -658,8 +673,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     component: { type: [Object, Function, String, Number, Boolean, null] }
   },
   setup(__props) {
+    const isRenderable = (c) => c !== null && c !== void 0 && (typeof c === "function" || typeof c === "object");
     return (_ctx, _cache) => {
-      return 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 }, [
+      return isRenderable(__props.component) ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
         createTextVNode(toDisplayString(__props.component), 1)
       ], 64));
     };
@@ -678,28 +694,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
     const currentForm = computed(
       () => props.form ?? fallbackForm
     );
-    const formProxy = new Proxy({}, {
-      get(_, prop) {
-        const target = currentForm.value;
-        const val = target == null ? void 0 : target[prop];
-        if (typeof val === "function") {
-          return (...args) => {
-            var _a, _b;
-            return (_b = (_a = currentForm.value) == null ? void 0 : _a[prop]) == null ? void 0 : _b.call(_a, ...args);
-          };
-        }
-        return val;
-      },
-      set(_, prop, value) {
-        if (currentForm.value) {
-          currentForm.value[prop] = value;
-        }
-        return true;
-      },
-      has(_, prop) {
-        return Boolean(currentForm.value && prop in currentForm.value);
-      }
-    });
+    const formProxy = createFormProxy(() => currentForm.value);
     provide(InjectionFormKey, formProxy);
     const fields = computed(() => {
       var _a;
@@ -731,6 +726,9 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       const { grid: _injectGrid, ...rest } = raw || {};
       return rest;
     });
+    const formAttrs = computed(() => {
+      return mergeProps(injectAttrs.value, camelizeProperties(attrs));
+    });
     const slots = useSlots();
     provide(InjectionFormSlotsKey, slots);
     return (_ctx, _cache) => {
@@ -738,7 +736,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
         key: formKey.value,
         ref: setFormRef,
         model: formData.value
-      }, mergeProps(injectAttrs.value, unref(camelizeProperties)(unref(attrs))), {
+      }, formAttrs.value, {
         class: "pro-form",
         onSubmit: _cache[0] || (_cache[0] = withModifiers(() => {
         }, ["prevent"]))
@@ -797,149 +795,8 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     const { t } = useLocale();
     const props = __props;
     const emit = __emit;
-    const proFormHeight = ref("unset");
-    const collapseHeight = ref(0);
-    const rowHeight = ref(32);
-    let resizeObserver = null;
-    let intersectionObserver = null;
-    const cleanupObservers = () => {
-      if (resizeObserver) {
-        resizeObserver.disconnect();
-        resizeObserver = null;
-      }
-      if (intersectionObserver) {
-        intersectionObserver.disconnect();
-        intersectionObserver = null;
-      }
-    };
-    onBeforeUnmount(() => {
-      cleanupObservers();
-    });
-    const computedExpand = computed(() => {
-      if (!props.expand) return false;
-      if (props.expand === true) return { minExpandRows: 2, expandStatus: false };
-      return {
-        minExpandRows: Math.max(Math.floor(props.expand.minExpandRows ?? 2), 1),
-        expandStatus: props.expand.expandStatus ?? false
-      };
-    });
-    const showExpandToggle = ref(false);
-    const expandStatus = ref(true);
-    const updateHeights = () => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
-      if (!props.expand || !((_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value)) return;
-      const proFormEl = (_c = props.form.formRef.value) == null ? void 0 : _c.$el;
-      if (!proFormEl) return;
-      const itemHeight = (_f = (_e = (_d = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _d.getBoundingClientRect) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.height;
-      if (itemHeight && itemHeight > 0) {
-        rowHeight.value = itemHeight;
-      }
-      const naturalHeight = proFormEl.scrollHeight || ((_h = (_g = proFormEl.getBoundingClientRect) == null ? void 0 : _g.call(proFormEl)) == null ? void 0 : _h.height) || 0;
-      if (naturalHeight > 0) {
-        proFormHeight.value = naturalHeight;
-      }
-    };
-    const isManualToggle = ref(false);
-    const changeExpandStatus = () => {
-      isManualToggle.value = true;
-      expandStatus.value = !expandStatus.value;
-    };
-    const hasFieldValue = (val) => val !== null && val !== void 0 && val !== "" && !(Array.isArray(val) && val.length === 0) && !(typeof val === "object" && Object.keys(val).length === 0);
-    const setInitExpandStatus = () => {
-      var _a, _b, _c;
-      if (isManualToggle.value) return;
-      const initStatus = computedExpand.value ? computedExpand.value.expandStatus : false;
-      expandStatus.value = initStatus;
-      if (((_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value) && computedExpand.value) {
-        const formEl = props.form.formRef.value.$el;
-        const formItemsEl = (_c = formEl == null ? void 0 : formEl.querySelectorAll) == null ? void 0 : _c.call(
-          formEl,
-          "[class*='-form-item'] [path]"
-        );
-        if (!formItemsEl || formItemsEl.length === 0) return;
-        if (intersectionObserver) {
-          intersectionObserver.disconnect();
-        }
-        intersectionObserver = new IntersectionObserver(
-          (entries) => {
-            if (isManualToggle.value) return;
-            expandStatus.value = entries.some((e) => {
-              var _a2, _b2;
-              if (e.intersectionRatio === 0) {
-                const path = e.target.getAttribute("path");
-                const searchFieldValue = path ? (_b2 = (_a2 = props.form) == null ? void 0 : _a2.getFormData) == null ? void 0 : _b2.call(_a2, path) : void 0;
-                return hasFieldValue(searchFieldValue);
-              }
-              return computedExpand.value ? computedExpand.value.expandStatus : false;
-            });
-            intersectionObserver == null ? void 0 : intersectionObserver.disconnect();
-          },
-          { root: formEl }
-        );
-        formItemsEl.forEach((element) => {
-          intersectionObserver == null ? void 0 : intersectionObserver.observe(element);
-        });
-      }
-    };
-    watch(
-      [
-        () => {
-          var _a, _b, _c;
-          return (_c = (_b = (_a = props.form) == null ? void 0 : _a.fields.value) == null ? void 0 : _b.filter((f) => !f.hidden)) == null ? void 0 : _c.length;
-        },
-        () => {
-          var _a, _b;
-          return (_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value;
-        },
-        () => props.expand
-      ],
-      () => {
-        updateHeights();
-      },
-      { flush: "post", immediate: true }
-    );
-    watch(
-      () => {
-        var _a, _b;
-        return (_b = (_a = props.form) == null ? void 0 : _a.formRef) == null ? void 0 : _b.value;
-      },
-      (val) => {
-        if (resizeObserver) {
-          resizeObserver.disconnect();
-          resizeObserver = null;
-        }
-        const formEl = val == null ? void 0 : val.$el;
-        if (formEl && typeof ResizeObserver !== "undefined") {
-          resizeObserver = new ResizeObserver(() => {
-            updateHeights();
-          });
-          resizeObserver.observe(formEl);
-        }
-      },
-      { immediate: true }
-    );
-    watchEffect(
-      () => {
-        if (typeof proFormHeight.value !== "number") return;
-        if (props.layout === "grid" && computedExpand.value) {
-          const { minExpandRows } = computedExpand.value;
-          collapseHeight.value = Math.min(
-            minExpandRows * rowHeight.value + (minExpandRows - 1) * props.rowGap,
-            +proFormHeight.value
-          );
-          showExpandToggle.value = +proFormHeight.value - collapseHeight.value > 1;
-          if (showExpandToggle.value) {
-            setInitExpandStatus();
-          }
-        } else {
-          showExpandToggle.value = false;
-        }
-      },
-      { flush: "post" }
-    );
+    const { showExpandToggle, expandStatus, changeExpandStatus, heightStyle } = useSearchFormExpand(props);
     const layoutProps = computed(() => {
-      const currentHeight = expandStatus.value ? proFormHeight.value : collapseHeight.value;
-      const heightStyle = currentHeight !== "unset" && currentHeight !== void 0 ? `${currentHeight}px` : void 0;
       return props.layout === "grid" ? {
         grid: {
           gutter: props.columnGap,
@@ -949,7 +806,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
           display: "flex",
           overflow: "hidden",
           columnGap: `${props.columnGap}px`,
-          height: heightStyle
+          height: heightStyle.value
         }
       } : {
         inline: true,
@@ -1015,29 +872,29 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                 ], 64)) : createCommentVNode("", true)
               ], true),
               renderSlot(_ctx.$slots, "expand-button", {
-                expandStatus: expandStatus.value,
-                changeExpandStatus
+                expandStatus: unref(expandStatus),
+                changeExpandStatus: unref(changeExpandStatus)
               }, () => [
-                props.expandButton !== false && showExpandToggle.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                props.expandButton !== false && unref(showExpandToggle) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                   props.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(props.expandButton), {
                     key: 0,
-                    "expand-status": expandStatus.value,
-                    onClick: changeExpandStatus
-                  }, null, 8, ["expand-status"])) : (openBlock(), createBlock(unref(ElButton), {
+                    "expand-status": unref(expandStatus),
+                    onClick: unref(changeExpandStatus)
+                  }, null, 8, ["expand-status", "onClick"])) : (openBlock(), createBlock(unref(ElButton), {
                     key: 1,
                     text: "",
                     class: "pro-table_search-form_expand-toggle-button",
-                    onClick: changeExpandStatus
+                    onClick: unref(changeExpandStatus)
                   }, {
                     default: withCtx(() => [
-                      createTextVNode(toDisplayString(expandStatus.value ? unref(t)("table.collapse") : unref(t)("table.expand")) + " ", 1),
+                      createTextVNode(toDisplayString(unref(expandStatus) ? unref(t)("table.collapse") : unref(t)("table.expand")) + " ", 1),
                       createVNode(DownOutlined, {
                         class: "transition",
-                        style: normalizeStyle([{ "margin-left": "4px" }, { transform: `rotate(${expandStatus.value ? -180 : 0}deg)` }])
+                        style: normalizeStyle([{ "margin-left": "4px" }, { transform: `rotate(${unref(expandStatus) ? -180 : 0}deg)` }])
                       }, null, 8, ["style"])
                     ]),
                     _: 1
-                  }))
+                  }, 8, ["onClick"]))
                 ], 64)) : createCommentVNode("", true)
               ], true)
             ]),
@@ -1049,7 +906,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-54c7c01c"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-9c362a11"]]);
 const _sfc_main$8 = {};
 const _hoisted_1$4 = { class: "pro-table_search-form-container" };
 function _sfc_render$3(_ctx, _cache) {
@@ -1174,7 +1031,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
     const checkedColumnsOptions = computed(
       () => props.columns.map((item, index2) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const key = getColumnKey(item, index2);
         const excluded = (_b = (_a = props.columnControl) == null ? void 0 : _a.excludedKeys) == null ? void 0 : _b.some(
           (ek) => String(ek) === key
@@ -1182,9 +1039,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         const disabled = (_d = (_c = props.columnControl) == null ? void 0 : _c.disabledKeys) == null ? void 0 : _d.some(
           (dk) => String(dk) === key
         );
-        const label = String(
-          item.label ?? item.title ?? item.prop ?? t("table.columnFallback", { index: index2 + 1 })
-        );
+        const rawTitle = item.label ?? item.title;
+        const titleLabel = typeof rawTitle === "string" ? rawTitle : void 0;
+        const propLabel = item.prop !== void 0 && item.prop !== null ? String(item.prop) : void 0;
+        const label = ((_f = (_e = props.columnControl) == null ? void 0 : _e.labels) == null ? void 0 : _f[key]) ?? titleLabel ?? propLabel ?? key ?? t("table.columnFallback", { index: index2 + 1 });
         return {
           label,
           value: key,
@@ -1218,7 +1076,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       var _a;
       const checked = !!(((_a = value == null ? void 0 : value.target) == null ? void 0 : _a.checked) ?? value);
       checkedColumnKeys.value = checked ? controllableOptions.value.map((item) => item.value) : [];
-      indeterminate.value = false;
     };
     const toggleColumnsItem = (val) => {
       const item = checkedColumnsOptions.value.find((o) => o.value === val);
@@ -1242,13 +1099,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       },
       { immediate: true }
     );
-    onMounted(() => {
-      var _a, _b;
-      (_b = (_a = props.columnControl) == null ? void 0 : _a.disabledKeys) == null ? void 0 : _b.forEach((key) => {
-        var _a2;
-        (_a2 = props.table) == null ? void 0 : _a2.setColumn(String(key), { hidden: false });
-      });
-    });
     watch(
       () => {
         var _a;
@@ -1260,7 +1110,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           (_a = props.table) == null ? void 0 : _a.setColumn(String(key), { hidden: false });
         });
       },
-      { deep: true }
+      { immediate: true, deep: true }
     );
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElDropdown), {
@@ -1332,7 +1182,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-f98ee06d"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-92c3fe41"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -1388,13 +1238,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             default: withCtx((scope) => {
               var _a;
               return [
-                (openBlock(), createBlock(resolveDynamicComponent(
-                  (_a = column.render) == null ? void 0 : _a.call(column, {
+                createVNode(unref(_sfc_main$c), {
+                  component: (_a = column.render) == null ? void 0 : _a.call(column, {
                     ...scope,
                     column,
                     cellValue: getCellValue(scope.row, column)
                   })
-                )))
+                }, null, 8, ["component"])
               ];
             }),
             _: 2
@@ -1497,14 +1347,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     "loadingModifiers": {}
   }),
   emits: ["update:size", "update:loading"],
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
+    const tableProperties = Object.keys(tableProps());
+    const paginationProperties = Object.keys(paginationProps());
     const props = __props;
     const { t } = useLocale();
     const config = INJECT_CONFIG["pro-table"];
     const injectPropsRaw = inject(config.injectionKey, config.default);
     const injectProps = computed(() => toValue(injectPropsRaw) || {});
-    const tableProperties = Object.keys(tableProps());
-    const paginationProperties = Object.keys(paginationProps());
     const attrs = useAttrs();
     const injectTableAttrs = computed(() => {
       return pick(injectProps.value, tableProperties);
@@ -1517,14 +1367,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     });
     const size = useModel(__props, "size");
     const loading = useModel(__props, "loading");
+    let searchSequence = 0;
     const _search = async () => {
       var _a;
+      const seq = ++searchSequence;
       const searchPromise = (_a = props.search || attrs.onSearch) == null ? void 0 : _a();
-      if (isPromise(searchPromise)) {
-        loading.value = true;
-        try {
-          await searchPromise;
-        } finally {
+      if (!isPromise(searchPromise)) return;
+      loading.value = true;
+      try {
+        await searchPromise;
+      } finally {
+        if (seq === searchSequence) {
           loading.value = false;
         }
       }
@@ -1536,22 +1389,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         _search();
       });
     };
+    const customSlotNames = [
+      "search-form",
+      "button-bar",
+      "toolbar",
+      "table"
+    ];
     const slots = useSlots();
-    const searchFormSlot = slots["search-form"];
-    const buttonBarSlot = slots["button-bar"];
-    const toolbarSlot = slots["toolbar"];
-    const tableSlots = computed(() => {
-      const customNames = /* @__PURE__ */ new Set([
-        "search-form",
-        "button-bar",
-        "toolbar",
-        "table"
-      ]);
-      return Object.fromEntries(
-        Object.entries(slots).filter(([name]) => !customNames.has(name))
-      );
-    });
-    const tableSlotNames = computed(() => Object.keys(tableSlots.value));
+    const forwardedSlotNames = () => Object.keys(slots).filter((name) => !customSlotNames.includes(name));
     const searchPage1st = () => {
       var _a, _b;
       (_b = (_a = props.table) == null ? void 0 : _a.setPageParam) == null ? void 0 : _b.call(_a, { current: 1 });
@@ -1652,11 +1497,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       var _a;
       (_a = attrs.onChange) == null ? void 0 : _a.call(attrs, currentPage, pageSize);
     };
-    const showSearch = computed(() => {
+    const searchFormVisible = computed(() => {
       var _a, _b, _c, _d, _e;
       const searchFields = (_b = (_a = props.table) == null ? void 0 : _a.searchForm) == null ? void 0 : _b.fields;
       const fieldList = (Array.isArray(searchFields) ? searchFields : searchFields == null ? void 0 : searchFields.value) ?? [];
-      return !!(searchFormSlot || ((_c = computedSearchFormConfig.value) == null ? void 0 : _c.hidden) !== true && ((_d = props.table) == null ? void 0 : _d.searchForm) && ((_e = fieldList.filter((item) => !item.hidden)) == null ? void 0 : _e.length) > 0);
+      return !!(((_c = computedSearchFormConfig.value) == null ? void 0 : _c.hidden) !== true && ((_d = props.table) == null ? void 0 : _d.searchForm) && ((_e = fieldList.filter((item) => !toValue(item.hidden))) == null ? void 0 : _e.length) > 0);
     });
     const computedControl = computed(() => {
       const mergedControl = props.control ?? injectProps.value.control;
@@ -1680,13 +1525,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         _search();
       }
     });
+    __expose({
+      /** 手动触发一次查询（与内部搜索共用 loading 竞态守卫），便于外部刷新列表 */
+      search: _search
+    });
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["pro-table", unref(attrs).class]),
         style: normalizeStyle(unref(attrs).style)
       }, [
-        showSearch.value ? (openBlock(), createBlock(unref(_sfc_main$d), {
+        searchFormVisible.value || _ctx.$slots["search-form"] ? (openBlock(), createBlock(unref(_sfc_main$d), {
           key: 0,
           component: computedSearchFormConfig.value.container
         }, {
@@ -1709,10 +1558,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         createVNode(unref(_sfc_main$d), { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
-              unref(buttonBarSlot) ? (openBlock(), createElementBlock("div", _hoisted_2, [
+              _ctx.$slots["button-bar"] ? (openBlock(), createElementBlock("div", _hoisted_2, [
                 renderSlot(_ctx.$slots, "button-bar", {}, void 0, true)
               ])) : createCommentVNode("", true),
-              unref(toolbarSlot) ? (openBlock(), createElementBlock("div", _hoisted_3, [
+              _ctx.$slots["toolbar"] ? (openBlock(), createElementBlock("div", _hoisted_3, [
                 renderSlot(_ctx.$slots, "toolbar", {}, void 0, true)
               ])) : createCommentVNode("", true),
               computedControl.value.sizeControl ? (openBlock(), createElementBlock("div", _hoisted_4, [
@@ -1739,7 +1588,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 2
               }, [
-                renderList(tableSlotNames.value, (name) => {
+                renderList(forwardedSlotNames(), (name) => {
                   return {
                     name,
                     fn: withCtx((scoped) => [
@@ -1766,7 +1615,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-e1546aaf"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-e9641e7c"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
@@ -1826,9 +1675,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
-    if (props.componentMap) {
-      provide(INJECT_COMPONENTS, props.componentMap);
-    }
+    provide(
+      INJECT_COMPONENTS,
+      computed(() => props.componentMap)
+    );
     provide(
       LOCALE_INJECT_KEY,
       computed(() => props.locale)