@qin-ui/element-plus-pro 1.2.1 → 1.2.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:42:26.218Z",
3
3
  "name": "@qin-ui/element-plus-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, 同prop
@@ -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' }
@@ -207,14 +208,20 @@ export type WithRef<T> = {
207
208
  type WithCommonBase<T = unknown> = T & Omit<FormItemProps, 'label'> & GridItemProps;
208
209
  type WithCommon<T, D extends Data = Data> = WithRef<WithCommonBase<T> & BaseWithoutFields<D>>;
209
210
  type WithFields<D extends Data = Data> = WithRef<WithCommonBase & BaseWithFields<D>>;
211
+ /**
212
+ * @description 合并 FormItem 插槽与组件插槽
213
+ */
214
+ export type MergeSlots<T extends abstract new (...args: any) => any, CS = ComponentSlots<T>> = Partial<{
215
+ [K in keyof FormItemSlots | keyof CS]: K extends keyof FormItemSlots ? FormItemSlots[K] : K extends keyof CS ? CS[K] : SlotComponentType;
216
+ }>;
210
217
  /**
211
218
  * @description 自动从 Vue 组件提取 Props 和 Slots,并加上公共表单字段属性
212
219
  * @template T - Vue 组件类型
213
220
  * @template D - 数据对象类型
214
221
  */
215
- type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = WithCommon<{
216
- slots?: Partial<ComponentSlots<T>>;
217
- } & Partial<Omit<ComponentProps<T>, keyof VNodeProps>>, D>;
222
+ type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = Omit<WithCommon<Partial<ComponentProps<T>>, D>, keyof VNodeProps | 'slots'> & {
223
+ slots?: MergeSlots<T>;
224
+ };
218
225
  /**
219
226
  * @description 字段配置类型,包含所有字段属性和响应式支持
220
227
  * @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":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,aAAa,EACb,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,EACL,UAAU,EACX,MAAM,KAAK,CAAC;AACb,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE/D,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC;AAEjD,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI;IACjC,UAAU,CAAC,EAAE,CAAC,CAAC;IACf,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB;IAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,GAChC;IAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;IAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,CAAA;CAAE,CAAC;AAEtE;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GACzB,SAAS,CAAC,SAAS,CAAC,GACpB,KAAK,GACL,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,GACT,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,iBAAiB,CAAC,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AACrE,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAEpC,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,QAAQ,CAAC,CAAC;AAE5D,KAAK,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI;IACvC;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/B;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG;IAC3D;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAClB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC;IACvB;;;OAGG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC;IACvB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B;;;OAGG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC;CACnB,CAAC;AAEF,KAAK,iBAAiB,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG;IAC9D,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAClC,cAAc,CAAC,CAAC,CAAC,GACjB,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEzB;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI;KAC/C,CAAC,IAAI,aAAa,GAAG,CAAC,SAAS,QAAQ,GACpC,UAAU,CAAC;QAAE,KAAK,CAAC,EAAE,KAAK,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC,CAAC,GAAG;QACnD,SAAS,CAAC,EAAE,mBAAmB,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;KAC5D,GACD,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,SAAS,CAAC,EAAE,CAAC,CAAA;KAAE;CAC9D,CAAC;AAEF;;GAEG;AACH,KAAK,4BAA4B,GAC7B,WAAW,GACX,mBAAmB,GACnB,oBAAoB,GACpB,gBAAgB,GAChB,QAAQ,GACR,OAAO,GACP,WAAW,CAAC;AAEhB,KAAK,qBAAqB,CAAC,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;KACtB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,4BAA4B,GAClD,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,CAAC,CAAC,CAAC,CAAC,GACJ,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC,GAClC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAC5B,aAAa,CAAC;AAEhB,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI,OAAO,CACjD,cAAc,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CACzC,CAAC;AAEF,KAAK,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI,OAAO,CAC9C,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,UAAU,CACpB,CAAC,SAAS,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,EAC5C,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,IACpB,OAAO,CAAC;KACT,CAAC,IAAI,MAAM,aAAa,GAAG,MAAM,EAAE,GAAG,CAAC,SAAS,MAAM,aAAa,GAChE,aAAa,CAAC,CAAC,CAAC,GAChB,CAAC,SAAS,MAAM,EAAE,GAChB,EAAE,CAAC,CAAC,CAAC,GACL,iBAAiB;CACxB,CAAC,CAAC;AAEH;;;;GAIG;AACH,KAAK,aAAa,CAChB,CAAC,SAAS,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,EAC5C,CAAC,SAAS,IAAI,GAAG,IAAI,IACnB,IAAI,CACN,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACzC,MAAM,UAAU,GAAG,OAAO,CAC3B,GAAG;IACF,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,KAAK,CACf,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,IAAI,GAAG,IAAI,IAEnB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;IACpB,SAAS,CAAC,EAAE,CAAC,SAAS,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;CACtE,CAAC,GACF,UAAU,CAAC,CAAC,CAAC,CAAC;AAElB;;;;;GAKG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qin-ui/element-plus-pro",
3
- "version": "1.2.1",
3
+ "version": "1.2.2",
4
4
  "description": "基于 element-plus 的二次封装组件",
5
5
  "bin": {
6
6
  "element-plus-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, 同prop
@@ -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' }
@@ -261,6 +263,20 @@ type WithFields<D extends Data = Data> = WithRef<
261
263
  WithCommonBase & BaseWithFields<D>
262
264
  >;
263
265
 
266
+ /**
267
+ * @description 合并 FormItem 插槽与组件插槽
268
+ */
269
+ export type MergeSlots<
270
+ T extends abstract new (...args: any) => any,
271
+ CS = ComponentSlots<T>,
272
+ > = Partial<{
273
+ [K in keyof FormItemSlots | keyof CS]: K extends keyof FormItemSlots
274
+ ? FormItemSlots[K]
275
+ : K extends keyof CS
276
+ ? CS[K]
277
+ : SlotComponentType;
278
+ }>;
279
+
264
280
  /**
265
281
  * @description 自动从 Vue 组件提取 Props 和 Slots,并加上公共表单字段属性
266
282
  * @template T - Vue 组件类型
@@ -269,12 +285,12 @@ type WithFields<D extends Data = Data> = WithRef<
269
285
  type WithComponent<
270
286
  T extends abstract new (...args: any) => any,
271
287
  D extends Data = Data,
272
- > = WithCommon<
273
- { slots?: Partial<ComponentSlots<T>> } & Partial<
274
- Omit<ComponentProps<T>, keyof VNodeProps>
275
- >,
276
- D
277
- >;
288
+ > = Omit<
289
+ WithCommon<Partial<ComponentProps<T>>, D>,
290
+ keyof VNodeProps | 'slots'
291
+ > & {
292
+ slots?: MergeSlots<T>;
293
+ };
278
294
 
279
295
  /**
280
296
  * @description 字段配置类型,包含所有字段属性和响应式支持