From 345a52e1db03afdc7cfb536cff01122cbe138920 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Tue, 24 Sep 2024 16:31:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E9=80=8F?= =?UTF-8?q?=E8=A7=86=E8=A1=A8=E5=B8=A6=E6=A0=BC=E5=BC=8F=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/components/canvas/components/editor/EditBar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue index c8285d0485..031e63b923 100644 --- a/core/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue @@ -314,6 +314,7 @@ export default { hasDataPermission('export', this.$store.state.panel.panelInfo.privileges) && this.chart && this.chart.dataFrom !== 'template' && + this.chart.type === 'table-pivot' && JSON.parse(this.chart.customAttr).size?.tableLayoutMode !== 'tree' }, enlargeShow() { From c8e1e73fca7a1fa4566ad7a1655dec08f4e2523d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 24 Sep 2024 17:04:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AF=BC=E5=87=BA=E8=A7=86=E5=9B=BEexcel=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/chart/ViewExportExcel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index 66768ac8fc..c456e43600 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -135,9 +135,9 @@ public class ViewExportExcel { for (int i = 0; i < headKeys.size(); i++) { String key = headKeys.get(i); Object val = row.get(key); - if (ObjectUtils.isEmpty(val)) + if (ObjectUtils.isEmpty(val)) { tempList.add(StringUtils.EMPTY); - if (fieldTypes.get(i) == 3) { + } else if (fieldTypes.get(i) == 3) { tempList.add(filterInvalidDecimal(val.toString())); } else { tempList.add(val.toString()); @@ -160,4 +160,10 @@ public class ViewExportExcel { } return sourceNumberStr; } + + public static void main(String[] args) { + List list = new ArrayList<>(); + list.add(null); + System.out.println(111); + } } From 4790bbe39d80a0243c22a335d5ee079ca830ed26 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 24 Sep 2024 17:52:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E5=91=8Apdf=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/ext/ExtPanelGroupMapper.java | 2 ++ .../main/java/io/dataease/ext/ExtPanelGroupMapper.xml | 4 ++++ .../job/sechedule/strategy/impl/EmailTaskHandler.java | 5 ++--- .../io/dataease/service/panel/PanelGroupService.java | 10 +++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java index 8e62c241e3..26df796681 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java @@ -37,4 +37,6 @@ public interface ExtPanelGroupMapper { List queryPanelRelation(@Param("panelId") String panelId, @Param("userId") Long userId); List listPanelByUser(@Param("userId") long userId); + + String queryPanelName(@Param("panelId") String panelId); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index a8e0e6f3c4..7fda18b5f3 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -366,4 +366,8 @@ ) group by pg.id + + diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 5ece55ee56..603f86834e 100644 --- a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -9,7 +9,6 @@ import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; import io.dataease.dto.PermissionProxy; import io.dataease.dto.chart.ViewOption; -import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.ext.ExtTaskMapper; import io.dataease.job.sechedule.ScheduleManager; import io.dataease.job.sechedule.strategy.TaskHandler; @@ -271,8 +270,8 @@ public class EmailTaskHandler extends TaskHandler implements Job { emailService.sendWithImageAndFiles(recipients, emailTemplateDTO.getTitle(), contentStr, bytes, files); } else { bytes = emailXpackService.printPdf(url, token, xpackPixelEntity, false, true); - PanelGroupDTO panelInfo = CommonBeanFactory.getBean(PanelGroupService.class).findOne(panelId); - String pdfFileName = panelInfo.getName() + "pdf"; + String panelName = CommonBeanFactory.getBean(PanelGroupService.class).getPanelName(panelId); + String pdfFileName = panelName + ".pdf"; emailService.sendPdfWithFiles(recipients, emailTemplateDTO.getTitle(), contentStr, bytes, files, pdfFileName); } diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index ec5f89a0d5..bbb7baf68e 100644 --- a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -21,7 +21,6 @@ import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.dataset.DataSetGroupDTO; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTaskDTO; -import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.dto.panel.PanelExport2App; import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.dto.panel.PanelTemplateFileDTO; @@ -32,6 +31,7 @@ import io.dataease.listener.util.CacheUtils; import io.dataease.plugins.common.base.domain.*; import io.dataease.plugins.common.base.mapper.*; import io.dataease.plugins.common.constants.DeTypeConstants; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; @@ -329,6 +329,10 @@ public class PanelGroupService { DeLogUtils.save(sysLogDTO); } + public String getPanelName(String panelId) { + return extPanelGroupMapper.queryPanelName(panelId); + } + /** * @param panelId @@ -722,10 +726,10 @@ public class PanelGroupService { composePermission.add(customFilterPermission); } dataSetExportRequest.setExpressionTree(gson.toJson(permissionsTreeObjFilter)); - } else if(StringUtils.isNotEmpty(permissionsTreeObjCustomsFilter.getLogic())){ + } else if (StringUtils.isNotEmpty(permissionsTreeObjCustomsFilter.getLogic())) { dataSetExportRequest.setExpressionTree(customFilter); } - dataSetExportRequest.setFilename(request.getViewName()+"-details"); + dataSetExportRequest.setFilename(request.getViewName() + "-details"); return dataSetExportRequest; }