public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-13 17:14:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong
2022-08-02 17:17:54 +08:00
parent eabbf9a609 1c5fb68461
commit 3e1f92d212
41 changed files with 595 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/commons/constants/ParamConstants.java
View File

@@ -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");

2
backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java
View File

@@ -20,5 +20,7 @@ public class BasicInfo implements Serializable {
private String templateMarketUlr;
@ApiModelProperty("模板市场AccessKey")
private String templateAccessKey;
@ApiModelProperty("显示模板市场")
private String openMarketPage;
}

12
backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml
View File

@@ -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
</select>

2
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@@ -517,6 +517,7 @@ public class ChartViewService {
// 仪表板有参数不使用缓存
if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
|| CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters())
|| CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) {
data = datasourceProvider.getData(datasourceRequest);
} else {
@@ -911,6 +912,7 @@ public class ChartViewService {
// 仪表板有参数不使用缓存
if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
|| CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters())
|| CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) {
data = datasourceProvider.getData(datasourceRequest);
} else {

6
backend/src/main/java/io/dataease/service/system/SystemParameterService.java
View File

@@ -51,7 +51,9 @@ public class SystemParameterService {
public BasicInfo basicInfo() {
List<SystemParameter> paramList = this.getParamList("basic");
List<SystemParameter> homePageList = this.getParamList("ui.openHomePage");
List<SystemParameter> 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());
}

10
backend/src/main/resources/db/migration/V38__1.13.sql
View File

@@ -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);
@@ -92,8 +92,6 @@ SET
`permission` = 'datasource:read'
WHERE
`menu_id` = 39;
UPDATE `sys_menu`
SET
`permission` = 'user:editPwd'
WHERE
`menu_id` = 51;
INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openMarketPage', 'true', 'boolean', 14);