From cb80de3742d66cfee20bc3136c735e5ca5a7d45c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:44:42 +0800
Subject: [PATCH] 优化字典标签支持自定义分隔符
---
src/views/system/dict/data.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 6960f2e..f6207dc 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" />
@@ -210,8 +210,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- dictName: undefined,
dictType: undefined,
+ dictLabel: undefined,
status: undefined
},
rules: {
@@ -279,7 +279,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
proxy.resetForm("queryRef");
- queryParams.value.dictType = defaultDictType;
+ queryParams.value.dictType = defaultDictType.value;
handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3