From 1b45f0a1cd3461c827e4018026d2cfd05c1b62bd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 14 九月 2023 16:54:43 +0800
Subject: [PATCH] 修复自定义字典样式不生效的问题(I81F03)
---
src/components/DictTag/index.vue | 2 +-
src/views/system/dict/data.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 4667310..71a3480 100644
--- a/src/components/DictTag/index.vue
+++ b/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.elTagType == 'default' || item.elTagType == ''"
+ v-if="(item.elTagType == 'default' || item.elTagType == '') && (item.elTagClass == '' || item.elTagClass == null)"
:key="item.value"
:index="index"
:class="item.elTagClass"
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 6960f2e..6928bd1 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -91,8 +91,8 @@
<el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
- <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
- <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+ <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+ <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column label="瀛楀吀閿��" align="center" prop="dictValue" />
--
Gitblit v1.9.3