From af15a3b2746e8b6da90debf7bc72efd34befeb78 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 23 Apr 2023 14:53:11 +0800
Subject: [PATCH] !704 Vue的DictTag组件，当value没有匹配的值时，展示value Merge pull request !704 from Aurora/master
---
ruoyi-ui/src/components/DictTag/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index b0484bc..279b613 100644
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -1,25 +1,28 @@
<template>
<div>
<template v-for="(item, index) in options">
- <template v-if="values.includes(item.dictValue)">
+ <template v-if="values.includes(item.value)">
<span
- v-if="item.listClass == 'default' || item.listClass == ''"
- :key="item.dictValue"
+ v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
+ :key="item.value"
:index="index"
- :class="item.cssClass"
- >{{ item.dictLabel }}</span
+ :class="item.raw.cssClass"
+ >{{ item.label + ' ' }}</span
>
<el-tag
v-else
:disable-transitions="true"
- :key="item.dictValue"
+ :key="item.value"
:index="index"
- :type="item.listClass == 'primary' ? '' : item.listClass"
- :class="item.cssClass"
+ :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+ :class="item.raw.cssClass"
>
- {{ item.dictLabel }}
+ {{ item.label + ' ' }}
</el-tag>
</template>
+ </template>
+ <template v-if="unmatch && showValue">
+ {{ unmatchArray | handleArray }}
</template>
</div>
</template>
@@ -33,6 +36,16 @@
default: null,
},
value: [Number, String, Array],
+ // 当未找到匹配的数据时，显示value
+ showValue: {
+ type: Boolean,
+ default: true,
+ }
+ },
+ data() {
+ return {
+ unmatchArray: [], // 记录未匹配的项
+ }
},
computed: {
values() {
@@ -42,7 +55,34 @@
return [];
}
},
+ 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;
+ }
+ // 没有value不显示
+ return false;
+ },
+
},
+ filters: {
+ handleArray(array) {
+ if(array.length===0) return '';
+ return array.reduce((pre, cur) => {
+ return pre + ' ' + cur;
+ })
+ },
+ }
};
</script>
<style scoped>
--
Gitblit v1.9.2