From 80e0a1099b051238bd3bcc8f2612ff5f5c10076e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Apr 2024 15:33:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=9C=A8=E8=A7=86=E5=9B=BE=E4=BE=A7=E5=AF=BC=E5=87=BA=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=8E=9F=E5=A7=8B=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20#5894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/controller/panel/PanelGroupController.java   | 8 ++++++--
 .../src/components/canvas/customComponent/UserView.vue    | 6 ++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
index 3e01a45acf..86564eed10 100644
--- a/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -166,14 +166,18 @@ public class PanelGroupController {
     @ApiOperation("公共连接导出仪表板视图明细")
     @PostMapping("/exportDetails")
     @I18n
-    public void exportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException {
+    public void exportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws Exception {
         HttpServletRequest httpServletRequest = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
                 .getRequest();
         String linkToken = httpServletRequest.getHeader(F2CLinkFilter.LINK_TOKEN_KEY);
         DecodedJWT jwt = JWT.decode(linkToken);
         Long userId = jwt.getClaim("userId").asLong();
         request.setUserId(userId);
-        panelGroupService.exportPanelViewDetails(request, response);
+        if("dataset".equals(request.getDownloadType())){
+            panelGroupService.exportDatasetDetails(request, response);
+        }else {
+            panelGroupService.exportPanelViewDetails(request, response);
+        }
     }
 
     @ApiOperation("站内导出仪表板视图明细")
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 5ade76dfeb..26ff35e563 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -212,7 +212,7 @@
           <svg-icon
             icon-class="ds-excel"
             class="ds-icon-excel"
-          />{{ $t('chart.導出原始明細') }}
+          />{{ $t('chart.export_source') }}
         </el-button>
       </span>
       <user-view-dialog
@@ -1059,9 +1059,7 @@ export default {
             if (response.success) {
               this.chart = response.data
               this.view = response.data
-              if (this.chart.type.includes('table')) {
-                this.$store.commit('setLastViewRequestInfo', { viewId: id, requestInfo: requestInfo })
-              }
+              this.$store.commit('setLastViewRequestInfo', { viewId: id, requestInfo: requestInfo })
               this.buildInnerRefreshTimer(this.chart.refreshViewEnable, this.chart.refreshUnit, this.chart.refreshTime)
               this.$emit('fill-chart-2-parent', this.chart)
               this.getDataOnly(response.data, dataBroadcast)