diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index e6dd2b8801..32bf982f19 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -318,11 +318,21 @@ const onWrapperClick = e => { const jumpType = config.value.events.jump.type try { if ('newPop' === jumpType) { - window.open( - url, - '_blank', - 'width=800,height=600,left=200,top=100,toolbar=no,scrollbars=yes,resizable=yes,location=no' - ) + console.info('DataEase Component Jump newPop value:' + window['originOpen']) + if (window['originOpen']) { + console.info('DataEase Component originOpen newPop') + window['originOpen']( + url, + '_blank', + 'width=800,height=600,left=200,top=100,toolbar=no,scrollbars=yes,resizable=yes,location=no' + ) + } else { + window.open( + url, + '_blank', + 'width=800,height=600,left=200,top=100,toolbar=no,scrollbars=yes,resizable=yes,location=no' + ) + } } else if ('_blank' === jumpType) { console.info('DataEase Component Jump _blank value:' + window['originOpen']) if (window['originOpen']) { diff --git a/de-xpack b/de-xpack index afcb5e18e3..b3b53b559b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit afcb5e18e3f2a20b9004f7ff07af089e64f5389a +Subproject commit b3b53b559b831f72466ced323e61df449d180ea7 diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java index 5c3bbb283e..ea5919f8e0 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java @@ -1,14 +1,17 @@ package io.dataease.api.permissions.org.dto; import io.dataease.model.KeywordRequest; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; - +@Schema(description = "组织列表过滤器") @EqualsAndHashCode(callSuper = true) @Data public class OrgLazyRequest extends KeywordRequest implements Serializable { - + @Schema(description = "上级节点ID") private Long pid; + @Schema(description = "是否降序", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean desc = true; }