Skip to content

Commit 2fa8603

Browse files
committed
fix(uni-data-checkbox): 修复selectedTextColor 属性不生效的Bug
1 parent cb14257 commit 2fa8603

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

uni_modules/uni-data-checkbox/changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 0.1.8(2021-06-28)
2+
- 修复 selectedTextColor 属性不生效的Bug
13
## 0.1.7(2021-06-02)
24
- 新增 map 属性,可以方便映射text/value属性
35
## 0.1.6(2021-05-26)

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@
108108
},
109109
selectedColor: {
110110
type: String,
111-
default: '#007aff'
111+
default: ''
112112
},
113113
selectedTextColor: {
114114
type: String,
115-
default: '#333'
115+
default: ''
116116
},
117117
emptyText:{
118118
type: String,
@@ -385,13 +385,20 @@
385385
let classles = ''
386386
// if (item.selected) {
387387
// if (this.selectedTextColor) {
388-
// styles.color = item.selected?this.selectedTextColor:'#999'
388+
// if (this.mode === 'tag') {
389+
// styles.color = item.selected?this.selectedTextColor:'#333'
390+
391+
// } else {
392+
// styles.color = item.selected?this.selectedTextColor:'#333'
393+
// }
394+
// if(!item.selected && item.disabled){
395+
// styles.color = '#999'
396+
// }
389397
// } else {
390398
if (this.mode === 'tag') {
391-
styles.color = item.selected?'#fff':'#333'
392-
399+
styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#333'
393400
} else {
394-
styles.color = item.selected?this.selectedColor:'#333'
401+
styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:this.selectedColor):'#333'
395402
}
396403
if(!item.selected && item.disabled){
397404
styles.color = '#999'

uni_modules/uni-data-checkbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-data-checkbox",
33
"displayName": "uni-data-checkbox 数据选择器",
4-
"version": "0.1.7",
4+
"version": "0.1.8",
55
"description": "通过数据驱动的单选框和复选框",
66
"keywords": [
77
"uni-ui",

0 commit comments

Comments
 (0)