Skip to content

Commit 74cff90

Browse files
author
pixel
committed
增加空menu的兼容
1 parent 04b3125 commit 74cff90

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

server/api/v1/sys_authority.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ func CreateAuthority(c *gin.Context) {
3131
global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
3232
response.FailWithMessage("创建失败"+err.Error(), c)
3333
} else {
34-
service.AddMenuAuthority(request.DefaultMenu(), authority.AuthorityId)
35-
service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
34+
_ = service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
3635
response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
3736
}
3837
}

server/api/v1/sys_menu.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ func GetMenu(c *gin.Context) {
2424
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
2525
response.FailWithMessage("获取失败", c)
2626
} else {
27+
if menus == nil {
28+
menus = []model.SysMenu{}
29+
}
2730
response.OkWithDetailed(response.SysMenusResponse{Menus: menus}, "获取成功", c)
2831
}
2932
}

web/src/view/person/person.vue

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@
1818
<li>
1919
<i class="el-icon-user" />{{ userInfo.nickName }}
2020
</li>
21-
<li>
22-
<i class="el-icon-data-analysis" />北京反转极光科技有限公司-技术部-前端事业群
23-
</li>
21+
<el-tooltip class="item" effect="light" content="北京反转极光科技有限公司-技术部-前端事业群" placement="top">
22+
<li>
23+
<i class="el-icon-data-analysis" />北京反转极光科技有限公司-技术部-前端事业群
24+
</li>
25+
</el-tooltip>
2426
<li>
2527
<i class="el-icon-video-camera-solid" />中国·北京市·朝阳区
2628
</li>
27-
<li>
28-
<i class="el-icon-medal-1" />goLang/JavaScript/Vue/Gorm
29-
</li>
29+
<el-tooltip class="item" effect="light" content="goLang/JavaScript/Vue/Gorm" placement="top">
30+
<li>
31+
<i class="el-icon-medal-1" />goLang/JavaScript/Vue/Gorm
32+
</li>
33+
</el-tooltip>
34+
3035
</ul>
3136
</div>
3237
</div>
@@ -245,7 +250,12 @@ export default {
245250
ul {
246251
display: inline-block;
247252
height: 100%;
253+
width: 100%;
248254
li {
255+
width: 100%;
256+
white-space:nowrap;
257+
overflow: hidden;
258+
text-overflow: ellipsis;
249259
i {
250260
margin-right: 8px;
251261
}

0 commit comments

Comments
 (0)