From 2a604c0548f5b45a00d56298e0c60d09e071e88b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 02 六月 2021 20:40:09 +0800
Subject: [PATCH] !237 同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题 Merge pull request !237 from 老李/origin
---
ruoyi-ui/src/layout/components/Navbar.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index db46ec5..18c89a0 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -2,7 +2,8 @@
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+ <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+ <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div class="right-menu">
<template v-if="device!=='mobile'">
@@ -48,6 +49,7 @@
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
+import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
@@ -58,6 +60,7 @@
export default {
components: {
Breadcrumb,
+ TopNav,
Hamburger,
Screenfull,
SizeSelect,
@@ -80,6 +83,11 @@
key: 'showSettings',
value: val
})
+ }
+ },
+ topNav: {
+ get() {
+ return this.$store.state.settings.topNav
}
}
},
@@ -127,6 +135,11 @@
float: left;
}
+ .topmenu-container {
+ position: absolute;
+ left: 50px;
+ }
+
.errLog-container {
display: inline-block;
vertical-align: top;
--
Gitblit v1.9.2