diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue index 4c196c48..279b6137 100644 --- a/ruoyi-ui/src/components/DictTag/index.vue +++ b/ruoyi-ui/src/components/DictTag/index.vue @@ -7,7 +7,7 @@ :key="item.value" :index="index" :class="item.raw.cssClass" - >{{ item.label }}{{ item.label + ' ' }} - {{ item.label }} + {{ item.label + ' ' }} + @@ -33,6 +36,16 @@ export default { default: null, }, value: [Number, String, Array], + // 当未找到匹配的数据时,显示value + showValue: { + type: Boolean, + default: true, + } + }, + data() { + return { + unmatchArray: [], // 记录未匹配的项 + } }, computed: { values() { @@ -42,11 +55,38 @@ export default { return []; } }, + unmatch(){ + this.unmatchArray = []; + if (this.value !== null && typeof this.value !== 'undefined') { + // 传入值为非数组 + if(!Array.isArray(this.value)){ + if(this.options.some(v=> v.value == this.value )) return false; + this.unmatchArray.push(this.value); + return true; + } + // 传入值为Array + this.value.forEach(item => { + if (!this.options.some(v=> v.value == item )) this.unmatchArray.push(item) + }); + return true; + } + // 没有value不显示 + return false; + }, + }, + filters: { + handleArray(array) { + if(array.length===0) return ''; + return array.reduce((pre, cur) => { + return pre + ' ' + cur; + }) + }, + } }; \ No newline at end of file +