Przeglądaj źródła

增加空menu的兼容

pixel 3 lat temu
rodzic
commit
b92d457886

+ 1 - 2
server/api/v1/sys_authority.go

@@ -31,8 +31,7 @@ func CreateAuthority(c *gin.Context) {
 		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
 		response.FailWithMessage("创建失败"+err.Error(), c)
 	} else {
-		service.AddMenuAuthority(request.DefaultMenu(), authority.AuthorityId)
-		service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
+		_ = service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
 		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
 	}
 }

+ 3 - 0
server/api/v1/sys_menu.go

@@ -24,6 +24,9 @@ func GetMenu(c *gin.Context) {
 		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
 		response.FailWithMessage("获取失败", c)
 	} else {
+		if menus == nil {
+			menus = []model.SysMenu{}
+		}
 		response.OkWithDetailed(response.SysMenusResponse{Menus: menus}, "获取成功", c)
 	}
 }

+ 16 - 6
web/src/view/person/person.vue

@@ -18,15 +18,20 @@
                 <li>
                   <i class="el-icon-user" />{{ userInfo.nickName }}
                 </li>
-                <li>
-                  <i class="el-icon-data-analysis" />北京反转极光科技有限公司-技术部-前端事业群
-                </li>
+                <el-tooltip class="item" effect="light" content="北京反转极光科技有限公司-技术部-前端事业群" placement="top">
+                  <li>
+                    <i class="el-icon-data-analysis" />北京反转极光科技有限公司-技术部-前端事业群
+                  </li>
+                </el-tooltip>
                 <li>
                   <i class="el-icon-video-camera-solid" />中国·北京市·朝阳区
                 </li>
-                <li>
-                  <i class="el-icon-medal-1" />goLang/JavaScript/Vue/Gorm
-                </li>
+                <el-tooltip class="item" effect="light" content="goLang/JavaScript/Vue/Gorm" placement="top">
+                  <li>
+                    <i class="el-icon-medal-1" />goLang/JavaScript/Vue/Gorm
+                  </li>
+                </el-tooltip>
+
               </ul>
             </div>
           </div>
@@ -245,7 +250,12 @@ export default {
       ul {
         display: inline-block;
         height: 100%;
+        width: 100%;
         li {
+          width: 100%;
+          white-space:nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
           i {
             margin-right: 8px;
           }