[build] 0.5.17

dist/collapse-item/index.js

@@ -67,11 +67,9 @@ VantComponent({
                         contentHeight: height ? `${height}px` : 'auto'
                     });
                 }
-                else {
+                return this.set({ contentHeight: `${height}px` })
-                    return this.set({ contentHeight: `${height}px` })
+                    .then(nextTick)
-                        .then(nextTick)
+                    .then(() => this.set({ contentHeight: 0 }));
-                        .then(() => this.set({ contentHeight: 0 }));
-                }
             });
         },
         onClick() {

dist/datetime-picker/index.js

@@ -91,7 +91,8 @@ VantComponent({
         },
         getPicker() {
             if (this.picker == null) {
-                const picker = (this.picker = this.selectComponent('.van-datetime-picker'));
+                this.picker = this.selectComponent('.van-datetime-picker');
+                const { picker } = this;
                 const { setColumnValues } = picker;
                 picker.setColumnValues = (...args) => setColumnValues.apply(picker, [...args, false]);
             }
@@ -99,7 +100,7 @@ VantComponent({
         },
         updateColumns() {
             const { formatter = defaultFormatter } = this.data;
-            const results = this.getRanges().map(({ type, range }, index) => {
+            const results = this.getRanges().map(({ type, range }) => {
                 const values = times(range[1] - range[0] + 1, index => {
                     let value = range[0] + index;
                     value = type === 'year' ? `${value}` : padZero(value);

dist/dialog/dialog.d.ts

@@ -10,6 +10,7 @@ declare type DialogOptions = {
     selector?: string;
     ariaLabel?: string;
     className?: string;
+    customStyle?: string;
     transition?: string;
     asyncClose?: boolean;
     businessId?: number;

dist/dialog/dialog.js

@@ -25,6 +25,7 @@ Dialog.defaultOptions = {
     zIndex: 100,
     overlay: true,
     className: '',
+    customStyle: '',
     asyncClose: false,
     messageAlign: '',
     transition: 'scale',

dist/dialog/index.js

@@ -9,6 +9,7 @@ VantComponent({
         message: String,
         useSlot: Boolean,
         className: String,
+        customStyle: String,
         asyncClose: Boolean,
         messageAlign: String,
         showCancelButton: Boolean,

dist/dialog/index.wxml

@@ -4,6 +4,7 @@
   overlay="{{ overlay }}"
   custom-class="van-dialog {{ className }}"
   transition="{{ transition }}"
+  custom-style="{{ customStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"
 >

dist/dialog/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-dialog{width:85%;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px}.van-dialog__header{padding-top:25px;font-weight:500;text-align:center}.van-dialog__header--isolated{padding:25px 0}.van-dialog__message{max-height:60vh;padding:25px;overflow-y:auto;font-size:14px;line-height:1.5;text-align:center;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:12px;color:#7d7e80}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__footer{display:-webkit-flex;display:flex}.van-dialog__button{-webkit-flex:1;flex:1}.van-dialog__cancel,.van-dialog__confirm{border:0!important}.van-dialog__confirm{color:#1989fa!important}.van-dialog-bounce-enter{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}.van-dialog-bounce-leave-active{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9)}
+@import '../common/index.wxss';.van-dialog{top:45%!important;width:85%;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px}.van-dialog__header{padding-top:25px;font-weight:500;line-height:24px;text-align:center}.van-dialog__header--isolated{padding:25px 0}.van-dialog__message{max-height:60vh;padding:25px;overflow-y:auto;font-size:14px;line-height:20px;text-align:center;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:12px;color:#7d7e80}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__footer{display:-webkit-flex;display:flex}.van-dialog__button{-webkit-flex:1;flex:1}.van-dialog__cancel,.van-dialog__confirm{border:0!important}.van-dialog__confirm{color:#1989fa!important}.van-dialog-bounce-enter{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}.van-dialog-bounce-leave-active{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9)}

dist/mixins/basic.js

@@ -1,7 +1,7 @@
 export const basic = Behavior({
     methods: {
-        $emit() {
+        $emit(...args) {
-            this.triggerEvent.apply(this, arguments);
+            this.triggerEvent(...args);
         },
         getRect(selector, all) {
             return new Promise(resolve => {

dist/mixins/observer/behavior.js

@@ -3,7 +3,6 @@ function setAsync(context, data) {
         context.setData(data, resolve);
     });
 }
-;
 export const behavior = Behavior({
     created() {
         if (!this.$options) {
@@ -17,7 +16,8 @@ export const behavior = Behavior({
             keys.forEach(key => {
                 const value = computed[key].call(this);
                 if (cache[key] !== value) {
-                    cache[key] = needUpdate[key] = value;
+                    cache[key] = value;
+                    needUpdate[key] = value;
                 }
             });
             return needUpdate;

dist/mixins/observer/props.js

@@ -8,12 +8,12 @@ export function observeProps(props) {
             prop = { type: prop };
         }
         let { observer } = prop;
-        prop.observer = function () {
+        prop.observer = function (...args) {
             if (observer) {
                 if (typeof observer === 'string') {
                     observer = this[observer];
                 }
-                observer.apply(this, arguments);
+                observer.apply(this, args);
             }
             this.set();
         };

dist/picker-column/index.js

@@ -115,9 +115,7 @@ VantComponent({
                     userAction && this.$emit('change', index);
                 });
             }
-            else {
+            return this.set({ offset });
-                return this.set({ offset });
-            }
         },
         setValue(value) {
             const { options } = this.data;

dist/picker-column/index.wxml

@@ -1,3 +1,5 @@
+<wxs src="./index.wxs" module="getOptionText" />
+
 <view
   class="van-picker-column custom-class"
   style="height: {{ itemHeight * visibleItemCount }}px"
@@ -18,14 +20,3 @@
     >{{ getOptionText(option, valueKey) }}</view>
   </view>
 </view>
-
-<wxs module="getOptionText">
-function isObj(x) {
-  var type = typeof x;
-  return x !== null && (type === 'object' || type === 'function');
-}
-
-module.exports = function (option, valueKey) {
-  return isObj(option) && option[valueKey] ? option[valueKey] : option;
-}
-</wxs>

dist/picker-column/index.wxs

@@ -0,0 +1,8 @@
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
+}

dist/picker/index.js

@@ -74,7 +74,7 @@ VantComponent({
         setColumnValue(index, value) {
             const column = this.getColumn(index);
             if (column == null) {
-                return Promise.reject('setColumnValue: 对应列不存在');
+                return Promise.reject(new Error('setColumnValue: 对应列不存在'));
             }
             return column.setValue(value);
         },
@@ -86,7 +86,7 @@ VantComponent({
         setColumnIndex(columnIndex, optionIndex) {
             const column = this.getColumn(columnIndex);
             if (column == null) {
-                return Promise.reject('setColumnIndex: 对应列不存在');
+                return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
             }
             return column.setIndex(optionIndex);
         },
@@ -98,7 +98,7 @@ VantComponent({
         setColumnValues(index, options, needReset = true) {
             const column = this.children[index];
             if (column == null) {
-                return Promise.reject('setColumnValues: 对应列不存在');
+                return Promise.reject(new Error('setColumnValues: 对应列不存在'));
             }
             const isSame = JSON.stringify(column.data.options) === JSON.stringify(options);
             if (isSame) {

dist/search/index.js

@@ -32,9 +32,15 @@ VantComponent({
             this.$emit('change', event.detail);
         },
         onCancel() {
-            this.set({ value: '' });
+            /**
-            this.$emit('cancel');
+             * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效
-            this.$emit('change', '');
+             * // https://github.com/youzan/vant-weapp/issues/1768
+             */
+            setTimeout(() => {
+                this.set({ value: '' });
+                this.$emit('cancel');
+                this.$emit('change', '');
+            }, 200);
         },
         onSearch() {
             this.$emit('search', this.data.value);

lib/collapse-item/index.js

@@ -71,11 +71,9 @@ component_1.VantComponent({
                         contentHeight: height ? height + "px" : 'auto'
                     });
                 }
-                else {
+                return _this.set({ contentHeight: height + "px" })
-                    return _this.set({ contentHeight: height + "px" })
+                    .then(nextTick)
-                        .then(nextTick)
+                    .then(function () { return _this.set({ contentHeight: 0 }); });
-                        .then(function () { return _this.set({ contentHeight: 0 }); });
-                }
             });
         },
         onClick: function () {

lib/datetime-picker/index.js

@@ -105,7 +105,8 @@ component_1.VantComponent({
         },
         getPicker: function () {
             if (this.picker == null) {
-                var picker_1 = (this.picker = this.selectComponent('.van-datetime-picker'));
+                this.picker = this.selectComponent('.van-datetime-picker');
+                var picker_1 = this.picker;
                 var setColumnValues_1 = picker_1.setColumnValues;
                 picker_1.setColumnValues = function () {
                     var args = [];
@@ -119,7 +120,7 @@ component_1.VantComponent({
         },
         updateColumns: function () {
             var _a = this.data.formatter, formatter = _a === void 0 ? defaultFormatter : _a;
-            var results = this.getRanges().map(function (_a, index) {
+            var results = this.getRanges().map(function (_a) {
                 var type = _a.type, range = _a.range;
                 var values = times(range[1] - range[0] + 1, function (index) {
                     var value = range[0] + index;

lib/dialog/dialog.js

@@ -38,6 +38,7 @@ Dialog.defaultOptions = {
     zIndex: 100,
     overlay: true,
     className: '',
+    customStyle: '',
     asyncClose: false,
     messageAlign: '',
     transition: 'scale',

lib/dialog/index.js

@@ -11,6 +11,7 @@ component_1.VantComponent({
         message: String,
         useSlot: Boolean,
         className: String,
+        customStyle: String,
         asyncClose: Boolean,
         messageAlign: String,
         showCancelButton: Boolean,

lib/dialog/index.wxml

@@ -4,6 +4,7 @@
   overlay="{{ overlay }}"
   custom-class="van-dialog {{ className }}"
   transition="{{ transition }}"
+  custom-style="{{ customStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"
 >

lib/dialog/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-dialog{width:85%;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px}.van-dialog__header{padding-top:25px;font-weight:500;text-align:center}.van-dialog__header--isolated{padding:25px 0}.van-dialog__message{max-height:60vh;padding:25px;overflow-y:auto;font-size:14px;line-height:1.5;text-align:center;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:12px;color:#7d7e80}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__footer{display:-webkit-flex;display:flex}.van-dialog__button{-webkit-flex:1;flex:1}.van-dialog__cancel,.van-dialog__confirm{border:0!important}.van-dialog__confirm{color:#1989fa!important}.van-dialog-bounce-enter{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}.van-dialog-bounce-leave-active{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9)}
+@import '../common/index.wxss';.van-dialog{top:45%!important;width:85%;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px}.van-dialog__header{padding-top:25px;font-weight:500;line-height:24px;text-align:center}.van-dialog__header--isolated{padding:25px 0}.van-dialog__message{max-height:60vh;padding:25px;overflow-y:auto;font-size:14px;line-height:20px;text-align:center;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:12px;color:#7d7e80}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__footer{display:-webkit-flex;display:flex}.van-dialog__button{-webkit-flex:1;flex:1}.van-dialog__cancel,.van-dialog__confirm{border:0!important}.van-dialog__confirm{color:#1989fa!important}.van-dialog-bounce-enter{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7)}.van-dialog-bounce-leave-active{opacity:0;-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9)}

lib/mixins/basic.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.basic = Behavior({
     methods: {
         $emit: function () {
-            this.triggerEvent.apply(this, arguments);
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            this.triggerEvent.apply(this, args);
         },
         getRect: function (selector, all) {
             var _this = this;

lib/mixins/observer/behavior.js

@@ -5,7 +5,6 @@ function setAsync(context, data) {
         context.setData(data, resolve);
     });
 }
-;
 exports.behavior = Behavior({
     created: function () {
         var _this = this;
@@ -20,7 +19,8 @@ exports.behavior = Behavior({
             keys.forEach(function (key) {
                 var value = computed[key].call(_this);
                 if (cache[key] !== value) {
-                    cache[key] = needUpdate[key] = value;
+                    cache[key] = value;
+                    needUpdate[key] = value;
                 }
             });
             return needUpdate;

lib/mixins/observer/props.js

@@ -11,11 +11,15 @@ function observeProps(props) {
         }
         var observer = prop.observer;
         prop.observer = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
             if (observer) {
                 if (typeof observer === 'string') {
                     observer = this[observer];
                 }
-                observer.apply(this, arguments);
+                observer.apply(this, args);
             }
             this.set();
         };

lib/picker-column/index.js

@@ -119,9 +119,7 @@ component_1.VantComponent({
                     userAction && _this.$emit('change', index);
                 });
             }
-            else {
+            return this.set({ offset: offset });
-                return this.set({ offset: offset });
-            }
         },
         setValue: function (value) {
             var options = this.data.options;

lib/picker-column/index.wxml

@@ -1,3 +1,5 @@
+<wxs src="./index.wxs" module="getOptionText" />
+
 <view
   class="van-picker-column custom-class"
   style="height: {{ itemHeight * visibleItemCount }}px"
@@ -18,14 +20,3 @@
     >{{ getOptionText(option, valueKey) }}</view>
   </view>
 </view>
-
-<wxs module="getOptionText">
-function isObj(x) {
-  var type = typeof x;
-  return x !== null && (type === 'object' || type === 'function');
-}
-
-module.exports = function (option, valueKey) {
-  return isObj(option) && option[valueKey] ? option[valueKey] : option;
-}
-</wxs>

lib/picker-column/index.wxs

@@ -0,0 +1,8 @@
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
+}

lib/picker/index.js

@@ -91,7 +91,7 @@ component_1.VantComponent({
         setColumnValue: function (index, value) {
             var column = this.getColumn(index);
             if (column == null) {
-                return Promise.reject('setColumnValue: 对应列不存在');
+                return Promise.reject(new Error('setColumnValue: 对应列不存在'));
             }
             return column.setValue(value);
         },
@@ -103,7 +103,7 @@ component_1.VantComponent({
         setColumnIndex: function (columnIndex, optionIndex) {
             var column = this.getColumn(columnIndex);
             if (column == null) {
-                return Promise.reject('setColumnIndex: 对应列不存在');
+                return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
             }
             return column.setIndex(optionIndex);
         },
@@ -116,7 +116,7 @@ component_1.VantComponent({
             if (needReset === void 0) { needReset = true; }
             var column = this.children[index];
             if (column == null) {
-                return Promise.reject('setColumnValues: 对应列不存在');
+                return Promise.reject(new Error('setColumnValues: 对应列不存在'));
             }
             var isSame = JSON.stringify(column.data.options) === JSON.stringify(options);
             if (isSame) {

lib/search/index.js

@@ -34,9 +34,16 @@ component_1.VantComponent({
             this.$emit('change', event.detail);
         },
         onCancel: function () {
-            this.set({ value: '' });
+            var _this = this;
-            this.$emit('cancel');
+            /**
-            this.$emit('change', '');
+             * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效
+             * // https://github.com/youzan/vant-weapp/issues/1768
+             */
+            setTimeout(function () {
+                _this.set({ value: '' });
+                _this.$emit('cancel');
+                _this.$emit('change', '');
+            }, 200);
         },
         onSearch: function () {
             this.$emit('search', this.data.value);