From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-ui/src/components/IconSelect/index.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue
index ea4c1b6..a7512b2 100644
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -25,10 +25,9 @@
},
methods: {
filterIcons() {
+ this.iconList = icons
if (this.name) {
this.iconList = this.iconList.filter(item => item.includes(this.name))
- } else {
- this.iconList = icons
}
},
selectedIcon(name) {
--
Gitblit v1.9.3