From 0434b4ca7aa1efde198474dbe5d7d64f981f45cd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 09 十月 2023 21:26:40 +0800
Subject: [PATCH] 去掉多余的参数
---
ruoyi-ui/src/components/DictTag/index.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index b0484bc..1ef13b9 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 == '') && (item.raw.cssClass == '' || item.raw.cssClass == null)"
+ :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,16 +36,53 @@
default: null,
},
value: [Number, String, Array],
+ // 当未找到匹配的数据时，显示value
+ showValue: {
+ type: Boolean,
+ default: true,
+ }
+ },
+ data() {
+ return {
+ unmatchArray: [], // 记录未匹配的项
+ }
},
computed: {
values() {
- if (this.value !== null && typeof this.value !== 'undefined') {
+ if (this.value !== null && typeof this.value !== "undefined") {
return Array.isArray(this.value) ? this.value : [String(this.value)];
} else {
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