fix(仪表板): 同一个仪表板中使用两个数据集的参数查询会报错

merge: 合并分支

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java

@@ -260,6 +260,7 @@ public class DatasetDataManage {
 
     public Long getDatasetTotal(Long datasetGroupId) throws Exception {
         DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId);
+        if (ObjectUtils.isEmpty(dto)) return 0L;
         if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
             return getDatasetTotal(dto, null, new ChartExtRequest());
         }

core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Component
 public class LinkInterceptor implements HandlerInterceptor {
 
-    private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValueObj";
+    private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValue, /datasetData/enumValueObj, /datasetData/getFieldTree, /dekey, /share/validate, /sysParameter/queryOnlineMap, /chartData/innerExportDetails";
 
 
     @Override
@@ -40,7 +40,7 @@ public class LinkInterceptor implements HandlerInterceptor {
                 if (StringUtils.startsWith(requestURI, AuthConstant.DE_API_PREFIX)) {
                     requestURI = requestURI.replaceFirst(AuthConstant.DE_API_PREFIX, "");
                 }
-                boolean valid = whiteList.contains(requestURI);
+                boolean valid = whiteList.contains(requestURI) || WhitelistUtils.match(requestURI);
                 if (!valid) {
                     DEException.throwException("分享链接Token不支持访问当前url[" + requestURI + "]");
                 }

core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java

@@ -1,6 +1,7 @@
 package io.dataease.substitute.permissions.user;
 
 
+import io.dataease.api.permissions.user.vo.CurIpVO;
 import io.dataease.api.permissions.user.vo.UserFormVO;
 import io.dataease.utils.IPUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -27,6 +28,7 @@ public class SubstituteUserServer {
         result.put("language", "zh-CN");
         return result;
     }
+
     @GetMapping("/personInfo")
     public UserFormVO personInfo() {
         UserFormVO userFormVO = new UserFormVO();
@@ -38,4 +40,13 @@ public class SubstituteUserServer {
         userFormVO.setModel("lose");
         return userFormVO;
     }
+
+    @GetMapping("/ipInfo")
+    public CurIpVO ipInfo() {
+        CurIpVO curIpVO = new CurIpVO();
+        curIpVO.setAccount("admin");
+        curIpVO.setName("管理员");
+        curIpVO.setIp(IPUtils.get());
+        return curIpVO;
+    }
 }

core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java

@@ -137,6 +137,7 @@ public class VisualizationLinkJumpService implements VisualizationLinkJumpApi {
         });
     }
 
+    @DeLinkPermit("#p0.targetDvId")
     @Override
     public VisualizationLinkJumpBaseResponse queryTargetVisualizationJumpInfo(VisualizationLinkJumpBaseRequest request) {
         List<VisualizationLinkJumpDTO> result = extVisualizationLinkJumpMapper.getTargetVisualizationJumpInfo(request);

core/core-backend/src/main/resources/application-standalone.yml

@@ -1,8 +1,9 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://123.57.152.118:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://39.101.192.183:12233/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Password123@mysql
   messages:
     basename: i18n/lic,i18n/core,i18n/permissions,i18n/xpack,i18n/sync
   flyway:

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -684,13 +684,13 @@ const setParameters = field => {
     Object.values(field?.fields || {})
       .flat()
       .filter(ele => fieldArr.includes(ele.id) && !!ele.variableName)
+      .concat(curComponent.value.parameters.filter(ele => fieldArr.includes(ele.id)))
   )
   nextTick(() => {
     if (isTimeParameter.value) {
+      const timeParameter = curComponent.value.parameters.find(ele => ele.deType === 1)
       curComponent.value.timeGranularity =
-        typeTimeMap[
-          curComponent.value.parameters[0].type[1] || curComponent.value.parameters[0].type[0]
-        ]
+        typeTimeMap[timeParameter.type[1] || timeParameter.type[0]]
       curComponent.value.displayType = '1'
     }
 

de-xpack

@@ -1 +1 @@
-Subproject commit db34a9f43beaa57f8942dfdee2c748c0afb88040
+Subproject commit a355248cac7b72ff99179f09e94e13c3bf09aff8

installer/install.sh

@@ -201,14 +201,16 @@ function install_docker() {
 EOF
       fi
 
+      log_content "启动 docker"
+      systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log
+         
       docker version >/dev/null 2>&1
       if [ $? -ne 0 ]; then
          log_content "docker 安装失败"
          exit 1
       else
          log_content "docker 安装成功"
-         log_content "启动 docker"
-         systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log
+
       fi
    fi
 }