Skip to content

Commit 9e377a2

Browse files
张寸起smileShirmy
authored andcommitted
fix(Checkbox): 修复多个由于属性定义导致的控制台警告
1 parent 56025bf commit 9e377a2

File tree

8 files changed

+16
-25
lines changed

8 files changed

+16
-25
lines changed

src/behaviors/countdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export default Behavior({
33
behaviors: [],
44
properties: {
55
time: {
6-
type: Date,
6+
type: Object,
77
value: new Date().getTime() + 86400000,
88
observer: function (newVal, oldVal) {
99
if (newVal && !oldVal) {

src/behaviors/rules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default Behavior({
1010
properties: {
1111
// 校验
1212
rules: {
13-
type: [Object, Array],
13+
optionalTypes: [Object, Array],
1414
value: []
1515
},
1616
tipType: {

src/calendar/components/mounth/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ Component({
66
},
77
properties: {
88
minDate: {
9-
type: [Date,String,null],
10-
// observer: 'setDays'
9+
optionalTypes: [Object,String],
1110
},
1211
maxDate: {
13-
type: [Date,String,null],
14-
// observer: 'setDays'
12+
optionalTypes: [Object,String],
1513
},
1614
formatter: {
1715
type: null,
@@ -22,7 +20,7 @@ Component({
2220
observer: 'setDays'
2321
},
2422
currentDate: {
25-
type: [null, Array],
23+
optionalTypes: [Array],
2624
observer() {
2725
this.setDays();
2826
}

src/calendar/index.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,37 @@ Component({
3535
value: ''
3636
},
3737
defaultDate: {
38-
type: [String, Number, Date, Array],
39-
value: '',
38+
optionalTypes: [String, Number, Date, Array],
4039
observer() {
4140
this.setData({ currentDate: this.initCurrentDate() });
4241
}
4342
},
4443
format: {
4544
type: String,
4645
value: 'timestamp'
47-
// value: 'yyyy-MM-dd',
4846
},
4947
formatter: {
50-
type: [Function, null],
48+
type: Object,
5149
value: null
5250
},
5351
minDate: {
54-
type: [String, Number, null],
52+
optionalTypes: [String, Number],
5553
value: Date.now()
5654
},
5755
maxDate: {
58-
type: [String, Number, null],
56+
optionalTypes: [String, Number],
5957
value: new Date(
6058
new Date().getFullYear(),
6159
new Date().getMonth() + 6,
6260
new Date().getDate()
6361
).getTime()
6462
},
6563
minSelect: {
66-
type: [Number, null],
64+
type: Number,
6765
value: null
6866
},
6967
maxSelect: {
70-
type: [Number, null],
68+
type: Number,
7169
value: null
7270
},
7371
allowSameDay: Boolean,

src/checkbox-group/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Component({
2626
},
2727
// 最多选中值
2828
maxSelected: {
29-
type: [Number,null],
29+
type: Number,
3030
value: null
3131
},
3232
minSelected: {
33-
type: [Number,null],
33+
type: Number,
3434
value: null
35-
}
35+
},
3636
},
3737
data: {
3838
},

src/image-picker/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Component({
4949
},
5050
sizeType: {
5151
// 该写法经测试有效
52-
type: Array | String,
52+
optionalTypes: [Array, String],
5353
value: ['original', 'compressed']
5454
},
5555
// 所选图片最大限制,单位字节

src/mask/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Component({
1313
},
1414
// 不透明度
1515
opacity: {
16-
type: [String, Number],
16+
optionalTypes: [String, Number],
1717
value: .4
1818
},
1919
// mask的z-index值

src/tab-bar/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ Component({
3333
}
3434
},
3535

36-
data: {
37-
// 当前选中项索引
38-
selectedIndex: 0
39-
},
40-
4136
pageLifetimes: {
4237
show: function () {
4338
// 切换 tab 选中项

0 commit comments

Comments
 (0)