diff --git a/pom.xml b/pom.xml
index 521e91aa..3d353fcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
2021.0.0
2021.1
2.0.3
- 2.6.0
+ 2.6.1
2.2.0
1.6.2
1.27.2
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
index dd7423fd..1cff6eeb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js
index 95a3848b..c8058a94 100644
--- a/ruoyi-ui/src/plugins/tab.js
+++ b/ruoyi-ui/src/plugins/tab.js
@@ -4,20 +4,21 @@ import router from '@/router';
export default {
// 刷新当前tab页签
refreshPage(obj) {
- const { path, matched } = router.currentRoute;
+ const { path, query, matched } = router.currentRoute;
if (obj === undefined) {
matched.forEach((m) => {
if (m.components && m.components.default && m.components.default.name) {
if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
- obj = { name: m.components.default.name, path: path };
+ obj = { name: m.components.default.name, path: path, query: query };
}
}
});
}
return store.dispatch('tagsView/delCachedView', obj).then(() => {
- const { path } = obj
+ const { path, query } = obj
router.replace({
- path: '/redirect' + path
+ path: '/redirect' + path,
+ query: query
})
})
},