From 92b2b489a40121a98417cabcfe644ddf80d039cd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 九月 2023 17:22:36 +0800
Subject: [PATCH] fix 修复 自定义字典样式不生效的问题
---
src/components/DictTag/index.vue | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index c03a1a6..1057b3f 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -2,12 +2,10 @@
<div>
<template v-for="(item, index) in options">
<template v-if="values.includes(item.value)">
- <span
- v-if="item.elTagType == 'default' || item.elTagType == ''"
- :key="item.value"
- :index="index"
- :class="item.elTagClass"
- >{{ item.label }}</span>
+ <span v-if="(item.elTagType == 'default' || item.elTagType == '') && (item.elTagClass == '' || item.elTagClass == null)"
+ :key="item.value" :index="index" :class="item.elTagClass">
+ {{ item.label + " " }}
+ </span>
<el-tag
v-else
:disable-transitions="true"
@@ -15,35 +13,73 @@
:index="index"
:type="item.elTagType === 'primary' ? '' : item.elTagType"
:class="item.elTagClass"
- >{{ item.label }}</el-tag>
+ >
+ {{ item.label + " " }}
+ </el-tag>
</template>
+ </template>
+ <template v-if="unmatch && showValue">
+ {{ unmatchArray }}
</template>
</div>
</template>
-<script setup>
+<script setup lang="ts">
+import { propTypes } from '@/utils/propTypes';
+
+
const props = defineProps({
// 鏁版嵁
options: {
- type: Array,
+ type: Array as PropType<DictDataOption[]>,
default: null,
},
// 褰撳墠鐨勫��
- value: [Number, String, Array],
-})
-
+ value: [Number, String, Array] as PropType<number | string | Array<number | string>>,
+ // 褰撴湭鎵惧埌鍖归厤鐨勬暟鎹椂锛屾樉绀簐alue
+ showValue: propTypes.bool.def(true),
+ separator: propTypes.string.def(","),
+});
const values = computed(() => {
- if (props.value !== null && typeof props.value !== 'undefined') {
- return Array.isArray(props.value) ? props.value : [String(props.value)];
- } else {
- return [];
- }
-})
+ if (props.value === '' || props.value === null || typeof props.value === "undefined") return []
+ return Array.isArray(props.value) ? props.value.map(item => '' + item) : String(props.value).split(props.separator);
+});
+const unmatch = computed(() => {
+ if (props.options?.length == 0 || props.value === '' || props.value === null || typeof props.value === "undefined") return false
+ // 浼犲叆鍊间负闈炴暟缁�
+ values.value.forEach(item => {
+ if (!props.options.some(v => v.value === item)) {
+ return true // 濡傛灉鏈夋湭鍖归厤椤癸紝灏嗘爣蹇楄缃负true
+ }
+ })
+ return false // 杩斿洖鏍囧織鐨勫��
+});
+
+const unmatchArray = computed(() => {
+// 璁板綍鏈尮閰嶇殑椤�
+ const itemUnmatchArray: Array<string | number> = [];
+ if (props.value !== '' && props.value !== null && typeof props.value !== "undefined") {
+ values.value.forEach(item => {
+ if (!props.options.some(v => v.value === item)) {
+ itemUnmatchArray.push(item);
+ }
+ })
+ }
+ // 娌℃湁value涓嶆樉绀�
+ return handleArray(itemUnmatchArray);
+});
+
+const handleArray = (array: Array<string | number>) => {
+ if (array.length === 0) return "";
+ return array.reduce((pre, cur) => {
+ return pre + " " + cur;
+ });
+}
</script>
<style scoped>
.el-tag + .el-tag {
margin-left: 10px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3