From 0b37ba17bce6bac095b3580392322309a36cd8c1 Mon Sep 17 00:00:00 2001 From: penggy Date: Thu, 4 Mar 2021 10:00:08 +0800 Subject: [PATCH] update ui --- web_src/components/AdminLTE.vue | 7 ++++++- web_src/components/Sider.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web_src/components/AdminLTE.vue b/web_src/components/AdminLTE.vue index a1f5290..2a6b4b0 100644 --- a/web_src/components/AdminLTE.vue +++ b/web_src/components/AdminLTE.vue @@ -105,15 +105,20 @@ Vue.prototype.canTalk = () => { return location.protocol.indexOf("https") == 0 || location.hostname === 'localhost' || location.hostname === '127.0.0.1'; } Vue.prototype.hasAnyRole = (serverInfo, userInfo, ...roles) => { + roles = roles||[]; if (serverInfo && serverInfo.APIAuth === false && !userInfo) { + if(roles.length == 1 && roles[0] == '管理员') { + return false; + } else { return true; + } } var userRoles = []; if (userInfo) { userRoles = userInfo.Roles || []; } var checked = false; - for(var role of (roles||[])) { + for(var role of roles) { if (!role || userRoles.some(ur => (ur == role || ur == '超级管理员'))) { checked = true; break; diff --git a/web_src/components/Sider.vue b/web_src/components/Sider.vue index 8a26e46..d86a095 100644 --- a/web_src/components/Sider.vue +++ b/web_src/components/Sider.vue @@ -36,7 +36,7 @@ export default { if(item.versionType && item.versionType != this.serverInfo.VersionType) { return false; } - if(item.roles && !this.hasAnyRole(this.serverInfo, this.userInfo, ...item.roles)) { + if(item.roles && this.userInfo && !this.hasAnyRole(this.serverInfo, this.userInfo, ...item.roles)) { return false; } if(item.path == "/about" && this.serverInfo.ShowAbout === false) {