From f44f43e2d5e223988a4293ba1c5481c567c70751 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Aug 2022 15:08:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA):?= =?UTF-8?q?=20=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=94=B1=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/commons/constants/ParamConstants.java | 2 ++ .../dataease/controller/sys/response/BasicInfo.java | 2 ++ .../main/java/io/dataease/ext/ExtSysMenuMapper.xml | 12 ++++++++++++ .../service/system/SystemParameterService.java | 6 ++++++ .../src/main/resources/db/migration/V38__1.13.sql | 5 ++++- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 3 ++- frontend/src/views/system/SysParam/BasicSetting.vue | 12 ++++++++++-- 9 files changed, 40 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java index 9c309442ed..6b5c6aacd0 100644 --- a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java @@ -112,6 +112,8 @@ public interface ParamConstants { MSG_TIME_OUT("basic.msgTimeOut"), DEFAULT_LOGIN_TYPE("basic.loginType"), OPEN_HOME_PAGE("ui.openHomePage"), + + OPEN_MARKET_PAGE("ui.openMarketPage"), TEMPLATE_MARKET_ULR("basic.templateMarketUlr"), TEMPLATE_ACCESS_KEY("basic.templateAccessKey"); diff --git a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java index c2ce08e501..4a4ca4f3b8 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java @@ -20,5 +20,7 @@ public class BasicInfo implements Serializable { private String templateMarketUlr; @ApiModelProperty("模板市场AccessKey") private String templateAccessKey; + @ApiModelProperty("显示模板市场") + private String openMarketPage; } diff --git a/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml b/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml index a074a1aa2f..1e82ad6b8c 100644 --- a/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml @@ -40,6 +40,18 @@ AND param_value = 'true' ) ) + AND ( + sys_menu.menu_id != 202 + OR EXISTS ( + SELECT + 1 + FROM + system_parameter + WHERE + param_key = 'ui.openMarketPage' + AND param_value = 'true' + ) + ) ORDER BY menu_sort diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 594389b4ee..f499dfd028 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -51,7 +51,9 @@ public class SystemParameterService { public BasicInfo basicInfo() { List paramList = this.getParamList("basic"); List homePageList = this.getParamList("ui.openHomePage"); + List marketPageList = this.getParamList("ui.openMarketPage"); paramList.addAll(homePageList); + paramList.addAll(marketPageList); BasicInfo result = new BasicInfo(); result.setOpenHomePage("true"); if (!CollectionUtils.isEmpty(paramList)) { @@ -70,6 +72,10 @@ public class SystemParameterService { boolean open = StringUtils.equals("true", param.getParamValue()); result.setOpenHomePage(open ? "true" : "false"); } + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.OPEN_MARKET_PAGE.getValue())) { + boolean open = StringUtils.equals("true", param.getParamValue()); + result.setOpenMarketPage(open ? "true" : "false"); + } if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.TEMPLATE_MARKET_ULR.getValue())) { result.setTemplateMarketUlr(param.getParamValue()); } diff --git a/backend/src/main/resources/db/migration/V38__1.13.sql b/backend/src/main/resources/db/migration/V38__1.13.sql index 82eb9a14dd..c956d40244 100644 --- a/backend/src/main/resources/db/migration/V38__1.13.sql +++ b/backend/src/main/resources/db/migration/V38__1.13.sql @@ -66,7 +66,7 @@ update area_mapping_global set county_code = concat('156', county_code); COMMIT; -INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (202, 0, 0, 1, '模板市场', 'template-market', 'panel/templateMarket/index', 5, 'dashboard', '/templateMarket', 0, 0, 0, null, NULL, NULL, NULL, 1620444227389); +INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (202, 0, 0, 1, '模板市场', 'template-market', 'panel/templateMarket/index', 5, 'dashboard', '/templateMarket', 1, 0, 0, null, NULL, NULL, NULL, 1620444227389); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateAccessKey', 'dataease', 'text', NULL); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateMarketUlr', 'https://dataease.io/templates', 'text', 4); @@ -97,3 +97,6 @@ SET `permission` = 'user:editPwd' WHERE `menu_id` = 51; + + +INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openMarketPage', 'true', 'boolean', 14); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index e8fc3a684a..a7dd275f25 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1896,6 +1896,7 @@ export default { themeDark: 'Dark', themeCustom: 'Custom', openHomePage: 'Show Home Page', + openMarketPage: 'Show Market Page', mobileBG: 'Mobile Login page BG', helpLink: 'Help Document Link', homeLink: 'Home Link', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 0b14bbfa6b..552d0f46b7 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1904,7 +1904,7 @@ export default { themeDark: '深色', themeCustom: '自定義', openHomePage: '顯示首頁', - + openMarketPage: '显示模板市场', mobileBG: '移動端登錄頁背景', helpLink: '幫助文檔鏈接', homeLink: '首頁鏈接', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e59eba52ad..c899adf897 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -568,7 +568,7 @@ export default { filter: '筛选', list: '列表项', list_info: '请选择列表中要展示的信息', - sure_delete: '确定删除该用户吗？', + sure_delete: '确定删除该用户吗？' }, ldap: { url: 'LDAP地址', @@ -1914,6 +1914,7 @@ export default { themeDark: '深色', themeCustom: '自定义', openHomePage: '显示首页', + openMarketPage: '显示模板市场', mobileBG: '移动端登录页背景', helpLink: '帮助文档链接', homeLink: '首页链接', diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index bad233e8cb..5d345d9167 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -49,6 +49,14 @@ {{ $t('system_parameter_setting.cas_reset') + '[/cas/reset/{adminAcount}/{adminPwd}]' }} + + + + + + + + @@ -163,8 +171,8 @@ export default { { paramKey: 'basic.frontTimeOut', paramValue: this.formInline.frontTimeOut, type: 'text', sort: 1 }, { paramKey: 'basic.msgTimeOut', paramValue: this.formInline.msgTimeOut, type: 'text', sort: 2 }, { paramKey: 'basic.loginType', paramValue: this.formInline.loginType, type: 'text', sort: 3 }, - { paramKey: 'ui.openHomePage', paramValue: this.formInline.openHomePage, type: 'text', sort: 13 } - + { paramKey: 'ui.openHomePage', paramValue: this.formInline.openHomePage, type: 'text', sort: 13 }, + { paramKey: 'ui.openMarketPage', paramValue: this.formInline.openMarketPage, type: 'text', sort: 14 } ] this.$refs[formInline].validate(valid => {