From 031d83828a20b7bc56c1723fe4eaa67fd9d8cd07 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 十二月 2023 00:44:12 +0800
Subject: [PATCH] update 代码规范化
---
src/components/DictTag/index.vue | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 827a7af..e5dd57d 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -3,46 +3,79 @@
<template v-for="(item, index) in options">
<template v-if="values.includes(item.value)">
<span
- v-if="item.elTagType == 'default' || item.elTagType == ''"
+ v-if="(item.elTagType === 'default' || item.elTagType === '') && (item.elTagClass === '' || item.elTagClass == null)"
:key="item.value"
:index="index"
:class="item.elTagClass"
- >{{ item.label }}</span
>
+ {{ item.label + ' ' }}
+ </span>
<el-tag
v-else
- :disable-transitions="true"
:key="item.value + ''"
+ :disable-transitions="true"
:index="index"
- :type="item.elTagType === 'primary' ? '' : item.elTagType"
+ :type="item.elTagType === 'primary' || item.elTagType === 'default' ? '' : 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 lang="ts">
-import { PropType } from 'vue';
-
-const props = defineProps({
- // 鏁版嵁
- options: {
- type: Array as PropType<DictDataOption[]>,
- default: null,
- },
- // 褰撳墠鐨勫��
- value: [Number, String, Array],
-})
+interface Props {
+ options: Array<DictDataOption>;
+ value: number | string | Array<number | string>;
+ showValue: boolean;
+ separator: string;
+}
+const props = withDefaults(defineProps<Props>(), {
+ showValue: true,
+ separator: ','
+});
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>
--
Gitblit v1.9.3