diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 7e5c095..daef599 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -5148,6 +5148,16 @@ 关联显示父级 + + + 权限标识 + + + + + 备注 + + 排序,越小优先级越高 diff --git a/Api/Ewide.Core/Service/Menu/Dto/MenuTreeOutput.cs b/Api/Ewide.Core/Service/Menu/Dto/MenuTreeOutput.cs index 11fe065..c194b11 100644 --- a/Api/Ewide.Core/Service/Menu/Dto/MenuTreeOutput.cs +++ b/Api/Ewide.Core/Service/Menu/Dto/MenuTreeOutput.cs @@ -38,6 +38,16 @@ namespace Ewide.Core.Service /// public bool VisibleParent { get; set; } + /// + /// 权限标识 + /// + public string Permission { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + /// /// 排序,越小优先级越高 /// diff --git a/Api/Ewide.Core/Service/Menu/SysMenuService.cs b/Api/Ewide.Core/Service/Menu/SysMenuService.cs index b9d3572..1e126f5 100644 --- a/Api/Ewide.Core/Service/Menu/SysMenuService.cs +++ b/Api/Ewide.Core/Service/Menu/SysMenuService.cs @@ -460,6 +460,8 @@ namespace Ewide.Core.Service Title = u.Name, Type = u.Type, VisibleParent = u.VisibleParent, + Permission = u.Permission, + Remark = u.Remark, Sort = u.Sort }).ToListAsync(); return new TreeBuildUtil().DoTreeBuild(menus); diff --git a/web-react/src/assets/style/lib/authority-view.less b/web-react/src/assets/style/lib/authority-view.less index 7fd6b37..94c2f71 100644 --- a/web-react/src/assets/style/lib/authority-view.less +++ b/web-react/src/assets/style/lib/authority-view.less @@ -9,7 +9,12 @@ width: 150px; } .ant-descriptions { + clear: both; + margin-bottom: @padding-sm; + .ant-descriptions-view { + overflow: visible; + } &:last-child { margin-bottom: 0; } @@ -26,4 +31,23 @@ } } } + .ant-card-grid { + width: 25%; + margin-bottom: @padding-sm; + padding: @padding-xs; + + cursor: pointer; + } + .ant-card { + margin-bottom: 0; + + background-color: transparent; + &-body { + margin: -1px 0 0 -1px; + padding: 0; + } + .ant-card-grid { + margin-bottom: 0; + } + } } diff --git a/web-react/src/components/authority-view/index.jsx b/web-react/src/components/authority-view/index.jsx index e6c220f..58cf93d 100644 --- a/web-react/src/components/authority-view/index.jsx +++ b/web-react/src/components/authority-view/index.jsx @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import { Checkbox, Descriptions, Empty, Spin, Tooltip } from 'antd' +import { Card, Checkbox, Descriptions, Empty, Popover, Spin, Tooltip } from 'antd' import { AntIcon } from 'components' import { EMPTY_ID } from 'util/global' @@ -58,7 +58,7 @@ function renderDescriptions(data) { function renderItem(data) { return ( - + } > - {renderDescriptions.call(this, data.children)} + {renderDescriptions.call(this, data.children)} ) @@ -79,16 +79,26 @@ function renderItem(data) { function renderCheckbox(data) { return ( - - this.onChange(e, data)}> - {data.title} - - {data.visibleParent && data.type == 2 && ( - - - - )} - + + 没有说明} + > + this.onChange(e, data)} + > + {data.title} + + {data.visibleParent && data.type == 2 && ( + + + + )} + {data.permission} + + ) }