build: compile 1.2.2

dist/calendar/index.js

@@ -1,5 +1,5 @@
 import { VantComponent } from '../common/component';
-import { ROW_HEIGHT, getNextDay, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths } from './utils';
+import { ROW_HEIGHT, getNextDay, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths, getDayByOffset } from './utils';
 import Toast from '../toast/toast';
 VantComponent({
     props: {
@@ -222,25 +222,38 @@ VantComponent({
             }
         },
         select(date, complete) {
+            if (complete && this.data.type === 'range') {
+                const valid = this.checkRange(date);
+                if (!valid) {
+                    // auto selected to max range if showConfirm
+                    if (this.data.showConfirm) {
+                        this.emit([date[0], getDayByOffset(date[0], this.data.maxRange - 1)]);
+                    }
+                    else {
+                        this.emit(date);
+                    }
+                    return;
+                }
+            }
+            this.emit(date);
+            if (complete && !this.data.showConfirm) {
+                this.onConfirm();
+            }
+        },
+        emit(date) {
             const getTime = (date) => (date instanceof Date ? date.getTime() : date);
             this.setData({
                 currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date)
             });
             this.$emit('select', copyDates(date));
-            if (complete && this.data.type === 'range') {
-                const valid = this.checkRange();
-                if (!valid) {
-                    return;
-                }
-            }
-            if (complete && !this.data.showConfirm) {
-                this.onConfirm();
-            }
         },
-        checkRange() {
+        checkRange(date) {
-            const { maxRange, currentDate, rangePrompt } = this.data;
+            const { maxRange, rangePrompt } = this.data;
-            if (maxRange && calcDateNum(currentDate) > maxRange) {
+            if (maxRange && calcDateNum(date) > maxRange) {
-                Toast(rangePrompt || `选择天数不能超过 ${maxRange} 天`);
+                Toast({
+                    context: this,
+                    message: rangePrompt || `选择天数不能超过 ${maxRange} 天`
+                });
                 return false;
             }
             return true;

dist/calendar/index.wxml

@@ -27,3 +27,5 @@
   is="calendar"
   data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
 />
+
+<van-toast id="van-toast" />

dist/calendar/utils.d.ts

@@ -2,6 +2,7 @@ export declare const ROW_HEIGHT = 64;
 export declare function formatMonthTitle(date: Date): string;
 export declare function compareMonth(date1: Date | number, date2: Date | number): 1 | 0 | -1;
 export declare function compareDay(day1: Date | number, day2: Date | number): 1 | 0 | -1;
+export declare function getDayByOffset(date: Date, offset: number): Date;
 export declare function getPrevDay(date: Date): Date;
 export declare function getNextDay(date: Date): Date;
 export declare function calcDateNum(date: [Date, Date]): number;

dist/calendar/utils.js

@@ -36,7 +36,7 @@ export function compareDay(day1, day2) {
     }
     return compareMonthResult;
 }
-function getDayByOffset(date, offset) {
+export function getDayByOffset(date, offset) {
     date = new Date(date);
     date.setDate(date.getDate() + offset);
     return date;

dist/field/index.js

@@ -85,7 +85,7 @@ VantComponent({
             const { clearable, readonly } = this.data;
             const { focused, value } = this;
             this.setData({
-                showClear: clearable && focused && !!value && !readonly
+                showClear: !!clearable && !!focused && !!value && !readonly
             });
         },
         noop() { }

dist/field/index.wxs

@@ -2,7 +2,7 @@
 var utils = require('../wxs/utils.wxs');
 
 function inputStyle(autosize) {
-  if (autosize.constructor === 'Object') {
+  if (autosize && autosize.constructor === 'Object') {
     var style = '';
     if (autosize.minHeight) {
       style += 'min-height:' + utils.addUnit(autosize.minHeight) + ';';

dist/goods-action-button/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:40px;--button-line-height:var(--goods-action-button-height,40px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}

dist/notify/index.js

@@ -23,7 +23,8 @@ VantComponent({
         safeAreaInsetTop: {
             type: Boolean,
             value: false
-        }
+        },
+        top: null
     },
     data: {
         show: false,

dist/notify/index.wxml

@@ -1,8 +1,10 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-transition
   name="slide-down"
   show="{{ show }}"
   custom-class="van-notify__container"
-  custom-style="z-index: {{ zIndex }};"
+  custom-style="z-index: {{ zIndex }}; top: {{ utils.addUnit(top) }}"
   bind:tap="onTap"
 >
   <view
@@ -12,7 +14,7 @@
     <view
       wx:if="{{ safeAreaInsetTop }}"
       style="height: {{ statusBarHeight }}px"
-    ></view>
+    />
     <text>{{ message }}</text>
   </view>
 </van-transition>

dist/notify/notify.d.ts

@@ -2,6 +2,7 @@ interface NotifyOptions {
     type?: 'primary' | 'success' | 'danger' | 'warning';
     color?: string;
     zIndex?: number;
+    top?: number;
     message: string;
     context?: any;
     duration?: number;

dist/notify/notify.js

@@ -6,6 +6,7 @@ const defaultOptions = {
     background: '',
     duration: 3000,
     zIndex: 110,
+    top: 0,
     color: WHITE,
     safeAreaInsetTop: false,
     onClick: () => { },

dist/uploader/utils.d.ts

@@ -8,7 +8,6 @@ interface File {
     time: number;
     image: boolean;
 }
-export declare function isImageUrl(url: string): boolean;
 export declare function isImageFile(item: File): boolean;
 export declare function isVideo(res: any, accept: string): res is WechatMiniprogram.ChooseVideoSuccessCallbackResult;
 export declare function chooseFile({ accept, multiple, capture, compressed, maxDuration, sizeType, camera, maxCount }: {

dist/uploader/utils.js

@@ -1,6 +1,6 @@
-const IMAGE_EXT = ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'];
+const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i;
-export function isImageUrl(url) {
+function isImageUrl(url) {
-    return IMAGE_EXT.some(ext => url.indexOf(`.${ext}`) !== -1 || url.indexOf(`.${ext.toLocaleUpperCase()}`) !== -1); // 有些七牛返回来的后缀的大写，加以判断
+    return IMAGE_REGEXP.test(url);
 }
 export function isImageFile(item) {
     if (item.type) {

lib/calendar/index.js

@@ -236,6 +236,25 @@ component_1.VantComponent({
             }
         },
         select: function (date, complete) {
+            if (complete && this.data.type === 'range') {
+                var valid = this.checkRange(date);
+                if (!valid) {
+                    // auto selected to max range if showConfirm
+                    if (this.data.showConfirm) {
+                        this.emit([date[0], utils_1.getDayByOffset(date[0], this.data.maxRange - 1)]);
+                    }
+                    else {
+                        this.emit(date);
+                    }
+                    return;
+                }
+            }
+            this.emit(date);
+            if (complete && !this.data.showConfirm) {
+                this.onConfirm();
+            }
+        },
+        emit: function (date) {
             var getTime = function (date) {
                 return (date instanceof Date ? date.getTime() : date);
             };
@@ -243,20 +262,14 @@ component_1.VantComponent({
                 currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date)
             });
             this.$emit('select', utils_1.copyDates(date));
-            if (complete && this.data.type === 'range') {
-                var valid = this.checkRange();
-                if (!valid) {
-                    return;
-                }
-            }
-            if (complete && !this.data.showConfirm) {
-                this.onConfirm();
-            }
         },
-        checkRange: function () {
+        checkRange: function (date) {
-            var _a = this.data, maxRange = _a.maxRange, currentDate = _a.currentDate, rangePrompt = _a.rangePrompt;
+            var _a = this.data, maxRange = _a.maxRange, rangePrompt = _a.rangePrompt;
-            if (maxRange && utils_1.calcDateNum(currentDate) > maxRange) {
+            if (maxRange && utils_1.calcDateNum(date) > maxRange) {
-                toast_1.default(rangePrompt || "\u9009\u62E9\u5929\u6570\u4E0D\u80FD\u8D85\u8FC7 " + maxRange + " \u5929");
+                toast_1.default({
+                    context: this,
+                    message: rangePrompt || "\u9009\u62E9\u5929\u6570\u4E0D\u80FD\u8D85\u8FC7 " + maxRange + " \u5929"
+                });
                 return false;
             }
             return true;

lib/calendar/index.wxml

@@ -27,3 +27,5 @@
   is="calendar"
   data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
 />
+
+<van-toast id="van-toast" />

lib/calendar/utils.js

@@ -46,6 +46,7 @@ function getDayByOffset(date, offset) {
     date.setDate(date.getDate() + offset);
     return date;
 }
+exports.getDayByOffset = getDayByOffset;
 function getPrevDay(date) {
     return getDayByOffset(date, -1);
 }

lib/field/index.js

@@ -100,7 +100,7 @@ component_1.VantComponent({
             var _a = this.data, clearable = _a.clearable, readonly = _a.readonly;
             var _b = this, focused = _b.focused, value = _b.value;
             this.setData({
-                showClear: clearable && focused && !!value && !readonly
+                showClear: !!clearable && !!focused && !!value && !readonly
             });
         },
         noop: function () { }

lib/field/index.wxs

@@ -2,7 +2,7 @@
 var utils = require('../wxs/utils.wxs');
 
 function inputStyle(autosize) {
-  if (autosize.constructor === 'Object') {
+  if (autosize && autosize.constructor === 'Object') {
     var style = '';
     if (autosize.minHeight) {
       style += 'min-height:' + utils.addUnit(autosize.minHeight) + ';';

lib/goods-action-button/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:40px;--button-line-height:var(--goods-action-button-height,40px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}

lib/notify/index.js

@@ -25,7 +25,8 @@ component_1.VantComponent({
         safeAreaInsetTop: {
             type: Boolean,
             value: false
-        }
+        },
+        top: null
     },
     data: {
         show: false,

lib/notify/index.wxml

@@ -1,8 +1,10 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-transition
   name="slide-down"
   show="{{ show }}"
   custom-class="van-notify__container"
-  custom-style="z-index: {{ zIndex }};"
+  custom-style="z-index: {{ zIndex }}; top: {{ utils.addUnit(top) }}"
   bind:tap="onTap"
 >
   <view
@@ -12,7 +14,7 @@
     <view
       wx:if="{{ safeAreaInsetTop }}"
       style="height: {{ statusBarHeight }}px"
-    ></view>
+    />
     <text>{{ message }}</text>
   </view>
 </van-transition>

lib/notify/notify.js

@@ -19,6 +19,7 @@ var defaultOptions = {
     background: '',
     duration: 3000,
     zIndex: 110,
+    top: 0,
     color: color_1.WHITE,
     safeAreaInsetTop: false,
     onClick: function () { },

lib/uploader/utils.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var IMAGE_EXT = ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'];
+var IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i;
 function isImageUrl(url) {
-    return IMAGE_EXT.some(function (ext) { return url.indexOf("." + ext) !== -1 || url.indexOf("." + ext.toLocaleUpperCase()) !== -1; }); // 有些七牛返回来的后缀的大写，加以判断
+    return IMAGE_REGEXP.test(url);
 }
-exports.isImageUrl = isImageUrl;
 function isImageFile(item) {
     if (item.type) {
         return item.type.indexOf('image') === 0;