Skip to content

Commit

Permalink
v1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
BearJ committed Jul 20, 2018
1 parent 0498cd4 commit aaa4177
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 12 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#### v1.1.4 (2018-07-20)

- 【修复】 percent拼写错误 #207
- 【优化】 弹窗之后背景还是可以滑动的问题
- 【优化】 `datePicker`默认选择当天 #196
- 【优化】 `actionSheet`增加`title`参数



#### v1.1.3 (2017-11-08)

- 【优化】 `picker``actionSheet` 增加`onClose`
Expand Down
22 changes: 15 additions & 7 deletions dist/weui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* weui.js v1.1.3 (https://weui.io)
* Copyright 2017, wechat ui team
* weui.js v1.1.4 (https://weui.io)
* Copyright 2018, wechat ui team
* MIT license
*/
(function webpackUniversalModuleDefinition(root, factory) {
Expand Down Expand Up @@ -277,6 +277,9 @@ return /******/ (function(modules) { // webpackBootstrap
} else {
hide();
}
}).on('touchmove', function (evt) {
evt.stopPropagation();
evt.preventDefault();
});

_sington = $dialogWrap[0];
Expand Down Expand Up @@ -1295,6 +1298,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {function} actions[].onClick 选项点击时的回调
*
* @param {object=} options 配置项
* @param {string=} options.title actionSheet的title,如果isAndroid=true,则不会显示
* @param {string=} options.className 自定义类名
* @param {function=} [options.onClose] actionSheet关闭后的回调
*
Expand Down Expand Up @@ -1341,6 +1345,7 @@ return /******/ (function(modules) { // webpackBootstrap
options = _util2.default.extend({
menus: menus,
actions: actions,
title: '',
className: '',
isAndroid: isAndroid,
onClose: _util2.default.noop
Expand Down Expand Up @@ -1395,7 +1400,7 @@ return /******/ (function(modules) { // webpackBootstrap
/* 14 */
/***/ function(module, exports) {

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

/***/ },
/* 15 */
Expand Down Expand Up @@ -2152,8 +2157,8 @@ return /******/ (function(modules) { // webpackBootstrap
*
* // return false; // 阻止文件上传
* },
* onProgress: function(procent){
* console.log(this, procent);
* onProgress: function(percent){
* console.log(this, percent);
* // return true; // 阻止默认行为,不使用默认的进度显示
* },
* onSuccess: function (ret) {
Expand Down Expand Up @@ -3133,12 +3138,15 @@ return /******/ (function(modules) { // webpackBootstrap
* });
*/
function datePicker(options) {
var nowDate = new Date();

var defaults = _util2.default.extend({
id: 'datePicker',
onChange: _util2.default.noop,
onConfirm: _util2.default.noop,
start: 2000,
end: 2030,
start: nowDate.getFullYear() - 20,
end: nowDate.getFullYear() + 20,
defaultValue: [nowDate.getFullYear(), nowDate.getMonth() + 1, nowDate.getDate()],
cron: '* * *'
}, options);

Expand Down
8 changes: 4 additions & 4 deletions dist/weui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "weui.js",
"version": "1.1.3",
"version": "1.1.4",
"description": "weui.js",
"main": "./dist/weui.min.js",
"scripts": {
Expand Down

0 comments on commit aaa4177

Please sign in to comment.