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/router/index.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 65099a2..983117c 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -141,7 +141,7 @@
permissions: ['monitor:job:list'],
children: [
{
- path: 'index',
+ path: 'index/:jobId(\\d+)',
component: () => import('@/views/monitor/job/log'),
name: 'JobLog',
meta: { title: '调度日志', activeMenu: '/monitor/job' }
@@ -155,7 +155,7 @@
permissions: ['tool:gen:edit'],
children: [
{
- path: 'index',
+ path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
@@ -164,6 +164,12 @@
}
]
+// 防止连续点击多次路由报错
+let routerPush = Router.prototype.push;
+Router.prototype.push = function push(location) {
+ return routerPush.call(this, location).catch(err => err)
+}
+
export default new Router({
mode: 'history', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
--
Gitblit v1.9.3