feat: 更新组件属性类型

agileago · Dec 23, 2021 · 72048a2 · 72048a2
1 parent ed2fb9b
commit 72048a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/example/example.tsx b/example/example.tsx
@@ -1,4 +1,4 @@
-import { Autobind, Mut, VueComponent, VueService } from 'vue3-oop'
+import { Autobind, ComponentProps, Mut, VueComponent, VueService } from 'vue3-oop'
 import { onBeforeUnmount } from 'vue'
 
 class PositionService extends VueService {
@@ -18,7 +18,13 @@ class PositionService extends VueService {
   }
 }
 
-class Foo extends VueComponent {
+interface Foo_Props {
+  name?: string
+  size?: number
+}
+
+class Foo extends VueComponent<Foo_Props> {
+  static defaultProps: ComponentProps<Foo_Props> = ['size', 'name']
   postionService = new PositionService()
 
   render() {

diff --git a/src/type.ts b/src/type.ts
@@ -60,7 +60,7 @@ export type TransformModelValue<T extends {}> = 'v-model:modelValue' extends key
   ? Omit<T, 'v-model:modelValue'> & { ['v-model']?: T['v-model:modelValue'] }
   : T
 
-export type ComponentProps<T extends {}> = ComponentPropsArray<T> | ComponentPropsObject<T>
+export type ComponentProps<T extends {}> = ComponentPropsObject<T> | Array<keyof Omit<T, 'slots'>>
 
 export type ComponentPropsObject<T extends {}> = {
   [U in keyof Omit<T, 'slots'>]-?: Prop<any>