fix(uat): 修正组件类型定义，去除一系列 JSX.IntrinsicElements 组件类型定义的 DefineComponent 泛型包裹 (#32)

Vanisper · web-flow · commit 3626dd876544 · 2025-10-15T19:55:50.000+08:00
diff --git a/packages/uni-app-components/tsconfig.json b/packages/uni-app-components/tsconfig.json
@@ -3,8 +3,5 @@
   "compilerOptions": {
     "baseUrl": "."
   },
-  "vueCompilerOptions": {
-    "plugins": ["@uni-helper/uni-types/volar-plugin"]
-  },
   "include": ["src/**/*.ts", "src/**/*.vue", "*.d.ts"]
 }
diff --git a/packages/uni-app-types/src/basic-components/progress.ts b/packages/uni-app-types/src/basic-components/progress.ts
@@ -154,7 +154,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      progress: _Progress;
+      progress: _ProgressProps;
     }
   }
 }
@@ -171,7 +171,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      progress: _Progress;
+      progress: _ProgressProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/basic-components/text.ts b/packages/uni-app-types/src/basic-components/text.ts
@@ -121,7 +121,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      text: _Text;
+      text: _TextProps;
     }
   }
 }
@@ -140,7 +140,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      text: _Text;
+      text: _TextProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/canvas/index.ts b/packages/uni-app-types/src/canvas/index.ts
@@ -153,7 +153,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      canvas: _Canvas;
+      canvas: _CanvasProps;
     }
   }
 }
@@ -169,7 +169,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      canvas: _Canvas;
+      canvas: _CanvasProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/button.ts b/packages/uni-app-types/src/form-components/button.ts
@@ -778,7 +778,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      button: _Button;
+      button: _ButtonProps;
     }
   }
 }
@@ -794,7 +794,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      button: _Button;
+      button: _ButtonProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/form.ts b/packages/uni-app-types/src/form-components/form.ts
@@ -131,7 +131,7 @@ declare global {
        *
        * 将组件内的用户输入的 switch、input、checkbox、slider、radio、picker 提交
        */
-      form: _Form;
+      form: _FormProps;
     }
   }
 }
@@ -150,7 +150,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      form: _Form;
+      form: _FormProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/input.ts b/packages/uni-app-types/src/form-components/input.ts
@@ -537,7 +537,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      input: _Input;
+      input: _InputProps;
     }
   }
 }
@@ -553,7 +553,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      input: _Input;
+      input: _InputProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/label.ts b/packages/uni-app-types/src/form-components/label.ts
@@ -83,7 +83,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      label: _Label;
+      label: _LabelProps;
     }
   }
 }
@@ -106,7 +106,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      label: _Label;
+      label: _LabelProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/switch.ts b/packages/uni-app-types/src/form-components/switch.ts
@@ -100,7 +100,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      switch: _Switch;
+      switch: _SwitchProps;
     }
   }
 }
@@ -116,7 +116,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      switch: _Switch;
+      switch: _SwitchProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/form-components/textarea.ts b/packages/uni-app-types/src/form-components/textarea.ts
@@ -355,7 +355,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      textarea: _Textarea;
+      textarea: _TextareaProps;
     }
   }
 }
@@ -371,7 +371,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      textarea: _Textarea;
+      textarea: _TextareaProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/map/index.ts b/packages/uni-app-types/src/map/index.ts
@@ -914,7 +914,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      map: _Map;
+      map: _MapProps;
     }
   }
 }
@@ -930,7 +930,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      map: _Map;
+      map: _MapProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/media-components/audio.ts b/packages/uni-app-types/src/media-components/audio.ts
@@ -174,7 +174,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      audio: _Audio;
+      audio: _AudioProps;
     }
   }
 }
@@ -190,7 +190,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      audio: _Audio;
+      audio: _AudioProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/media-components/image.ts b/packages/uni-app-types/src/media-components/image.ts
@@ -241,7 +241,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      image: _Image;
+      image: _ImageProps;
     }
   }
 }
@@ -257,7 +257,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      image: _Image;
+      image: _ImageProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/media-components/video.ts b/packages/uni-app-types/src/media-components/video.ts
@@ -668,7 +668,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      video: _Video;
+      video: _VideoProps;
     }
   }
 }
@@ -687,7 +687,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      video: _Video;
+      video: _VideoProps;
     }
   }
 }
diff --git a/packages/uni-app-types/src/view-containers/view.ts b/packages/uni-app-types/src/view-containers/view.ts
@@ -107,7 +107,7 @@ declare global {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      view: _View;
+      view: _ViewProps;
     }
   }
 }
@@ -128,7 +128,7 @@ declare module "vue/jsx-runtime" {
        * |
        * [使用说明](https://uni-typed.netlify.app/)
        */
-      view: _View;
+      view: _ViewProps;
     }
   }
 }
diff --git a/playground/tsconfig.json b/playground/tsconfig.json
@@ -23,10 +23,6 @@
       "@uni-helper/uni-types"
     ]
   },
-  "vueCompilerOptions": {
-    // 调整 Volar（Vue 语言服务工具）解析行为，用于为 uni-app 组件提供 TypeScript 类型
-    "plugins": ["@uni-helper/uni-types/volar-plugin"]
-  },
   "include": [
     "src/**/*.ts",
     "src/**/*.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,5 @@`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"baseUrl": "."`
`5`	`5`	`},`
`6`		`- "vueCompilerOptions": {`
`7`		`- "plugins": ["@uni-helper/uni-types/volar-plugin"]`
`8`		`- },`
`9`	`6`	`"include": ["src/*/.ts", "src/*/.vue", "*.d.ts"]`
`10`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ declare global {`
`154`	`154`	`* \|`
`155`	`155`	`* [使用说明](https://uni-typed.netlify.app/)`
`156`	`156`	`*/`
`157`		`- progress: _Progress;`
	`157`	`+ progress: _ProgressProps;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`}`
`@@ -171,7 +171,7 @@ declare module "vue/jsx-runtime" {`
`171`	`171`	`* \|`
`172`	`172`	`* [使用说明](https://uni-typed.netlify.app/)`
`173`	`173`	`*/`
`174`		`- progress: _Progress;`
	`174`	`+ progress: _ProgressProps;`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ declare global {`
`121`	`121`	`* \|`
`122`	`122`	`* [使用说明](https://uni-typed.netlify.app/)`
`123`	`123`	`*/`
`124`		`- text: _Text;`
	`124`	`+ text: _TextProps;`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -140,7 +140,7 @@ declare module "vue/jsx-runtime" {`
`140`	`140`	`* \|`
`141`	`141`	`* [使用说明](https://uni-typed.netlify.app/)`
`142`	`142`	`*/`
`143`		`- text: _Text;`
	`143`	`+ text: _TextProps;`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ declare global {`
`153`	`153`	`* \|`
`154`	`154`	`* [使用说明](https://uni-typed.netlify.app/)`
`155`	`155`	`*/`
`156`		`- canvas: _Canvas;`
	`156`	`+ canvas: _CanvasProps;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -169,7 +169,7 @@ declare module "vue/jsx-runtime" {`
`169`	`169`	`* \|`
`170`	`170`	`* [使用说明](https://uni-typed.netlify.app/)`
`171`	`171`	`*/`
`172`		`- canvas: _Canvas;`
	`172`	`+ canvas: _CanvasProps;`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ declare global {`
`778`	`778`	`* \|`
`779`	`779`	`* [使用说明](https://uni-typed.netlify.app/)`
`780`	`780`	`*/`
`781`		`- button: _Button;`
	`781`	`+ button: _ButtonProps;`
`782`	`782`	`}`
`783`	`783`	`}`
`784`	`784`	`}`
`@@ -794,7 +794,7 @@ declare module "vue/jsx-runtime" {`
`794`	`794`	`* \|`
`795`	`795`	`* [使用说明](https://uni-typed.netlify.app/)`
`796`	`796`	`*/`
`797`		`- button: _Button;`
	`797`	`+ button: _ButtonProps;`
`798`	`798`	`}`
`799`	`799`	`}`
`800`	`800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ declare global {`
`131`	`131`	`*`
`132`	`132`	`* 将组件内的用户输入的 switch、input、checkbox、slider、radio、picker 提交`
`133`	`133`	`*/`
`134`		`- form: _Form;`
	`134`	`+ form: _FormProps;`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -150,7 +150,7 @@ declare module "vue/jsx-runtime" {`
`150`	`150`	`* \|`
`151`	`151`	`* [使用说明](https://uni-typed.netlify.app/)`
`152`	`152`	`*/`
`153`		`- form: _Form;`
	`153`	`+ form: _FormProps;`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ declare global {`
`537`	`537`	`* \|`
`538`	`538`	`* [使用说明](https://uni-typed.netlify.app/)`
`539`	`539`	`*/`
`540`		`- input: _Input;`
	`540`	`+ input: _InputProps;`
`541`	`541`	`}`
`542`	`542`	`}`
`543`	`543`	`}`
`@@ -553,7 +553,7 @@ declare module "vue/jsx-runtime" {`
`553`	`553`	`* \|`
`554`	`554`	`* [使用说明](https://uni-typed.netlify.app/)`
`555`	`555`	`*/`
`556`		`- input: _Input;`
	`556`	`+ input: _InputProps;`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ declare global {`
`83`	`83`	`* \|`
`84`	`84`	`* [使用说明](https://uni-typed.netlify.app/)`
`85`	`85`	`*/`
`86`		`- label: _Label;`
	`86`	`+ label: _LabelProps;`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
`@@ -106,7 +106,7 @@ declare module "vue/jsx-runtime" {`
`106`	`106`	`* \|`
`107`	`107`	`* [使用说明](https://uni-typed.netlify.app/)`
`108`	`108`	`*/`
`109`		`- label: _Label;`
	`109`	`+ label: _LabelProps;`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ declare global {`
`100`	`100`	`* \|`
`101`	`101`	`* [使用说明](https://uni-typed.netlify.app/)`
`102`	`102`	`*/`
`103`		`- switch: _Switch;`
	`103`	`+ switch: _SwitchProps;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
`@@ -116,7 +116,7 @@ declare module "vue/jsx-runtime" {`
`116`	`116`	`* \|`
`117`	`117`	`* [使用说明](https://uni-typed.netlify.app/)`
`118`	`118`	`*/`
`119`		`- switch: _Switch;`
	`119`	`+ switch: _SwitchProps;`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ declare global {`
`355`	`355`	`* \|`
`356`	`356`	`* [使用说明](https://uni-typed.netlify.app/)`
`357`	`357`	`*/`
`358`		`- textarea: _Textarea;`
	`358`	`+ textarea: _TextareaProps;`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`	`}`
`@@ -371,7 +371,7 @@ declare module "vue/jsx-runtime" {`
`371`	`371`	`* \|`
`372`	`372`	`* [使用说明](https://uni-typed.netlify.app/)`
`373`	`373`	`*/`
`374`		`- textarea: _Textarea;`
	`374`	`+ textarea: _TextareaProps;`
`375`	`375`	`}`
`376`	`376`	`}`
`377`	`377`	`}`