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 }} {{ item.label }} 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 elementIcons from '@/components/SvgIcon/svgicon' 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.resetForm = resetForm 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 @@ export function useDict(...args) { 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);