@qin-ui/antd-vue-pro 2.3.1 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/api.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "generatedAt": "2026-08-13T11:21:23.164Z",
2
+ "generatedAt": "2026-08-17T05:43:26.942Z",
3
3
  "name": "@qin-ui/antd-vue-pro",
4
4
  "api": [
5
5
  {
@@ -43,6 +43,7 @@ export type Option = {
43
43
  };
44
44
  export type Options = Array<Option>;
45
45
  export type Grid = boolean | (GridProps & {});
46
+ export type FormItemSlots = ComponentSlots<typeof FormItem>;
46
47
  type BaseCommon<D extends Data = Data> = {
47
48
  /**
48
49
  * @description 字段标识namePath, 同name
@@ -73,7 +74,7 @@ type BaseCommon<D extends Data = Data> = {
73
74
  * }
74
75
  * ```
75
76
  */
76
- slots?: Partial<ComponentSlots<typeof FormItem>>;
77
+ slots?: Partial<FormItemSlots>;
77
78
  /**
78
79
  * @description 字段formItem样式属性
79
80
  * @example { marginBottom: '8px', padding: '12px' }
@@ -184,14 +185,20 @@ export type WithRef<T> = {
184
185
  type WithCommonBase<T = unknown> = T & Omit<FormItemProps, 'label'> & GridItemProps;
185
186
  type WithCommon<T, D extends Data = Data> = WithRef<WithCommonBase<T> & BaseWithoutFields<D>>;
186
187
  type WithFields<D extends Data = Data> = WithRef<WithCommonBase & BaseWithFields<D>>;
188
+ /**
189
+ * @description 合并 FormItem 插槽与组件插槽
190
+ */
191
+ export type MergeSlots<T extends abstract new (...args: any) => any, CS = ComponentSlots<T>> = Partial<{
192
+ [K in keyof FormItemSlots | keyof CS]: K extends keyof FormItemSlots ? FormItemSlots[K] : K extends keyof CS ? CS[K] : SlotComponentType;
193
+ }>;
187
194
  /**
188
195
  * @description 自动从 Vue 组件提取 Props 和 Slots,并加上公共表单字段属性
189
196
  * @template T - Vue 组件类型
190
197
  * @template D - 数据对象类型
191
198
  */
192
- type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = WithCommon<{
193
- slots?: Partial<ComponentSlots<T>>;
194
- } & Partial<Omit<ComponentProps<T>, keyof VNodeProps>>, D>;
199
+ type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = Omit<WithCommon<Partial<ComponentProps<T>>, D>, keyof VNodeProps | 'slots'> & {
200
+ slots?: MergeSlots<T>;
201
+ };
195
202
  /**
196
203
  * @description 字段配置类型,包含所有字段属性和响应式支持
197
204
  * @template D - 数据对象类型
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/form/types/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/form/types/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qin-ui/antd-vue-pro",
3
- "version": "2.3.1",
3
+ "version": "2.3.2",
4
4
  "description": "二次封装antd vue组件",
5
5
  "bin": {
6
6
  "antd-vue-pro": "./bin/init-ai.mjs"
@@ -70,6 +70,8 @@ export type Options = Array<Option>;
70
70
 
71
71
  export type Grid = boolean | (GridProps & {});
72
72
 
73
+ export type FormItemSlots = ComponentSlots<typeof FormItem>;
74
+
73
75
  type BaseCommon<D extends Data = Data> = {
74
76
  /**
75
77
  * @description 字段标识namePath, 同name
@@ -100,7 +102,7 @@ type BaseCommon<D extends Data = Data> = {
100
102
  * }
101
103
  * ```
102
104
  */
103
- slots?: Partial<ComponentSlots<typeof FormItem>>;
105
+ slots?: Partial<FormItemSlots>;
104
106
  /**
105
107
  * @description 字段formItem样式属性
106
108
  * @example { marginBottom: '8px', padding: '12px' }
@@ -238,6 +240,20 @@ type WithFields<D extends Data = Data> = WithRef<
238
240
  WithCommonBase & BaseWithFields<D>
239
241
  >;
240
242
 
243
+ /**
244
+ * @description 合并 FormItem 插槽与组件插槽
245
+ */
246
+ export type MergeSlots<
247
+ T extends abstract new (...args: any) => any,
248
+ CS = ComponentSlots<T>,
249
+ > = Partial<{
250
+ [K in keyof FormItemSlots | keyof CS]: K extends keyof FormItemSlots
251
+ ? FormItemSlots[K]
252
+ : K extends keyof CS
253
+ ? CS[K]
254
+ : SlotComponentType;
255
+ }>;
256
+
241
257
  /**
242
258
  * @description 自动从 Vue 组件提取 Props 和 Slots,并加上公共表单字段属性
243
259
  * @template T - Vue 组件类型
@@ -246,12 +262,12 @@ type WithFields<D extends Data = Data> = WithRef<
246
262
  type WithComponent<
247
263
  T extends abstract new (...args: any) => any,
248
264
  D extends Data = Data,
249
- > = WithCommon<
250
- { slots?: Partial<ComponentSlots<T>> } & Partial<
251
- Omit<ComponentProps<T>, keyof VNodeProps>
252
- >,
253
- D
254
- >;
265
+ > = Omit<
266
+ WithCommon<Partial<ComponentProps<T>>, D>,
267
+ keyof VNodeProps | 'slots'
268
+ > & {
269
+ slots?: MergeSlots<T>;
270
+ };
255
271
 
256
272
  /**
257
273
  * @description 字段配置类型,包含所有字段属性和响应式支持