From e03b2894ead61ddabf7237e173e903e89db360f4 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 27 Jul 2021 10:31:16 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/business/complex-table/index.vue | 6 +++++-
 frontend/src/views/msg/unread.vue                        | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/business/complex-table/index.vue b/frontend/src/components/business/complex-table/index.vue
index 684a9430dc..6a172a9258 100644
--- a/frontend/src/components/business/complex-table/index.vue
+++ b/frontend/src/components/business/complex-table/index.vue
@@ -14,7 +14,7 @@
           <slot name="complex" />
         </template>
         <slot name="buttons" />
-        <fu-table-column-select :columns="columns" />
+        <fu-table-column-select v-if="!hideColumns" :columns="columns" />
       </fu-search-bar>
     </div>
 
@@ -46,6 +46,10 @@ export default {
       type: Array,
       default: () => []
     },
+    hideColumns: {
+      type: Boolean,
+      default: false
+    },
     // eslint-disable-next-line vue/require-default-prop
     localKey: String, // 如果需要记住选择的列，则这里添加一个唯一的Key
     // eslint-disable-next-line vue/require-default-prop
diff --git a/frontend/src/views/msg/unread.vue b/frontend/src/views/msg/unread.vue
index 83ecdeb2e2..18dc1743a7 100644
--- a/frontend/src/views/msg/unread.vue
+++ b/frontend/src/views/msg/unread.vue
@@ -8,6 +8,7 @@
     <complex-table
       :data="data"
       :columns="columns"
+      :hide-columns="true"
       :pagination-config="paginationConfig"
       :search-config="searchConfig"
       @select="select"

From 6407b278eacc2770fa32e722ff1bc0d4aa8c14c2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 27 Jul 2021 11:37:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E9=83=A8=E5=88=86=E5=B0=BA=E5=AF=B8=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B1=8F=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=8A=96=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/Preview.vue     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 1e0a961b76..70cdab8bc6 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -108,6 +108,12 @@ export default {
           }
         }
       }
+      if (this.canvasStyleData.selfAdaption) {
+        style = {
+          overflow: 'hidden',
+          ...style
+        }
+      }
       return style
     },
     // 此处单独计算componentData的值 不放入全局mapState中

From 6718d15cf0150f5296530c8de353ad35274f2173 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 27 Jul 2021 12:26:03 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E8=B7=B3=E8=BD=AC=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java   |  21 ++--
 .../service/message/SysMsgService.java        |   2 +-
 .../src/views/system/task/DatasetTaskList.vue | 114 +++++++++---------
 frontend/src/views/system/task/TaskRecord.vue |  62 ++++++----
 frontend/src/views/system/task/dataset.vue    |  16 +--
 5 files changed, 113 insertions(+), 102 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index c40599503b..5e187bfed3 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -29,10 +29,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.pentaho.di.cluster.SlaveServer;
 import org.pentaho.di.core.database.DatabaseMeta;
 import org.pentaho.di.core.row.ValueMetaInterface;
@@ -66,8 +62,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.net.InetAddress;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -295,7 +289,7 @@ public class ExtractDataService {
                     replaceTable(DorisTableUtils.dorisName(datasetTableId));
                     saveSucessLog(datasetTableTaskLog);
 
-                    sendWebMsg(datasetTable, datasetTableTask, true);
+                    sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, true);
 
                     deleteFile("all_scope", datasetTableId);
 
@@ -308,7 +302,7 @@ public class ExtractDataService {
 
                     dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
 
-                    sendWebMsg(datasetTable, datasetTableTask, false);
+                    sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
                     deleteFile("all_scope", datasetTableId);
@@ -350,7 +344,7 @@ public class ExtractDataService {
                     }
                     saveSucessLog(datasetTableTaskLog);
 
-                    sendWebMsg(datasetTable, datasetTableTask, true);
+                    sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,true);
 
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
@@ -360,7 +354,7 @@ public class ExtractDataService {
                     dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed);
                 } catch (Exception e) {
                     saveErrorLog(datasetTableId, taskId, e);
-                    sendWebMsg(datasetTable, datasetTableTask, false);
+                    sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
 
                     dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
@@ -385,13 +379,14 @@ public class ExtractDataService {
 
     }
 
-    private void sendWebMsg(DatasetTable datasetTable, DatasetTableTask datasetTableTask, Boolean status) {
+    private void sendWebMsg(DatasetTable datasetTable, DatasetTableTask datasetTableTask, DatasetTableTaskLog datasetTableTaskLog, Boolean status) {
         String taskId = datasetTableTask.getId();
         String msg = status ? "成功" : "失败";
         Long typeId = status ? 5L : 6L;
         String id = datasetTable.getId();
         AuthURD authURD = AuthUtils.authURDR(id);
         Set<Long> userIds = AuthUtils.userIdsByURD(authURD);
+
         Gson gson = new Gson();
         userIds.forEach(userId -> {
             Map<String, Object> param = new HashMap<>();
@@ -399,6 +394,10 @@ public class ExtractDataService {
             if (StringUtils.isNotEmpty(taskId)) {
                 param.put("taskId", taskId);
             }
+
+            if (ObjectUtils.isNotEmpty(datasetTableTaskLog) && StringUtils.isNotEmpty(datasetTableTaskLog.getId())) {
+                param.put("logId", datasetTableTaskLog.getId());
+            }
             String content = "数据集【" + datasetTable.getName() + "】同步" + msg;
             if (ObjectUtils.isNotEmpty(datasetTableTask) && ObjectUtils.isNotEmpty(datasetTableTask.getName())) {
                 content += " 任务名称【" + datasetTableTask.getName() + "】";
diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java
index 95dbc38e4e..28e25ee900 100644
--- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java
+++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java
@@ -181,7 +181,7 @@ public class SysMsgService {
     }
 
     public List<SysMsgSetting> defaultSettings() {
-        Long userId = AuthUtils.getUser().getUserId();
+        // Long userId = AuthUtils.getUser().getUserId();
         SysMsgSetting sysMsgSetting1 = new SysMsgSetting();
         sysMsgSetting1.setTypeId(2L);
         sysMsgSetting1.setChannelId(1L);
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index a288ef48f1..d5f063f9ec 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -3,10 +3,10 @@
     <el-row style="margin-top: 10px;">
       <complex-table :data="data" :columns="columns" local-key="datasetTask" :search-config="searchConfig" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
         <template #toolbar>
-          <el-button  icon="el-icon-circle-plus-outline" @click="selectDataset">{{ $t('dataset.task.create') }}</el-button>
+          <el-button icon="el-icon-circle-plus-outline" @click="selectDataset">{{ $t('dataset.task.create') }}</el-button>
         </template>
 
-        <el-table-column prop="name" :label="$t('dataset.task_name')" >
+        <el-table-column prop="name" :label="$t('dataset.task_name')">
           <template slot-scope="scope">
             <span>
               <el-link style="font-size: 12px" @click="jumpTaskRecord(scope.row)">{{ scope.row.name }}</el-link>
@@ -23,20 +23,20 @@
         </el-table-column>
 
         <el-table-column prop="lastExecTime" :label="$t('dataset.task.last_exec_time')">
-          <template slot-scope="scope" >
+          <template slot-scope="scope">
             <span v-if="scope.row.lastExecTime && scope.row.lastExecTime != -1">
-            {{ scope.row.lastExecTime | timestampFormatDate }}
-          </span>
-            <span v-if="scope.row.lastExecTime === -1"></span>
+              {{ scope.row.lastExecTime | timestampFormatDate }}
+            </span>
+            <span v-if="scope.row.lastExecTime === -1" />
           </template>
         </el-table-column>
 
-        <el-table-column prop="lastExecStatus" :label="$t('dataset.task.last_exec_status')" >
+        <el-table-column prop="lastExecStatus" :label="$t('dataset.task.last_exec_status')">
           <template slot-scope="scope">
             <span v-if="scope.row.lastExecStatus === 'Completed'" style="color: green">{{ $t('dataset.completed') }}</span>
             <span v-if="scope.row.lastExecStatus === 'Underway'" style="color: blue">
-                <i class="el-icon-loading" />
-                {{ $t('dataset.underway') }}
+              <i class="el-icon-loading" />
+              {{ $t('dataset.underway') }}
             </span>
             <span v-if="scope.row.lastExecStatus === 'Error'" style="color: red">
               <el-link type="danger" style="font-size: 12px" @click="showErrorMassage(scope.row.msg)">{{ $t('dataset.error') }}</el-link>
@@ -46,11 +46,11 @@
         </el-table-column>
 
         <el-table-column prop="nextExecTime" :label="$t('dataset.task.next_exec_time')">
-          <template slot-scope="scope" >
+          <template slot-scope="scope">
             <span v-if="scope.row.nextExecTime && scope.row.nextExecTime !== -1 && scope.row.rate !== 'SIMPLE'">
               {{ scope.row.nextExecTime | timestampFormatDate }}
             </span>
-            <span v-if="!scope.row.nextExecTime || scope.row.rate === 'SIMPLE'"></span>
+            <span v-if="!scope.row.nextExecTime || scope.row.rate === 'SIMPLE'" />
           </template>
 
         </el-table-column>
@@ -67,13 +67,12 @@
               <el-link type="primary" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.pending') }}</el-link>
             </span>
             <span v-if="scope.row.status === 'Exec'" style="color: blue">
-                <i class="el-icon-loading" />
-                {{ $t('dataset.underway') }}
+              <i class="el-icon-loading" />
+              {{ $t('dataset.underway') }}
             </span>
           </template>
         </el-table-column>
 
-
         <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
       </complex-table>
     </el-row>
@@ -82,19 +81,19 @@
       <el-col>
         <el-form :form="taskForm" label-width="100px" size="mini">
           <el-form-item :label="$t('dataset.task_name')" prop="name">
-            <el-input v-model="taskForm.name" size="mini" style="width: 50%" :placeholder="$t('dataset.task_name')"/>
+            <el-input v-model="taskForm.name" size="mini" style="width: 50%" :placeholder="$t('dataset.task_name')" />
           </el-form-item>
           <el-form-item :label="$t('dataset.update_type')" prop="type">
             <el-select v-model="taskForm.type" size="mini">
-              <el-option :label="$t('dataset.all_scope')" value="all_scope"/>
-              <el-option :label="$t('dataset.add_scope')" value="add_scope"/>
+              <el-option :label="$t('dataset.all_scope')" value="all_scope" />
+              <el-option :label="$t('dataset.add_scope')" value="add_scope" />
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('dataset.execute_rate')" prop="rate">
             <el-select v-model="taskForm.rate" size="mini" @change="onRateChange">
-              <el-option :label="$t('dataset.execute_once')" value="SIMPLE"/>
-              <el-option :label="$t('dataset.cron_config')" value="CRON"/>
-              <el-option :label="$t('dataset.simple_cron')" value="SIMPLE_CRON"/>
+              <el-option :label="$t('dataset.execute_once')" value="SIMPLE" />
+              <el-option :label="$t('dataset.cron_config')" value="CRON" />
+              <el-option :label="$t('dataset.simple_cron')" value="SIMPLE_CRON" />
             </el-select>
           </el-form-item>
 
@@ -107,34 +106,33 @@
 
           <el-form-item v-if="taskForm.rate === 'SIMPLE_CRON'" label="">
             <el-form :inline="true">
-              <el-form-item :label="$t('cron.every')" >
-                <el-input v-model="taskForm.extraData.simple_cron_value" size="mini" type="number"  min="1" @change="onSimpleCronChange()" />
+              <el-form-item :label="$t('cron.every')">
+                <el-input v-model="taskForm.extraData.simple_cron_value" size="mini" type="number" min="1" @change="onSimpleCronChange()" />
               </el-form-item>
 
               <el-form-item class="form-item">
-                <el-select v-model="taskForm.extraData.simple_cron_type"  filterable size="mini" @change="onSimpleCronChange()" >
+                <el-select v-model="taskForm.extraData.simple_cron_type" filterable size="mini" @change="onSimpleCronChange()">
                   <el-option :label="$t('cron.minute_default')" value="minute" />
-                  <el-option :label="$t('cron.hour_default')" value="hour"  />
-                  <el-option :label="$t('cron.day_default')" value="day"  />
+                  <el-option :label="$t('cron.hour_default')" value="hour" />
+                  <el-option :label="$t('cron.day_default')" value="day" />
                 </el-select>
               </el-form-item>
 
-              <el-form-item class="form-item"  :label="$t('cron.every_exec')">
-              </el-form-item>
+              <el-form-item class="form-item" :label="$t('cron.every_exec')" />
             </el-form>
           </el-form-item>
 
           <el-form-item v-if="taskForm.rate !== 'SIMPLE'" :label="$t('dataset.start_time')" prop="startTime">
-            <el-date-picker v-model="taskForm.startTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini"/>
+            <el-date-picker v-model="taskForm.startTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini" />
           </el-form-item>
           <el-form-item v-if="taskForm.rate !== 'SIMPLE'" :label="$t('dataset.end_time')" prop="end">
             <el-select v-model="taskForm.end" size="mini">
-              <el-option :label="$t('dataset.no_limit')" value="0"/>
-              <el-option :label="$t('dataset.set_end_time')" value="1"/>
+              <el-option :label="$t('dataset.no_limit')" value="0" />
+              <el-option :label="$t('dataset.set_end_time')" value="1" />
             </el-select>
           </el-form-item>
           <el-form-item v-if="taskForm.end === '1'" label="">
-            <el-date-picker v-model="taskForm.endTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini"/>
+            <el-date-picker v-model="taskForm.endTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini" />
           </el-form-item>
 
           <el-form-item v-if="taskForm.type === 'add_scope'" :label="$t('dataset.incremental_update_type')">
@@ -150,7 +148,8 @@
             <el-button type="text" size="mini" @click="insertParamToCodeMirror('${__current_update_time__}')">{{ $t('dataset.current_update_time') }}</el-button>
           </el-form-item>
 
-          <codemirror v-if="taskForm.type === 'add_scope'"
+          <codemirror
+            v-if="taskForm.type === 'add_scope'"
             ref="myCm"
             v-model="sql"
             class="codemirror"
@@ -169,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 @getTable="getTable" :mode="1" type="db"  showMode="datasetTask"/>
+      <table-selector :mode="1" type="db" show-mode="datasetTask" @getTable="getTable" />
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeCreateTask">{{ $t('chart.cancel') }}</el-button>
         <el-button type="primary" size="mini" :disabled="!table.id" @click="create(undefined)">{{ $t('chart.confirm') }}</el-button>
@@ -196,7 +195,7 @@
 import ComplexTable from '@/components/business/complex-table'
 import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {datasetTaskList, post} from '@/api/dataset/dataset'
+import { datasetTaskList, post } from '@/api/dataset/dataset'
 import { codemirror } from 'vue-codemirror'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/theme/solarized.css'
@@ -217,7 +216,6 @@ import 'codemirror/addon/hint/show-hint'
 import cron from '@/components/cron/cron'
 import TableSelector from '@/views/chart/view/TableSelector'
 
-
 export default {
   name: 'DatasetTaskList',
   components: { ComplexTable, cron, codemirror, TableSelector },
@@ -326,14 +324,14 @@ export default {
     }
   },
   created() {
-    if(this.param == null){
+    if (this.param == null) {
       this.last_condition = {}
       this.search()
-    }else {
+    } else {
       this.last_condition = {
         'dataset_table_task.name': {
-          field: "dataset_table_task.name",
-          operator: "eq",
+          field: 'dataset_table_task.name',
+          operator: 'eq',
           value: this.param.name
         }
       }
@@ -347,7 +345,7 @@ export default {
     clearInterval(this.timer)
   },
   methods: {
-    sortChange( { column, prop, order } ) {
+    sortChange({ column, prop, order }) {
       this.orderConditions = []
       if (!order) {
         this.search(this.last_condition)
@@ -382,10 +380,10 @@ export default {
     },
     taskStatus(item) {
       post('/dataset/task/lastExecStatus', item, false).then(response => {
-        if(!item.lastExecStatus) {
+        if (!item.lastExecStatus) {
           item.lastExecStatus = response.data.lastExecStatus
         }
-        if(!item.lastExecTime) {
+        if (!item.lastExecTime) {
           item.lastExecTime = response.data.lastExecTime
         }
         item.msg = response.data.msg
@@ -405,11 +403,11 @@ export default {
       }
       this.update_task = true
     },
-    changeTaskStatus(task){
-      const param = task;
+    changeTaskStatus(task) {
+      const param = task
       param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
       post('/dataset/task/updateStatus', task).then(response => {
-        task.status = param.status;
+        task.status = param.status
         this.$message({
           message: this.$t('dataset.task.change_success'),
           type: 'success',
@@ -417,7 +415,7 @@ export default {
         })
       })
     },
-    execTask(task){
+    execTask(task) {
       this.$confirm(this.$t('dataset.task.confirm_exec'), this.$t('dataset.tips'), {
         confirmButtonText: this.$t('dataset.confirm'),
         cancelButtonText: this.$t('dataset.cancel'),
@@ -455,27 +453,27 @@ export default {
     },
     onSimpleCronChange() {
       if (this.taskForm.extraData.simple_cron_type === 'minute') {
-        if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 59){
-          this.$message({message: this.$t('cron.minute_limit'), type: 'warning', showClose: true})
+        if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 59) {
+          this.$message({ message: this.$t('cron.minute_limit'), type: 'warning', showClose: true })
           this.taskForm.extraData.simple_cron_value = 59
         }
-        this.taskForm.cron = '0 0/'+ this.taskForm.extraData.simple_cron_value + ' * * * ? *'
+        this.taskForm.cron = '0 0/' + this.taskForm.extraData.simple_cron_value + ' * * * ? *'
         return
       }
       if (this.taskForm.extraData.simple_cron_type === 'hour') {
-        if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 23){
-          this.$message({message: this.$t('cron.hour_limit'), type: 'warning', showClose: true})
+        if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 23) {
+          this.$message({ message: this.$t('cron.hour_limit'), type: 'warning', showClose: true })
           this.taskForm.extraData.simple_cron_value = 23
         }
-        this.taskForm.cron = '0 0 0/'+ this.taskForm.extraData.simple_cron_value + ' * * ? *'
+        this.taskForm.cron = '0 0 0/' + this.taskForm.extraData.simple_cron_value + ' * * ? *'
         return
       }
       if (this.taskForm.extraData.simple_cron_type === 'day') {
-        if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 31){
-          this.$message({message: this.$t('cron.day_limit'), type: 'warning', showClose: true})
+        if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 31) {
+          this.$message({ message: this.$t('cron.day_limit'), type: 'warning', showClose: true })
           this.taskForm.extraData.simple_cron_value = 31
         }
-        this.taskForm.cron = '0 0 0 1/'+ this.taskForm.extraData.simple_cron_value + ' * ? *'
+        this.taskForm.cron = '0 0 0 1/' + this.taskForm.extraData.simple_cron_value + ' * ? *'
         return
       }
     },
@@ -485,10 +483,10 @@ export default {
         this.taskForm.endTime = ''
         this.taskForm.cron = ''
       }
-      if (this.taskForm.rate === 'SIMPLE_CRON'){
+      if (this.taskForm.rate === 'SIMPLE_CRON') {
         this.taskForm.cron = '0 0 0/1 *  * ? *'
       }
-      if (this.taskForm.rate === 'CRON'){
+      if (this.taskForm.rate === 'CRON') {
         this.taskForm.cron = '00 00 * ? * * *'
       }
     },
@@ -597,7 +595,7 @@ export default {
       this.show_error_massage = true
       this.error_massage = massage
     },
-    jumpTaskRecord(item){
+    jumpTaskRecord(item) {
       this.$emit('jumpTaskRecord', item)
     },
     saveTask(task) {
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index b178451bab..c7c36297f9 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -5,7 +5,7 @@
         <el-table-column prop="name" :label="$t('dataset.task_name')">
           <template slot-scope="scope">
             <span>
-              <el-link style="font-size: 12px" @click="jumpTask(scope.row)">{{ scope.row.name }}</el-link>
+              <el-link :type="matchLogId && scope.row.id === matchLogId ? 'danger': ''" style="font-size: 12px" @click="jumpTask(scope.row)">{{ scope.row.name }}</el-link>
             </span>
           </template>
         </el-table-column>
@@ -51,17 +51,14 @@
 </template>
 
 <script>
-import LayoutContent from '@/components/business/LayoutContent'
 import ComplexTable from '@/components/business/complex-table'
 import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { post } from '@/api/dataset/dataset'
-import cron from '@/components/cron/cron'
-import TableSelector from '@/views/chart/view/TableSelector'
 
 export default {
   name: 'TaskRecord',
-  components: { ComplexTable, LayoutContent, cron, TableSelector },
+  components: { ComplexTable },
   props: {
     param: {
       type: Object,
@@ -112,7 +109,8 @@ export default {
       orderConditions: [],
       last_condition: null,
       show_error_massage: false,
-      error_massage: ''
+      error_massage: '',
+      matchLogId: null
     }
   },
   computed: {
@@ -121,7 +119,7 @@ export default {
     if (this.param == null) {
       this.last_condition = {}
       this.search()
-    } else {
+    } else if (this.param.name) {
       this.last_condition = {
         'dataset_table_task.name': {
           field: 'dataset_table_task.name',
@@ -130,6 +128,16 @@ export default {
         }
       }
       this.search(this.last_condition)
+    } else if (this.param.taskId) {
+      this.matchLogId = this.param.logId || this.matchLogId
+      this.last_condition = {
+        'dataset_table_task.id': {
+          field: 'dataset_table_task.id',
+          operator: 'eq',
+          value: this.param.taskId
+        }
+      }
+      this.search(this.last_condition)
     }
 
     // this.timer = setInterval(() => {
@@ -155,25 +163,25 @@ export default {
         this.timer = null
       }
     },
-    msg2Current(routerParam) {
-      if (!routerParam || !routerParam.taskId) return
-      const taskId = routerParam.taskId
-      // console.log(taskId)
-      const current_condition = {
-        'dataset_table_task.id': {
-          field: 'dataset_table_task.id',
-          operator: 'eq',
-          value: taskId
-        }
-      }
-      // 先把定时器干掉 否则会阻塞下面的search
-      this.destroyTimer()
+    // msg2Current(routerParam) {
+    //   if (!routerParam || !routerParam.taskId) return
+    //   const taskId = routerParam.taskId
+    //   // console.log(taskId)
+    //   const current_condition = {
+    //     'dataset_table_task.id': {
+    //       field: 'dataset_table_task.id',
+    //       operator: 'eq',
+    //       value: taskId
+    //     }
+    //   }
+    //   // 先把定时器干掉 否则会阻塞下面的search
+    //   this.destroyTimer()
 
-      this.search(current_condition)
+    //   this.search(current_condition)
 
-      // 查询完再开启定时器
-      this.createTimer()
-    },
+    //   // 查询完再开启定时器
+    //   this.createTimer()
+    // },
     sortChange({ column, prop, order }) {
       this.orderConditions = []
       if (!order) {
@@ -209,6 +217,12 @@ export default {
     },
     jumpTask(item) {
       this.$emit('jumpTask', item)
+    },
+    rowClassMethod({ row, rowIndex }) {
+      if (this.matchLogId && this.matchLogId === row.id) {
+        return 'row-match-class'
+      }
+      return ''
     }
   }
 }
diff --git a/frontend/src/views/system/task/dataset.vue b/frontend/src/views/system/task/dataset.vue
index 62b3f359ac..592727f5ff 100644
--- a/frontend/src/views/system/task/dataset.vue
+++ b/frontend/src/views/system/task/dataset.vue
@@ -17,17 +17,14 @@
 <script>
 
 import LayoutContent from '@/components/business/LayoutContent'
-import ComplexTable from '@/components/business/complex-table'
-import UnionView from '@/views/dataset/data/UnionView'
-import UpdateInfo from '@/views/dataset/data/UpdateInfo'
+
 import DatasetTaskList from '@/views/system/task/DatasetTaskList'
 import TaskRecord from '@/views/system/task/TaskRecord'
-import TabDataPreview from '@/views/dataset/data/TabDataPreview'
-import DatasetTableData from '@/views/dataset/common/DatasetTableData'
+
 import bus from '@/utils/bus'
 import { mapGetters } from 'vuex'
 export default {
-  components: { DatasetTableData, LayoutContent, ComplexTable, UnionView, UpdateInfo, TabDataPreview, DatasetTaskList, TaskRecord },
+  components: { LayoutContent, DatasetTaskList, TaskRecord },
   data() {
     return {
       task: null,
@@ -74,9 +71,12 @@ export default {
             try {
               const msgParam = JSON.parse(routerParam.sourceParam)
               // this.param = msgParam.tableId
-              this.tabActive = 'TaskRecord'
+
               this.$nextTick(() => {
-                this.$refs.task_record && this.$refs.task_record.msg2Current && this.$refs.task_record.msg2Current(msgParam)
+                // 目标组件存在定时器 这种方式会被定时器阻塞
+                // this.$refs.task_record && this.$refs.task_record.msg2Current && this.$refs.task_record.msg2Current(msgParam)
+                this.task = msgParam
+                this.tabActive = 'TaskRecord'
               })
             } catch (error) {
               console.error(error)

From c0e86e6e3066c874f1fc7e27ac6b51856e9e322b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 27 Jul 2021 14:04:57 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BFview=E5=BC=B9=E5=87=BA=E8=8F=9C=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E4=B8=AD=E6=9C=89=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/SettingMenu.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index 8a9d469104..3e345100e8 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -3,8 +3,8 @@
     <div style="width: 100%;">
       <el-dropdown trigger="click" @mouseup="handleMouseUp">
         <slot name="icon" />
-        <el-dropdown-menu v-if="curComponent" slot="dropdown">
-          <el-dropdown-item v-if="editFilter.includes(curComponent.type)" icon="el-icon-edit-outline" @click.native="edit">{{ $t('panel.edit') }}</el-dropdown-item>
+        <el-dropdown-menu>
+          <el-dropdown-item v-if="curComponent&&editFilter.includes(curComponent.type)" icon="el-icon-edit-outline" @click.native="edit">{{ $t('panel.edit') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-document-copy" @click.native="copy">{{ $t('panel.copy') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-delete" @click.native="deleteComponent">{{ $t('panel.delete') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-upload2" @click.native="topComponent">{{ $t('panel.topComponent') }}</el-dropdown-item>

From 009c6ac9d086c480f9e3a00e9a6ced30f0bec8c8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 27 Jul 2021 14:42:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?refactor:=E4=BF=AE=E5=A4=8D=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E7=9F=A9=E5=BD=A2=E6=82=AC=E6=B5=AE=E6=A1=86?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/RectangleAttr.vue       | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/RectangleAttr.vue b/frontend/src/components/canvas/components/RectangleAttr.vue
index d7d15b6952..da5f9b12ee 100644
--- a/frontend/src/components/canvas/components/RectangleAttr.vue
+++ b/frontend/src/components/canvas/components/RectangleAttr.vue
@@ -32,13 +32,29 @@
         </el-tooltip>
       </div>
 
+      <el-tooltip :content="$t('panel.borderRadius')">
+        <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-fangxing-" />
+      </el-tooltip>
+
+      <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
+        <el-input v-model="styleInfo.borderRadius" type="number" size="mini" min="0" max="100" step="1" @change="styleChange" />
+      </div>
+
+      <el-tooltip :content="$t('panel.opacity')">
+        <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-touming" />
+      </el-tooltip>
+
+      <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
+        <el-input v-model="innerOpacity" type="number" size="mini" min="0" max="100" step="10" @change="styleChange" />
+      </div>
+
       <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
         <div style="width: 16px;height: 18px">
           <el-tooltip content="边框颜色">
             <i class="iconfont icon-huabi" @click="goBoardColor" />
           </el-tooltip>
           <div :style="boardDivColor" />
-          <el-color-picker ref="boardColorPicker" v-model="styleInfo.borderColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
+          <el-color-picker ref="boardColorPicker" v-model="styleInfo.borderColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange" />
         </div>
       </div>
 
@@ -48,9 +64,10 @@
             <i class="iconfont icon-beijingse1" @click="goBackgroundColor" />
           </el-tooltip>
           <div :style="backgroundDivColor" />
-          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
+          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange" />
         </div>
       </div>
+
     </div>
   </el-card>
 </template>
@@ -101,7 +118,20 @@ export default {
       }, {
         value: '5',
         label: '5'
-      }]
+      }],
+      innerOpacity: 0
+    }
+  },
+  watch: {
+    innerOpacity: {
+      handler(oldVal, newVal) {
+        this.styleInfo['opacity'] = this.innerOpacity / 100
+      }
+    }
+  },
+  mounted() {
+    if (this.styleInfo['opacity']) {
+      this.innerOpacity = this.styleInfo['opacity'] * 100
     }
   },
   computed: {
@@ -176,7 +206,7 @@ export default {
   .el-card-main {
     height: 34px;
     z-index: 10;
-    width: 210px;
+    width: 400px;
     position: absolute;
 
   }

From fc5c3dcc0305f60f2e12373e6f5ec547408bb758 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 27 Jul 2021 15:04:56 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E4=B8=8B=E6=8B=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/DeWidget/DeSelectGrid.vue          | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index 452186fdbc..d03e024a00 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -8,7 +8,7 @@
       <el-tree
         v-if="options!== null && options.attrs!==null"
         ref="deSelectGrid"
-        :data="options.attrs.datas"
+        :data="options.attrs.multiple ? [allNode, ...options.attrs.datas] : options.attrs.datas"
         :props="defaultProp"
         :indent="0"
         :filter-node-method="filterNode"
@@ -18,7 +18,8 @@
         <span slot-scope="{ node, data }" class="custom-tree-node-list father">
           <span style="display: flex;flex: 1;width: 0;">
             <el-radio v-if="!options.attrs.multiple" v-model="options.value" :label="data.id" @change="changeRadioBox"><span> {{ node.label }} </span></el-radio>
-            <el-checkbox v-if="options.attrs.multiple" v-model="data.checked" :label="data.id" @change="changeCheckBox(data)"><span> {{ node.label }} </span></el-checkbox>
+            <el-checkbox v-if="options.attrs.multiple && data.id !== allNode.id" v-model="data.checked" :label="data.id" @change="changeCheckBox(data)"><span> {{ node.label }} </span></el-checkbox>
+            <el-checkbox v-if="inDraw && options.attrs.multiple && data.id === allNode.id" v-model="data.checked" :indeterminate="data.indeterminate" :label="data.id" @change="allCheckChange(data)"><span> {{ node.label }} </span></el-checkbox>
           </span>
           <span v-if="!options.attrs.multiple && options.value && options.value === data.id" class="child">
             <span style="margin-left: 12px;" @click.stop>
@@ -70,7 +71,13 @@ export default {
         label: 'text',
         children: 'children'
       },
-      keyWord: null
+      keyWord: null,
+      allNode: {
+        id: (-2 << 16) + '',
+        text: this.$t('commons.all'),
+        checked: false,
+        indeterminate: false
+      }
     }
   },
   computed: {
@@ -89,6 +96,11 @@ export default {
         !sourceValid && (this.options.value = [])
         sourceValid && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(','))
         !this.inDraw && (this.options.value = [])
+        if (!this.inDraw) {
+          this.options.value = []
+          this.allNode.indeterminate = false
+          this.allNode.checked = false
+        }
         this.setMutiBox()
       } else {
         !sourceValid && (this.options.value = null)
@@ -122,6 +134,7 @@ export default {
         this.options.attrs.datas.forEach(data => {
           data.checked = (this.options.value && this.options.value.includes(data.id))
         })
+        this.setAllNodeStatus()
       }
     },
     setRadioBox() {
@@ -150,6 +163,36 @@ export default {
         values.splice(index, 1)
       }
 
+      this.setAllNodeStatus()
+
+      this.options.value = values
+      this.setCondition()
+    },
+    // 勾选数据项 会影响全选节点的状态
+    setAllNodeStatus() {
+      const nodeSize = this.options.attrs.datas.length
+      const checkedSize = this.options.attrs.datas.filter(item => item.checked).length
+      if (nodeSize === checkedSize) {
+        this.allNode.checked = true
+        this.allNode.indeterminate = false
+      } else if (checkedSize === 0) {
+        this.allNode.checked = false
+        this.allNode.indeterminate = false
+      } else {
+        this.allNode.checked = false
+        this.allNode.indeterminate = true
+      }
+    },
+    allCheckChange(data) {
+      data.indeterminate = false
+      const values = []
+      // this.options.value = []
+      this.options.attrs.datas.forEach(item => {
+        item.checked = data.checked
+        // data.checked && this.options.value.push(item.id)
+        data.checked && values.push(item.id)
+      })
+
       this.options.value = values
       this.setCondition()
     },