|
|
@@ -155,17 +155,17 @@
|
|
|
value(newVal) {
|
|
|
this.dataList = this.getDataList(newVal)
|
|
|
// fix by mehaotian is_reset 在 uni-forms 中定义
|
|
|
- if(!this.is_reset){
|
|
|
- this.is_reset = false
|
|
|
- this.formItem && this.formItem.setValue(newVal)
|
|
|
- }
|
|
|
+ // if(!this.is_reset){
|
|
|
+ // this.is_reset = false
|
|
|
+ // this.formItem && this.formItem.setValue(newVal)
|
|
|
+ // }
|
|
|
},
|
|
|
modelValue(newVal) {
|
|
|
this.dataList = this.getDataList(newVal);
|
|
|
- if(!this.is_reset){
|
|
|
- this.is_reset = false
|
|
|
- this.formItem && this.formItem.setValue(newVal)
|
|
|
- }
|
|
|
+ // if(!this.is_reset){
|
|
|
+ // this.is_reset = false
|
|
|
+ // this.formItem && this.formItem.setValue(newVal)
|
|
|
+ // }
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
|
@@ -193,22 +193,22 @@
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- this.form = this.getForm('uniForms')
|
|
|
- this.formItem = this.getForm('uniFormsItem')
|
|
|
+ // this.form = this.getForm('uniForms')
|
|
|
+ // this.formItem = this.getForm('uniFormsItem')
|
|
|
// this.formItem && this.formItem.setValue(this.value)
|
|
|
|
|
|
- if (this.formItem) {
|
|
|
- this.isTop = 6
|
|
|
- if (this.formItem.name) {
|
|
|
- // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
|
|
|
- if(!this.is_reset){
|
|
|
- this.is_reset = false
|
|
|
- this.formItem.setValue(this.dataValue)
|
|
|
- }
|
|
|
- this.rename = this.formItem.name
|
|
|
- this.form.inputChildrens.push(this)
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (this.formItem) {
|
|
|
+ // this.isTop = 6
|
|
|
+ // if (this.formItem.name) {
|
|
|
+ // // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
|
|
|
+ // if(!this.is_reset){
|
|
|
+ // this.is_reset = false
|
|
|
+ // this.formItem.setValue(this.dataValue)
|
|
|
+ // }
|
|
|
+ // this.rename = this.formItem.name
|
|
|
+ // this.form.inputChildrens.push(this)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
if (this.localdata && this.localdata.length !== 0) {
|
|
|
this.isLocal = true
|
|
|
@@ -273,7 +273,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.formItem && this.formItem.setValue(detail.value)
|
|
|
+ // this.formItem && this.formItem.setValue(detail.value)
|
|
|
// TODO 兼容 vue2
|
|
|
this.$emit('input', detail.value);
|
|
|
// // TOTO 兼容 vue3
|
|
|
@@ -375,7 +375,7 @@
|
|
|
selectedArr.push(item[this.map.value])
|
|
|
}
|
|
|
})
|
|
|
- return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
|
|
|
+ return this.dataValue.length > 0 ? this.dataValue : selectedArr
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -384,11 +384,13 @@
|
|
|
setStyleBackgroud(item) {
|
|
|
let styles = {}
|
|
|
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
|
|
|
- if (this.mode !== 'list') {
|
|
|
- styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
|
|
|
- }
|
|
|
- if (this.mode === 'tag') {
|
|
|
- styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
|
|
|
+ if (this.selectedColor) {
|
|
|
+ if (this.mode !== 'list') {
|
|
|
+ styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
|
|
|
+ }
|
|
|
+ if (this.mode === 'tag') {
|
|
|
+ styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
|
|
|
+ }
|
|
|
}
|
|
|
let classles = ''
|
|
|
for (let i in styles) {
|
|
|
@@ -399,15 +401,16 @@
|
|
|
setStyleIcon(item) {
|
|
|
let styles = {}
|
|
|
let classles = ''
|
|
|
- let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
|
|
|
- styles['background-color'] = item.selected?selectedColor:'#fff'
|
|
|
- styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
|
|
|
-
|
|
|
- if(!item.selected && item.disabled){
|
|
|
- styles['background-color'] = '#F2F6FC'
|
|
|
+ if (this.selectedColor) {
|
|
|
+ let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
|
|
|
+ styles['background-color'] = item.selected?selectedColor:'#fff'
|
|
|
styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
|
|
|
+
|
|
|
+ if(!item.selected && item.disabled){
|
|
|
+ styles['background-color'] = '#F2F6FC'
|
|
|
+ styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
for (let i in styles) {
|
|
|
classles += `${i}:${styles[i]};`
|
|
|
}
|
|
|
@@ -416,16 +419,17 @@
|
|
|
setStyleIconText(item) {
|
|
|
let styles = {}
|
|
|
let classles = ''
|
|
|
- let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
|
|
|
- if (this.mode === 'tag') {
|
|
|
- styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
|
|
|
- } else {
|
|
|
- styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
|
|
|
- }
|
|
|
- if(!item.selected && item.disabled){
|
|
|
- styles.color = '#999'
|
|
|
+ if (this.selectedColor) {
|
|
|
+ let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
|
|
|
+ if (this.mode === 'tag') {
|
|
|
+ styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
|
|
|
+ } else {
|
|
|
+ styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
|
|
|
+ }
|
|
|
+ if(!item.selected && item.disabled){
|
|
|
+ styles.color = '#999'
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
for (let i in styles) {
|
|
|
classles += `${i}:${styles[i]};`
|
|
|
}
|
|
|
@@ -448,7 +452,7 @@
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
- $checked-color: #2979ff;
|
|
|
+ $uni-primary: #2979ff !default;
|
|
|
$border-color: #DCDFE6;
|
|
|
$disable:0.4;
|
|
|
|
|
|
@@ -614,8 +618,8 @@
|
|
|
// 选中
|
|
|
&.is-checked {
|
|
|
.checkbox__inner {
|
|
|
- border-color: $checked-color;
|
|
|
- background-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
+ background-color: $uni-primary;
|
|
|
|
|
|
.checkbox__inner-icon {
|
|
|
opacity: 1;
|
|
|
@@ -623,14 +627,14 @@
|
|
|
}
|
|
|
}
|
|
|
.radio__inner {
|
|
|
- border-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
.radio__inner-icon {
|
|
|
opacity: 1;
|
|
|
- background-color: $checked-color;
|
|
|
+ background-color: $uni-primary;
|
|
|
}
|
|
|
}
|
|
|
.checklist-text {
|
|
|
- color: $checked-color;
|
|
|
+ color: $uni-primary;
|
|
|
}
|
|
|
// 选中禁用
|
|
|
&.is-disable {
|
|
|
@@ -683,10 +687,10 @@
|
|
|
}
|
|
|
|
|
|
&.is-checked {
|
|
|
- border-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
.checkbox__inner {
|
|
|
- border-color: $checked-color;
|
|
|
- background-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
+ background-color: $uni-primary;
|
|
|
.checkbox__inner-icon {
|
|
|
opacity: 1;
|
|
|
transform: rotate(45deg);
|
|
|
@@ -694,16 +698,16 @@
|
|
|
}
|
|
|
|
|
|
.radio__inner {
|
|
|
- border-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
|
|
|
.radio__inner-icon {
|
|
|
opacity: 1;
|
|
|
- background-color: $checked-color;
|
|
|
+ background-color: $uni-primary;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
.checklist-text {
|
|
|
- color: $checked-color;
|
|
|
+ color: $uni-primary;
|
|
|
}
|
|
|
|
|
|
// 选中禁用
|
|
|
@@ -735,8 +739,8 @@
|
|
|
}
|
|
|
|
|
|
&.is-checked {
|
|
|
- background-color: $checked-color;
|
|
|
- border-color: $checked-color;
|
|
|
+ background-color: $uni-primary;
|
|
|
+ border-color: $uni-primary;
|
|
|
|
|
|
.checklist-text {
|
|
|
color: #fff;
|
|
|
@@ -775,8 +779,8 @@
|
|
|
|
|
|
&.is-checked {
|
|
|
.checkbox__inner {
|
|
|
- border-color: $checked-color;
|
|
|
- background-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
+ background-color: $uni-primary;
|
|
|
|
|
|
.checkbox__inner-icon {
|
|
|
opacity: 1;
|
|
|
@@ -789,13 +793,13 @@
|
|
|
}
|
|
|
}
|
|
|
.checklist-text {
|
|
|
- color: $checked-color;
|
|
|
+ color: $uni-primary;
|
|
|
}
|
|
|
|
|
|
.checklist-content {
|
|
|
.checkobx__list {
|
|
|
opacity: 1;
|
|
|
- border-color: $checked-color;
|
|
|
+ border-color: $uni-primary;
|
|
|
}
|
|
|
}
|
|
|
|
落日晚风