From 8bba9fda23db845e4ff5fd749f29eb812f21029f Mon Sep 17 00:00:00 2001 From: orangej Date: Sat, 18 Jun 2022 18:28:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scSelectFilter/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/scSelectFilter/index.vue b/src/components/scSelectFilter/index.vue index 3064680c..c62fd19b 100644 --- a/src/components/scSelectFilter/index.vue +++ b/src/components/scSelectFilter/index.vue @@ -42,7 +42,8 @@ watch:{ data(val) { val.forEach(item => { - this.selected[item.key] = this.selectedValues[item.key] || [item.options[0].value] + this.selected[item.key] = this.selectedValues[item.key] || + (Array.isArray(item.options) && item.options.length) ? [item.options[0].value] : [] }) } }, @@ -58,7 +59,8 @@ mounted() { //默认赋值 this.data.forEach(item => { - this.selected[item.key] = this.selectedValues[item.key] || [item.options[0].value] + this.selected[item.key] = this.selectedValues[item.key] || + (Array.isArray(item.options) && item.options.length) ? [item.options[0].value] : [] }) }, methods: { From 43ebbdb1b94c5addbfbe8172d406f35b510504cb Mon Sep 17 00:00:00 2001 From: orangej Date: Sat, 18 Jun 2022 18:31:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scIconSelect/index.vue | 1 + src/views/vab/iconselect.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/scIconSelect/index.vue b/src/components/scIconSelect/index.vue index ab562222..4326ff22 100644 --- a/src/components/scIconSelect/index.vue +++ b/src/components/scIconSelect/index.vue @@ -74,6 +74,7 @@ } }, mounted() { + this.value = this.modelValue this.data.push(...config.icons) }, methods: { diff --git a/src/views/vab/iconselect.vue b/src/views/vab/iconselect.vue index 0774d5d9..9597d84d 100644 --- a/src/views/vab/iconselect.vue +++ b/src/views/vab/iconselect.vue @@ -36,7 +36,7 @@ data() { return { form: { - icon: '' + icon: 'el-icon-apple' }, rules: { icon: [