manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

角色增加包含系统参数，切换系统时只需展示当前用户包含的子系统

Browse Source
This commit is contained in:
thinkgem
2023-08-16 16:30:07 +08:00
parent f5080cd8f5
commit da12b2d092
21 changed files with 373 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
View File

@@ -456,6 +456,7 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
roleMap.put("roleCode", role.getRoleCode());
roleMap.put("roleName", role.getRoleName());
roleMap.put("isShow", role.getIsShow());
roleMap.put("sysCodes", role.getSysCodes());
roleList.add(roleMap);
if (desktopUrl == null && StringUtils.isNotBlank(role.getDesktopUrl())) {
desktopUrl = role.getDesktopUrl();

2
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -708,7 +708,7 @@ file:
imageMaxWidth: 1024
imageMaxHeight: 768
# 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.4.2
# 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.5.0
#imageThumbConfig: 150x150,300x300
#imageThumbFormat: jpg

1
modules/core/src/main/resources/db/create/db2/core.sql
View File

@@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role
desktop_url varchar(255),
data_scope char(1),
biz_scope varchar(255),
sys_codes vargraphic(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,

1
modules/core/src/main/resources/db/create/h2/core.sql
View File

@@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role
desktop_url varchar(255),
data_scope char(1),
biz_scope varchar(255),
sys_codes varchar(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date datetime NOT NULL,

1
modules/core/src/main/resources/db/create/mssql/core.sql
View File

@@ -699,6 +699,7 @@ CREATE TABLE [${_prefix}sys_role]
[desktop_url] varchar(255),
[data_scope] char(1),
[biz_scope] varchar(255),
[sys_codes] nvarchar(500),
[status] char(1) DEFAULT '0' NOT NULL,
[create_by] varchar(64) NOT NULL,
[create_date] datetime NOT NULL,

1
modules/core/src/main/resources/db/create/mysql/core.sql
View File

@@ -700,6 +700,7 @@ CREATE TABLE ${_prefix}sys_role
desktop_url varchar(255) COMMENT '桌面地址（仪表盘地址）',
data_scope char(1) COMMENT '数据范围设置（0未设置 1全部数据 2自定义数据）',
biz_scope varchar(255) COMMENT '适应业务范围（不同的功能，不同的数据权限支持）',
sys_codes varchar(500) COMMENT '包含系统（多个用逗号隔开）',
status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
create_by varchar(64) NOT NULL COMMENT '创建者',
create_date datetime NOT NULL COMMENT '创建时间',

2
modules/core/src/main/resources/db/create/oracle/core.sql
View File

@@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role
desktop_url varchar2(255),
data_scope char(1),
biz_scope varchar2(255),
sys_codes nvarchar2(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar2(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1504,6 +1505,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工
COMMENT ON COLUMN ${_prefix}sys_role.desktop_url IS '桌面地址（仪表盘地址）';
COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围设置（0未设置 1全部数据 2自定义数据）';
COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN ${_prefix}sys_role.create_by IS '创建者';
COMMENT ON COLUMN ${_prefix}sys_role.create_date IS '创建时间';

3
modules/core/src/main/resources/db/create/postgresql/core.sql
View File

@@ -321,7 +321,6 @@ CREATE TABLE ${_prefix}sys_file_upload
) WITHOUT OIDS;
-- 作业调度表
CREATE TABLE ${_prefix}sys_job
(
@@ -700,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role
desktop_url varchar(255),
data_scope char(1),
biz_scope varchar(255),
sys_codes varchar(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1505,6 +1505,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工
COMMENT ON COLUMN ${_prefix}sys_role.desktop_url IS '桌面地址（仪表盘地址）';
COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围设置（0未设置 1全部数据 2自定义数据）';
COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN ${_prefix}sys_role.create_by IS '创建者';
COMMENT ON COLUMN ${_prefix}sys_role.create_date IS '创建时间';

1
modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
View File

@@ -379,6 +379,7 @@
角色名称=Role name
角色名称已存在=Role name already exists
授权功能菜单=Authorization menu
包含系统=Include system
未设置=None
本人数据=Self data

1
modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
View File

@@ -304,6 +304,7 @@
角色名称=キャラクター名
角色名称已存在=キャラクター名が存在する
授权功能菜单=ライセンス機能メニュー
包含系统=含めたシステム
未设置=未設置
全部数据=すべてのデータ

23
modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html
View File

@@ -17,19 +17,32 @@
<a href="${ctx}/logout">
<i class="fa fa-sign-out"></i> ${text('退出登录')}</a>
</li>
<% var sysDictList = @DictUtils.getDictList('sys_menu_sys_code');
if(sysDictList.~size > 1){
var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %>
<% var sysCodes = [];
for(var role in user.roleList) {
var codes = @StringUtils.splitComma(role.sysCodes);
if (!isEmpty(codes)) {
for (var code in codes) {
@sysCodes.add(code);
}
}
}
var sysDictList = @DictUtils.getDictList('sys_menu_sys_code');
if(sysDictList.~size > 1){
var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %>
<li class="divider"></li>
<li class="dropdown-header mb5">${text('系统切换')}：</li>
<% for(var dict in sysDictList){ %>
<% for(var dict in sysDictList){
if(sysCodes.~size == 0 || @ListUtils.inString(dict.dictValue, sysCodes)){ %>
<li>
<a href="${ctx}/switch/${dict.dictValue}">
<i class="fa fa-${menuSysCode == dict.dictValue
? 'check-' : ''}circle-o"></i> ${dict.dictLabel}
</a>
</li>
<% } %>
<%
}
}
%>
<li class="mt10"></li>
<% }else{ %>
<li class="mt10"></li>