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

新增参数配置 sys.index.menuStyle=2 的时候，一级菜单显示在主框架页顶部。

Browse Source
This commit is contained in:
thinkgem
2019-02-05 21:04:19 +08:00
parent 2a5857645b
commit 7d2615be5d
20 changed files with 108 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/db/db2/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code);

2
modules/core/db/mssql/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX [idx_sys_company_status] ON [js_sys_company] ([status]);
CREATE INDEX [idx_sys_company_vc] ON [js_sys_company] ([view_code]);
CREATE INDEX [idx_sys_company_pcs] ON [js_sys_company] ([parent_codes]);
CREATE INDEX [idx_sys_company_tss] ON [js_sys_company] ([tree_sorts]);
CREATE INDEX [idx_sys_config_key] ON [js_sys_config] ([config_key]);
CREATE UNIQUE INDEX [idx_sys_config_key] ON [js_sys_config] ([config_key]);
CREATE INDEX [idx_sys_dict_data_cc] ON [js_sys_dict_data] ([corp_code]);
CREATE INDEX [idx_sys_dict_data_dt] ON [js_sys_dict_data] ([dict_type]);
CREATE INDEX [idx_sys_dict_data_pc] ON [js_sys_dict_data] ([parent_code]);

2
modules/core/db/mysql/core.sql
View File

@@ -805,7 +805,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status ASC);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code ASC);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes ASC);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts ASC);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key ASC);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key ASC);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code ASC);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type ASC);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code ASC);

2
modules/core/db/oracle/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code);

2
modules/core/db/postgresql/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code);

BIN
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
View File

Binary file not shown.

9
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -311,6 +311,15 @@ public class LoginController extends BaseController{
return "modules/sys/sysIndex";
}
/**
* 获取侧边栏菜单数据
*/
@RequiresPermissions("user")
@RequestMapping(value = "index/menuTree")
public String indexMenuTree(String parentCode) {
return "modules/sys/sysIndex/menuTree";
}
/**
* 获取当前用户权限字符串数据（移动端用）
*/

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

@@ -430,6 +430,7 @@ web:
${adminPath}/index,
${adminPath}/login,
${adminPath}/desktop,
${adminPath}/index/menuTree,
${adminPath}/sys/online/count,
${adminPath}/state/server/rtInfo,
${adminPath}/**/treeData,

2
modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql
View File

@@ -2,5 +2,3 @@
UPDATE ${_prefix}sys_menu SET permission='sys:stste:cache' WHERE permission='sys:stste:ehcache';
UPDATE ${_prefix}sys_menu SET menu_href='/state/cache/index' WHERE menu_href='/state/ehcache';
UPDATE ${_prefix}sys_menu SET menu_href='/state/server/index' WHERE menu_href='/state/server';
commit;

8
modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.3.sql Normal file
View File

@@ -0,0 +1,8 @@
-- 将config表的key设置为唯一索引
DROP INDEX [idx_sys_config_key] ON [${_prefix}sys_config];
CREATE UNIQUE INDEX [idx_sys_config_key] ON [${_prefix}sys_config] ([config_key]);
-- 新增主导航菜单显示风格配置
INSERT INTO ${_prefix}sys_config(id, config_name, config_key, config_value, is_sys, create_by, create_date, update_by, update_date, remarks)
VALUES ('1092344803460943872', '主框架页-主导航菜单显示风格', 'sys.index.menuStyle', '1', '0', 'system', getdate(), 'system', getdate(), '1：菜单全部在左侧；2：根菜单显示在顶部');

10
modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.3.sql Normal file
View File

@@ -0,0 +1,10 @@
-- 将config表的key设置为唯一索引
ALTER TABLE ${_prefix}sys_config DROP INDEX idx_sys_config_key;
ALTER TABLE ${_prefix}sys_config ADD UNIQUE INDEX idx_sys_config_key(config_key);
-- 新增主导航菜单显示风格配置
INSERT INTO ${_prefix}sys_config(id, config_name, config_key, config_value, is_sys, create_by, create_date, update_by, update_date, remarks)
VALUES ('1092344803460943872', '主框架页-主导航菜单显示风格', 'sys.index.menuStyle', '1', '0', 'system', now(), 'system', now(), '1：菜单全部在左侧；2：根菜单显示在顶部');
commit;

10
modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.3.sql Normal file
View File

@@ -0,0 +1,10 @@
-- 将config表的key设置为唯一索引
DROP INDEX idx_sys_config_key;
CREATE UNIQUE INDEX idx_sys_config_key ON ${_prefix}sys_config (config_key);
-- 新增主导航菜单显示风格配置
INSERT INTO ${_prefix}sys_config(id, config_name, config_key, config_value, is_sys, create_by, create_date, update_by, update_date, remarks)
VALUES ('1092344803460943872', '主框架页-主导航菜单显示风格', 'sys.index.menuStyle', '1', '0', 'system', sysdate, 'system', sysdate, '1：菜单全部在左侧；2：根菜单显示在顶部');
commit;

10
modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.3.sql Normal file
View File

@@ -0,0 +1,10 @@
-- 将config表的key设置为唯一索引
DROP INDEX idx_sys_config_key;
CREATE UNIQUE INDEX idx_sys_config_key ON ${_prefix}sys_config (config_key);
-- 新增主导航菜单显示风格配置
INSERT INTO ${_prefix}sys_config(id, config_name, config_key, config_value, is_sys, create_by, create_date, update_by, update_date, remarks)
VALUES ('1092344803460943872', '主框架页-主导航菜单显示风格', 'sys.index.menuStyle', '1', '0', 'system', now(), 'system', now(), '1：菜单全部在左侧；2：根菜单显示在顶部');
commit;

6
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/menuTree.html Normal file
View File

@@ -0,0 +1,6 @@
<ul class="sidebar-menu" id="leftMenu-${parameter.parentCode}">
<%
var p = {parentCode: parameter.parentCode};
menu.tree(p); print(p.html);
%>
</ul>

44
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
View File

@@ -20,4 +20,48 @@
<% include('topMenuUser.html'){} %>
</ul>
</div>
<% if(@Global.getConfig('sys.index.menuStyle', '1') == '2'){ %>
<div class="navbar-custom-menu pull-left">
<ul class="nav navbar-nav" id="topMenu">
<%
var p = {parentCode: '0', children: false};
menu.tree(p); print(p.html);
%>
</ul>
<script>
$(function(){
$('#topMenu').on('click', '.addTabPage', function (e) {
$('#topMenu li').removeClass('active');
$(this).closest('li').addClass('active');
var code = $(this).data("code");
js.cookie('currentMenuCode', code); // 保存当前菜单ID
if ($("#leftMenu-" + code).length > 0){
$("#leftMenu > ul").hide();
$("#leftMenu-" + code).show();
}else{
js.ajaxSubmit('${ctx}/index/menuTree?parentCode=' + code
+ '&t=' + new Date().getTime(), function(data){
$("#leftMenu > ul").hide();
$("#leftMenu").append(data);
// 如果是初次加载，则选中上次打开的菜单
if($('.sidebar-menu').length == 1){
$(window).trigger("hashchange");
}
}, 'html');
}
});
// 激活存储的顶部当前菜单项
var currentMenuCode = js.cookie('currentMenuCode'), currentMenu;
if (currentMenuCode && currentMenuCode != ''){
currentMenu = $("#topMenu .addTabPage[data-code="+currentMenuCode+"]");
}
if (currentMenu && currentMenu.length > 0 && window.location.hash != ''){
currentMenu.click();
}else{
$("#topMenu .addTabPage:first").click();
}
});
</script>
</div>
<% } %>
</nav>

2
web/db/mssql/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX [idx_sys_company_status] ON [js_sys_company] ([status]);
CREATE INDEX [idx_sys_company_vc] ON [js_sys_company] ([view_code]);
CREATE INDEX [idx_sys_company_pcs] ON [js_sys_company] ([parent_codes]);
CREATE INDEX [idx_sys_company_tss] ON [js_sys_company] ([tree_sorts]);
CREATE INDEX [idx_sys_config_key] ON [js_sys_config] ([config_key]);
CREATE UNIQUE INDEX [idx_sys_config_key] ON [js_sys_config] ([config_key]);
CREATE INDEX [idx_sys_dict_data_cc] ON [js_sys_dict_data] ([corp_code]);
CREATE INDEX [idx_sys_dict_data_dt] ON [js_sys_dict_data] ([dict_type]);
CREATE INDEX [idx_sys_dict_data_pc] ON [js_sys_dict_data] ([parent_code]);

2
web/db/mysql/core.sql
View File

@@ -805,7 +805,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status ASC);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code ASC);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes ASC);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts ASC);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key ASC);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key ASC);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code ASC);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type ASC);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code ASC);

2
web/db/oracle/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code);

2
web/db/postgresql/core.sql
View File

@@ -803,7 +803,7 @@ CREATE INDEX idx_sys_company_status ON js_sys_company (status);
CREATE INDEX idx_sys_company_vc ON js_sys_company (view_code);
CREATE INDEX idx_sys_company_pcs ON js_sys_company (parent_codes);
CREATE INDEX idx_sys_company_tss ON js_sys_company (tree_sorts);
CREATE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE UNIQUE INDEX idx_sys_config_key ON js_sys_config (config_key);
CREATE INDEX idx_sys_dict_data_cc ON js_sys_dict_data (corp_code);
CREATE INDEX idx_sys_dict_data_dt ON js_sys_dict_data (dict_type);
CREATE INDEX idx_sys_dict_data_pc ON js_sys_dict_data (parent_code);

1
web/src/main/resources/config/application.yml
View File

@@ -446,6 +446,7 @@ logging:
# ${adminPath}/index,
# ${adminPath}/login,
# ${adminPath}/desktop,
# ${adminPath}/index/menuTree,
# ${adminPath}/sys/online/count,
# ${adminPath}/state/server/rtInfo,
# ${adminPath}/**/treeData,