From 9450660ada7925db77246a8852822fb25858f48e Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Wed, 15 Sep 2021 10:05:59 +0800
Subject: [PATCH] build: compile 1.8.5

---
 dist/area/index.js         | 3 ++-
 dist/calendar/index.js     | 1 -
 dist/checkbox/index.js     | 3 ++-
 dist/circle/index.js       | 3 ++-
 dist/grid/index.js         | 3 ++-
 dist/mixins/page-scroll.js | 2 +-
 dist/overlay/index.js      | 3 ++-
 dist/progress/index.js     | 3 ++-
 dist/radio/index.js        | 3 ++-
 dist/share-sheet/index.js  | 3 ++-
 dist/skeleton/index.js     | 3 ++-
 dist/swipe-cell/index.js   | 3 ++-
 dist/tabs/index.js         | 6 ++++--
 dist/tree-select/index.js  | 3 ++-
 dist/uploader/index.js     | 6 ++++--
 lib/area/index.js          | 3 ++-
 lib/calendar/index.js      | 1 -
 lib/checkbox/index.js      | 3 ++-
 lib/circle/index.js        | 3 ++-
 lib/grid/index.js          | 3 ++-
 lib/mixins/page-scroll.js  | 2 +-
 lib/overlay/index.js       | 3 ++-
 lib/progress/index.js      | 3 ++-
 lib/radio/index.js         | 3 ++-
 lib/share-sheet/index.js   | 3 ++-
 lib/skeleton/index.js      | 3 ++-
 lib/swipe-cell/index.js    | 3 ++-
 lib/tabs/index.js          | 6 ++++--
 lib/tree-select/index.js   | 3 ++-
 lib/uploader/index.js      | 6 ++++--
 30 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/dist/area/index.js b/dist/area/index.js
index e21e67e2..9bf520ee 100644
--- a/dist/area/index.js
+++ b/dist/area/index.js
@@ -18,7 +18,8 @@ VantComponent({
       observer: 'setValues',
     },
     columnsNum: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 3,
     },
     columnsPlaceholder: {
diff --git a/dist/calendar/index.js b/dist/calendar/index.js
index b4c4cb83..e6891826 100644
--- a/dist/calendar/index.js
+++ b/dist/calendar/index.js
@@ -317,7 +317,6 @@ VantComponent({
       if (maxRange && calcDateNum(date) > maxRange) {
         if (showRangePrompt) {
           Toast({
-            duration: 0,
             context: this,
             message: rangePrompt || `选择天数不能超过 ${maxRange} 天`,
           });
diff --git a/dist/checkbox/index.js b/dist/checkbox/index.js
index 304be2cd..a5734303 100644
--- a/dist/checkbox/index.js
+++ b/dist/checkbox/index.js
@@ -23,7 +23,8 @@ VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 20,
     },
   },
diff --git a/dist/circle/index.js b/dist/circle/index.js
index d42da08e..50e342c9 100644
--- a/dist/circle/index.js
+++ b/dist/circle/index.js
@@ -39,7 +39,8 @@ VantComponent({
       value: WHITE,
     },
     color: {
-      type: null,
+      type: String,
+      optionalTypes: [Object],
       value: BLUE,
       observer() {
         this.setHoverColor().then(() => {
diff --git a/dist/grid/index.js b/dist/grid/index.js
index b80d3785..50a1f23b 100644
--- a/dist/grid/index.js
+++ b/dist/grid/index.js
@@ -8,7 +8,8 @@ VantComponent({
       observer: 'updateChildren',
     },
     gutter: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 0,
       observer: 'updateChildren',
     },
diff --git a/dist/mixins/page-scroll.js b/dist/mixins/page-scroll.js
index 4b0f2a5c..f01e3ed8 100644
--- a/dist/mixins/page-scroll.js
+++ b/dist/mixins/page-scroll.js
@@ -25,7 +25,7 @@ export const pageScrollMixin = (scroller) =>
     detached() {
       var _a;
       const page = getCurrentPage();
-      if (!isDef(page)) {
+      if (isDef(page)) {
         page.vanPageScroller =
           ((_a = page.vanPageScroller) === null || _a === void 0
             ? void 0
diff --git a/dist/overlay/index.js b/dist/overlay/index.js
index 65231cbe..e110df18 100644
--- a/dist/overlay/index.js
+++ b/dist/overlay/index.js
@@ -4,7 +4,8 @@ VantComponent({
     show: Boolean,
     customStyle: String,
     duration: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
     zIndex: {
diff --git a/dist/progress/index.js b/dist/progress/index.js
index ee6a0c15..b50ea5f6 100644
--- a/dist/progress/index.js
+++ b/dist/progress/index.js
@@ -24,8 +24,9 @@ VantComponent({
       value: '#fff',
     },
     strokeWidth: {
-      type: null,
+      type: Number,
       value: 4,
+      optionalTypes: [String],
     },
   },
   data: {
diff --git a/dist/radio/index.js b/dist/radio/index.js
index 8e749996..69c4f645 100644
--- a/dist/radio/index.js
+++ b/dist/radio/index.js
@@ -23,7 +23,8 @@ VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 20,
     },
   },
diff --git a/dist/share-sheet/index.js b/dist/share-sheet/index.js
index 470dea68..5343ffab 100644
--- a/dist/share-sheet/index.js
+++ b/dist/share-sheet/index.js
@@ -33,7 +33,8 @@ VantComponent({
       value: true,
     },
     duration: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
   },
diff --git a/dist/skeleton/index.js b/dist/skeleton/index.js
index aab922d0..194f1ab1 100644
--- a/dist/skeleton/index.js
+++ b/dist/skeleton/index.js
@@ -32,7 +32,8 @@ VantComponent({
       value: '40%',
     },
     rowWidth: {
-      type: null,
+      type: String,
+      optionalTypes: [Array],
       value: '100%',
       observer(val) {
         this.setData({ isArray: val instanceof Array });
diff --git a/dist/swipe-cell/index.js b/dist/swipe-cell/index.js
index 216ffb0e..0d059689 100644
--- a/dist/swipe-cell/index.js
+++ b/dist/swipe-cell/index.js
@@ -26,7 +26,8 @@ VantComponent({
     },
     asyncClose: Boolean,
     name: {
-      type: null,
+      type: String,
+      optionalTypes: [Number],
       value: '',
     },
   },
diff --git a/dist/tabs/index.js b/dist/tabs/index.js
index dee2aef6..ad8b6aca 100644
--- a/dist/tabs/index.js
+++ b/dist/tabs/index.js
@@ -31,12 +31,14 @@ VantComponent({
       },
     },
     lineWidth: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 40,
       observer: 'resize',
     },
     lineHeight: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: -1,
     },
     active: {
diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js
index 8dc4ed86..70fde9b6 100644
--- a/dist/tree-select/index.js
+++ b/dist/tree-select/index.js
@@ -20,7 +20,8 @@ VantComponent({
       observer: 'updateSubItems',
     },
     height: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
     max: {
diff --git a/dist/uploader/index.js b/dist/uploader/index.js
index 263c50e3..55168209 100644
--- a/dist/uploader/index.js
+++ b/dist/uploader/index.js
@@ -13,11 +13,13 @@ VantComponent({
         afterRead: null,
         beforeRead: null,
         previewSize: {
-          type: null,
+          type: Number,
+          optionalTypes: [String],
           value: 80,
         },
         name: {
-          type: null,
+          type: String,
+          optionalTypes: [Number],
           value: '',
         },
         accept: {
diff --git a/lib/area/index.js b/lib/area/index.js
index 6b17a07c..5819bf14 100644
--- a/lib/area/index.js
+++ b/lib/area/index.js
@@ -35,7 +35,8 @@ component_1.VantComponent({
       observer: 'setValues',
     },
     columnsNum: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 3,
     },
     columnsPlaceholder: {
diff --git a/lib/calendar/index.js b/lib/calendar/index.js
index 38a84b90..6a1dff54 100644
--- a/lib/calendar/index.js
+++ b/lib/calendar/index.js
@@ -348,7 +348,6 @@ component_1.VantComponent({
       if (maxRange && utils_1.calcDateNum(date) > maxRange) {
         if (showRangePrompt) {
           toast_1.default({
-            duration: 0,
             context: this,
             message:
               rangePrompt ||
diff --git a/lib/checkbox/index.js b/lib/checkbox/index.js
index c607f292..555802e0 100644
--- a/lib/checkbox/index.js
+++ b/lib/checkbox/index.js
@@ -25,7 +25,8 @@ component_1.VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 20,
     },
   },
diff --git a/lib/circle/index.js b/lib/circle/index.js
index 416c0bd3..013a18b6 100644
--- a/lib/circle/index.js
+++ b/lib/circle/index.js
@@ -41,7 +41,8 @@ component_1.VantComponent({
       value: color_1.WHITE,
     },
     color: {
-      type: null,
+      type: String,
+      optionalTypes: [Object],
       value: color_1.BLUE,
       observer: function () {
         var _this = this;
diff --git a/lib/grid/index.js b/lib/grid/index.js
index 2de31e04..1772bfc4 100644
--- a/lib/grid/index.js
+++ b/lib/grid/index.js
@@ -10,7 +10,8 @@ component_1.VantComponent({
       observer: 'updateChildren',
     },
     gutter: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 0,
       observer: 'updateChildren',
     },
diff --git a/lib/mixins/page-scroll.js b/lib/mixins/page-scroll.js
index 145639ee..5e503d6e 100644
--- a/lib/mixins/page-scroll.js
+++ b/lib/mixins/page-scroll.js
@@ -29,7 +29,7 @@ var pageScrollMixin = function (scroller) {
     detached: function () {
       var _a;
       var page = utils_1.getCurrentPage();
-      if (!utils_1.isDef(page)) {
+      if (utils_1.isDef(page)) {
         page.vanPageScroller =
           ((_a = page.vanPageScroller) === null || _a === void 0
             ? void 0
diff --git a/lib/overlay/index.js b/lib/overlay/index.js
index a3e3a759..20f33b0d 100644
--- a/lib/overlay/index.js
+++ b/lib/overlay/index.js
@@ -6,7 +6,8 @@ component_1.VantComponent({
     show: Boolean,
     customStyle: String,
     duration: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
     zIndex: {
diff --git a/lib/progress/index.js b/lib/progress/index.js
index f41cf4ff..980b5edf 100644
--- a/lib/progress/index.js
+++ b/lib/progress/index.js
@@ -26,8 +26,9 @@ component_1.VantComponent({
       value: '#fff',
     },
     strokeWidth: {
-      type: null,
+      type: Number,
       value: 4,
+      optionalTypes: [String],
     },
   },
   data: {
diff --git a/lib/radio/index.js b/lib/radio/index.js
index 9d9fc0c8..7069c919 100644
--- a/lib/radio/index.js
+++ b/lib/radio/index.js
@@ -25,7 +25,8 @@ component_1.VantComponent({
       value: 'round',
     },
     iconSize: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 20,
     },
   },
diff --git a/lib/share-sheet/index.js b/lib/share-sheet/index.js
index 0040e147..db35ddfc 100644
--- a/lib/share-sheet/index.js
+++ b/lib/share-sheet/index.js
@@ -35,7 +35,8 @@ component_1.VantComponent({
       value: true,
     },
     duration: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
   },
diff --git a/lib/skeleton/index.js b/lib/skeleton/index.js
index 52137fa8..cb305baf 100644
--- a/lib/skeleton/index.js
+++ b/lib/skeleton/index.js
@@ -34,7 +34,8 @@ component_1.VantComponent({
       value: '40%',
     },
     rowWidth: {
-      type: null,
+      type: String,
+      optionalTypes: [Array],
       value: '100%',
       observer: function (val) {
         this.setData({ isArray: val instanceof Array });
diff --git a/lib/swipe-cell/index.js b/lib/swipe-cell/index.js
index bf6648af..f807904b 100644
--- a/lib/swipe-cell/index.js
+++ b/lib/swipe-cell/index.js
@@ -34,7 +34,8 @@ component_1.VantComponent({
     },
     asyncClose: Boolean,
     name: {
-      type: null,
+      type: String,
+      optionalTypes: [Number],
       value: '',
     },
   },
diff --git a/lib/tabs/index.js b/lib/tabs/index.js
index a33f4cfe..12d32618 100644
--- a/lib/tabs/index.js
+++ b/lib/tabs/index.js
@@ -28,12 +28,14 @@ component_1.VantComponent({
       },
     },
     lineWidth: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 40,
       observer: 'resize',
     },
     lineHeight: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: -1,
     },
     active: {
diff --git a/lib/tree-select/index.js b/lib/tree-select/index.js
index 9796507e..bfc80b72 100644
--- a/lib/tree-select/index.js
+++ b/lib/tree-select/index.js
@@ -22,7 +22,8 @@ component_1.VantComponent({
       observer: 'updateSubItems',
     },
     height: {
-      type: null,
+      type: Number,
+      optionalTypes: [String],
       value: 300,
     },
     max: {
diff --git a/lib/uploader/index.js b/lib/uploader/index.js
index ca3c43ad..36b42352 100644
--- a/lib/uploader/index.js
+++ b/lib/uploader/index.js
@@ -30,11 +30,13 @@ component_1.VantComponent({
         afterRead: null,
         beforeRead: null,
         previewSize: {
-          type: null,
+          type: Number,
+          optionalTypes: [String],
           value: 80,
         },
         name: {
-          type: null,
+          type: String,
+          optionalTypes: [Number],
           value: '',
         },
         accept: {