Skip to content

Commit 0256ca8

Browse files
authored
fix(src): 修改rules组件不能正确校验的bug(#716)
1 parent b6318d4 commit 0256ca8

File tree

14 files changed

+55
-25
lines changed

14 files changed

+55
-25
lines changed

dist/checkbox-group/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/input/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/radio-group/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/textarea/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/dist/checkbox-group/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import eventBus from '../utils/eventBus';
2+
import rules from '../behaviors/rules';
3+
24

35
Component({
4-
behaviors: ['wx://form-field'],
6+
behaviors: ['wx://form-field',rules],
57
externalClasses: ['l-class', 'l-error-text', 'l-error-text-class'],
68
relations: {
79
'../checkbox/index': {
@@ -78,6 +80,10 @@ Component({
7880
onEmitEventHandle(currentItem) {
7981
currentItem.checked ? this.addSelect (currentItem):this.removeSelect(currentItem.key);
8082

83+
this.validatorData({
84+
[this.data.name]: Object.values(this._selected)
85+
});
86+
8187
this.triggerEvent('linchange', currentItem, {
8288
bubbles: true,
8389
composed: true

examples/dist/input/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// input/input.js
22
import eventBus from '../utils/eventBus.js';
33
import validator from '../behaviors/validator';
4+
import rules from '../behaviors/rules';
45
Component({
56
/**
67
* 组件的属性列表
78
*/
89
options: {
910
multipleSlots: true,
1011
},
11-
behaviors: ['wx://form-field', validator],
12+
behaviors: ['wx://form-field', validator, rules],
1213
externalClasses: ['l-class', 'l-label-class', 'l-error-text', 'l-error-text-class'],
1314
properties: {
1415
// 表单标题(label)的文本
@@ -101,9 +102,9 @@ Component({
101102
},
102103

103104
handleInputBlur(event) {
104-
// this.validatorData({
105-
// value: event.detail.value
106-
// });
105+
this.validatorData({
106+
[this.data.name]: event.detail.value
107+
});
107108
eventBus.emit(`lin-form-blur-${this.id}`, this.id);
108109
this.triggerEvent('linblur', event.detail);
109110
},

examples/dist/radio-group/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import eventBus from '../utils/eventBus';
2+
import rules from '../behaviors/rules';
3+
24

35
Component({
46
externalClasses: ['l-class', 'l-error-text', 'l-error-text-class'],
5-
behaviors: ['wx://form-field'],
7+
behaviors: ['wx://form-field',rules],
68
relations: {
79
'../radio/index': {
810
type: 'child',
@@ -89,6 +91,9 @@ Component({
8991
Object.assign(currentItem, {
9092
currentKey: this.properties.current
9193
});
94+
this.validatorData({
95+
[this.data.name]: this.data.current
96+
});
9297
this.triggerEvent('linchange', currentItem, {
9398
bubbles: true,
9499
composed: true

examples/dist/textarea/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ Component({
9595
},
9696

9797
handleInputBlur(event) {
98-
// this.validatorData({
99-
// value: event.detail.value
100-
// });
98+
this.validatorData({
99+
[this.data.name]: event.detail.value
100+
});
101101
eventBus.emit(`lin-form-blur-${this.id}`,this.id);
102102
this.triggerEvent('linblur', event.detail);
103103
},

examples/pages/components/form/pages/rules/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,14 @@ Component({
2727
required: true
2828
},
2929
sexRules: {
30+
type: 'string',
31+
required: true,
32+
message: '请选择性别'
33+
},
34+
habbitRules: {
3035
type: 'array',
31-
required: true
36+
required: true,
37+
message: '至少选择一个兴趣爱好'
3238
},
3339
phoneRules: [{
3440
type: "string",

examples/pages/components/form/pages/rules/index.wxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<l-input label="邮箱" placeholder="请输入邮箱" label-width="170" name="email" rules="{{emailRules}}" tipType="message" bind:linvalidate="linvalidate"/>
88
<l-input label="用户名" placeholder="长度需要在12个字以内" label-width="170" name="user" rules="{{userRules}}" tipType="text" clear="{{true}}" l-error-text="error-text"/>
99
<l-input label="密码" label-width="170" placeholder="请输入密码" name="password" rules="{{passwordRules}}" tipType="toast"/>
10-
<l-input label="手机号" label-width="170" placeholder="请输入密码" name="phone" rules="{{phoneRules}}" tipType="toast"/>
10+
<l-input label="手机号" label-width="170" placeholder="请输入手机号" name="phone" rules="{{phoneRules}}" tipType="toast"/>
1111
<view class="group-label">
1212
<text>爱好</text>
13-
<l-checkbox-group l-class="l-radio-group" rules="{{sexRules}}" name="habbit" tipType="text" bind:linchange="changeCheckbox">
13+
<l-checkbox-group l-class="l-radio-group" rules="{{habbitRules}}" name="habbit" tipType="text" bind:linchange="changeCheckbox">
1414
<l-checkbox l-class="l-radio" l-title-class="l-title-class" placement="left" key="读书" checked="{{util.isChecked('读书',likes)}}">读书</l-checkbox>
1515
<l-checkbox l-class="l-radio" l-title-class="l-title-class" placement="left" key="写字" checked="{{util.isChecked('写字',likes)}}">写字</l-checkbox>
1616
<l-checkbox l-class="l-radio" l-title-class="l-title-class" placement="left" key="摄影" checked="{{util.isChecked('摄影',likes)}}">摄影</l-checkbox>

0 commit comments

Comments
 (0)