From d2f9d59af4dde84a1e078457242707a4e2ddaa3c Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 8 Nov 2022 20:19:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=AF=BC=E5=87=BAExcel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/DataSetTableService.java   | 1 +
 .../io/dataease/service/dataset/PermissionsTreeService.java     | 2 +-
 frontend/src/views/dataset/data/ViewTable.vue                   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 7849c86d69..d7ddee0749 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -2886,6 +2886,7 @@ public class DataSetTableService {
             if (StringUtils.isNotEmpty(request.getExpressionTree())) {
                 Gson gson = new Gson();
                 tree = gson.fromJson(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class);
+                permissionsTreeService.getField(tree);
             }
             Map<String, Object> previewData = getPreviewData(request, 1, 100000, null, tree);
             List<DatasetTableField> fields = (List<DatasetTableField>) previewData.get("fields");
diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java
index 54350dd09b..040e26d6fe 100644
--- a/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java
@@ -153,7 +153,7 @@ public class PermissionsTreeService {
         return result;
     }
 
-    private void getField(DatasetRowPermissionsTreeObj tree) {
+    public void getField(DatasetRowPermissionsTreeObj tree) {
         if (ObjectUtils.isNotEmpty(tree)) {
             if (ObjectUtils.isNotEmpty(tree.getItems())) {
                 for (DatasetRowPermissionsTreeItem item : tree.getItems()) {
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index bc40625337..b22355bc22 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -187,6 +187,7 @@
 
     <!--导出数据集弹框-->
     <el-dialog
+      v-if="showExport"
       v-dialogDrag
       :visible.sync="showExport"
       width="600px"
@@ -470,6 +471,7 @@ export default {
       this.showExport = true
       this.fetchFiledList()
       this.exportForm.name = this.table.name
+      this.exportForm.expressionTree = ''
     },
     closeExport() {
       this.showExport = false