diff --git a/dist/area/index.js b/dist/area/index.js
index 9bf520ee..e21e67e2 100644
--- a/dist/area/index.js
+++ b/dist/area/index.js
@@ -18,8 +18,7 @@ VantComponent({
       observer: 'setValues',
     },
     columnsNum: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 3,
     },
     columnsPlaceholder: {
diff --git a/dist/calendar/index.js b/dist/calendar/index.js
index e6891826..6e1c7515 100644
--- a/dist/calendar/index.js
+++ b/dist/calendar/index.js
@@ -44,6 +44,10 @@ VantComponent({
       type: String,
       value: '确定',
     },
+    confirmDisabledText: {
+      type: String,
+      value: '确定',
+    },
     rangePrompt: String,
     showRangePrompt: {
       type: Boolean,
@@ -57,7 +61,6 @@ VantComponent({
       },
     },
     allowSameDay: Boolean,
-    confirmDisabledText: String,
     type: {
       type: String,
       value: 'single',
diff --git a/dist/checkbox/index.js b/dist/checkbox/index.js
index a5734303..304be2cd 100644
--- a/dist/checkbox/index.js
+++ b/dist/checkbox/index.js
@@ -23,8 +23,7 @@ VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 20,
     },
   },
diff --git a/dist/circle/index.js b/dist/circle/index.js
index 50e342c9..d42da08e 100644
--- a/dist/circle/index.js
+++ b/dist/circle/index.js
@@ -39,8 +39,7 @@ VantComponent({
       value: WHITE,
     },
     color: {
-      type: String,
-      optionalTypes: [Object],
+      type: null,
       value: BLUE,
       observer() {
         this.setHoverColor().then(() => {
diff --git a/dist/empty/index.json b/dist/empty/index.json
index e8cfaaf8..a89ef4db 100644
--- a/dist/empty/index.json
+++ b/dist/empty/index.json
@@ -1,4 +1,4 @@
 {
   "component": true,
   "usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/dist/grid/index.js b/dist/grid/index.js
index 50a1f23b..b80d3785 100644
--- a/dist/grid/index.js
+++ b/dist/grid/index.js
@@ -8,8 +8,7 @@ VantComponent({
       observer: 'updateChildren',
     },
     gutter: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 0,
       observer: 'updateChildren',
     },
diff --git a/dist/overlay/index.js b/dist/overlay/index.js
index e110df18..65231cbe 100644
--- a/dist/overlay/index.js
+++ b/dist/overlay/index.js
@@ -4,8 +4,7 @@ VantComponent({
     show: Boolean,
     customStyle: String,
     duration: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
     zIndex: {
diff --git a/dist/progress/index.js b/dist/progress/index.js
index b50ea5f6..ee6a0c15 100644
--- a/dist/progress/index.js
+++ b/dist/progress/index.js
@@ -24,9 +24,8 @@ VantComponent({
       value: '#fff',
     },
     strokeWidth: {
-      type: Number,
+      type: null,
       value: 4,
-      optionalTypes: [String],
     },
   },
   data: {
diff --git a/dist/radio/index.js b/dist/radio/index.js
index 69c4f645..8e749996 100644
--- a/dist/radio/index.js
+++ b/dist/radio/index.js
@@ -23,8 +23,7 @@ VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 20,
     },
   },
diff --git a/dist/share-sheet/index.js b/dist/share-sheet/index.js
index 5343ffab..470dea68 100644
--- a/dist/share-sheet/index.js
+++ b/dist/share-sheet/index.js
@@ -33,8 +33,7 @@ VantComponent({
       value: true,
     },
     duration: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
   },
diff --git a/dist/skeleton/index.js b/dist/skeleton/index.js
index 194f1ab1..aab922d0 100644
--- a/dist/skeleton/index.js
+++ b/dist/skeleton/index.js
@@ -32,8 +32,7 @@ VantComponent({
       value: '40%',
     },
     rowWidth: {
-      type: String,
-      optionalTypes: [Array],
+      type: null,
       value: '100%',
       observer(val) {
         this.setData({ isArray: val instanceof Array });
diff --git a/dist/slider/index.js b/dist/slider/index.js
index 88916a9c..feca0b0c 100644
--- a/dist/slider/index.js
+++ b/dist/slider/index.js
@@ -23,9 +23,8 @@ VantComponent({
       value: 1,
     },
     value: {
-      type: Number,
+      type: null,
       value: 0,
-      optionalTypes: [Array],
       observer(val) {
         if (val !== this.value) {
           this.updateValue(val);
diff --git a/dist/swipe-cell/index.js b/dist/swipe-cell/index.js
index 0d059689..216ffb0e 100644
--- a/dist/swipe-cell/index.js
+++ b/dist/swipe-cell/index.js
@@ -26,8 +26,7 @@ VantComponent({
     },
     asyncClose: Boolean,
     name: {
-      type: String,
-      optionalTypes: [Number],
+      type: null,
       value: '',
     },
   },
diff --git a/dist/tabs/index.js b/dist/tabs/index.js
index ad8b6aca..dee2aef6 100644
--- a/dist/tabs/index.js
+++ b/dist/tabs/index.js
@@ -31,14 +31,12 @@ VantComponent({
       },
     },
     lineWidth: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 40,
       observer: 'resize',
     },
     lineHeight: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: -1,
     },
     active: {
diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js
index 70fde9b6..8dc4ed86 100644
--- a/dist/tree-select/index.js
+++ b/dist/tree-select/index.js
@@ -20,8 +20,7 @@ VantComponent({
       observer: 'updateSubItems',
     },
     height: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
     max: {
diff --git a/dist/uploader/index.js b/dist/uploader/index.js
index 55168209..263c50e3 100644
--- a/dist/uploader/index.js
+++ b/dist/uploader/index.js
@@ -13,13 +13,11 @@ VantComponent({
         afterRead: null,
         beforeRead: null,
         previewSize: {
-          type: Number,
-          optionalTypes: [String],
+          type: null,
           value: 80,
         },
         name: {
-          type: String,
-          optionalTypes: [Number],
+          type: null,
           value: '',
         },
         accept: {
diff --git a/lib/area/index.js b/lib/area/index.js
index 5819bf14..6b17a07c 100644
--- a/lib/area/index.js
+++ b/lib/area/index.js
@@ -35,8 +35,7 @@ component_1.VantComponent({
       observer: 'setValues',
     },
     columnsNum: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 3,
     },
     columnsPlaceholder: {
diff --git a/lib/calendar/index.js b/lib/calendar/index.js
index 6a1dff54..086e69d7 100644
--- a/lib/calendar/index.js
+++ b/lib/calendar/index.js
@@ -46,6 +46,10 @@ component_1.VantComponent({
       type: String,
       value: '确定',
     },
+    confirmDisabledText: {
+      type: String,
+      value: '确定',
+    },
     rangePrompt: String,
     showRangePrompt: {
       type: Boolean,
@@ -59,7 +63,6 @@ component_1.VantComponent({
       },
     },
     allowSameDay: Boolean,
-    confirmDisabledText: String,
     type: {
       type: String,
       value: 'single',
diff --git a/lib/checkbox/index.js b/lib/checkbox/index.js
index 555802e0..c607f292 100644
--- a/lib/checkbox/index.js
+++ b/lib/checkbox/index.js
@@ -25,8 +25,7 @@ component_1.VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 20,
     },
   },
diff --git a/lib/circle/index.js b/lib/circle/index.js
index 013a18b6..416c0bd3 100644
--- a/lib/circle/index.js
+++ b/lib/circle/index.js
@@ -41,8 +41,7 @@ component_1.VantComponent({
       value: color_1.WHITE,
     },
     color: {
-      type: String,
-      optionalTypes: [Object],
+      type: null,
       value: color_1.BLUE,
       observer: function () {
         var _this = this;
diff --git a/lib/empty/index.json b/lib/empty/index.json
index e8cfaaf8..a89ef4db 100644
--- a/lib/empty/index.json
+++ b/lib/empty/index.json
@@ -1,4 +1,4 @@
 {
   "component": true,
   "usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/lib/grid/index.js b/lib/grid/index.js
index 1772bfc4..2de31e04 100644
--- a/lib/grid/index.js
+++ b/lib/grid/index.js
@@ -10,8 +10,7 @@ component_1.VantComponent({
       observer: 'updateChildren',
     },
     gutter: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 0,
       observer: 'updateChildren',
     },
diff --git a/lib/overlay/index.js b/lib/overlay/index.js
index 20f33b0d..a3e3a759 100644
--- a/lib/overlay/index.js
+++ b/lib/overlay/index.js
@@ -6,8 +6,7 @@ component_1.VantComponent({
     show: Boolean,
     customStyle: String,
     duration: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
     zIndex: {
diff --git a/lib/progress/index.js b/lib/progress/index.js
index 980b5edf..f41cf4ff 100644
--- a/lib/progress/index.js
+++ b/lib/progress/index.js
@@ -26,9 +26,8 @@ component_1.VantComponent({
       value: '#fff',
     },
     strokeWidth: {
-      type: Number,
+      type: null,
       value: 4,
-      optionalTypes: [String],
     },
   },
   data: {
diff --git a/lib/radio/index.js b/lib/radio/index.js
index 7069c919..9d9fc0c8 100644
--- a/lib/radio/index.js
+++ b/lib/radio/index.js
@@ -25,8 +25,7 @@ component_1.VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 20,
     },
   },
diff --git a/lib/share-sheet/index.js b/lib/share-sheet/index.js
index db35ddfc..0040e147 100644
--- a/lib/share-sheet/index.js
+++ b/lib/share-sheet/index.js
@@ -35,8 +35,7 @@ component_1.VantComponent({
       value: true,
     },
     duration: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
   },
diff --git a/lib/skeleton/index.js b/lib/skeleton/index.js
index cb305baf..52137fa8 100644
--- a/lib/skeleton/index.js
+++ b/lib/skeleton/index.js
@@ -34,8 +34,7 @@ component_1.VantComponent({
       value: '40%',
     },
     rowWidth: {
-      type: String,
-      optionalTypes: [Array],
+      type: null,
       value: '100%',
       observer: function (val) {
         this.setData({ isArray: val instanceof Array });
diff --git a/lib/slider/index.js b/lib/slider/index.js
index 3976beca..24db03a5 100644
--- a/lib/slider/index.js
+++ b/lib/slider/index.js
@@ -25,9 +25,8 @@ component_1.VantComponent({
       value: 1,
     },
     value: {
-      type: Number,
+      type: null,
       value: 0,
-      optionalTypes: [Array],
       observer: function (val) {
         if (val !== this.value) {
           this.updateValue(val);
diff --git a/lib/swipe-cell/index.js b/lib/swipe-cell/index.js
index f807904b..bf6648af 100644
--- a/lib/swipe-cell/index.js
+++ b/lib/swipe-cell/index.js
@@ -34,8 +34,7 @@ component_1.VantComponent({
     },
     asyncClose: Boolean,
     name: {
-      type: String,
-      optionalTypes: [Number],
+      type: null,
       value: '',
     },
   },
diff --git a/lib/tabs/index.js b/lib/tabs/index.js
index 12d32618..a33f4cfe 100644
--- a/lib/tabs/index.js
+++ b/lib/tabs/index.js
@@ -28,14 +28,12 @@ component_1.VantComponent({
       },
     },
     lineWidth: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 40,
       observer: 'resize',
     },
     lineHeight: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: -1,
     },
     active: {
diff --git a/lib/tree-select/index.js b/lib/tree-select/index.js
index bfc80b72..9796507e 100644
--- a/lib/tree-select/index.js
+++ b/lib/tree-select/index.js
@@ -22,8 +22,7 @@ component_1.VantComponent({
       observer: 'updateSubItems',
     },
     height: {
-      type: Number,
-      optionalTypes: [String],
+      type: null,
       value: 300,
     },
     max: {
diff --git a/lib/uploader/index.js b/lib/uploader/index.js
index 36b42352..ca3c43ad 100644
--- a/lib/uploader/index.js
+++ b/lib/uploader/index.js
@@ -30,13 +30,11 @@ component_1.VantComponent({
         afterRead: null,
         beforeRead: null,
         previewSize: {
-          type: Number,
-          optionalTypes: [String],
+          type: null,
           value: 80,
         },
         name: {
-          type: String,
-          optionalTypes: [Number],
+          type: null,
           value: '',
         },
         accept: {