dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wisonic-s 2023-12-26 15:10:08 +08:00
commit 676ebbe06c
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1503,7 +1503,7 @@ public class ChartViewService {
if (CollectionUtils.isNotEmpty(detailData)) { if (CollectionUtils.isNotEmpty(detailData)) {
mapTableNormal = ChartDataBuild.transTableNormalWithDetail(xAxis, yAxis, data, detailFieldList, detailData, desensitizationList); mapTableNormal = ChartDataBuild.transTableNormalWithDetail(xAxis, yAxis, data, detailFieldList, detailData, desensitizationList);
} else { } else {
if (StringUtils.equalsIgnoreCase(view.getType(), "bar-time-range") && !drillRequestList.isEmpty() && !xAxisExt.isEmpty()) { // 针对区间条形图，还需要给xAxis排个序, 把xAxisExt放到最后 if (StringUtils.equalsIgnoreCase(view.getType(), "bar-time-range") && CollectionUtils.isNotEmpty(drillRequestList) && CollectionUtils.isNotEmpty(xAxisExt)) { // 针对区间条形图，还需要给xAxis排个序, 把xAxisExt放到最后
int count = 0; int count = 0;
for (int i = xAxis.size() - drillRequestList.size() - 1; i >= 0; i--) { for (int i = xAxis.size() - drillRequestList.size() - 1; i >= 0; i--) {
xAxis.remove(i); xAxis.remove(i);

2
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java
View File

@ -142,7 +142,7 @@ public class SymbolMapRSHandler implements PluginViewRSHandler<Map> {
if (StringUtils.isBlank(val)) return val; if (StringUtils.isBlank(val)) return val;
String typeField = field.getTypeField(); String typeField = field.getTypeField();
if (StringUtils.isNotBlank(typeField) && trans2Ykeys.contains(typeField)) { if (StringUtils.isNotBlank(typeField) && trans2Ykeys.contains(typeField)) {
return Arrays.stream(val.split(",")).distinct().collect(Collectors.joining(",")); return Arrays.stream(val.split(",")).map(StringUtils::trim).distinct().collect(Collectors.joining(","));
} }
return val; return val;
} }

2
installer/dataease/install.conf
View File

@ -15,6 +15,8 @@ DE_DORIS_FE_IP=172.19.0.198
DE_DORIS_BE_IP=172.19.0.199 DE_DORIS_BE_IP=172.19.0.199
## 登录超时时间，单位min。如果不设置则默认8小时，也就是480 ## 登录超时时间，单位min。如果不设置则默认8小时，也就是480
DE_LOGIN_TIMEOUT=480 DE_LOGIN_TIMEOUT=480
## 新建用户初始密码
DE_INIT_PASSWORD=DataEase123456
# 数据库配置 # 数据库配置
## 是否使用外部数据库 ## 是否使用外部数据库

2
installer/dataease/install.sh
View File

@ -75,10 +75,12 @@ echo -e "*******************************************************\n" 2>&1 | tee -
if [[ -f $dataease_conf ]]; then if [[ -f $dataease_conf ]]; then
DE_LOGIN_TIMEOUT=$(prop $dataease_conf dataease.login_timeout) DE_LOGIN_TIMEOUT=$(prop $dataease_conf dataease.login_timeout)
DE_INIT_PASSWORD=$(prop $dataease_conf dataease.init_password)
DE_MYSQL_PARAMS=$(grep -P "^\s*[^#]?spring.datasource.url=.*$" $dataease_conf | cut -d'=' --complement -f1 | awk -F'?' '{print $2}') DE_MYSQL_PARAMS=$(grep -P "^\s*[^#]?spring.datasource.url=.*$" $dataease_conf | cut -d'=' --complement -f1 | awk -F'?' '{print $2}')
fi fi
export DE_MYSQL_PARAMS export DE_MYSQL_PARAMS
export DE_LOGIN_TIMEOUT=$([[ -z $DE_LOGIN_TIMEOUT ]] && echo -n 480 || echo -n $DE_LOGIN_TIMEOUT) export DE_LOGIN_TIMEOUT=$([[ -z $DE_LOGIN_TIMEOUT ]] && echo -n 480 || echo -n $DE_LOGIN_TIMEOUT)
export DE_INIT_PASSWORD=$([[ -z $DE_INIT_PASSWORD ]] && echo -n DataEase123456 || echo -n $DE_INIT_PASSWORD)
if [[ -f $dataease_conf ]] && [[ ! ${DE_EXTERNAL_DORIS} ]]; then if [[ -f $dataease_conf ]] && [[ ! ${DE_EXTERNAL_DORIS} ]]; then
export DE_DORIS_DB=$(prop $dataease_conf doris.db) export DE_DORIS_DB=$(prop $dataease_conf doris.db)

2
installer/dataease/templates/dataease.properties
View File

@ -16,7 +16,7 @@ doris.port=${DE_DORIS_PORT}
doris.httpPort=${DE_DORIS_HTTPPORT} doris.httpPort=${DE_DORIS_HTTPPORT}
#新建用户初始密码 #新建用户初始密码
dataease.init_password=DataEase123456 dataease.init_password=${DE_INIT_PASSWORD}
#登录超时时间单位min 如果不设置 默认8小时也就是480 #登录超时时间单位min 如果不设置 默认8小时也就是480
dataease.login_timeout=${DE_LOGIN_TIMEOUT} dataease.login_timeout=${DE_LOGIN_TIMEOUT}