From d76d27999ea82e1680e1139f16a10c396d90ae5b Mon Sep 17 00:00:00 2001 From: wisonic-s <51065359+wisonic-s@users.noreply.github.com> Date: Wed, 12 Mar 2025 18:30:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E8=A1=A8=E5=A4=B4=E6=9C=AA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=20(#15326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/models/chart/chart-attr.d.ts | 2 +- .../editor-style/components/table/TableHeaderGroupConfig.vue | 2 +- .../editor-style/components/table/TableHeaderSelector.vue | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index a796d99c6f..1aed43cc1f 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -1312,4 +1312,4 @@ declare interface ColumnNode { children?: Columns } -declare type Columns = Array +declare type Columns = Array diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue index 463760610b..f7dd3b1fdd 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue @@ -74,7 +74,7 @@ const init = () => { } if (headerGroupConfig?.columns?.length) { const allAxis = showColumns.map(item => item.key) - const leafNodes = getLeafNodes(headerGroupConfig.columns as Array) + const leafNodes = getLeafNodes(headerGroupConfig.columns) const leafKeys = leafNodes.map(item => item.key) if (!isEqual(allAxis, leafKeys)) { const { columns, meta } = headerGroupConfig diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue index 46bab59e39..c8d0c4d99e 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue @@ -92,6 +92,10 @@ const groupConfigValid = computed(() => { if (!columns?.length) { return false } + const noGroup = columns.every(item => !item.children?.length) + if (noGroup) { + return false + } const xAxis = props.chart.xAxis const showColumns = [] xAxis?.forEach(axis => { From 4def632408eb1bb75005b336a5186de49169861b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 12 Mar 2025 19:02:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddiv=E5=B5=8C?= =?UTF-8?q?=E5=85=A5=E4=BB=AA=E8=A1=A8=E6=9D=BF=20=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=8D=A1/=E5=AF=8C=E6=96=87=E6=9C=AC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B7=B3=E8=BD=AC=E6=B2=A1=E5=8A=9E=E6=B3=95?= =?UTF-8?q?=E8=B7=B3=E5=88=B0=E5=8F=A6=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/ComponentWrapper.vue | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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']) { From 50bf66348baf43e6ab6dd3235c8b2107ef8afc76 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 12 Mar 2025 19:07:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf(X-Pack):=20=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../dataease/api/permissions/org/dto/OrgLazyRequest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/de-xpack b/de-xpack index d5ff98c6f3..7bb968fdd3 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d5ff98c6f379f38789ed43b1205e987bceea27fa +Subproject commit 7bb968fdd3496bfa9034b688bc0993205d2cacf4 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; }