@qin-ui/element-plus-pro 1.3.3 → 1.3.4

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

@@ -1,6 +1,5 @@
 /**
- * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容，
- * 避免直接散列依赖 @qin-ui/pro-components-core，便于将来统一维护。
+ * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容。
  */
 export { useForm, createFormProxy, useTable, useSearchFormExpand, useFields, useFormData, useFormRef, InjectionFormKey, InjectionFormSlotsKey, getObject, get, set, normalizePathKey, toPath, camelizeProperties, cloneDeep, pick, isPlainObject, 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';
 //# 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;;;GAGG;AACH,OAAO,EAEL,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EAEV,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,aAAa,EACb,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,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EAEV,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,aAAa,EACb,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"}

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

@@ -1,6 +1,6 @@
-import { ElForm as Form, ElFormItem as FormItem, ElRow as Grid, ElCol as GridItem, ElTable as Table, ElTableColumn as TableColumn, ElSpace as Space, ElDropdown as Dropdown, ElDropdownMenu as DropdownMenu, ElDropdownItem as DropdownItem, ElCheckbox as Checkbox, ElCheckboxGroup as CheckboxGroup, ElButton as Button, ElAutocomplete as AutoComplete, ElCascader as Cascader, ElDatePicker as DatePicker, ElInput as Input, ElInputNumber as InputNumber, ElSelect as Select, ElSlider as Slider, ElSwitch as Switch, ElTransfer as Transfer, ElTreeSelect as TreeSelect, ElRadioGroup as RadioGroup, ElTimePicker as TimePicker, ElTimeSelect as TimeSelect, ElPagination as Pagination, FormItemInstance, FormInstance, FormProps, FormItemProps, TableProps as _TableProps, TableColumnCtx as ColumnType, PaginationProps, RowProps as GridProps, ColProps as GridItemProps } from 'element-plus';
+import { ElForm as Form, ElFormItem as FormItem, ElRow as Grid, ElCol as GridItem, ElTable as Table, ElTableColumn as TableColumn, ElSpace as Space, ElDropdown as Dropdown, ElDropdownMenu as DropdownMenu, ElDropdownItem as DropdownItem, ElCheckbox as Checkbox, ElCheckboxGroup as CheckboxGroup, ElButton as Button, ElAutocomplete as AutoComplete, ElCascader as Cascader, ElDatePicker as DatePicker, ElInput as Input, ElInputNumber as InputNumber, ElSelect as Select, ElSlider as Slider, ElSwitch as Switch, ElTransfer as Transfer, ElTreeSelect as TreeSelect, ElRadioGroup as RadioGroup, ElTimePicker as TimePicker, ElTimeSelect as TimeSelect, ElPagination as Pagination, FormItemInstance, FormInstance, FormProps, FormItemProps, TableProps as _TableProps, TableEmits, TableColumnCtx as ColumnType, PaginationProps, RowProps as GridProps, ColProps as GridItemProps } from 'element-plus';
 import { MaybeRefOrGetter } from 'vue';
-export { Form, FormItem, Grid, GridItem, Table, TableColumn, Space, Dropdown, DropdownMenu, DropdownItem, Checkbox, CheckboxGroup, Button, AutoComplete, Cascader, DatePicker, Input, InputNumber, Select, Slider, Switch, Transfer, TreeSelect, RadioGroup, TimePicker, TimeSelect, Pagination, type FormItemInstance, type FormInstance, type FormProps, type FormItemProps, type PaginationProps, type GridProps, type GridItemProps, type ColumnType, };
+export { Form, FormItem, Grid, GridItem, Table, TableColumn, Space, Dropdown, DropdownMenu, DropdownItem, Checkbox, CheckboxGroup, Button, AutoComplete, Cascader, DatePicker, Input, InputNumber, Select, Slider, Switch, Transfer, TreeSelect, RadioGroup, TimePicker, TimeSelect, Pagination, type FormItemInstance, type FormInstance, type FormProps, type FormItemProps, type PaginationProps, type GridProps, type GridItemProps, type ColumnType, type TableEmits, };
 export type TableProps = _TableProps<any>;
 export declare const tableProps: () => any;
 export declare const paginationProps: () => any;

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,EACL,MAAM,IAAI,IAAI,EACd,UAAU,IAAI,QAAQ,EACtB,KAAK,IAAI,IAAI,EACb,KAAK,IAAI,QAAQ,EACjB,OAAO,IAAI,KAAK,EAChB,aAAa,IAAI,WAAW,EAC5B,OAAO,IAAI,KAAK,EAChB,UAAU,IAAI,QAAQ,EACtB,cAAc,IAAI,YAAY,EAC9B,cAAc,IAAI,YAAY,EAC9B,UAAU,IAAI,QAAQ,EACtB,eAAe,IAAI,aAAa,EAChC,QAAQ,IAAI,MAAM,EAClB,cAAc,IAAI,YAAY,EAC9B,UAAU,IAAI,QAAQ,EACtB,YAAY,IAAI,UAAU,EAC1B,OAAO,IAAI,KAAK,EAChB,aAAa,IAAI,WAAW,EAC5B,QAAQ,IAAI,MAAM,EAClB,QAAQ,IAAI,MAAM,EAClB,QAAQ,IAAI,MAAM,EAClB,UAAU,IAAI,QAAQ,EACtB,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAE1B,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,IAAI,WAAW,EAC9B,KAAK,cAAc,IAAI,UAAU,EACjC,KAAK,eAAe,EACpB,KAAK,QAAQ,IAAI,SAAS,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,gBAAgB,EAAsC,MAAM,KAAK,CAAC;AAEhF,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,KAAK,EACL,WAAW,EACX,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,GAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;AAO1C,eAAO,MAAM,UAAU,WAAoB,CAAC;AAC5C,eAAO,MAAM,eAAe,WAAyB,CAAC;AACtD,eAAO,MAAM,aAAa,WAAuB,CAAC;AAClD,eAAO,MAAM,aAAa,WAAuB,CAAC;AAIlD,eAAO,MAAM,kBAAkB,0CAS9B,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,UAAU,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,SAMhD,CAAC;AAEF,eAAO,MAAM,iBAAiB,0CAAqB,CAAC;AACpD,eAAO,MAAM,mBAAmB,aATpB,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,SASY,CAAC;AAE9D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/ui/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,IAAI,IAAI,EACd,UAAU,IAAI,QAAQ,EACtB,KAAK,IAAI,IAAI,EACb,KAAK,IAAI,QAAQ,EACjB,OAAO,IAAI,KAAK,EAChB,aAAa,IAAI,WAAW,EAC5B,OAAO,IAAI,KAAK,EAChB,UAAU,IAAI,QAAQ,EACtB,cAAc,IAAI,YAAY,EAC9B,cAAc,IAAI,YAAY,EAC9B,UAAU,IAAI,QAAQ,EACtB,eAAe,IAAI,aAAa,EAChC,QAAQ,IAAI,MAAM,EAClB,cAAc,IAAI,YAAY,EAC9B,UAAU,IAAI,QAAQ,EACtB,YAAY,IAAI,UAAU,EAC1B,OAAO,IAAI,KAAK,EAChB,aAAa,IAAI,WAAW,EAC5B,QAAQ,IAAI,MAAM,EAClB,QAAQ,IAAI,MAAM,EAClB,QAAQ,IAAI,MAAM,EAClB,UAAU,IAAI,QAAQ,EACtB,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAC1B,YAAY,IAAI,UAAU,EAE1B,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,IAAI,WAAW,EAC9B,KAAK,UAAU,EACf,KAAK,cAAc,IAAI,UAAU,EACjC,KAAK,eAAe,EACpB,KAAK,QAAQ,IAAI,SAAS,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,gBAAgB,EAAsC,MAAM,KAAK,CAAC;AAEhF,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,KAAK,EACL,WAAW,EACX,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,UAAU,GAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;AAO1C,eAAO,MAAM,UAAU,WAAoB,CAAC;AAC5C,eAAO,MAAM,eAAe,WAAyB,CAAC;AACtD,eAAO,MAAM,aAAa,WAAuB,CAAC;AAClD,eAAO,MAAM,aAAa,WAAuB,CAAC;AAIlD,eAAO,MAAM,kBAAkB,0CAS9B,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,UAAU,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,SAMhD,CAAC;AAEF,eAAO,MAAM,iBAAiB,0CAAqB,CAAC;AACpD,eAAO,MAAM,mBAAmB,aATpB,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,SASY,CAAC;AAE9D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/element-plus-pro",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "基于 element-plus 的二次封装组件",
   "bin": {
     "element-plus-pro": "./bin/init-ai.mjs"
@@ -39,11 +39,11 @@
   },
   "dependencies": {
     "vue-component-type-helpers": "^3.2.5",
-    "@qin-ui/pro-components-core": "^2.0.2"
+    "@qin-ui/pro-components-core": "^2.0.3"
   },
   "devDependencies": {
     "@vue/test-utils": "^2.4.11",
-    "element-plus": "^2.13.6",
+    "element-plus": "^2.14.5",
     "happy-dom": "^20.11.6",
     "vitest": "^4.1.11"
   },

package/src/components/component-provider/constants/index.ts

@@ -122,6 +122,18 @@ export const INJECT_CONFIG: {
     injectionKey: Symbol(''),
     default: { style: { width: '100%' } },
   },
+  'date-picker.quarter': {
+    injectionKey: Symbol(''),
+    default: { style: { width: '100%' } },
+  },
+  'date-picker.quarters': {
+    injectionKey: Symbol(''),
+    default: { style: { width: '100%' } },
+  },
+  'date-picker.quarterrange': {
+    injectionKey: Symbol(''),
+    default: { style: { width: '100%' } },
+  },
   'date-picker.datetime': {
     injectionKey: Symbol(''),
     default: { style: { width: '100%' } },

package/src/components/component-provider/types/index.ts

@@ -11,6 +11,7 @@ import { ProFormProps } from '../../form';
 import type { SearchFormProps } from '../../table/components/SearchForm.vue';
 import { AllowedComponentProps } from 'vue';
 import type { ComponentProps } from 'vue-component-type-helpers';
+import { ColumnControlConfig } from 'src/components/table/types';
 
 type PP<T extends Record<string, any>> = Partial<T & AllowedComponentProps>;
 
@@ -33,7 +34,12 @@ export type RequiredComponentVars = {
   'pro-table': PP<
     TableProps & {
       pagination?: false | Partial<PaginationProps>;
-      control?: boolean | { sizeControl?: boolean; columnControl?: boolean };
+      control?:
+        | boolean
+        | {
+            sizeControl?: boolean;
+            columnControl?: boolean | ColumnControlConfig;
+          };
       searchFormConfig?: Partial<Omit<SearchFormProps, 'form'>> & {
         hidden?: boolean;
         container?: ContainerComponent | false;

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

@@ -68,7 +68,11 @@ const componentRef = ref<any>();
 
 const attrs: any = useAttrs();
 
-// 全局默认配置注入：key = 组件名 + type 修饰段；inject 须在 setup 同步期调用
+/**
+ * 全局默认配置注入：key = 组件名 + type 修饰段，inject 须在 setup 同步期调用。
+ * 组件名与 `type` 仅取 setup 期初始值——运行期变更不会切换 Provider 的默认值预设
+ * （`date-picker.month` 等子类型预设需在初始渲染前确定）。
+ */
 const typeVal = attrs.type;
 const injectConfigKey =
   typeof props.component === 'string'
@@ -114,6 +118,13 @@ const value = computed({
       newVal = setFormatter(val, oldVal);
     }
     form.setFormData?.(props.path, newVal);
+    // 字段配置/attrs 传入的 onUpdate:* 监听器与内部写值组合回放，参数为组件原始 emit 值
+    const { onUpdateValue } = groupedAttrs.value;
+    if (typeof onUpdateValue === 'function') {
+      onUpdateValue(val);
+    } else if (Array.isArray(onUpdateValue)) {
+      onUpdateValue.forEach(listener => listener(val));
+    }
   },
 });
 
@@ -148,7 +159,7 @@ const groupedAttrs = computed(() => {
 
   // prettier-ignore
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [modelPropName]: _modelVal, [`onUpdate:${modelPropName}`]: _onUpdateModelVal, ...bindAttrs } = mergedProps as any;
+  const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [modelPropName]: _modelVal, [`onUpdate:${modelPropName}`]: onUpdateValue, ...bindAttrs } = mergedProps as any;
 
   return {
     attrs: bindAttrs,
@@ -156,6 +167,7 @@ const groupedAttrs = computed(() => {
     componentContainer,
     modelProp: modelPropName,
     valueFormatter,
+    onUpdateValue,
   };
 });
 

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

@@ -72,7 +72,7 @@ export const getInitProps = (
   return {};
 };
 
-/** 已告警过的未知组件名（模块级去重，避免 computed 重算导致刷屏） */
+/** 已告警过的未知组件名（模块级去重集合） */
 const warnedUnknownComponents = new Set<string>();
 
 export function warnUnknownComponent(name: string) {

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

@@ -82,6 +82,8 @@ const setFormItemRef = (field: any, el: any, formItemProps?: any) => {
     raw.getFormItemComputedProps = () => formItemProps;
   } else {
     formItemInstanceMap.delete(raw);
+    delete raw.getFormItemRef;
+    delete raw.getFormItemComputedProps;
   }
 };
 
@@ -96,6 +98,8 @@ const setComponentRef = (field: any, el: any) => {
       componentInstanceMap.get(raw)?.getComponentComputedProps();
   } else {
     componentInstanceMap.delete(raw);
+    delete raw.getComponentRef;
+    delete raw.getComponentComputedProps;
   }
 };
 

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

@@ -9,8 +9,8 @@
  *
  * 1. 数据隔离：ProForm 本身不负责存储和管理表单状态，所有核心状态（formData, fields, 校验规则）
  *    均交由底层的 `useForm`（@qin-ui/pro-components-core）驱动。
- * 2. 上下文透传：通过 `provide` 将核心状态下发给子组件，避免了深层嵌套的 Props 传递。
- * 3. 递归渲染：网格布局和具体字段的解析交由 `<BaseFormItem>` 递归完成，实现了 UI 布局与表单逻辑的解耦。
+ * 2. 上下文透传：通过 `provide` 将核心状态下发给子组件。
+ * 3. 递归渲染：网格布局和具体字段的解析交由 `<BaseFormItem>` 递归完成。
  *
  * 通过配置驱动的方式快速构建表单，支持：
  * - 字段联动、嵌套字段、自定义组件、网格布局
@@ -86,6 +86,10 @@ const fields = computed(() => {
 const formData = computed(() => currentForm.value?.formData);
 const setFormRef = (el: any) => currentForm.value?.setFormRef?.(el);
 
+/*
+ * formKey 子树重挂载契约：以 WeakMap 为每个 form 实例生成自增 key，绑定到原生 Form 的 :key
+ * :form 运行期替换为全新实例时强制整棵表单子树重新挂载，重置宿主校验状态与深层字段非受控状态
+ */
 let formInstanceCounter = 0;
 const formInstanceKeyMap = new WeakMap<object, number>();
 const getFormKey = (f: object) => {
@@ -129,6 +133,7 @@ provide(InjectionFormSlotsKey, slots);
 </script>
 
 <template>
+  <!-- el-form 渲染原生 form 元素，拦截回车触发的默认提交 -->
   <ElForm
     :key="formKey"
     :ref="setFormRef"

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

@@ -14,9 +14,10 @@ type Props = {
 };
 defineProps<Props>();
 
-// 可组件化渲染判定：VNode / 函数（含函数式组件）/ 组件定义对象；
-// 其余（string/number/boolean/null/undefined）一律按文本渲染，
-// 避免字符串返回值被 <component :is> 当作标签名解析
+/*
+ * 可组件化渲染判定：VNode / 函数（含函数式组件）/ 组件定义对象
+ * 其余（string/number/boolean/null/undefined）一律按文本渲染，不作为 <component :is> 的标签名解析
+ */
 const isRenderable = (c: Props['component']) =>
   c !== null &&
   c !== undefined &&

package/src/components/form/hooks/useGroupFieldAttrs.ts

@@ -17,6 +17,7 @@ const gridItemPropKeys = Object.keys(gridItemProps());
 // 模块级 Set：字段循环内 O(1) 命中，替代数组 includes 线性扫描
 const gridItemPropKeySet = new Set<string>(gridItemPropKeys);
 const formItemPropKeySet = new Set<string>(formItemPropKeys);
+const formItemSlotKeySet = new Set<string>(FORM_ITEM_SLOT_KEYS);
 
 export interface GroupedField {
   path: string;
@@ -89,7 +90,7 @@ export function useGroupFieldAttrs(validFields: ComputedRef<Field[]>) {
 
         Object.assign(componentProps, componentDataAttrs);
         Object.keys(slots).forEach(k => {
-          if (FORM_ITEM_SLOT_KEYS.includes(k as any)) {
+          if (formItemSlotKeySet.has(k)) {
             formItemSlots[k] = slots[k];
           } else {
             componentProps.slots[k] = slots[k];

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

@@ -290,10 +290,7 @@ type WithFields<D extends Data = Data> = WithRef<
 /**
  * @description 合并 FormItem 插槽与组件插槽
  */
-export type MergeSlots<
-  T extends abstract new (...args: any) => any,
-  CS = ComponentSlots<T>,
-> = Partial<{
+export type MergeSlots<T, CS = ComponentSlots<T>> = Partial<{
   [K in keyof FormItemSlots | keyof CS]: K extends keyof FormItemSlots
     ? FormItemSlots[K]
     : K extends keyof CS
@@ -306,10 +303,7 @@ export type MergeSlots<
  * @template T - Vue 组件类型
  * @template D - 数据对象类型
  */
-type WithComponent<
-  T extends abstract new (...args: any) => any,
-  D extends Data = Data,
-> = Omit<
+type WithComponent<T, D extends Data = Data> = Omit<
   WithCommon<Partial<ComponentProps<T>>, D>,
   keyof VNodeProps | 'slots'
 > & {

package/src/components/table/components/ColumnControl.vue

@@ -28,9 +28,10 @@ const { t } = useLocale();
 const checkAll = ref(false);
 const indeterminate = ref(false);
 
-const getColumnKey = (column: Column, index: number) => {
+const getColumnKey = (column: Column) => {
   const rawKey = column.key ?? column.prop;
-  if (rawKey === undefined || rawKey === null) return `__col_${index}`;
+  if (rawKey === undefined || rawKey === null || rawKey === '')
+    return undefined;
   return normalizePathKey(rawKey);
 };
 
@@ -43,39 +44,39 @@ const checkedColumnsOptions = computed<
     column: Column;
   }>
 >(() =>
-  props.columns
-    .map((item, index) => {
-      const key = getColumnKey(item, index);
-      // 默认排除内部序号列 __INDEX__ 及显式指定的 excludedKeys
-      const excluded =
-        key === '__INDEX__' ||
-        (item as any).type === 'index' ||
-        props.columnControl?.excludedKeys?.some(ek => String(ek) === key);
-      const disabled = props.columnControl?.disabledKeys?.some(
-        dk => String(dk) === key
-      );
-      const rawTitle = item.label ?? (item as any).title;
-      const titleLabel = typeof rawTitle === 'string' ? rawTitle : undefined;
-      const propLabel =
-        item.prop !== undefined && item.prop !== null
-          ? String(item.prop)
-          : undefined;
-      const label =
-        (props.columnControl?.labels?.[key] as string) ??
-        titleLabel ??
-        propLabel ??
-        key ??
-        t('table.columnFallback', { index: index + 1 });
-      return {
-        label,
-        value: key,
-        checked: !item.hidden || !!disabled,
-        disabled: !!disabled,
-        column: item,
-        excluded,
-      };
-    })
-    .filter(item => !item.excluded)
+  props.columns.flatMap(item => {
+    const key = getColumnKey(item);
+    // 无 key/prop 列不进入列控面板
+    if (key === undefined) return [];
+    // 默认排除内部序号列 __INDEX__ 及显式指定的 excludedKeys
+    if (
+      key === '__INDEX__' ||
+      (item as any).type === 'index' ||
+      props.columnControl?.excludedKeys?.some(ek => String(ek) === key)
+    )
+      return [];
+    const disabled =
+      props.columnControl?.disabledKeys?.some(dk => String(dk) === key) ??
+      false;
+    const rawTitle = item.label ?? (item as any).title;
+    const titleLabel = typeof rawTitle === 'string' ? rawTitle : undefined;
+    const propLabel =
+      item.prop !== undefined && item.prop !== null
+        ? String(item.prop)
+        : undefined;
+    const label =
+      (props.columnControl?.labels?.[key] as string) ??
+      titleLabel ??
+      propLabel ??
+      key;
+    return {
+      label,
+      value: key,
+      checked: !item.hidden || !!disabled,
+      disabled: !!disabled,
+      column: item,
+    };
+  })
 );
 
 /** 可被用户勾选/取消的列（非 disabled） */

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

@@ -37,6 +37,7 @@ import {
   type PaginationProps,
   Table as ElTable,
   type TableProps,
+  type TableEmits,
   tableProps,
   paginationProps,
 } from '../../../shared/ui';
@@ -119,7 +120,11 @@ type Props = {
   columns?: Columns<RecordType>;
   data?: RecordType[];
   pagination?: false | Partial<PaginationProps>;
-} & Omit<TableProps, 'data'>;
+} & /* @vue-ignore */ Omit<TableProps, 'data'>;
+
+type Emits = {} & /* @vue-ignore */ TableEmits<RecordType>;
+
+defineEmits<Emits>();
 
 const props = withDefaults(defineProps<Props>(), {
   table: undefined,
@@ -142,8 +147,36 @@ const injectProps = computed(() => toValue(injectPropsRaw) || {});
 
 const attrs = useAttrs() as Record<string, any>;
 
+const PRO_TABLE_EXCLUDED_ATTR_KEYS = new Set([
+  'class',
+  'style',
+  'onSearch',
+  'onChange',
+  'onUpdate:size',
+  'onUpdate:loading',
+  'data',
+  'columns',
+  'size',
+  'pagination',
+]);
+
+const PRO_TABLE_PROVIDER_KEYS = new Set([
+  'pagination',
+  'searchFormConfig',
+  'control',
+  'immediateSearch',
+  'addIndexColumn',
+  'tableContainer',
+]);
+
 const injectTableAttrs = computed(() => {
-  return pick(injectProps.value, tableProperties) as Partial<TableProps>;
+  const tableConfig: Record<string, any> = {};
+  for (const [key, value] of Object.entries(injectProps.value)) {
+    if (!PRO_TABLE_PROVIDER_KEYS.has(key)) {
+      tableConfig[key] = value;
+    }
+  }
+  return tableConfig as Partial<TableProps>;
 });
 
 const attrsTableProps = computed(() => {
@@ -153,6 +186,16 @@ const attrsTableProps = computed(() => {
   ) as Partial<TableProps>;
 });
 
+const restTableAttrs = computed(() => {
+  const rest: Record<string, any> = {};
+  for (const [key, value] of Object.entries(attrs)) {
+    if (!PRO_TABLE_EXCLUDED_ATTR_KEYS.has(key)) {
+      rest[key] = value;
+    }
+  }
+  return rest;
+});
+
 const size = defineModel<TableProps['size']>('size');
 const loading = defineModel<boolean>('loading', { default: false });
 
@@ -263,9 +306,13 @@ const computedDataSource = computed<any[]>(() => {
 const computedTableProps = computed<TableProps>(() => {
   const merged = {
     ...injectTableAttrs.value,
+    ...restTableAttrs.value,
     ...attrsTableProps.value,
   } as TableProps;
   delete (merged as any).data;
+  delete (merged as any).columns;
+  delete (merged as any).size;
+  delete (merged as any).pagination;
   return merged;
 });
 
@@ -313,6 +360,7 @@ const onCurrentChange = (current: number) => {
   _search();
 };
 
+// 改变 pageSize 时重置回第 1 页并重新查询
 const onSizeChange = (pageSize: number) => {
   props.table?.setPageParam?.({ pageSize, current: 1 });
   _search();

package/src/components/table/components/SearchForm.vue

@@ -46,7 +46,7 @@ export type SearchFormProps = {
  *
  * 1. 内部渲染 ProForm，使用 table.searchForm 管理搜索条件
  * 2. 支持 grid（网格）和 inline（行内）两种布局
- * 3. 网格布局下支持展开/折叠：通过 IntersectionObserver 自动检测哪些字段溢出
+ * 3. 网格布局下支持展开/折叠（溢出检测与初值自动展开见下方机制说明）
  * 4. 提供搜索、重置、展开/折叠按钮（支持自定义）
  *
  * ## 展开/折叠机制

package/src/components/table/index.ts

@@ -1,38 +1,18 @@
-import type { ComponentPublicInstance } from 'vue';
-import type { PaginationProps, TableProps } from '../../shared/ui';
-import type { ContainerComponent } from '../form/types';
-import type { Columns } from './types';
-import type { SearchFormProps } from './components/SearchForm.vue';
-import type { Table } from './useTable';
+import type {
+  ComponentExposed,
+  ComponentProps,
+} from 'vue-component-type-helpers';
 import ProTable from './components/ProTable.vue';
 
-type Control = { sizeControl: boolean; columnControl: boolean };
-type SearchFormConfig = Omit<SearchFormProps, 'form'> & {
-  hidden?: boolean;
-  container?: ContainerComponent | false;
-};
+// 仅导出组件 Props 与实例类型，不导出裸组件
+export type ProTableProps = ComponentProps<typeof ProTable>;
+export type ProTableInstance = ComponentExposed<typeof ProTable>;
 
-type ReturnTableRecord<V> = V extends Table<any, infer R> ? R : any;
-
-// instance
-export type ProTableProps<T extends Table<any> = Table> = {
-  table?: T;
-  search?: () => Promise<unknown>;
-  addIndexColumn?: boolean;
-  immediateSearch?: boolean;
-  control?: boolean | Partial<Control>;
-  searchFormConfig?: SearchFormConfig;
-  tableContainer?: ContainerComponent | false;
-  columns?: Columns<ReturnTableRecord<T>>;
-  data?: ReturnTableRecord<T>[];
-  pagination?: false | Partial<PaginationProps>;
-} & Omit<TableProps, 'data'>;
-export type ProTableInstance = ComponentPublicInstance;
-
-// types
+// 仅导出核心列配置类型
 export { type Column, type Columns } from './types';
+export { type TableEmits } from '../../shared/ui';
 
-// hooks
+// 仅导出核心表格 Hook 与类型
 export { useTable, type Table } from './useTable';
 
 export default ProTable;

package/src/components/table/useTable.ts

@@ -31,7 +31,7 @@ import type { Ref } from 'vue';
  * @property appendColumn - 在指定列后追加新列，传 undefined 在末尾追加
  * @property prependColumn - 在指定列前插入新列，传 undefined 在开头插入
  * @property setPageParam - 设置分页参数，支持部分更新和函数式更新
- * @property resetQueryParams - 重置分页到第一页并恢复搜索条件到初始值
+ * @property resetQueryParams - 恢复分页与搜索条件到初始化时的快照（含自定义分页键，非固定回到第一页）
  *
  * @example
  * ```ts

package/src/shared/core/index.ts

@@ -1,6 +1,5 @@
 /**
- * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容，
- * 避免直接散列依赖 @qin-ui/pro-components-core，便于将来统一维护。
+ * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容。
  */
 export {
   // hooks

package/src/shared/ui/index.ts

@@ -32,6 +32,7 @@ import {
   type FormProps,
   type FormItemProps,
   type TableProps as _TableProps,
+  type TableEmits,
   type TableColumnCtx as ColumnType,
   type PaginationProps,
   type RowProps as GridProps,
@@ -75,6 +76,7 @@ export {
   type GridProps,
   type GridItemProps,
   type ColumnType,
+  type TableEmits,
 };
 
 export type TableProps = _TableProps<any>;