diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index f417be4c..e0be5a99 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -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); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 279a6cf6..e3a826be 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -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]); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index df645588..c4210a56 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -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); diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index b41ba9cc..3026384e 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -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); diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 757b3c81..05304ede 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -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); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 839fcf66..4628dc8c 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 7f0ab1fa..6e055a21 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -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"; + } + /** * 获取当前用户权限字符串数据(移动端用) */ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 461c93d8..d52e9aba 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -430,6 +430,7 @@ web: ${adminPath}/index, ${adminPath}/login, ${adminPath}/desktop, + ${adminPath}/index/menuTree, ${adminPath}/sys/online/count, ${adminPath}/state/server/rtInfo, ${adminPath}/**/treeData, diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql index 4f0dd8be..ad91a6da 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql @@ -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; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.3.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.3.sql new file mode 100644 index 00000000..dcc73de7 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.3.sql @@ -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:根菜单显示在顶部'); diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.3.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.3.sql new file mode 100644 index 00000000..da88bbd0 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.3.sql @@ -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; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.3.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.3.sql new file mode 100644 index 00000000..b7b2aaaa --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.3.sql @@ -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; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.3.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.3.sql new file mode 100644 index 00000000..c8db64ea --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.3.sql @@ -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; \ No newline at end of file diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/menuTree.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/menuTree.html new file mode 100644 index 00000000..87fea3e3 --- /dev/null +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/menuTree.html @@ -0,0 +1,6 @@ +
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html index f109e2ed..761b0269 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html @@ -20,4 +20,48 @@ <% include('topMenuUser.html'){} %> + <% if(@Global.getConfig('sys.index.menuStyle', '1') == '2'){ %> + + <% } %> \ No newline at end of file diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 279a6cf6..e3a826be 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -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]); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index df645588..c4210a56 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -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); diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index b41ba9cc..3026384e 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -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); diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 757b3c81..05304ede 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -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); diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 3d51f870..af226baa 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -446,6 +446,7 @@ logging: # ${adminPath}/index, # ${adminPath}/login, # ${adminPath}/desktop, +# ${adminPath}/index/menuTree, # ${adminPath}/sys/online/count, # ${adminPath}/state/server/rtInfo, # ${adminPath}/**/treeData,