From 6e5d7a6dab441eaa6d4ebca8cb8fc6fb2919d4e2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 14 Nov 2022 11:34:59 +0800
Subject: [PATCH] 升级druid到最新版本1.2.14
---
ruoyi-ui/src/components/DictTag/index.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index 4779415..c635dee 100644
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -1,22 +1,23 @@
<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
- :key="item.dictValue"
+ :disable-transitions="true"
+ :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>
@@ -31,12 +32,12 @@
type: Array,
default: null,
},
- value: [String, Array],
+ value: [Number, String, Array],
},
computed: {
values() {
- if (this.value) {
- return Array.isArray(this.value) ? this.value : [this.value];
+ if (this.value !== null && typeof this.value !== 'undefined') {
+ return Array.isArray(this.value) ? this.value : [String(this.value)];
} else {
return [];
}
--
Gitblit v1.9.3