From 719e0853fa45fa905d9cddc1b66eddf7e2b64563 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 27 五月 2022 11:32:36 +0800
Subject: [PATCH] 修复自定义字典样式不生效问题
---
src/utils/dict.js | 2 +-
src/components/DictTag/index.vue | 4 ++--
src/main.js | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 9650428..0f49315 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -6,7 +6,7 @@
v-if="item.elTagType == 'default' || item.elTagType == ''"
:key="item.value"
:index="index"
- :class="item.elTagType"
+ :class="item.elTagClass"
>{{ item.label }}</span>
<el-tag
v-else
@@ -14,7 +14,7 @@
:key="item.value + ''"
:index="index"
:type="item.elTagType === 'primary' ? '' : item.elTagType"
- :class="item.elTagType"
+ :class="item.elTagClass"
>{{ item.label }}</el-tag>
</template>
</template>
diff --git a/src/main.js b/src/main.js
index 46c22ac..28725e7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,7 @@
import './permission' // permission control
import { useDict } from '@/utils/dict'
-import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel } from '@/utils/ruoyi'
+import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi'
// 鍒嗛〉缁勪欢
import Pagination from '@/components/Pagination'
@@ -52,6 +52,7 @@
app.config.globalProperties.handleTree = handleTree
app.config.globalProperties.addDateRange = addDateRange
app.config.globalProperties.selectDictLabel = selectDictLabel
+app.config.globalProperties.selectDictLabels = selectDictLabels
// 鍏ㄥ眬缁勪欢鎸傝浇
app.component('DictTag', DictTag)
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 8db7d97..0f9144a 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -9,7 +9,7 @@
args.forEach((d, index) => {
res.value[d] = [];
getDicts(d).then(resp => {
- res.value[d] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass }))
+ res.value[d] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))
})
})
return toRefs(res.value);
--
Gitblit v1.9.3