From e181f04c642204e79749af93fa921875ff6c21ba Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期二, 20 五月 2025 10:46:35 +0800 Subject: [PATCH] refactor(qms): 重构趋势图展示逻辑 --- src/components/DictTag/index.vue | 89 +++++++++++++++++++++++++++++++++----------- 1 files changed, 67 insertions(+), 22 deletions(-) diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index c03a1a6..ad326c2 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -3,47 +3,92 @@ <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 === 'success' || + item.elTagType === 'info' || + item.elTagType === 'warning' || + item.elTagType === 'danger' + ? item.elTagType + : 'primary' + " :class="item.elTagClass" - >{{ item.label }}</el-tag> + > + {{ item.label + ' ' }} + </el-tag> </template> + </template> + <template v-if="unmatch && showValue"> + {{ unmatchArray }} </template> </div> </template> -<script setup> -const props = defineProps({ - // 鏁版嵁 - options: { - type: Array, - default: null, - }, - // 褰撳墠鐨勫�� - value: [Number, String, Array], -}) +<script setup lang="ts"> +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; + // 浼犲叆鍊间负闈炴暟缁� + let unmatch = false; // 娣诲姞涓�涓爣蹇楁潵鍒ゆ柇鏄惁鏈夋湭鍖归厤椤� + values.value.forEach((item) => { + if (!props.options.some((v) => v.value === item)) { + unmatch = true; // 濡傛灉鏈夋湭鍖归厤椤癸紝灏嗘爣蹇楄缃负true + } + }); + return unmatch; // 杩斿洖鏍囧織鐨勫�� +}); + +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