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/utils/generator/render.js | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-ui/src/utils/generator/render.js b/ruoyi-ui/src/utils/generator/render.js
index 42cd664..f187029 100644
--- a/ruoyi-ui/src/utils/generator/render.js
+++ b/ruoyi-ui/src/utils/generator/render.js
@@ -26,6 +26,11 @@
}
const componentChild = {
+ 'el-button': {
+ default(h, conf, key) {
+ return conf[key]
+ },
+ },
'el-input': {
prepend(h, conf, key) {
return <template slot="prepend">{conf[key]}</template>
--
Gitblit v1.9.3