From a90355eb5e2db04e7c197d9051fd6cd92e2e6eb1 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Tue, 28 Nov 2023 11:54:05 +0800
Subject: [PATCH] !791 优化白名单页面放行逻辑 Merge pull request !791 from 也曾为你像超人/N/A
---
ruoyi-ui/src/components/DictTag/index.vue | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index 542c6ed..1ef13b9 100644
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -1,51 +1,92 @@
-<template>
- <div>
- <template v-for="(item, index) in options">
- <template v-if="values.includes(item.dictValue)">
- <span
- v-if="item.listClass == 'default' || item.listClass == ''"
- :key="item.dictValue"
- :index="index"
- :class="item.cssClass"
- >{{ item.dictLabel }}</span
- >
- <el-tag
- v-else
- :key="item.dictValue"
- :index="index"
- :type="item.listClass == 'primary' ? '' : item.listClass"
- :class="item.cssClass"
- >
- {{ item.dictLabel }}
- </el-tag>
- </template>
- </template>
- </div>
-</template>
-
-<script>
-export default {
- name: "DictTag",
- props: {
- options: {
- type: Array,
- default: null,
- },
- value: [Number, String, Array],
- },
- computed: {
- values() {
- if (this.value !== null && typeof this.value !== 'undefined') {
- return Array.isArray(this.value) ? this.value : [String(this.value)];
- } else {
- return [];
- }
- },
- },
-};
-</script>
-<style scoped>
-.el-tag + .el-tag {
- margin-left: 10px;
-}
-</style>
\ No newline at end of file
+<template>
+ <div>
+ <template v-for="(item, index) in options">
+ <template v-if="values.includes(item.value)">
+ <span
+ 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"
+ >{{ item.label + " " }}</span
+ >
+ <el-tag
+ v-else
+ :disable-transitions="true"
+ :key="item.value"
+ :index="index"
+ :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+ :class="item.raw.cssClass"
+ >
+ {{ item.label + " " }}
+ </el-tag>
+ </template>
+ </template>
+ <template v-if="unmatch && showValue">
+ {{ unmatchArray | handleArray }}
+ </template>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "DictTag",
+ props: {
+ options: {
+ type: Array,
+ 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") {
+ 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>
+.el-tag + .el-tag {
+ margin-left: 10px;
+}
+</style>
--
Gitblit v1.9.2