Skip to content

Commit 34d68a5

Browse files
committed
Merge branch 'master' into develop
2 parents 2e1d01b + 2bd78e2 commit 34d68a5

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"scripts": {
1010
"submodule": "git submodule init && git submodule update --init",
11-
"init": "npm run submodule && npm i && cd src/weui-wxss && npm i && gulp build:style && cd ../../ && npm run dev",
11+
"init": "npm run submodule && npm i && npm run dev",
1212
"dev": "gulp dev --develop",
1313
"demo": "gulp demo --develop",
1414
"watch": "gulp watch --develop --watch",

src/form/validator.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ export default {
121121
bytelength(r, value, param) {
122122
param = r.param
123123
// eslint-disable-next-line no-control-regex
124+
value = value || ''
124125
const len = value.replace(/[^\x00-\xff]/g, '**').length
125126
if (len > param) {
126127
return sprintf(r.message || defaultMessage.bytelength, param)

src/half-screen-dialog/half-screen-dialog.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</view>
2020
</view>
2121
<view class="weui-half-screen-dialog__bd">
22-
<block wx:if="{{title}}">
22+
<block wx:if="{{desc}}">
2323
<view class="weui-half-screen-dialog__desc">{{desc}}</view>
2424
<view class="weui-half-screen-dialog__tips">{{tips}}</view>
2525
</block>

src/searchbar/searchbar.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Component({
9191
this.setData({
9292
searchState: false
9393
})
94+
this.triggerEvent('cancel')
9495
},
9596
// @ts-ignore
9697
inputChange(e) {
@@ -107,7 +108,7 @@ Component({
107108
this.lastSearch = Date.now()
108109
this.timerId = setTimeout(() => {
109110
this.data
110-
.search(e.detail.value)
111+
.search(this.data.value)
111112
.then((json) => {
112113
this.setData({
113114
result: json

0 commit comments

Comments
 (0)