Skip to content

Commit

Permalink
Merge pull request #131 from uxsi/master
Browse files Browse the repository at this point in the history
weui-wxss v2.0.1
  • Loading branch information
progrape authored Oct 23, 2019
2 parents dd6ee7c + 00549ce commit 1e6b1b1
Show file tree
Hide file tree
Showing 150 changed files with 4,893 additions and 542 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ npm-debug.log
.DS_Store
dist/project.config.json
dist/sitemap*

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#### v 2.0.1 (2019-10-23)
- 【增强】 增加组件 form 表单页
- 【增强】 增加组件 actionsheet 模拟原生actionsheet
- 【优化】 优化 slideview 右滑操作UI
- 【修复】 修复在[weui-miniprogram](https://github.com/wechat-miniprogram/weui-miniprogram) v0.2下的一些兼容问题

#### v 2.0.0 (2019-08-01)

- 【同步weui】 颜色规范、字体大小规范、间距规范对齐微信7.0新视觉风格
Expand Down
11 changes: 8 additions & 3 deletions dist/app.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"pages": [
"example/index",

"example/button/button",
"example/list/list",
"example/slideview/slideview",
"example/input/input",
"example/form/form",
"example/slider/slider",
"example/uploader/uploader",

"example/article/article",
"example/badge/badge",
"example/flex/flex",
Expand All @@ -19,6 +22,7 @@
"example/panel/panel",
"example/preview/preview",
"example/progress/progress",

"example/actionsheet/actionsheet",
"example/half-screen-dialog/half-screen-dialog",
"example/dialog/dialog",
Expand All @@ -29,8 +33,10 @@
"example/msg/msg_fail",
"example/picker/picker",
"example/toast/toast",

"example/navigation-bar/navigation-bar",
"example/tabbar/tabbar",

"example/searchbar/searchbar"
],
"window": {
Expand All @@ -46,6 +52,5 @@
"downloadFile": 10000
},
"style": "v2",
"debug": true,
"sitemapLocation": "sitemap.json"
}
"debug": true
}
15 changes: 14 additions & 1 deletion dist/example/actionsheet/actionsheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,18 @@ Page({
}
}
});
},
data: {
showDialog: false
},
openDialog: function () {
this.setData({
istrue: true
})
},
closeDialog: function () {
this.setData({
istrue: false
})
}
});
});
3 changes: 0 additions & 3 deletions dist/example/actionsheet/actionsheet.json

This file was deleted.

21 changes: 19 additions & 2 deletions dist/example/actionsheet/actionsheet.wxml
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
<view class="page">
<view class="page__hd">
<view class="page__title">ActionSheet</view>
<view class="page__desc">弹出式菜单,采用小程序原生的actionsheet</view>
<view class="page__desc">弹出式菜单</view>
</view>
<view class="page__bd">
<view class="weui-btn-area">
<button class="weui-btn" type="default" bindtap="open">ActionSheet</button>
<button class="weui-btn" type="default" bindtap="open">原生 ActionSheet</button>
<button class="weui-btn" type="default" bindtap="openDialog">模拟 ActionSheet</button>
</view>
</view>
<view class="weui-demo-dialog {{istrue ? 'weui-demo-dialog_show' : ''}}">
<view class="weui-mask" bindtap="closeDialog"></view>
<view class="weui-actionsheet {{istrue ? 'weui-actionsheet_toggle' : ''}}" catchtap="stopEvent">
<view class="weui-actionsheet__title">
<view class="weui-actionsheet__title-text">这是一个标题,可以为一行或者两行。</view>
</view>
<view class="weui-actionsheet__menu">
<view class="weui-actionsheet__cell">示例菜单</view>
<view class="weui-actionsheet__cell">示例菜单</view>
<view class="weui-actionsheet__cell weui-actionsheet__cell_warn">负向菜单</view>
</view>
<view class="weui-actionsheet__action">
<view class="weui-actionsheet__cell" bindtap="closeDialog">取消</view>
</view>
</view>
</view>
</view>
12 changes: 9 additions & 3 deletions dist/example/actionsheet/actionsheet.wxss
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
page{
background-color: #FFFFFF;
}
.weui-demo-dialog{
visibility:hidden;
opacity:0;
transition:all .3s;
}
.weui-demo-dialog_show{
visibility:visible;
opacity:1;
}
3 changes: 0 additions & 3 deletions dist/example/article/article.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/badge/badge.json

This file was deleted.

1 change: 0 additions & 1 deletion dist/example/badge/badge.wxss

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/button/button.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/dialog/dialog.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/flex/flex.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/footer/footer.json

This file was deleted.

File renamed without changes.
43 changes: 43 additions & 0 deletions dist/example/form/form.wxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<view class="page">
<view class="weui-form">
<view class="weui-form__text-area">
<view class="weui-form__title">表单标题</view>
<view class="weui-form__desc">表单描述示意</view>
</view>
<view class="weui-form__control-area">
<view class="weui-cells__group weui-cells__group_form">
<view class="weui-cells__title">输入框</view>
<view class="weui-cells weui-cells_form">
<view class="weui-cell">
<view class="weui-cell__hd"><label class="weui-label">QQ号</label></view>
<view class="weui-cell__bd">
<input class="weui-input" type="number" pattern="[0-9]*" placeholder="请输入QQ号"/>
</view>
</view>
</view>
</view>
</view>
<view class="weui-form__tips-area">
<label for="weuiAgree" class="weui-agree">
<input id="weuiAgree" type="checkbox" class="weui-agree__checkbox"/><span class="weui-agree__text">阅读并同意<a href="javascript:void(0);">《相关条款》</a>
</span>
</label>
</view>
<view class="weui-form__opr-area">
<button type="primary">确定</button>
</view>
<view class="weui-form__tips-area">
<view class="weui-form__tips">
点击下一步即表示<navigator href="javascript:;">同意用户协议</navigator>
</view>
</view>
<view class="weui-form__extra-area">
<view class="weui-footer">
<view class="weui-footer__links">
<navigator href="javascript:void(0);" class="weui-footer__link">底部链接文本</navigator>
</view>
<view class="weui-footer__text">Copyright © 2008-2019 weui.io</view>
</view>
</view>
</view>
</view>
1 change: 1 addition & 0 deletions dist/example/form/form.wxss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
page,.page{height:100%;}
3 changes: 0 additions & 3 deletions dist/example/gallery/gallery.json

This file was deleted.

1 change: 0 additions & 1 deletion dist/example/gallery/gallery.wxss

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/grid/grid.json

This file was deleted.

1 change: 0 additions & 1 deletion dist/example/grid/grid.wxss

This file was deleted.

15 changes: 0 additions & 15 deletions dist/example/half-screen-dialog/dialog.js

This file was deleted.

28 changes: 0 additions & 28 deletions dist/example/half-screen-dialog/dialog.wxml

This file was deleted.

12 changes: 0 additions & 12 deletions dist/example/half-screen-dialog/dialog.wxss

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/half-screen-dialog/half-screen-dialog.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/icons/icons.json

This file was deleted.

2 changes: 1 addition & 1 deletion dist/example/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Page({
id: 'form',
name: '表单',
open: false,
pages: ['button', 'list', 'slideview', 'input', 'slider', 'uploader']
pages: ['button', 'list', 'slideview', 'input', 'form', 'slider', 'uploader']
},
{
id: 'widget',
Expand Down
3 changes: 0 additions & 3 deletions dist/example/index.json

This file was deleted.

2 changes: 1 addition & 1 deletion dist/example/index.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.0.0 (https://github.com/weui/weui-wxss)
* WeUI v2.0.1 (https://github.com/weui/weui-wxss)
* Copyright 2019 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
3 changes: 0 additions & 3 deletions dist/example/input/input.json

This file was deleted.

1 change: 0 additions & 1 deletion dist/example/input/input.wxss

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/list/list.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/loading/loading.json

This file was deleted.

18 changes: 0 additions & 18 deletions dist/example/loading/loadmore.wxml

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/loading/loadmore.wxss

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/loadmore/loadmore.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/msg/msg.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/msg/msg_fail.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/msg/msg_success.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/msg/msg_text.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/msg/msg_text_primary.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/example/navbar/navbar.json

This file was deleted.

Loading

0 comments on commit 1e6b1b1

Please sign in to comment.