Skip to content

Commit aaa4177

Browse files
committed
v1.1.4
1 parent 0498cd4 commit aaa4177

File tree

4 files changed

+29
-12
lines changed

4 files changed

+29
-12
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
#### v1.1.4 (2018-07-20)
2+
3+
- 【修复】 percent拼写错误 #207
4+
- 【优化】 弹窗之后背景还是可以滑动的问题
5+
- 【优化】 `datePicker`默认选择当天 #196
6+
- 【优化】 `actionSheet`增加`title`参数
7+
8+
9+
110
#### v1.1.3 (2017-11-08)
211

312
- 【优化】 `picker``actionSheet` 增加`onClose`

dist/weui.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
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
44
* MIT license
55
*/
66
(function webpackUniversalModuleDefinition(root, factory) {
@@ -277,6 +277,9 @@ return /******/ (function(modules) { // webpackBootstrap
277277
} else {
278278
hide();
279279
}
280+
}).on('touchmove', function (evt) {
281+
evt.stopPropagation();
282+
evt.preventDefault();
280283
});
281284

282285
_sington = $dialogWrap[0];
@@ -1295,6 +1298,7 @@ return /******/ (function(modules) { // webpackBootstrap
12951298
* @param {function} actions[].onClick 选项点击时的回调
12961299
*
12971300
* @param {object=} options 配置项
1301+
* @param {string=} options.title actionSheet的title,如果isAndroid=true,则不会显示
12981302
* @param {string=} options.className 自定义类名
12991303
* @param {function=} [options.onClose] actionSheet关闭后的回调
13001304
*
@@ -1341,6 +1345,7 @@ return /******/ (function(modules) { // webpackBootstrap
13411345
options = _util2.default.extend({
13421346
menus: menus,
13431347
actions: actions,
1348+
title: '',
13441349
className: '',
13451350
isAndroid: isAndroid,
13461351
onClose: _util2.default.noop
@@ -1395,7 +1400,7 @@ return /******/ (function(modules) { // webpackBootstrap
13951400
/* 14 */
13961401
/***/ function(module, exports) {
13971402

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> ";
13991404

14001405
/***/ },
14011406
/* 15 */
@@ -2152,8 +2157,8 @@ return /******/ (function(modules) { // webpackBootstrap
21522157
*
21532158
* // return false; // 阻止文件上传
21542159
* },
2155-
* onProgress: function(procent){
2156-
* console.log(this, procent);
2160+
* onProgress: function(percent){
2161+
* console.log(this, percent);
21572162
* // return true; // 阻止默认行为,不使用默认的进度显示
21582163
* },
21592164
* onSuccess: function (ret) {
@@ -3133,12 +3138,15 @@ return /******/ (function(modules) { // webpackBootstrap
31333138
* });
31343139
*/
31353140
function datePicker(options) {
3141+
var nowDate = new Date();
3142+
31363143
var defaults = _util2.default.extend({
31373144
id: 'datePicker',
31383145
onChange: _util2.default.noop,
31393146
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()],
31423150
cron: '* * *'
31433151
}, options);
31443152

dist/weui.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "weui.js",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"description": "weui.js",
55
"main": "./dist/weui.min.js",
66
"scripts": {

0 commit comments

Comments
 (0)