From 79c994e3801dd57bf54acc6b8f32c59bf9d48ed0 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Mon, 9 Sep 2019 11:59:37 +0800
Subject: [PATCH] fix: invalid prop types (#1991)

---
 packages/area/index.ts        | 2 +-
 packages/mixins/transition.ts | 2 +-
 packages/overlay/index.ts     | 2 +-
 packages/tabbar-item/index.ts | 6 ++----
 packages/tabbar/index.ts      | 2 +-
 packages/tree-select/index.ts | 4 +---
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/area/index.ts b/packages/area/index.ts
index 0013e7a0..c66c9004 100644
--- a/packages/area/index.ts
+++ b/packages/area/index.ts
@@ -18,7 +18,7 @@ VantComponent({
       value: {}
     },
     columnsNum: {
-      type: [String, Number],
+      type: null,
       value: 3
     }
   },
diff --git a/packages/mixins/transition.ts b/packages/mixins/transition.ts
index 4f338ed1..842e8130 100644
--- a/packages/mixins/transition.ts
+++ b/packages/mixins/transition.ts
@@ -21,7 +21,7 @@ export const transition = function (showDefaultValue: boolean) {
       },
       // @ts-ignore
       duration: {
-        type: [Number, Object],
+        type: null,
         value: 300,
         observer: 'observeDuration'
       },
diff --git a/packages/overlay/index.ts b/packages/overlay/index.ts
index a996c78b..fe717805 100644
--- a/packages/overlay/index.ts
+++ b/packages/overlay/index.ts
@@ -7,7 +7,7 @@ VantComponent({
     mask: Boolean,
     customStyle: String,
     duration: {
-      type: [Number, Object],
+      type: null,
       value: 300
     },
     zIndex: {
diff --git a/packages/tabbar-item/index.ts b/packages/tabbar-item/index.ts
index da832c1a..6aa210c3 100644
--- a/packages/tabbar-item/index.ts
+++ b/packages/tabbar-item/index.ts
@@ -3,11 +3,9 @@ import { VantComponent } from '../common/component';
 VantComponent({
   props: {
     info: null,
+    name: null,
     icon: String,
-    dot: Boolean,
-    name: {
-      type: [String, Number]
-    }
+    dot: Boolean
   },
 
   relation: {
diff --git a/packages/tabbar/index.ts b/packages/tabbar/index.ts
index 6faa774d..dc13f40b 100644
--- a/packages/tabbar/index.ts
+++ b/packages/tabbar/index.ts
@@ -22,7 +22,7 @@ VantComponent({
 
   props: {
     active: {
-      type: [Number, String],
+      type: null,
       observer: 'updateChildren'
     },
     activeColor: {
diff --git a/packages/tree-select/index.ts b/packages/tree-select/index.ts
index 280702ec..09b5573f 100644
--- a/packages/tree-select/index.ts
+++ b/packages/tree-select/index.ts
@@ -15,13 +15,11 @@ VantComponent({
 
   props: {
     items: Array,
+    activeId: null,
     mainActiveIndex: {
       type: Number,
       value: 0
     },
-    activeId: {
-      type: [Number, String, Array]
-    },
     maxHeight: {
       type: Number,
       value: 300