Bladeren bron

!417 优化字典标签支持传分隔符分隔的字符串和数组,优化渲染效果
Merge pull request !417 from 抓蛙师/dev

疯狂的狮子Li 1 jaar geleden
bovenliggende
commit
3b498c4939
1 gewijzigde bestanden met toevoegingen van 19 en 22 verwijderingen
  1. 19 22
      ruoyi-ui/src/components/DictTag/index.vue

+ 19 - 22
ruoyi-ui/src/components/DictTag/index.vue

@@ -40,6 +40,10 @@ export default {
     showValue: {
       type: Boolean,
       default: true,
+    },
+    separator: {
+      type: String,
+      default: ","
     }
   },
   data() {
@@ -49,35 +53,28 @@ export default {
   },
   computed: {
     values() {
-      if (this.value !== null && typeof this.value !== 'undefined') {
-        return Array.isArray(this.value) ? this.value : [String(this.value)];
-      } else {
-        return [];
-      }
+      if (this.value === null || typeof this.value !== 'undefined' || this.value === '') return []
+      return Array.isArray(this.value) ? this.value.map(item => '' + item) : String(this.value).split(this.separator)
     },
-    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;
-      }
+    unmatch() {
+      this.unmatchArray = []
       // 没有value不显示
-      return false;
+      if (this.value === null || typeof this.value !== 'undefined' || this.value === '' || this.options.length === 0) return false
+      // 传入值为数组
+      let unmatch = false // 添加一个标志来判断是否有未匹配项
+      this.values.forEach(item => {
+        if (!this.options.some(v => v.value === item)) {
+          this.unmatchArray.push(item)
+          unmatch = true // 如果有未匹配项,将标志设置为true
+        }
+      })
+      return unmatch // 返回标志的值
     },
 
   },
   filters: {
     handleArray(array) {
-      if(array.length===0) return '';
+      if (array.length === 0) return '';
       return array.reduce((pre, cur) => {
         return pre + ' ' + cur;
       })