疯狂的狮子li
2021-04-25 4e723f4936289ae14cd2b8adfbc135d7edcef71b
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
已修改3个文件
17 ■■■■ 文件已修改
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/components/TopNav/index.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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())
        {
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());
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
    }
  },
};