优化字典标签支持自定义分隔符

master
RuoYi 10 months ago
parent 438cb0d1dd
commit cb80de3742
  1. 46
      src/components/DictTag/index.vue

@ -7,8 +7,7 @@
:key="item.value" :key="item.value"
:index="index" :index="index"
:class="item.elTagClass" :class="item.elTagClass"
>{{ item.label + " " }}</span >{{ item.label + " " }}</span>
>
<el-tag <el-tag
v-else v-else
:disable-transitions="true" :disable-transitions="true"
@ -16,8 +15,7 @@
:index="index" :index="index"
:type="item.elTagType === 'primary' ? '' : item.elTagType" :type="item.elTagType === 'primary' ? '' : item.elTagType"
:class="item.elTagClass" :class="item.elTagClass"
>{{ item.label + " " }}</el-tag >{{ item.label + " " }}</el-tag>
>
</template> </template>
</template> </template>
<template v-if="unmatch && showValue"> <template v-if="unmatch && showValue">
@ -27,7 +25,7 @@
</template> </template>
<script setup> <script setup>
// // //
const unmatchArray = ref([]); const unmatchArray = ref([]);
const props = defineProps({ const props = defineProps({
@ -43,34 +41,30 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
separator: {
type: String,
default: ",",
}
}); });
const values = computed(() => { const values = computed(() => {
if (props.value !== null && typeof props.value !== "undefined") { if (props.value === null || typeof props.value === 'undefined' || props.value === '') return [];
return Array.isArray(props.value) ? props.value : [String(props.value)]; return Array.isArray(props.value) ? props.value.map(item => '' + item) : String(props.value).split(props.separator);
} else {
return [];
}
}); });
const unmatch = computed(() => { const unmatch = computed(() => {
unmatchArray.value = []; unmatchArray.value = [];
if (props.value !== null && typeof props.value !== "undefined") {
//
if (!Array.isArray(props.value)) {
if (props.options.some((v) => v.value == props.value)) return false;
unmatchArray.value.push(props.value);
return true;
}
// Array
props.value.forEach((item) => {
if (!props.options.some((v) => v.value == item))
unmatchArray.value.push(item);
});
return true;
}
// value // value
return false; if (props.value === null || typeof props.value === 'undefined' || props.value === '' || props.options.length === 0) return false
//
let unmatch = false //
values.value.forEach(item => {
if (!props.options.some(v => v.value === item)) {
unmatchArray.value.push(item)
unmatch = true // true
}
})
return unmatch //
}); });
function handleArray(array) { function handleArray(array) {
@ -85,4 +79,4 @@ function handleArray(array) {
.el-tag + .el-tag { .el-tag + .el-tag {
margin-left: 10px; margin-left: 10px;
} }
</style> </style>

Loading…
Cancel
Save