From 8f33d3779ecfb5c61ecbdc0ef799ba9b326d7239 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 25 May 2022 20:24:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E9=9C=80=E6=8F=90=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E8=AF=B7=E5=85=88=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/request/dataset/DataSetTableRequest.java     | 2 ++
 .../io/dataease/service/dataset/DataSetTableService.java    | 6 +++++-
 frontend/src/views/chart/view/TableSelector.vue             | 6 ++++++
 frontend/src/views/system/task/DatasetTaskList.vue          | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
index 4b3fafa1f0..bd33c0b6ae 100644
--- a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
@@ -6,6 +6,7 @@ import io.dataease.plugins.common.dto.datasource.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -38,4 +39,5 @@ public class DataSetTableRequest extends DatasetTable {
     private List<ExcelSheetData> sheets;
     @ApiModelProperty("是否合并sheet")
     private boolean mergeSheet = false;
+    private boolean previewForTask = false;
 }
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 b2bbf4200d..4d9cabd2d2 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -581,7 +581,11 @@ public class DataSetTableService {
             } else {
                 // check doris table
                 if (!checkEngineTableIsExists(dataSetTableRequest.getId())) {
-                    throw new RuntimeException(Translator.get("i18n_data_not_sync"));
+                    if(dataSetTableRequest.isPreviewForTask()){
+                        return map;
+                    }else {
+                        throw new RuntimeException(Translator.get("i18n_data_not_sync"));
+                    }
                 }
                 Datasource ds = engineService.getDeEngine();
                 JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue
index 0d39978435..e08662af67 100644
--- a/frontend/src/views/chart/view/TableSelector.vue
+++ b/frontend/src/views/chart/view/TableSelector.vue
@@ -50,6 +50,11 @@ export default {
       required: false,
       default: null
     },
+    previewForTask: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     clearEmptyDir: {
       type: Boolean,
       required: false,
@@ -77,6 +82,7 @@ export default {
       // this.table = table
       table && table.id && getTable(table.id).then(response => {
         this.table = response.data
+        this.table.previewForTask = this.previewForTask
         this.$emit('getTable', this.table)
       }).catch(res => {
         this.table = {}
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 3fd288f7db..ebe3c1978b 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -168,7 +168,7 @@
 
     <!--添加任务-选择数据集-->
     <el-dialog v-dialogDrag :title="$t('dataset.task.create')" :visible="selectDatasetFlag" :show-close="false" width="70%" class="dialog-css" :destroy-on-close="true">
-      <table-selector privileges="manage" :mode="1" :clear-empty-dir="true" :custom-type="customType" show-mode="datasetTask" @getTable="getTable" />
+      <table-selector previewForTask="true" privileges="manage" :mode="1" :clear-empty-dir="true" :custom-type="customType" show-mode="datasetTask" @getTable="getTable" />
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="closeCreateTask">{{ $t('chart.cancel') }}</el-button>
         <el-button type="primary" size="small" :disabled="!table.id" @click="create(undefined)">{{ $t('chart.confirm') }}</el-button>