Skip to content

Commit a4914a0

Browse files
authored
Merge pull request #839 from liujiayii/patch-1
fix(uni-data-checkbox): fix typo chagne => change
2 parents 9358c8e + 69dc266 commit a4914a0

File tree

1 file changed

+36
-32
lines changed

1 file changed

+36
-32
lines changed

uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue

+36-32
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</view>
88
</template>
99
<template v-else>
10-
<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="chagne">
10+
<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="change">
1111
<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
1212
:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
1313
<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''" :checked="item.selected" />
@@ -20,7 +20,7 @@
2020
</view>
2121
</label>
2222
</checkbox-group>
23-
<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
23+
<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="change">
2424
<!-- -->
2525
<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
2626
:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
@@ -153,7 +153,7 @@
153153
this.dataList = this.getDataList(this.getSelectedValue(newVal))
154154
},
155155
value(newVal) {
156-
this.dataList = this.getDataList(newVal)
156+
this.dataList = this.getDataList(newVal)
157157
// fix by mehaotian is_reset 在 uni-forms 中定义
158158
// if(!this.is_reset){
159159
// this.is_reset = false
@@ -181,7 +181,7 @@
181181
styles: {
182182
selectedColor: '#2979ff',
183183
selectedTextColor: '#666',
184-
},
184+
},
185185
isTop:0
186186
};
187187
},
@@ -197,13 +197,13 @@
197197
// this.formItem = this.getForm('uniFormsItem')
198198
// this.formItem && this.formItem.setValue(this.value)
199199
200-
// if (this.formItem) {
200+
// if (this.formItem) {
201201
// this.isTop = 6
202-
// if (this.formItem.name) {
203-
// // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
204-
// if(!this.is_reset){
205-
// this.is_reset = false
206-
// this.formItem.setValue(this.dataValue)
202+
// if (this.formItem.name) {
203+
// // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
204+
// if(!this.is_reset){
205+
// this.is_reset = false
206+
// this.formItem.setValue(this.dataValue)
207207
// }
208208
// this.rename = this.formItem.name
209209
// this.form.inputChildrens.push(this)
@@ -248,7 +248,11 @@
248248
}
249249
return parent;
250250
},
251-
chagne(e) {
251+
/** 为了兼容原来的错别字 */
252+
chagne(...rest){
253+
this.change(...rest)
254+
},
255+
change(e) {
252256
const values = e.detail.value
253257
254258
let detail = {
@@ -383,14 +387,14 @@
383387
*/
384388
setStyleBackgroud(item) {
385389
let styles = {}
386-
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
387-
if (this.selectedColor) {
388-
if (this.mode !== 'list') {
389-
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
390-
}
391-
if (this.mode === 'tag') {
392-
styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
393-
}
390+
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
391+
if (this.selectedColor) {
392+
if (this.mode !== 'list') {
393+
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
394+
}
395+
if (this.mode === 'tag') {
396+
styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
397+
}
394398
}
395399
let classles = ''
396400
for (let i in styles) {
@@ -400,16 +404,16 @@
400404
},
401405
setStyleIcon(item) {
402406
let styles = {}
403-
let classles = ''
404-
if (this.selectedColor) {
405-
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
406-
styles['background-color'] = item.selected?selectedColor:'#fff'
407-
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
408-
409-
if(!item.selected && item.disabled){
410-
styles['background-color'] = '#F2F6FC'
411-
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
412-
}
407+
let classles = ''
408+
if (this.selectedColor) {
409+
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
410+
styles['background-color'] = item.selected?selectedColor:'#fff'
411+
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
412+
413+
if(!item.selected && item.disabled){
414+
styles['background-color'] = '#F2F6FC'
415+
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
416+
}
413417
}
414418
for (let i in styles) {
415419
classles += `${i}:${styles[i]};`
@@ -418,8 +422,8 @@
418422
},
419423
setStyleIconText(item) {
420424
let styles = {}
421-
let classles = ''
422-
if (this.selectedColor) {
425+
let classles = ''
426+
if (this.selectedColor) {
423427
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
424428
if (this.mode === 'tag') {
425429
styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
@@ -428,7 +432,7 @@
428432
}
429433
if(!item.selected && item.disabled){
430434
styles.color = '#999'
431-
}
435+
}
432436
}
433437
for (let i in styles) {
434438
classles += `${i}:${styles[i]};`

0 commit comments

Comments
 (0)