From 0977598cb6df3d9e488f7eb7c6cde5aa4fe73f66 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 8 Mar 2023 14:38:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=AB=99=E5=86=85=E5=88=86=E4=BA=AB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E9=83=A8=E5=88=86=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=20#4697?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/controller/panel/PanelGroupController.java | 1 + .../controller/request/panel/PanelViewDetailsRequest.java | 5 +++++ .../components/canvas/customComponent/UserViewDialog.vue | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java index 2e46bab9ef..4b5164b44e 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java @@ -146,6 +146,7 @@ public class PanelGroupController { @ApiOperation("站内导出仪表板视图明细") @PostMapping("/innerExportDetails") + @DePermissionProxy(value = "proxy") @I18n public void innerExportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException { panelGroupService.exportPanelViewDetails(request, response); diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java index 41e3c09e0b..ec9650c909 100644 --- a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java @@ -1,6 +1,8 @@ package io.dataease.controller.request.panel; import io.dataease.controller.request.chart.ChartExtRequest; +import io.dataease.dto.PermissionProxy; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -35,4 +37,7 @@ public class PanelViewDetailsRequest { private List excelHeaderKeys; + @ApiModelProperty(hidden = true) + private PermissionProxy proxy; + } diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue index 58a4e5fee1..cd958b81aa 100644 --- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue +++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue @@ -124,6 +124,9 @@ export default { } }, computed: { + panelInfo() { + return this.$store.state.panel.panelInfo + }, isAbsoluteContainer() { return this.showChartCanvas && this.chart.type === 'symbol-map' }, @@ -288,6 +291,7 @@ export default { }) } const request = { + proxy:null, viewId: this.chart.id, viewName: excelName, header: excelHeader, @@ -306,6 +310,10 @@ export default { if (!token && linkToken) { method = exportDetails } + + if (this.panelInfo.proxy) { + request.proxy = { userId: this.panelInfo.proxy } + } method(request).then((res) => { const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) const link = document.createElement('a')