chore: 合并代码

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']) {

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;
 }