Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 12, 2021
Merged

merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f1160e
test: update snapshot
Tidyzq Feb 22, 2021
72d0fe5
fix: fix searchbar cancel focus
Tidyzq Apr 8, 2021
55eca46
fix: fix half screen dialog buttons. close #158
Tidyzq Apr 8, 2021
ef8ac6c
fix: example navbar. close #160
Tidyzq Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/half-screen-dialog/half-screen-dialog.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@
.weui-half-screen-dialog {
transform: translateY(0%);
}
}
}

.weui-half-screen-dialog__ft {
display: flex;
}
5 changes: 2 additions & 3 deletions src/loading/__test__/__snapshots__/loading.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
exports[`loading basic 1`] = `
<main>
<wx-view
animation="{{Object {}}}"
class="wx_loading_view "
class="wx_loading_view "
id="wx_loading_view"
style="display:;"
style=""
>
<wx-view
class="weui-loadmore"
Expand Down
2 changes: 1 addition & 1 deletion src/searchbar/__test__/__snapshots__/searchbar.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ exports[`searchbar basic 6`] = `
/>
<wx-input
class="weui-search-bar__input"
focus="{{true}}"
focus="{{false}}"
placeholder="搜索"
type="text"
value=""
Expand Down
2 changes: 1 addition & 1 deletion src/searchbar/searchbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Component({
// @ts-ignore
this.setData({
value: '',
focus: true,
focus: false,
result: []
})
// @ts-ignore
Expand Down
4 changes: 2 additions & 2 deletions src/uploader/__test__/__snapshots__/uploader.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ exports[`uploader basic 2`] = `
<wx-image
class="weui-uploader__img"
mode="aspectFill"
src="data:image/jpg;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="
src="/a/b.png"
/>
<wx-view
class="weui-uploader__file-content"
Expand Down Expand Up @@ -450,7 +450,7 @@ exports[`uploader upload fail 2`] = `
<wx-image
class="weui-uploader__img"
mode="aspectFill"
src="data:image/jpg;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="
src="/a/b.png"
/>
<wx-view
class="weui-uploader__file-content"
Expand Down
18 changes: 7 additions & 11 deletions tools/demo/example/half-screen-dialog/half-screen-dialog.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,20 @@
<mp-halfScreenDialog show="{{typeF}}">
<view slot="title">测试标题A</view>
<view slot="desc">这是自定义描述区</view>
<view slot="footer">
<button type="default" class="weui-btn">按钮A</button>
<button type="primary" class="weui-btn">按钮B</button>
</view>
<button slot="footer" type="default" class="weui-btn">按钮A</button>
<button slot="footer" type="primary" class="weui-btn">按钮B</button>
</mp-halfScreenDialog>
<mp-halfScreenDialog show="{{typeT}}" closabled="{{false}}">
<view slot="title">测试标题A</view>
<view slot="desc">这是自定义描述区</view>
<view slot="footer">
<button type="default" class="weui-btn">按钮A</button>
<button type="primary" class="weui-btn">按钮B</button>
</view>
<button slot="footer" type="default" class="weui-btn">按钮A</button>
<button slot="footer" type="primary" class="weui-btn">按钮B</button>
</mp-halfScreenDialog>
<mp-halfScreenDialog
<mp-halfScreenDialog
bindbuttontap="buttontap"
show="{{typeS}}"
maskClosable="{{false}}"
title="测试标题B"
maskClosable="{{false}}"
title="测试标题B"
subTitle="测试标题B的副标题"
desc="辅助描述内容，可根据实际需要安排"
tips="辅助提示内容，可根据实际需要安排"
Expand Down
6 changes: 3 additions & 3 deletions tools/demo/example/navbar/navbar.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</block>
</view>
<view class="weui-tab__panel">
<view class="weui-tab__content" hidden="{{activeIndex != 0}}">选项一的内容</view>
<view class="weui-tab__content" hidden="{{activeIndex != 1}}">选项二的内容</view>
<view class="weui-tab__content" hidden="{{activeIndex != 2}}">选项三的内容</view>
<view class="weui-tab__content" style="display: {{activeIndex === 0 ? 'block' : 'none'}}">选项一的内容</view>
<view class="weui-tab__content" style="display: {{activeIndex === 1 ? 'block' : 'none'}}">选项二的内容</view>
<view class="weui-tab__content" style="display: {{activeIndex === 2 ? 'block' : 'none'}}">选项三的内容</view>
</view>
</view>
</view>
Expand Down