From 99e66bf11c38ebe2f21f73b956918468eae4929c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 30 六月 2024 08:02:22 +0800
Subject: [PATCH] 若依 3.8.8
---
ruoyi-ui/src/components/DictTag/index.vue | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index 279b613..6b5b230 100644
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -3,7 +3,7 @@
<template v-for="(item, index) in options">
<template v-if="values.includes(item.value)">
<span
- v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
+ v-if="(item.raw.listClass == 'default' || item.raw.listClass == '') && (item.raw.cssClass == '' || item.raw.cssClass == null)"
:key="item.value"
:index="index"
:class="item.raw.cssClass"
@@ -40,6 +40,10 @@
showValue: {
type: Boolean,
default: true,
+ },
+ separator: {
+ type: String,
+ default: ","
}
},
data() {
@@ -49,35 +53,28 @@
},
computed: {
values() {
- if (this.value !== null && typeof this.value !== 'undefined') {
- return Array.isArray(this.value) ? this.value : [String(this.value)];
- } else {
- return [];
- }
+ if (this.value === null || typeof this.value === 'undefined' || this.value === '') return []
+ return Array.isArray(this.value) ? this.value.map(item => '' + item) : String(this.value).split(this.separator)
},
- unmatch(){
- this.unmatchArray = [];
- if (this.value !== null && typeof this.value !== 'undefined') {
- // 传入值为非数组
- if(!Array.isArray(this.value)){
- if(this.options.some(v=> v.value == this.value )) return false;
- this.unmatchArray.push(this.value);
- return true;
- }
- // 传入值为Array
- this.value.forEach(item => {
- if (!this.options.some(v=> v.value == item )) this.unmatchArray.push(item)
- });
- return true;
- }
+ unmatch() {
+ this.unmatchArray = []
// 没有value不显示
- return false;
+ if (this.value === null || typeof this.value === 'undefined' || this.value === '' || this.options.length === 0) return false
+ // 传入值为数组
+ let unmatch = false // 添加一个标志来判断是否有未匹配项
+ this.values.forEach(item => {
+ if (!this.options.some(v => v.value === item)) {
+ this.unmatchArray.push(item)
+ unmatch = true // 如果有未匹配项，将标志设置为true
+ }
+ })
+ return unmatch // 返回标志的值
},
},
filters: {
handleArray(array) {
- if(array.length===0) return '';
+ if (array.length === 0) return '';
return array.reduce((pre, cur) => {
return pre + ' ' + cur;
})
--
Gitblit v1.9.2