From 4e723f4936289ae14cd2b8adfbc135d7edcef71b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 25 四月 2021 09:27:07 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/components/TopNav/index.vue | 9 +++++++--
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 ++++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 3 ++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 073ece3..c2c5423 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -513,7 +513,10 @@
}
else if (ColumnType.NUMERIC == attr.cellType())
{
- cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ if (StrUtil.isNotNull(value))
+ {
+ cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ }
}
else if (ColumnType.IMAGE == attr.cellType())
{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index de669b1..6f7cc41 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -25,7 +25,7 @@
/**
* 鑿滃崟 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
@@ -142,6 +142,7 @@
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
} else if (isMenuFrame(menu)) {
+ router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 6f7b688..d89930a 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -73,7 +73,9 @@
if(router.path === "/") {
router.children[item].path = "/redirect/" + router.children[item].path;
} else {
- router.children[item].path = router.path + "/" + router.children[item].path;
+ if(!this.ishttp(router.children[item].path)) {
+ router.children[item].path = router.path + "/" + router.children[item].path;
+ }
}
router.children[item].parentPath = router.path;
}
@@ -122,7 +124,7 @@
// 鑿滃崟閫夋嫨浜嬩欢
handleSelect(key, keyPath) {
this.currentIndex = key;
- if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
+ if (this.ishttp(key)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
window.open(key, "_blank");
} else if (key.indexOf("/redirect") !== -1) {
@@ -147,6 +149,9 @@
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
}
return routes;
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
},
};
--
Gitblit v1.9.3