|
1 | 1 | /*!
|
2 |
| - * weui.js v1.1.3 (https://weui.io) |
3 |
| - * Copyright 2017, wechat ui team |
| 2 | + * weui.js v1.1.4 (https://weui.io) |
| 3 | + * Copyright 2018, wechat ui team |
4 | 4 | * MIT license
|
5 | 5 | */
|
6 | 6 | (function webpackUniversalModuleDefinition(root, factory) {
|
@@ -277,6 +277,9 @@ return /******/ (function(modules) { // webpackBootstrap
|
277 | 277 | } else {
|
278 | 278 | hide();
|
279 | 279 | }
|
| 280 | + }).on('touchmove', function (evt) { |
| 281 | + evt.stopPropagation(); |
| 282 | + evt.preventDefault(); |
280 | 283 | });
|
281 | 284 |
|
282 | 285 | _sington = $dialogWrap[0];
|
@@ -1295,6 +1298,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
1295 | 1298 | * @param {function} actions[].onClick 选项点击时的回调
|
1296 | 1299 | *
|
1297 | 1300 | * @param {object=} options 配置项
|
| 1301 | + * @param {string=} options.title actionSheet的title,如果isAndroid=true,则不会显示 |
1298 | 1302 | * @param {string=} options.className 自定义类名
|
1299 | 1303 | * @param {function=} [options.onClose] actionSheet关闭后的回调
|
1300 | 1304 | *
|
@@ -1341,6 +1345,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
1341 | 1345 | options = _util2.default.extend({
|
1342 | 1346 | menus: menus,
|
1343 | 1347 | actions: actions,
|
| 1348 | + title: '', |
1344 | 1349 | className: '',
|
1345 | 1350 | isAndroid: isAndroid,
|
1346 | 1351 | onClose: _util2.default.noop
|
@@ -1395,7 +1400,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
1395 | 1400 | /* 14 */
|
1396 | 1401 | /***/ function(module, exports) {
|
1397 | 1402 |
|
1398 |
| - module.exports = "<div class=\"<% if(isAndroid){ %>weui-skin_android <% } %><%= className %>\"> <div class=weui-mask></div> <div class=weui-actionsheet> <div class=weui-actionsheet__menu> <% for(var i = 0; i < menus.length; i++){ %> <div class=weui-actionsheet__cell><%= menus[i].label %></div> <% } %> </div> <div class=weui-actionsheet__action> <% for(var j = 0; j < actions.length; j++){ %> <div class=weui-actionsheet__cell><%= actions[j].label %></div> <% } %> </div> </div> </div> "; |
| 1403 | + module.exports = "<div class=\"<% if(isAndroid){ %>weui-skin_android <% } %><%= className %>\"> <div class=weui-mask></div> <div class=weui-actionsheet> <% if(!isAndroid && title){ %> <div class=weui-actionsheet__title> <p class=weui-actionsheet__title-text><%= title %></p> </div> <% } %> <div class=weui-actionsheet__menu> <% for(var i = 0; i < menus.length; i++){ %> <div class=weui-actionsheet__cell><%= menus[i].label %></div> <% } %> </div> <div class=weui-actionsheet__action> <% for(var j = 0; j < actions.length; j++){ %> <div class=weui-actionsheet__cell><%= actions[j].label %></div> <% } %> </div> </div> </div> "; |
1399 | 1404 |
|
1400 | 1405 | /***/ },
|
1401 | 1406 | /* 15 */
|
@@ -2152,8 +2157,8 @@ return /******/ (function(modules) { // webpackBootstrap
|
2152 | 2157 | *
|
2153 | 2158 | * // return false; // 阻止文件上传
|
2154 | 2159 | * },
|
2155 |
| - * onProgress: function(procent){ |
2156 |
| - * console.log(this, procent); |
| 2160 | + * onProgress: function(percent){ |
| 2161 | + * console.log(this, percent); |
2157 | 2162 | * // return true; // 阻止默认行为,不使用默认的进度显示
|
2158 | 2163 | * },
|
2159 | 2164 | * onSuccess: function (ret) {
|
@@ -3133,12 +3138,15 @@ return /******/ (function(modules) { // webpackBootstrap
|
3133 | 3138 | * });
|
3134 | 3139 | */
|
3135 | 3140 | function datePicker(options) {
|
| 3141 | + var nowDate = new Date(); |
| 3142 | + |
3136 | 3143 | var defaults = _util2.default.extend({
|
3137 | 3144 | id: 'datePicker',
|
3138 | 3145 | onChange: _util2.default.noop,
|
3139 | 3146 | onConfirm: _util2.default.noop,
|
3140 |
| - start: 2000, |
3141 |
| - end: 2030, |
| 3147 | + start: nowDate.getFullYear() - 20, |
| 3148 | + end: nowDate.getFullYear() + 20, |
| 3149 | + defaultValue: [nowDate.getFullYear(), nowDate.getMonth() + 1, nowDate.getDate()], |
3142 | 3150 | cron: '* * *'
|
3143 | 3151 | }, options);
|
3144 | 3152 |
|
|
0 commit comments