@qin-ui/antd-vue-pro 2.6.0 → 2.6.2

package/es/shared/core/index.d.ts

@@ -1,5 +1,5 @@
 /**
  * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容。
  */
-export { type AdditionalMethods, localePacks, normalizeColumn, normalizeColumns, useForm, createFormProxy, useTable, useSearchFormExpand, useFields, resolveFieldIdentity, DEFAULT_FIELD_IDENTITY_KEYS, useFormData, useFormRef, useReactiveAttrs, InjectionFormKey, InjectionFormSlotsKey, getObject, omitBy, get, set, normalizePathKey, toPath, camelizeProperties, cloneDeep, pick, omit, isPlainObject, isObjectItem, isPromise, zhCN, zhTW, enUS, format, resolveLocaleName, type ProLocale, type ProLocaleName, type ProLocaleKey, type Data, type Path, type Paths, type KeyExpandString, type ExtendWithAny, type DeepPartial, type PageParam, type Fields, type Form, type Table, type UseFieldsReturn, type UseFormDataReturn, type UseFormRefReturn, } from '@qin-ui/pro-components-core';
+export { type AdditionalMethods, localePacks, normalizeColumn, normalizeColumns, useForm, createFormProxy, useTable, useSearchFormExpand, useFields, resolveFieldIdentity, DEFAULT_FIELD_IDENTITY_KEYS, useFormData, useFormRef, useReactiveAttrs, InjectionFormKey, InjectionFormSlotsKey, getObject, mergeComponentVars, omitBy, get, set, normalizePathKey, toPath, camelizeProperties, cloneDeep, pick, omit, isPlainObject, isObjectItem, isPromise, callListeners, zhCN, zhTW, enUS, format, resolveLocaleName, type ProLocale, type ProLocaleName, type ProLocaleKey, type Data, type Path, type Paths, type KeyExpandString, type ExtendWithAny, type DeepPartial, type PageParam, type Fields, type Form, type Table, type UseFieldsReturn, type UseFormDataReturn, type UseFormRefReturn, } from '@qin-ui/pro-components-core';
 //# sourceMappingURL=index.d.ts.map

package/es/shared/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/core/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,iBAAiB,EACtB,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,oBAAoB,EACpB,2BAA2B,EAC3B,WAAW,EACX,UAAU,EACV,gBAAgB,EAEhB,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,MAAM,EACN,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,SAAS,EAET,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,iBAAiB,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/core/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,iBAAiB,EACtB,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,oBAAoB,EACpB,2BAA2B,EAC3B,WAAW,EACX,UAAU,EACV,gBAAgB,EAEhB,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,SAAS,EACT,aAAa,EAEb,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,iBAAiB,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,6BAA6B,CAAC"}

package/es/shared/ui/index.d.ts

@@ -1,7 +1,7 @@
 import { FormProps as _FormProps, Table, TableProps as _TableProps } from 'ant-design-vue';
 import { ComponentProps } from 'vue-component-type-helpers';
 import { Options } from 'scroll-into-view-if-needed';
-export { theme, Form, FormItem, Row as Grid, Col as GridItem, Table, Space, MenuDivider, Dropdown, Menu, MenuItem, Checkbox, Button, Cascader, CheckboxGroup, DatePicker, Input, InputNumber, InputPassword, InputSearch, RadioGroup, Select, Slider, Switch, Textarea, TimePicker, Transfer, TreeSelect, RangePicker, Tooltip, type FormItemInstance, type FormInstance, type RowProps as GridProps, type ColProps as GridItemProps, type FormItemProps, type PaginationProps, } from 'ant-design-vue';
+export { theme, Form, FormItem, Row as Grid, Col as GridItem, Table, TableColumn, Space, MenuDivider, Dropdown, Menu, MenuItem, Checkbox, Button, Cascader, CheckboxGroup, DatePicker, Input, InputNumber, InputPassword, InputSearch, RadioGroup, Select, Slider, Switch, Textarea, TimePicker, Transfer, TreeSelect, RangePicker, Tooltip, type FormItemInstance, type FormInstance, type RowProps as GridProps, type ColProps as GridItemProps, type FormItemProps, type PaginationProps, } from 'ant-design-vue';
 export { type ColumnType, tableProps } from 'ant-design-vue/es/table';
 export type { TooltipProps } from 'ant-design-vue';
 export { type RangePickerProps } from 'ant-design-vue/es/date-picker';

package/es/shared/ui/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/ui/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,IAAI,UAAU,EACvB,KAAK,EACL,UAAU,IAAI,WAAW,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,GAAG,IAAI,IAAI,EACX,GAAG,IAAI,QAAQ,EACf,KAAK,EACL,KAAK,EACL,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW,EACX,UAAU,EACV,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,EACX,OAAO,EACP,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,QAAQ,IAAI,SAAS,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,KAAK,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,GAAG;IAC/D,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,0BAA0B,CAAC,EAAE,cAAc,CACzC,OAAO,KAAK,CACb,CAAC,0BAA0B,CAAC,CAAC;CAC/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/ui/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,IAAI,UAAU,EACvB,KAAK,EACL,UAAU,IAAI,WAAW,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,GAAG,IAAI,IAAI,EACX,GAAG,IAAI,QAAQ,EACf,KAAK,EACL,WAAW,EACX,KAAK,EACL,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW,EACX,UAAU,EACV,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,EACX,OAAO,EACP,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,QAAQ,IAAI,SAAS,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,KAAK,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,GAAG;IAC/D,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,0BAA0B,CAAC,EAAE,cAAc,CACzC,OAAO,KAAK,CACb,CAAC,0BAA0B,CAAC,CAAC;CAC/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "二次封装antd vue组件",
   "bin": {
     "antd-vue-pro": "./bin/init-ai.mjs"
@@ -44,7 +44,7 @@
   "dependencies": {
     "scroll-into-view-if-needed": "^3.1.0",
     "vue-component-type-helpers": "^3.2.5",
-    "@qin-ui/pro-components-core": "^2.1.2"
+    "@qin-ui/pro-components-core": "^2.2.0"
   },
   "devDependencies": {
     "@types/node": "^24",

package/src/components/component-provider/components/index.vue

@@ -36,8 +36,8 @@ import {
   ensureInjectConfig,
 } from '../constants';
 import type { ComponentVars } from '../types';
-import { computed, provide } from 'vue';
-import { getObject, omit } from '../../../shared/core';
+import { computed, inject, provide, toValue, type InjectionKey } from 'vue';
+import { getObject, mergeComponentVars, omit } from '../../../shared/core';
 import type { ComponentName } from '../../form/constants';
 import { LOCALE_INJECT_KEY, type ProLocale } from '../../../locale';
 
@@ -77,20 +77,25 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 /*
- * 遍历 componentVars 的每个 key，获取或创建对应的 inject 配置
- * 将用户提供的值合并到默认值上，剔除该注入项的不可注入键后通过 provide 响应式注入到子组件树
+ * 遍历 componentVars 的每个 key，读取祖先注入值与本层配置合并后向下 provide
+ * 合并顺序为内置默认值 → 祖先注入值 → 本层 componentVars，剔除该注入项的不可注入键
  * 子组件通过 inject(config.injectionKey) 获取合并后的计算属性配置
  */
 (Object.keys(INJECT_CONFIG) as Array<keyof typeof INJECT_CONFIG>).forEach(
   key => {
     const config = INJECT_CONFIG[key];
     const ignored = config.ignoreProps;
+    const parentConfig = inject(
+      config.injectionKey as InjectionKey<any>,
+      undefined
+    );
     provide(
       config.injectionKey,
       computed(() =>
         omit(
           {
             ...config.default,
+            ...(toValue(parentConfig) || {}),
             ...getObject(props.componentVars?.[key as keyof ComponentVars]),
           },
           ignored ?? []
@@ -105,10 +110,14 @@ if (props.componentVars) {
   Object.keys(props.componentVars).forEach(key => {
     if (!(key in INJECT_CONFIG)) {
       const config = ensureInjectConfig(key);
+      const parentConfig = inject(
+        config.injectionKey as InjectionKey<any>,
+        undefined
+      );
       provide(
         config.injectionKey,
         computed(() => ({
-          ...config.default,
+          ...(toValue(parentConfig) || {}),
           ...getObject((props.componentVars as any)?.[key]),
         }))
       );
@@ -116,22 +125,36 @@ if (props.componentVars) {
   });
 }
 
+const parentComponentVars = inject(INJECT_COMPONENT_VARS, undefined);
 // 全量 componentVars：自定义组件键在运行期新增后同样可被子组件读取
 provide(
   INJECT_COMPONENT_VARS,
-  computed(() => (props.componentVars as Record<string, any>) ?? {})
+  computed(() =>
+    mergeComponentVars(
+      toValue(parentComponentVars),
+      props.componentVars as Record<string, any>
+    )
+  )
 );
 
+const parentComponents = inject(INJECT_COMPONENTS, undefined);
 // 注入自定义组件映射，BaseField 在解析组件时会优先使用此映射
 provide(
   INJECT_COMPONENTS,
-  computed(() => props.componentMap)
+  computed(() => ({
+    ...(toValue(parentComponents) || {}),
+    ...(props.componentMap ?? {}),
+  }))
 );
 
+const parentLocale = inject(LOCALE_INJECT_KEY, undefined);
 // 注入内置文案覆盖，useLocale 在解析文案时会优先使用
 provide(
   LOCALE_INJECT_KEY,
-  computed(() => props.locale)
+  computed(() => ({
+    ...(toValue(parentLocale) || {}),
+    ...(props.locale ?? {}),
+  }))
 );
 </script>
 

package/src/components/form/components/BaseField/index.vue

@@ -40,6 +40,7 @@ import {
 import {
   cloneDeep,
   getObject,
+  omitBy,
   useReactiveAttrs,
 } from '../../../../shared/core';
 import {
@@ -126,20 +127,23 @@ onBeforeUnmount(() => {
 const attrs: any = useReactiveAttrs();
 
 /**
- * 全局默认配置注入：key = 组件名 + picker 修饰段，inject 须在 setup 同步期调用。
+ * 全局默认配置注入：按组件名与 picker 修饰段分别解析注入通道，inject 须在 setup 同步期调用。
  * 组件名与 `picker` 仅取 setup 期初始值——运行期变更不会切换 Provider 的默认值预设
  * （`date-picker.month` 等子类型预设需在初始渲染前确定）。
+ * `date-picker` 的 picker 缺省时按 `date` 段解析子类型预设。
  */
 const pickerVal = attrs.picker;
-const injectConfigKey =
-  typeof props.component === 'string'
-    ? [props.component, pickerVal].filter(Boolean).join('.')
-    : '';
-const componentInjectConfig = injectConfigKey
-  ? getInjectConfig(injectConfigKey)
+const baseConfigKey =
+  typeof props.component === 'string' ? props.component : '';
+const pickerConfigKey =
+  pickerVal || (baseConfigKey === 'date-picker' ? 'date' : '');
+const subtypeConfigKey =
+  baseConfigKey && pickerConfigKey ? `${baseConfigKey}.${pickerConfigKey}` : '';
+const baseInjectConfig = baseConfigKey
+  ? getInjectConfig(baseConfigKey)
   : undefined;
-const rawInjectComponentProps = componentInjectConfig
-  ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default)
+const subtypeInjectConfig = subtypeConfigKey
+  ? getInjectConfig(subtypeConfigKey)
   : undefined;
 // 全量 componentVars：运行期新增的自定义组件键由此兜底读取
 const componentVars = inject(INJECT_COMPONENT_VARS, undefined);
@@ -197,9 +201,12 @@ const parentDisabled = useInjectDisabled();
  * 属性分为三类：绑定属性（v-model）、组件属性（传递给组件）、插槽（动态渲染）
  */
 const groupedAttrs = computed(() => {
+  // 库内置默认（基础键 → 子类型键）之后再铺项目配置，项目配置始终覆盖库默认
   const currentInjectProps = {
-    ...(toValue(rawInjectComponentProps) || {}),
-    ...getObject(toValue(componentVars)?.[injectConfigKey]),
+    ...getObject(baseInjectConfig?.default),
+    ...getObject(subtypeInjectConfig?.default),
+    ...getObject(toValue(componentVars)?.[baseConfigKey]),
+    ...getObject(toValue(componentVars)?.[subtypeConfigKey]),
   };
   const initProps = getInitProps(
     { component: props.component, picker: attrs.picker } as Field,
@@ -207,9 +214,11 @@ const groupedAttrs = computed(() => {
     t
   );
   const effectiveModelProp = attrs.modelProp ?? initProps.modelProp ?? 'value';
+  // 未赋值（undefined）的键不作为显式值下发，保留注入默认值与占位符兜底
+  const definedAttrs = omitBy(attrs, value => value === undefined);
   const mergedProps = mergeProps(
     initProps,
-    attrs,
+    definedAttrs,
     { class: attrs.componentClass, style: attrs.componentStyle },
     { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
     { modelProp: effectiveModelProp }

package/src/components/form/components/BaseField/utils/index.ts

@@ -29,8 +29,7 @@ const getPlaceholderProps = (
 /**
  * 解析字段的 Provider 默认属性
  *
- * @description 仅字符串组件名取注入值（含 `date-picker` 子类型段）；组件对象无注入配置，返回空对象。
- * `date-picker` 不拼接 `picker` 段，其子类型预设由注入 key 在 BaseField 内单独解析
+ * @description 仅字符串组件名取注入值；占位符兜底按基础组件名解析，组件对象无注入配置，返回空对象。
  *
  * @param field - 字段配置项
  * @param injectProps - 该组件名对应的 Provider 注入默认值
@@ -43,10 +42,11 @@ export const getInitProps = (
   t: LocaleT
 ): Record<string, any> => {
   const { component } = field as any;
-  const picker = component === 'date-picker' ? '' : (field as any).picker;
   if (typeof component === 'string') {
-    const k = [component, picker].filter(Boolean).join('.');
-    return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
+    return {
+      ...injectProps,
+      ...getPlaceholderProps(component, injectProps, t),
+    };
   }
   return {};
 };

package/src/components/form/components/ProForm/index.vue

@@ -30,14 +30,14 @@
  * @param {...FormProps} ...attrs - Ant Design Vue Form 组件的其他属性
  *
  * @slot default - 默认插槽，可用于添加额外内容
- * @slot [path] - 以字段 path 命名的动态插槽，可用于自定义字段渲染
+ * @slot [path] - 以字段 path 命名的动态插槽，优先于 component 渲染；作用域含字段值 value、回写通道 onUpdate:value、disabled、path 与合并后的控件属性，可直接 v-bind 给控件
  *
  * @example
  * ```vue
  * <template>
  *   <ProForm :form="form" @submit="handleSubmit">
- *     <template #name="{ value, disabled }">
- *       <a-input :value="value" :disabled="disabled" />
+ *     <template #name="scoped">
+ *       <a-input v-bind="scoped" />
  *     </template>
  *   </ProForm>
  * </template>
@@ -101,7 +101,14 @@ const fields = computed(() => {
   return (Array.isArray(f) ? f : f?.value) ?? [];
 });
 const formData = computed(() => currentForm.value?.formData);
-const setFormRef = (el: any) => currentForm.value?.setFormRef?.(el);
+/*
+ * ref 回调按渲染期实例路由：卸载回调（null）写回该子树所属表单，
+ * 运行期替换 :form 后旧实例的 formRef 同步清空
+ */
+const formRefSetter = computed(() => {
+  const form = currentForm.value;
+  return (el: any) => form?.setFormRef?.(el);
+});
 
 /*
  * formKey 子树重挂载契约：以 WeakMap 为每个 form 实例生成自增 key，绑定到原生 Form 的 :key
@@ -160,7 +167,7 @@ provide(InjectionFormSlotsKey, formSlotsRef);
 <template>
   <AForm
     :key="formKey"
-    :ref="setFormRef"
+    :ref="formRefSetter"
     :model="formData"
     v-bind="formAttrs"
     class="pro-form"

package/src/components/table/components/ProTable.vue

@@ -51,7 +51,7 @@
  * @slot search-form - 搜索区域插槽，作用域参数 form / search / reset
  * @slot button-bar - 表格头部按钮区插槽
  * @slot toolbar - 工具栏插槽
- * @slot default - 透传给宿主表格的默认插槽（可用于以宿主列组件声明列）
+ * @slot default - 透传给宿主表格的默认插槽；未显式绑定 `columns` 且表格实例无列时用于声明列，显式传入（含空数组）时以列配置为准
  * @slot table - 表格区域插槽，作用域参数 columns / dataSource / pagination / loading / size / onChange
  */
 import type {
@@ -59,15 +59,18 @@ import type {
   TableProps,
   ColumnType,
 } from '../../../shared/ui';
-import { Table as ATable, tableProps } from '../../../shared/ui';
+import { Table as ATable, TableColumn, tableProps } from '../../../shared/ui';
 import {
   computed,
   getCurrentInstance,
   nextTick,
   onMounted,
+  onUpdated,
   inject,
   ref,
+  shallowRef,
   toValue,
+  triggerRef,
   watch,
   type Slot,
 } from 'vue';
@@ -81,6 +84,7 @@ import { useLocale } from '../../../locale';
 import type { Path } from '../../../shared/core';
 import {
   camelizeProperties,
+  callListeners,
   getObject,
   isObjectItem,
   isPlainObject,
@@ -210,16 +214,21 @@ const _search = async () => {
   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') as
+      | PromiseRejectedResult
+      | undefined;
+    if (rejected) throw rejected.reason;
   } finally {
     if (seq === searchSequence) {
       loading.value = false;
@@ -254,9 +263,17 @@ type TableSlots = Omit<ComponentSlots<typeof ATable>, 'bodyCell'> &
       column: Column<RecordType>;
     }) => void;
   }>;
-type Slots = Omit<TableSlots & CustomSlots, 'default'>;
+type Slots = Omit<TableSlots & CustomSlots, 'default'> & {
+  /** 透传宿主表格的默认插槽，用于以宿主列组件声明列 */
+  default?: Slot;
+};
 
 const slots = defineSlots<Slots>();
+/* 默认插槽存在性随父级重渲染更新：运行期增删插槽后插槽列模式可感知 */
+const slotsRef = shallowRef<Record<string, any>>(slots);
+onUpdated(() => {
+  triggerRef(slotsRef);
+});
 const forwardedSlotNames = () =>
   (Object.keys(slots) as Array<Extract<keyof Slots, string>>).filter(
     name => !customSlotNames.includes(name as any)
@@ -366,13 +383,32 @@ const indexColumn = computed<ColumnType>(() => ({
   customRender: ({ index }) => getIndex(index),
 }));
 
+/** 插槽序号列的单元格渲染：按有效分页偏移行号 */
+const slotIndexRender = ({ index }: { index: number }) => getIndex(index);
+
 // 列来源优先级：显式绑定 > table 实例（useTable 创建的 columns）；显式列原样透传，不补齐 key
-const computedColumns = computed<Columns<RecordType>>(() => {
-  const cols = (resolveOwnedProp('columns') ??
+const columnSource = computed<any[]>(() => {
+  return (resolveOwnedProp('columns') ??
     toValue(props.table?.columns) ??
-    []) as any;
-  const needIndex = props.addIndexColumn ?? injectProps.value.addIndexColumn;
-  return needIndex ? [indexColumn.value, ...cols] : cols;
+    []) as any[];
+});
+
+/* 无列源且存在默认插槽时由宿主消费插槽列，序号列改由插槽内的列组件提供 */
+const slotColumnsMode = computed(
+  () =>
+    !hasExplicitColumns.value &&
+    Boolean(slotsRef.value.default) &&
+    columnSource.value.length === 0
+);
+const indexEnabled = computed(() =>
+  Boolean(props.addIndexColumn ?? injectProps.value.addIndexColumn)
+);
+
+const computedColumns = computed<Columns<RecordType>>(() => {
+  if (slotColumnsMode.value) return [];
+  return indexEnabled.value
+    ? [indexColumn.value, ...columnSource.value]
+    : columnSource.value;
 });
 
 const ellipsisTooltipValue = computed(
@@ -397,6 +433,11 @@ const {
   () => ellipsisTooltipGlobal.value
 );
 
+/* 宿主列绑定：插槽列模式下不下发列配置，其余模式始终以列配置为准 */
+const hostColumns = computed(() =>
+  slotColumnsMode.value ? undefined : visibleComputedColumns.value
+);
+
 /*
  * 下发给宿主表格的属性：Provider 注入为底（其不可注入键已在注入层剔除），调用方绑定与 v-model 透传值覆盖同键。
  * size / loading 为声明模型，其 onUpdate:* 回写通道不进入 attrs，无需另行剔除
@@ -535,8 +576,11 @@ const onTableChange: TableProps['onChange'] = (...args) => {
   } else if (sorterArg) {
     nextArgs[2] = resolveSorterColumn(sorterArg);
   }
-  (attrs.onChange ?? injectProps.value.onChange)?.(...nextArgs);
-  _search();
+  try {
+    callListeners(attrs.onChange ?? injectProps.value.onChange, ...nextArgs);
+  } finally {
+    _search();
+  }
 };
 
 const searchFormVisible = computed(() => {
@@ -664,7 +708,7 @@ defineExpose({
           class="pro-table_content"
           v-bind="computedTableProps"
           :loading="loading"
-          :columns="visibleComputedColumns"
+          :columns="hostColumns"
           :data-source="computedDataSource"
           :pagination="computedPagination"
           @change="onTableChange"
@@ -674,8 +718,19 @@ defineExpose({
             :key="name"
             #[name]="scoped"
           >
+            <template v-if="name === 'default'">
+              <TableColumn
+                v-if="slotColumnsMode && indexEnabled"
+                key="__INDEX__"
+                :title="t('table.index')"
+                :width="80"
+                data-index="__INDEX__"
+                :custom-render="slotIndexRender"
+              />
+              <slot name="default" v-bind="scoped || {}" />
+            </template>
             <slot
-              v-if="isSlotRenderable(name, scoped)"
+              v-else-if="isSlotRenderable(name, scoped)"
               :name="name"
               v-bind="scoped"
             />
@@ -701,15 +756,12 @@ defineExpose({
     display: flex;
     align-items: center;
     justify-content: flex-end;
+    margin-bottom: 8px;
 
     &:empty {
       display: none;
     }
 
-    & + &_content {
-      margin-top: 16px;
-    }
-
     &_button-bar {
       flex: 1;
     }

package/src/components/table/hooks/useEllipsisTooltipColumns.ts

@@ -6,6 +6,8 @@ type ColumnTransformResult = {
   columns: any[];
   changed: boolean;
   hasTooltip: boolean;
+  // 本层是否有列因环状引用被剔除
+  cycleSkipped: boolean;
 };
 
 /**
@@ -58,6 +60,7 @@ export function useEllipsisTooltipColumns(
     const list: any[] = [];
     let changed = false;
     let hasTooltip = false;
+    let cycleSkipped = false;
 
     for (const column of columns) {
       if (!isObjectItem(column) || toValue(column.hidden)) {
@@ -72,6 +75,7 @@ export function useEllipsisTooltipColumns(
       if (Array.isArray(column.children) && column.children.length > 0) {
         if (ancestors.has(column)) {
           changed = true;
+          cycleSkipped = true;
           continue;
         }
         ancestors.add(column);
@@ -80,6 +84,12 @@ export function useEllipsisTooltipColumns(
         childChanged = child.changed;
         childColumns = child.columns;
         childHasTooltip = child.hasTooltip;
+        cycleSkipped = cycleSkipped || child.cycleSkipped;
+        // 子列全部被过滤后分组列整体移除；环状引用剔除时保留为叶子列
+        if (childColumns.length === 0 && !child.cycleSkipped) {
+          changed = true;
+          continue;
+        }
       }
 
       const ellipsis = column.ellipsis;
@@ -125,7 +135,12 @@ export function useEllipsisTooltipColumns(
       list.push(next);
     }
 
-    return { columns: changed ? list : columns, changed, hasTooltip };
+    return {
+      columns: changed ? list : columns,
+      changed,
+      hasTooltip,
+      cycleSkipped,
+    };
   };
 
   const state = computed(() => transformColumns(getColumns(), globalEnabled()));

package/src/components/table/types/index.ts

@@ -112,6 +112,7 @@ export type Column<D extends Data = Data> = Omit<
   /**
    * 列是否隐藏；支持布尔、Ref 与 ComputedRef 形式，渲染期按 `toValue` 取值。
    * 分组列的子列同样参与过滤（递归生效）。
+   * 只读 ref（如 `computed`）经 `setColumn` 写入时会被普通值替换，可写 ref 保持绑定。
    * @default false
    */
   hidden?: MaybeRefOrComputedRef<boolean>;

package/src/shared/core/index.ts

@@ -23,6 +23,7 @@ export {
   InjectionFormSlotsKey,
   // utils
   getObject,
+  mergeComponentVars,
   omitBy,
   get,
   set,
@@ -35,6 +36,7 @@ export {
   isPlainObject,
   isObjectItem,
   isPromise,
+  callListeners,
   // locale
   zhCN,
   zhTW,

package/src/shared/ui/index.ts

@@ -13,6 +13,7 @@ export {
   Row as Grid,
   Col as GridItem,
   Table,
+  TableColumn,
   Space,
   MenuDivider,
   Dropdown,