From 94d9c537b70fed297bcf8ef0794be0708ec4e522 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 18 Aug 2022 00:12:17 -0400
Subject: [PATCH 1/4] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20pc=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?-=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/panel/panel.js                  |  9 +++++++++
 frontend/src/views/panel/GrantAuth/shareTree.vue | 12 ++++++++----
 frontend/src/views/panel/enshrine/index.vue      |  6 ++++--
 frontend/src/views/panel/list/PanelList.vue      |  8 +++++---
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index e5e92583e7..acb749adcf 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -90,6 +90,15 @@ export function findOne(id) {
   })
 }
 
+export function viewPanelLog(data) {
+  return request({
+    url: 'panel/group/viewLog',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
 export function getTable(id) {
   return request({
     url: '/panel/table/get/' + id,
diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue
index 052819a17a..e601263560 100644
--- a/frontend/src/views/panel/GrantAuth/shareTree.vue
+++ b/frontend/src/views/panel/GrantAuth/shareTree.vue
@@ -71,7 +71,7 @@
 <script>
 import { loadTree, loadShareOutTree, removePanelShares } from '@/api/panel/share'
 import { uuid } from 'vue-uuid'
-import { initPanelData } from '@/api/panel/panel'
+import { initPanelData, viewPanelLog } from '@/api/panel/panel'
 import { proxyInitPanelData } from '@/api/panel/shareProxy'
 import bus from '@/utils/bus'
 
@@ -134,14 +134,18 @@ export default {
       }
       const param = { userId: data.userId }
       proxyInitPanelData(data.id, param, function() {
-        bus.$emit('set-panel-show-type', 1)
-        bus.$emit('set-panel-share-user', data.userId)
+        viewPanelLog({ panelId: data.id }).then(res => {
+          bus.$emit('set-panel-show-type', 1)
+          bus.$emit('set-panel-share-user', data.userId)
+        })
       })
       this.$refs['botTree'].setCurrentKey(null)
     },
     viewMyShare(data) {
       initPanelData(data.id, false, function() {
-        bus.$emit('set-panel-show-type', 2)
+        viewPanelLog({ panelId: data.id }).then(res => {
+          bus.$emit('set-panel-show-type', 2)
+        })
       })
       this.$refs['topTree'].setCurrentKey(null)
     },
diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue
index a706016928..c1ff91cb41 100644
--- a/frontend/src/views/panel/enshrine/index.vue
+++ b/frontend/src/views/panel/enshrine/index.vue
@@ -31,7 +31,7 @@
 <script>
 import { deleteEnshrine, enshrineList } from '@/api/panel/enshrine'
 import { uuid } from 'vue-uuid'
-import { initPanelData } from '@/api/panel/panel'
+import { initPanelData, viewPanelLog } from '@/api/panel/panel'
 import bus from '@/utils/bus'
 
 export default {
@@ -56,7 +56,9 @@ export default {
   methods: {
     showPanel(row) {
       initPanelData(row.panelGroupId, false, function() {
-        bus.$emit('set-panel-show-type', 0)
+        viewPanelLog({ panelId: row.panelGroupId }).then(res => {
+          bus.$emit('set-panel-show-type', 0)
+        })
       })
     },
     resetID(data) {
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 267b219054..be94388ca0 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -228,7 +228,7 @@ import LinkGenerate from '@/views/link/generate'
 import { uuid } from 'vue-uuid'
 import bus from '@/utils/bus'
 import EditPanel from './EditPanel'
-import { addGroup, delGroup, groupTree, defaultTree, initPanelData, panelUpdate } from '@/api/panel/panel'
+import { addGroup, delGroup, groupTree, defaultTree, initPanelData, panelUpdate, viewPanelLog } from '@/api/panel/panel'
 import { mapState } from 'vuex'
 import {
   DEFAULT_COMMON_CANVAS_STYLE_STRING
@@ -675,8 +675,10 @@ export default {
         // 清理pc布局缓存
         this.$store.commit('setComponentDataCache', null)
         initPanelData(data.id, false, function(response) {
-          bus.$emit('set-panel-show-type', 0)
-          data.mobileLayout = response.data.mobileLayout
+          viewPanelLog({ panelId: data.id }).then(res => {
+            bus.$emit('set-panel-show-type', 0)
+            data.mobileLayout = response.data.mobileLayout
+          })
         })
       }
     },

From c4c89795f0755f950fd77612a9b884aaa9d4f7e4 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 18 Aug 2022 12:20:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20pc=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=AE=B0=E5=BD=95=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97-=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/constants/SysLogConstants.java    |  6 +++--
 .../panel/PanelGroupController.java           |  8 +++++-
 .../request/panel/PanelViewLogRequest.java    | 12 +++++++++
 .../service/panel/PanelGroupService.java      | 16 +++++++++---
 .../dataease/service/sys/log/LogService.java  | 25 +++++++++++++++++++
 .../resources/i18n/messages_en_US.properties  |  2 ++
 .../resources/i18n/messages_zh_CN.properties  |  2 ++
 .../resources/i18n/messages_zh_TW.properties  |  2 ++
 8 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/controller/request/panel/PanelViewLogRequest.java

diff --git a/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java b/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
index 69cbc00165..dd1508ef07 100644
--- a/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
+++ b/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
@@ -26,9 +26,11 @@ public class SysLogConstants {
 
         LOGIN(12, "OPERATE_TYPE_LOGIN"),
 
-        VIEW(13, "OPERATE_TYPE_VIEW"),
+        PC_VIEW(13, "OPERATE_TYPE_PC_VIEW"),
 
-        EXPORT(14, "OPERATE_TYPE_EXPORT");
+        MB_VIEW(14, "OPERATE_TYPE_MB_VIEW"),
+
+        EXPORT(15, "OPERATE_TYPE_EXPORT");
         private Integer value;
         private String name;
         OPERATE_TYPE(Integer value, String name) {
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 4b315e3fd9..5c45b68005 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -7,7 +7,7 @@ import io.dataease.auth.annotation.DePermissions;
 import io.dataease.auth.service.impl.ExtAuthServiceImpl;
 import io.dataease.commons.constants.PanelConstants;
 import io.dataease.controller.request.panel.PanelGroupBaseInfoRequest;
-import io.dataease.plugins.common.base.domain.PanelGroup;
+import io.dataease.controller.request.panel.PanelViewLogRequest;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.controller.handler.annotation.I18n;
@@ -172,4 +172,10 @@ public class PanelGroupController {
     public void removePanelCache(@PathVariable String panelId){
         panelGroupService.removePanelCache(panelId);
     }
+
+    @ApiIgnore
+    @PostMapping("/viewLog")
+    public void viewLog(@RequestBody PanelViewLogRequest request) {
+        panelGroupService.viewLog(request);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewLogRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewLogRequest.java
new file mode 100644
index 0000000000..a685074dd9
--- /dev/null
+++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewLogRequest.java
@@ -0,0 +1,12 @@
+package io.dataease.controller.request.panel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PanelViewLogRequest implements Serializable {
+    private String panelId;
+
+    private Boolean mobile = false;
+}
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 91ceb1f0fa..0e7eab6fde 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -6,10 +6,7 @@ import io.dataease.commons.constants.*;
 import io.dataease.commons.utils.*;
 import io.dataease.controller.request.authModel.VAuthModelRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
-import io.dataease.controller.request.panel.PanelGroupBaseInfoRequest;
-import io.dataease.controller.request.panel.PanelGroupRequest;
-import io.dataease.controller.request.panel.PanelTemplateRequest;
-import io.dataease.controller.request.panel.PanelViewDetailsRequest;
+import io.dataease.controller.request.panel.*;
 import io.dataease.dto.PanelGroupExtendDataDTO;
 import io.dataease.dto.SysLogDTO;
 import io.dataease.dto.authModel.VAuthModelDTO;
@@ -669,4 +666,15 @@ public class PanelGroupService {
         Object cache = CacheUtils.get(cacheName,cacheId);
         return cache!=null;
     }
+
+    public void viewLog(PanelViewLogRequest request) {
+        String panelId = request.getPanelId();
+        Boolean mobile = request.getMobile();
+        PanelGroupWithBLOBs panel = panelGroupMapper.selectByPrimaryKey(panelId);
+        SysLogConstants.OPERATE_TYPE operateType = SysLogConstants.OPERATE_TYPE.PC_VIEW;
+        if (mobile) {
+            operateType = SysLogConstants.OPERATE_TYPE.MB_VIEW;
+        }
+        DeLogUtils.save(operateType, sourceType, panelId, panel.getPid(), null, null);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
index f4fbc4ebeb..1e43cf2ecc 100644
--- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java
+++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
@@ -179,9 +179,34 @@ public class LogService {
         userLogin.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
         results.add(userLogin);
 
+        List<FolderItem> folderItems = viewPanelTypes();
+        results.addAll(folderItems);
         return results;
     }
 
+    private List<FolderItem> viewPanelTypes () {
+        List<FolderItem> results = new ArrayList<>();
+        Integer[] opTypes = new Integer[]{13, 14};
+        Integer[] sourceTypes = new Integer[]{3};
+        for (int i = 0; i < sourceTypes.length; i++) {
+            Integer sourceVal = sourceTypes[i];
+            String sourceTypeName = SysLogConstants.sourceTypeName(sourceVal);
+
+            for (int j = 0; j < opTypes.length; j++) {
+
+                Integer operateVal = opTypes[j];
+
+                String operateTypeName = SysLogConstants.operateTypeName(operateVal);
+                FolderItem folderItem = new FolderItem();
+                folderItem.setId(operateVal + "-" + sourceVal);
+                folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
+                results.add(folderItem);
+            }
+        }
+        return results;
+
+    }
+
     public SysLogGridDTO convertDTO(SysLogWithBLOBs vo) {
         SysLogGridDTO sysLogGridDTO = new SysLogGridDTO();
         sysLogGridDTO.setOpType(SysLogConstants.operateTypeName(vo.getOperateType()));
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index d14d00dabc..3e93c86f78 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -143,6 +143,8 @@ OPERATE_TYPE_DELETELINK=Delete Link
 OPERATE_TYPE_MODIFYLINK=Modify Link
 OPERATE_TYPE_UPLOADFILE=Upload
 OPERATE_TYPE_LOGIN=Login
+OPERATE_TYPE_PC_VIEW=View with pc
+OPERATE_TYPE_MB_VIEW=View with mobile device
 
 SOURCE_TYPE_DATASOURCE=DATASOURCE
 SOURCE_TYPE_DATASET=DATASET
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 39c4733993..7ee0f4df52 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -141,6 +141,8 @@ OPERATE_TYPE_DELETELINK=\u5220\u9664\u516C\u5171\u94FE\u63A5
 OPERATE_TYPE_MODIFYLINK=\u4FEE\u6539\u516C\u5171\u94FE\u63A5
 OPERATE_TYPE_UPLOADFILE=\u4E0A\u4F20
 OPERATE_TYPE_LOGIN=\u767B\u5F55
+OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B
+OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52A8\u7AEF\u67E5\u770B
 
 SOURCE_TYPE_DATASOURCE=\u6570\u636E\u6E90
 SOURCE_TYPE_DATASET=\u6570\u636E\u96C6
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index f113a7e01f..b5ecee389f 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -142,6 +142,8 @@ OPERATE_TYPE_DELETELINK=\u522A\u9664\u516C\u5171\u93C8\u63A5
 OPERATE_TYPE_MODIFYLINK=\u4FEE\u6539\u516C\u5171\u93C8\u63A5
 OPERATE_TYPE_UPLOADFILE=\u4E0A\u50B3
 OPERATE_TYPE_LOGIN=\u767B\u9304
+OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B
+OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52D5\u7AEF\u67E5\u770B
 
 SOURCE_TYPE_DATASOURCE=\u6578\u64DA\u6E90
 SOURCE_TYPE_DATASET=\u6578\u64DA\u96C6

From cf92b5055ec0c7c93af222940a6d6b392153b7a5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 18 Aug 2022 13:07:04 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/panel/PanelGroupController.java  |  9 ++++++++-
 .../request/panel/PanelViewDetailsRequest.java  |  2 ++
 .../service/panel/PanelGroupService.java        |  6 ++++++
 .../io/dataease/service/sys/log/LogService.java | 17 +++++++++++++----
 .../resources/i18n/messages_en_US.properties    |  1 +
 .../resources/i18n/messages_zh_CN.properties    |  1 +
 .../resources/i18n/messages_zh_TW.properties    |  1 +
 7 files changed, 32 insertions(+), 5 deletions(-)

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 5c45b68005..fd2c029ae3 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -131,13 +131,20 @@ public class PanelGroupController {
         return panelGroupService.queryPanelComponents(id);
     }
 
-    @ApiOperation("导出仪表板视图明细")
+    @ApiOperation("公共连接导出仪表板视图明细")
     @PostMapping("/exportDetails")
     @I18n
     public void exportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException {
         panelGroupService.exportPanelViewDetails(request, response);
     }
 
+    @ApiOperation("站内导出仪表板视图明细")
+    @PostMapping("/innerExportDetails")
+    @I18n
+    public void innerExportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException {
+        panelGroupService.exportPanelViewDetails(request, response);
+    }
+
     @ApiOperation("更新仪表板状态")
     @PostMapping("/updatePanelStatus/{panelId}")
     @I18n
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 841ff36e8b..2523167f11 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
@@ -12,6 +12,8 @@ import java.util.List;
 @Data
 public class PanelViewDetailsRequest {
 
+    private String viewId;
+
     private String viewName;
 
     private String[] header;
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index c80ab5631d..721354df67 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -620,6 +620,12 @@ public class PanelGroupService {
         } catch (Exception e) {
             DataEaseException.throwException(e);
         }
+        if (ObjectUtils.isNotEmpty(AuthUtils.getUser())) {
+            String viewId = request.getViewId();
+            ChartViewWithBLOBs chartViewWithBLOBs = chartViewService.get(viewId);
+            String pid = chartViewWithBLOBs.getSceneId();
+            DeLogUtils.save(SysLogConstants.OPERATE_TYPE.EXPORT, SysLogConstants.SOURCE_TYPE.VIEW, viewId,pid, null, null);
+        }
     }
 
     public void updatePanelStatus(String panelId, PanelGroupBaseInfoRequest request) {
diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
index 1e43cf2ecc..3838bb7b47 100644
--- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java
+++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
@@ -181,13 +181,18 @@ public class LogService {
 
         List<FolderItem> folderItems = viewPanelTypes();
         results.addAll(folderItems);
+        results.addAll(viewRelativeTypes());
         return results;
     }
 
-    private List<FolderItem> viewPanelTypes () {
+    private List<FolderItem> viewRelativeTypes() {
+        Integer[] opTypes = new Integer[]{15};
+        Integer[] sourceTypes = new Integer[]{4};
+        return typesByArr(opTypes, sourceTypes);
+    }
+
+    private List<FolderItem> typesByArr(Integer[] opTypes, Integer[] sourceTypes) {
         List<FolderItem> results = new ArrayList<>();
-        Integer[] opTypes = new Integer[]{13, 14};
-        Integer[] sourceTypes = new Integer[]{3};
         for (int i = 0; i < sourceTypes.length; i++) {
             Integer sourceVal = sourceTypes[i];
             String sourceTypeName = SysLogConstants.sourceTypeName(sourceVal);
@@ -204,7 +209,11 @@ public class LogService {
             }
         }
         return results;
-
+    }
+    private List<FolderItem> viewPanelTypes () {
+        Integer[] opTypes = new Integer[]{13, 14};
+        Integer[] sourceTypes = new Integer[]{3};
+        return typesByArr(opTypes, sourceTypes);
     }
 
     public SysLogGridDTO convertDTO(SysLogWithBLOBs vo) {
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 3e93c86f78..2f5afb2967 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -145,6 +145,7 @@ OPERATE_TYPE_UPLOADFILE=Upload
 OPERATE_TYPE_LOGIN=Login
 OPERATE_TYPE_PC_VIEW=View with pc
 OPERATE_TYPE_MB_VIEW=View with mobile device
+OPERATE_TYPE_EXPORT=Export
 
 SOURCE_TYPE_DATASOURCE=DATASOURCE
 SOURCE_TYPE_DATASET=DATASET
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 7ee0f4df52..00a0f7d2fd 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -143,6 +143,7 @@ OPERATE_TYPE_UPLOADFILE=\u4E0A\u4F20
 OPERATE_TYPE_LOGIN=\u767B\u5F55
 OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B
 OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52A8\u7AEF\u67E5\u770B
+OPERATE_TYPE_EXPORT=\u5BFC\u51FA
 
 SOURCE_TYPE_DATASOURCE=\u6570\u636E\u6E90
 SOURCE_TYPE_DATASET=\u6570\u636E\u96C6
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index b5ecee389f..41b412d5e8 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -144,6 +144,7 @@ OPERATE_TYPE_UPLOADFILE=\u4E0A\u50B3
 OPERATE_TYPE_LOGIN=\u767B\u9304
 OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B
 OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52D5\u7AEF\u67E5\u770B
+OPERATE_TYPE_EXPORT=\u5C0E\u51FA
 
 SOURCE_TYPE_DATASOURCE=\u6578\u64DA\u6E90
 SOURCE_TYPE_DATASET=\u6578\u64DA\u96C6

From 846ca0346b586e71afb76b3071142a03d40e8924 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 18 Aug 2022 01:09:45 -0400
Subject: [PATCH 4/4] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/panel/panel.js                    | 10 ++++++++++
 .../canvas/custom-component/UserViewDialog.vue     | 14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index acb749adcf..de63eb6380 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -233,6 +233,16 @@ export function exportDetails(data) {
   })
 }
 
+export function innerExportDetails(data) {
+  return request({
+    url: 'panel/group/innerExportDetails',
+    method: 'post',
+    data: data,
+    loading: true,
+    responseType: 'blob'
+  })
+}
+
 export function updatePanelStatus(panelId, param) {
   return request({
     url: '/panel/group/updatePanelStatus/' + panelId,
diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index 5905c74d75..2500116f40 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -10,7 +10,7 @@
             :chart="mapChart || chart"
             class="chart-class"
           />
-          <chart-component :theme-style="element.commonBackground" v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" class="chart-class" :chart="mapChart || chart" />
+          <chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" :theme-style="element.commonBackground" class="chart-class" :chart="mapChart || chart" />
           <chart-component-g2 v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
           <chart-component-s2 v-else-if="chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
           <label-normal v-else-if="chart.type.includes('text')" :chart="chart" class="table-class" />
@@ -38,10 +38,11 @@ import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
 import PluginCom from '@/views/system/plugin/PluginCom'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
 import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
-import { exportDetails } from '@/api/panel/panel'
+import { exportDetails, innerExportDetails } from '@/api/panel/panel'
 import html2canvas from 'html2canvasde'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { deepCopy, exportImg } from '@/components/canvas/utils/utils'
+import { getLinkToken, getToken } from '@/utils/auth'
 export default {
   name: 'UserViewDialog',
   components: { LabelNormalText, ChartComponentS2, ChartComponentG2, DeMainContainer, DeContainer, DeAsideContainer, ChartComponent, TableNormal, LabelNormal, PluginCom },
@@ -187,6 +188,7 @@ export default {
       const excelData = JSON.parse(JSON.stringify(this.chart.data.tableRow)).map(item => excelHeaderKeys.map(i => item[i]))
       const excelName = this.chart.name
       const request = {
+        viewId: this.chart.id,
         viewName: excelName,
         header: excelHeader,
         details: excelData,
@@ -195,7 +197,13 @@ export default {
         snapshotWidth: width,
         snapshotHeight: height
       }
-      exportDetails(request).then((res) => {
+      let method = innerExportDetails
+      const token = this.$store.getters.token || getToken()
+      const linkToken = this.$store.getters.linkToken || getLinkToken()
+      if (!token && linkToken) {
+        method = exportDetails
+      }
+      method(request).then((res) => {
         const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
         const link = document.createElement('a')
         link.style.display = 'none'