Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml

@@ -16,6 +16,7 @@
         SELECT dataset_table_task_log.*, dataset_table_task.name
         FROM dataset_table_task_log
         LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
+        LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
         <if test="_parameter != null">
             <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
         </if>

backend/src/main/java/io/dataease/commons/constants/TaskStatus.java

 package io.dataease.commons.constants;
 
 public enum TaskStatus {
-    Underway, Stopped
+    Underway, Stopped, Pending, Exec
 }

backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java

@@ -11,9 +11,9 @@ public class MysqlConfigration extends JdbcDTO {
 
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
-        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8"
+        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&socketTimeout=5000"
                 .replace("HOSTNAME", getHost())
                 .replace("PORT", getPort().toString())
                 .replace("DATABASE", getDataBase());
     }
-}
+}
\ No newline at end of file

backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java

@@ -401,6 +401,7 @@ public class JdbcProvider extends DatasourceProvider {
         String driver = null;
         String jdbcurl = null;
         DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
+        Properties props = new Properties();
         switch (datasourceType) {
             case mysql:
                 MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class);
@@ -429,13 +430,14 @@ public class JdbcProvider extends DatasourceProvider {
                 password = oracleConfigration.getPassword();
                 driver = oracleConfigration.getDriver();
                 jdbcurl = oracleConfigration.getJdbc();
+                props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ;
+                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
                 break;
             default:
                 break;
         }
 
         Class.forName(driver);
-        Properties props = new Properties();
         props.setProperty("user", username);
         if (StringUtils.isNotBlank(password)) {
             props.setProperty("password", password);

backend/src/main/java/io/dataease/datasource/service/DatasourceService.java

@@ -120,6 +120,13 @@ public class DatasourceService {
         datasourceProvider.checkStatus(datasourceRequest);
     }
 
+    public void validate(String datasourceId) throws Exception {
+        if(StringUtils.isEmpty(datasourceId)){
+            return;
+        }
+        Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
+        validate(datasource);
+    }
     public List<String> getSchema(Datasource datasource) throws Exception {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
@@ -132,6 +139,7 @@ public class DatasourceService {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
+        datasourceProvider.checkStatus(datasourceRequest);
         List<String> tables = datasourceProvider.getTables(datasourceRequest);
 
         // 获取当前数据源下的db类型数据集

backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java

@@ -15,4 +15,5 @@ public class DataSetTaskDTO extends DatasetTableTask {
     private String datasetName;
     private Long nextExecTime;
     private String taskStatus;
+    private String msg;
 }

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -180,10 +180,10 @@ public class ChartViewService {
             }
         }
 
-        // 获取数据集
+        // 获取数据集,需校验权限
         DatasetTable table = dataSetTableService.get(view.getTableId());
         if (ObjectUtils.isEmpty(table)) {
-            throw new RuntimeException(Translator.get("i18n_dataset_delete"));
+            throw new RuntimeException(Translator.get("i18n_dataset_delete_or_no_permission"));
         }
         // 判断连接方式，直连或者定时抽取 table.mode
         DatasourceRequest datasourceRequest = new DatasourceRequest();

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -299,6 +299,12 @@ public class DataSetTableService {
         datasetTableField.setTableId(dataSetTableRequest.getId());
         datasetTableField.setChecked(Boolean.TRUE);
         List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
+        if (CollectionUtils.isEmpty(fields)) {
+            map.put("fields", fields);
+            map.put("data", new ArrayList<>());
+            map.put("page", new DataSetPreviewPage());
+            return map;
+        }
         String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new);
 
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);
@@ -1392,9 +1398,8 @@ public class DataSetTableService {
         List<String> taskIds = datasetTableTaskLogMapper.selectByExample(datasetTableTaskLogExample).stream().map(DatasetTableTaskLog::getTaskId).collect(Collectors.toList());
         datasetTableTaskLogMapper.updateByExampleSelective(datasetTableTaskLog, datasetTableTaskLogExample);
 
-        DatasetTableTask datasetTableTask = new DatasetTableTask();
-        datasetTableTask.setLastExecStatus(JobStatus.Error.name());
-        dataSetTableTaskService.update(taskIds, datasetTableTask);
+        dataSetTableTaskService.updateTaskStatus(taskIds, JobStatus.Error);
+        //TODO check task status
 
         for (DatasetTable jobStoppeddDatasetTable : jobStoppeddDatasetTables) {
             extractDataService.deleteFile("all_scope", jobStoppeddDatasetTable.getId());

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java

@@ -95,6 +95,7 @@ public class DataSetTableTaskLogService {
         if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
             dataSetTaskDTO.setLastExecStatus(datasetTableTaskLogs.get(0).getStatus());
             dataSetTaskDTO.setLastExecTime(datasetTableTaskLogs.get(0).getCreateTime());
+            dataSetTaskDTO.setMsg(datasetTableTaskLogs.get(0).getInfo());
         }
         return dataSetTaskDTO;
     }

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java

@@ -5,6 +5,7 @@ import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
+import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.constants.ScheduleType;
@@ -48,12 +49,11 @@ public class DataSetTableTaskService {
     @Lazy
     private DataSetTableService dataSetTableService;
     @Resource
-    private ExtractDataService extractDataService;
-    @Resource
     private ExtDataSetTaskMapper extDataSetTaskMapper;
     @Resource
     private DatasetTableMapper datasetTableMapper;
-
+    @Resource
+    private UtilMapper utilMapper;
 
     public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception {
         checkName(dataSetTaskRequest);
@@ -82,22 +82,21 @@ public class DataSetTableTaskService {
         if (StringUtils.isEmpty(datasetTableTask.getId())) {
             datasetTableTask.setId(UUID.randomUUID().toString());
             datasetTableTask.setCreateTime(System.currentTimeMillis());
-            datasetTableTask.setStatus(TaskStatus.Underway.name());
+            if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.SIMPLE.toString())){
+                datasetTableTask.setStatus(TaskStatus.Exec.name());
+            }else {
+                datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
             datasetTableTaskMapper.insert(datasetTableTask);
         } else {
             datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
         }
 
         // simple
-        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString()) && datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) { // SIMPLE 类型，提前占位
+        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位
             execNow(datasetTableTask);
-            scheduleService.addSchedule(datasetTableTask);
-        }
-        //cron、simple_cron
-        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
-            scheduleService.addSchedule(datasetTableTask);
         }
-
+        scheduleService.addSchedule(datasetTableTask);
         return datasetTableTask;
     }
 
@@ -122,6 +121,7 @@ public class DataSetTableTaskService {
         if(!existSyncTask){
             datasetTableTask.setLastExecTime(System.currentTimeMillis());
             datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
+            datasetTableTask.setStatus(TaskStatus.Exec.name());
             update(datasetTableTask);
             DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
             datasetTableTaskLog.setTableId(datasetTableTask.getTableId());
@@ -159,17 +159,36 @@ public class DataSetTableTaskService {
         return datasetTableTaskMapper.selectByPrimaryKey(id);
     }
 
-    public void update(DatasetTableTask datasetTableTask) {
-        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
-    }
-
-    public void update(List<String> taskIds, DatasetTableTask datasetTableTask) {
+    public void updateTaskStatus(List<String> taskIds, JobStatus lastExecStatus) {
         if (CollectionUtils.isEmpty(taskIds)){
             return;
         }
         DatasetTableTaskExample example = new DatasetTableTaskExample();
         example.createCriteria().andIdIn(taskIds);
-        datasetTableTaskMapper.updateByExampleSelective(datasetTableTask, example);
+        List<DatasetTableTask>  datasetTableTasks = datasetTableTaskMapper.selectByExample(example);
+        for (DatasetTableTask tableTask : datasetTableTasks) {
+            updateTaskStatus(tableTask, lastExecStatus);
+        }
+    }
+
+    public void updateTaskStatus(DatasetTableTask datasetTableTask, JobStatus lastExecStatus){
+        datasetTableTask.setLastExecStatus(lastExecStatus.name());
+        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
+            datasetTableTask.setStatus(TaskStatus.Stopped.name());
+        }else {
+            if(StringUtils.isNotEmpty(datasetTableTask.getEnd()) && datasetTableTask.getEnd().equalsIgnoreCase("1")){
+                if(utilMapper.currentTimestamp() > datasetTableTask.getEndTime()){
+                    datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                }
+            }else {
+                datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
+        }
+        update(datasetTableTask);
+    }
+
+    public void update(DatasetTableTask datasetTableTask) {
+        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
     }
 
     public List<DatasetTableTask> list(DatasetTableTask datasetTableTask) {
@@ -217,12 +236,11 @@ public class DataSetTableTaskService {
 
     public void execTask(DatasetTableTask datasetTableTask) throws Exception{
         execNow(datasetTableTask);
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())){
+        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
             scheduleService.fireNow(datasetTableTask);
         }
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
-            scheduleService.addSchedule(datasetTableTask);
-        }
-
+//        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
+//            scheduleService.addSchedule(datasetTableTask);
+//        }
     }
 }

backend/src/main/resources/db/migration/V10__web_msg.sql

@@ -56,9 +56,9 @@ BEGIN;
 INSERT INTO `sys_msg_type` VALUES (1, 0, 'i18n_msg_type_panel_share', 'panel', 'to-msg-share');
 INSERT INTO `sys_msg_type` VALUES (2, 1, 'i18n_msg_type_panel_share', 'panel', 'to-msg-share');
 INSERT INTO `sys_msg_type` VALUES (3, 1, 'i18n_msg_type_panel_share_cacnel', 'panel', 'to-msg-share');
-INSERT INTO `sys_msg_type` VALUES (4, 0, 'i18n_msg_type_dataset_sync', 'dataset', 'to-msg-dataset');
-INSERT INTO `sys_msg_type` VALUES (5, 4, 'i18n_msg_type_dataset_sync_success', 'dataset', 'to-msg-dataset');
-INSERT INTO `sys_msg_type` VALUES (6, 4, 'i18n_msg_type_dataset_sync_faild', 'dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (4, 0, 'i18n_msg_type_dataset_sync', 'sys-task-dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (5, 4, 'i18n_msg_type_dataset_sync_success', 'sys-task-dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (6, 4, 'i18n_msg_type_dataset_sync_faild', 'sys-task-dataset', 'to-msg-dataset');
 COMMIT;
 
 -- ----------------------------

backend/src/main/resources/db/migration/V13__system_task.sql

-INSERT INTO `sys_menu` VALUES (57, 1, 3, 1, '任务管理', 'sys-task', 'system/task/index', 2000,  'task', 'system-task', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu` VALUES (58, 57, 0, 1, '数据集任务', 'sys-task-dataset', 'system/task/dataset', 1,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu` VALUES (58, 1, 0, 1, 'i18n_timed_task', 'sys-task-dataset', 'system/task/dataset', 1001,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+
 ALTER TABLE `dataset_table_task`
     ADD COLUMN `last_exec_time` BIGINT(13) NULL DEFAULT NULL COMMENT '上次执行时间' AFTER `create_time`,
     ADD COLUMN `status` VARCHAR(50) NULL DEFAULT NULL COMMENT '任务状态' AFTER `last_exec_time`,
     ADD COLUMN `last_exec_status` VARCHAR(50) NULL DEFAULT NULL COMMENT '上次执行结果' AFTER `last_exec_time`;
 
-update dataset_table_task set status='Underway';
 update dataset_table_task set rate='SIMPLE' where rate='SIMPLE_COMPLETE';
 
+update dataset_table_task set status='Stopped' where rate='SIMPLE';
+update dataset_table_task set status='Underway' where rate='CRON';
+
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_time = (SELECT dataset_table_task_log.start_time FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_status = (SELECT dataset_table_task_log.status FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
 
 ALTER TABLE `dataset_table_task_log` ADD COLUMN `trigger_type` VARCHAR(45) NULL AFTER `create_time`;
+ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+
 update dataset_table_task_log set trigger_type='Cron';
 
-ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+

backend/src/main/resources/i18n/messages_en_US.properties

@@ -251,7 +251,7 @@ i18n_datasource_not_allow_delete_msg= datasets are using this data source and ca
 i18n_task_name_repeat=Name is used in same data set
 i18n_id_or_pwd_error=Invalid ID or password
 i18n_datasource_delete=Data source is delete
-i18n_dataset_delete=Data set is delete
+i18n_dataset_delete_or_no_permission=Data set is delete or no permission
 i18n_chart_delete=Chart is delete
 i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
 i18n_excel_header_empty=Excel first row can not empty
@@ -273,4 +273,5 @@ i18n_msg_type_dataset_sync=Data set synchronization
 i18n_msg_type_dataset_sync_success=Dataset synchronization successful
 i18n_msg_type_dataset_sync_faild=Dataset synchronization failed
 i18n_data_not_sync=Please sync data first
-i18n_excel_colume_change=The column name of Excel is inconsistent with the original data set
+i18n_excel_colume_change=The column name of Excel is inconsistent with the original data set
\ No newline at end of file
+i18n_timed_task=Timed Task
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -250,7 +250,7 @@ i18n_datasource_not_allow_delete_msg= 个数据集正在使用此数据源，无
 i18n_task_name_repeat=同一数据集下任务名称已被使用
 i18n_id_or_pwd_error=无效的ID或密码
 i18n_datasource_delete=当前用到的数据源已被删除
-i18n_dataset_delete=当前用到的数据集已被删除
+i18n_dataset_delete_or_no_permission=当前用到的数据集没有权限或已被删除
 i18n_chart_delete=当前用到的视图已被删除
 i18n_not_exec_add_sync=没有已完成的同步任务，无法进行增量同步
 i18n_excel_header_empty=Excel第一行为空
@@ -273,3 +273,4 @@ i18n_msg_type_dataset_sync_success=数据集同步成功
 i18n_msg_type_dataset_sync_faild=数据集同步失败
 i18n_data_not_sync=请先完成数据同步
 i18n_excel_colume_change=Excel的列名与原数据集不一致
+i18n_timed_task=定时任务
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -253,7 +253,7 @@ i18n_datasource_not_allow_delete_msg= 個數據集正在使用此數據源，無
 i18n_task_name_repeat=同一數據集下任務名稱已被使用
 i18n_id_or_pwd_error=無效的ID或密碼
 i18n_datasource_delete=當前用到的數據源已被刪除
-i18n_dataset_delete=當前用到的數據集已被刪除
+i18n_dataset_delete_or_no_permission=當前用到的數據集沒有權限或已被刪除
 i18n_chart_delete=當前用到的視圖已被刪除
 i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
 i18n_excel_header_empty=Excel第一行為空
@@ -275,4 +275,5 @@ i18n_msg_type_dataset_sync=數據集同步
 i18n_msg_type_dataset_sync_success=數據集同步成功
 i18n_msg_type_dataset_sync_faild=數據集同步失敗
 i18n_data_not_sync=請先完成數據同步
-i18n_excel_colume_change=Excel的列名與原數據集不一致
+i18n_excel_colume_change=Excel的列名與原數據集不一致
\ No newline at end of file
+i18n_timed_task=定時任務
\ No newline at end of file

frontend/src/components/DeDrag/index.vue

@@ -1448,6 +1448,7 @@ export default {
     },
     // 记录当前样式
     recordCurStyle() {
+      debugger
       const style = {
         ...this.defaultStyle
       }
@@ -1462,6 +1463,7 @@ export default {
 
     // 记录当前样式 矩阵处理
     recordMatrixCurStyle() {
+      debugger
       const left = Math.round(this.left / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
       const top = Math.round(this.top / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
       const width = Math.round(this.width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth

frontend/src/components/canvas/custom-component/component-list.js

@@ -122,7 +122,8 @@ const list = [
       borderStyle: 'solid',
       borderWidth: 1,
       borderColor: '#000000',
-      backgroundColor: '#ffffff'
+      backgroundColor: '#ffffff',
+      borderRadius: 0
     }
   },
   {

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -4,10 +4,10 @@
     ref="dateRef"
     v-model="options.value"
     :type="options.attrs.type"
-    :range-separator="options.attrs.rangeSeparator"
-    :start-placeholder="options.attrs.startPlaceholder"
-    :end-placeholder="options.attrs.endPlaceholder"
-    :placeholder="options.attrs.placeholder"
+    :range-separator="$t(options.attrs.rangeSeparator)"
+    :start-placeholder="$t(options.attrs.startPlaceholder)"
+    :end-placeholder="$t(options.attrs.endPlaceholder)"
+    :placeholder="$t(options.attrs.placeholder)"
     style="min-height: 36px;"
     @change="dateChange"
   />

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -4,7 +4,7 @@
     v-if="options!== null && options.attrs!==null"
     v-model="values"
     resize="vertical"
-    :placeholder="options.attrs.placeholder"
+    :placeholder="$t(options.attrs.placeholder)"
     @keypress.enter.native="search"
     @dblclick="setEdit"
   >

frontend/src/components/widget/DeWidget/DeNumberRange.vue

@@ -3,11 +3,11 @@
   <el-form v-if="options!== null && options.attrs!==null" ref="form" :model="form" :rules="rules">
     <div class="de-number-range-container">
       <el-form-item prop="min">
-        <el-input v-model="form.min" :placeholder="options.attrs.placeholder" @change="handleMinChange" />
+        <el-input v-model="form.min" :placeholder="$t(options.attrs.placeholder_min)" @change="handleMinChange" />
       </el-form-item>
-      <span>~</span>
+      <span>{{ $t('denumberrange.split_placeholder') }}</span>
       <el-form-item prop="max">
-        <el-input v-model="form.max" :placeholder="options.attrs.placeholder" @change="handleMaxChange" />
+        <el-input v-model="form.max" :placeholder="$t(options.attrs.placeholder_max)" @change="handleMaxChange" />
       </el-form-item>
     </div>
   </el-form>
@@ -40,12 +40,12 @@ export default {
       form: { min: '', max: '' },
       rules: {
         min: [
-          { required: true, message: this.$t('denumberrange.please_key_min'), trigger: 'blur' },
+        //   { required: true, message: this.$t('denumberrange.please_key_min'), trigger: 'blur' },
           { validator: this.validateCom, trigger: 'blur' },
           { validator: this.validateMin, trigger: 'blur' }
         ],
         max: [
-          { required: true, message: this.$t('denumberrange.please_key_max'), trigger: 'blur' },
+        //   { required: true, message: this.$t('denumberrange.please_key_max'), trigger: 'blur' },
           { validator: this.validateCom, trigger: 'blur' },
           { validator: this.validateMax, trigger: 'blur' }
         ]
@@ -98,6 +98,7 @@ export default {
       this.$refs.form.validateField('min')
     },
     validateCom(rule, value, callback) {
+      if (!value) return callback()
       const one = Number(value)
       if (Number.isInteger(one)) {
         if (one < MIN_NUMBER) {
@@ -110,6 +111,7 @@ export default {
       return callback(new Error(this.$t('denumberrange.must_int')))
     },
     validateMin(rule, value, callback) {
+      if (!value) return callback()
       const one = Number(value)
       const max = Number(this.form.max)
       if (!max || one < max) {
@@ -118,6 +120,7 @@ export default {
       return callback(new Error(this.$t('denumberrange.min_out_max')))
     },
     validateMax(rule, value, callback) {
+      if (!value) return callback()
       const one = Number(value)
       const min = Number(this.form.min)
       if (!min || one > min) {
@@ -141,7 +144,27 @@ export default {
         value: [this.form.min, this.form.max],
         operator: this.operator
       }
-      this.inDraw && this.$store.commit('addViewFilter', param)
+      if (this.form.min && this.form.max) {
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (!this.form.min && !this.form.max) {
+        param.value = []
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (this.form.min) {
+        param.value = [this.form.min]
+        param.operator = 'ge'
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (this.form.max) {
+        param.value = [this.form.max]
+        param.operator = 'le'
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
     }
   }
 }
@@ -151,7 +174,7 @@ export default {
 .de-number-range-container {
   display: inline;
   >>>div.el-form-item {
-    width: calc(50% - 5px) !important;
+    width: calc(50% - 10px) !important;
     display: inline-block;
     padding: 0 5px;
   }

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -7,7 +7,7 @@
     :collapse-tags="showNumber"
     :clearable="!options.attrs.multiple"
     :multiple="options.attrs.multiple"
-    :placeholder="options.attrs.placeholder"
+    :placeholder="$t(options.attrs.placeholder)"
     :popper-append-to-body="inScreen"
     @change="changeValue"
   >

frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js

@@ -2,14 +2,15 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-zuoce-qujian',
-  label: '数值区间',
+  label: 'denumberrange.label',
   defaultClass: 'text-filter'
 }
 
 const dialogPanel = {
   options: {
     attrs: {
-      placeholder: '请输入整数',
+      placeholder_min: 'denumberrange.please_key_min',
+      placeholder_max: 'denumberrange.please_key_max',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js

@@ -3,7 +3,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-xialakuang',
-  label: '数字下拉',
+  label: 'denumberselect.label',
   defaultClass: 'text-filter'
 }
 
@@ -11,7 +11,7 @@ const dialogPanel = {
   options: {
     attrs: {
       multiple: false,
-      placeholder: '请选择',
+      placeholder: 'denumberselect.placeholder',
       datas: [],
       key: 'id',
       label: 'text',

frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js

@@ -2,14 +2,14 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-shuru',
-  label: '文本搜索',
+  label: 'deinputsearch.label',
   defaultClass: 'text-filter'
 }
 
 const dialogPanel = {
   options: {
     attrs: {
-      placeholder: '请输入关键字',
+      placeholder: 'deinputsearch.placeholder',
       viewIds: []
 
     },

frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js

@@ -3,7 +3,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-xialakuang',
-  label: '文本下拉',
+  label: 'detextselect.label',
   defaultClass: 'text-filter'
 }
 
@@ -11,7 +11,7 @@ const dialogPanel = {
   options: {
     attrs: {
       multiple: false,
-      placeholder: '请选择',
+      placeholder: 'detextselect.placeholder',
       viewIds: [],
       datas: [],
       key: 'id',

frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-riqi',
-  label: '日期范围',
+  label: 'dedaterange.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,9 +10,9 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'daterange',
-      rangeSeparator: '至',
-      startPlaceholder: '开始日期',
-      endPlaceholder: '结束日期',
+      rangeSeparator: 'dedaterange.split_placeholder',
+      startPlaceholder: 'dedaterange.to_placeholder',
+      endPlaceholder: 'dedaterange.from_placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-ri',
-  label: '日期',
+  label: 'dedate.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'date',
-      placeholder: '请选择日期',
+      placeholder: 'dedate.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-yue',
-  label: '年月',
+  label: 'deyearmonth.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'month',
-      placeholder: '请选择年月',
+      placeholder: 'deyearmonth.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-nian',
-  label: '年份',
+  label: 'deyear.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'year',
-      placeholder: '请选择年份',
+      placeholder: 'deyear.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/lang/en.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
     datalist: 'Data Set',
+    name: 'DataSet Name',
     add_group: 'Add Group',
     add_scene: 'Add Scene',
     group: 'Group',
@@ -961,9 +962,10 @@ export default {
       task_status: 'Task status',
       dataset: 'Data set',
       search_by_name: 'Search by name',
-      underway: 'Running',
-      stopped: 'Stopped',
-      exec: 'Execute',
+      underway: 'Waiting for execution',
+      stopped: 'End',
+      pending: 'Pause',
+      exec: 'Execute Once',
       confirm_exec: 'Manual trigger execution？',
       change_success: 'State switch successful'
     },
@@ -1289,6 +1291,8 @@ export default {
     channel_inner_msg: 'On site news'
   },
   denumberrange: {
+    label: 'Number range',
+    split_placeholder: 'To',
     please_key_min: 'Please key min value',
     please_key_max: 'Please key max value',
     out_of_min: 'The min value cannot be less than the min integer -2³²',
@@ -1296,5 +1300,35 @@ export default {
     must_int: 'Please key interger',
     min_out_max: 'The min value must be less than the max value',
     max_out_min: 'The max value must be more than the min value'
+  },
+  denumberselect: {
+    label: 'Number selector',
+    placeholder: 'Please select'
+  },
+  deinputsearch: {
+    label: 'Text search',
+    placeholder: 'Please key keyword'
+  },
+  detextselect: {
+    label: 'Text selector',
+    placeholder: 'Please select'
+  },
+  dedaterange: {
+    label: 'Date range',
+    to_placeholder: 'End date',
+    from_placeholder: 'Start date',
+    split_placeholder: 'To'
+  },
+  dedate: {
+    label: 'Date',
+    placeholder: 'Please select date'
+  },
+  deyearmonth: {
+    label: 'Month',
+    placeholder: 'Please select month'
+  },
+  deyear: {
+    label: 'Year',
+    placeholder: 'Please select year'
   }
 }

frontend/src/lang/tw.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
     datalist: '數據集',
+    name: '數據集名稱',
     add_group: '添加分組',
     add_scene: '添加場景',
     group: '分組',
@@ -961,9 +962,10 @@ export default {
       task_status: '任務狀態',
       dataset: '數據集',
       search_by_name: '根據名稱搜索',
-      underway: '運行中',
-      stopped: '停止',
-      exec: '執行',
+      underway: '等待執行',
+      stopped: '執行结束',
+      pending: '暫停',
+      exec: '執行一次',
       confirm_exec: '手動觸發執行？',
       change_success: '狀態切換成功'
     },
@@ -1289,6 +1291,8 @@ export default {
     channel_inner_msg: '站內消息'
   },
   denumberrange: {
+    label: '數值區間',
+    split_placeholder: '至',
     please_key_min: '請輸入最小值',
     please_key_max: '請輸入最大值',
     out_of_min: '最小值不能小于最小整數-2³²',
@@ -1296,5 +1300,35 @@ export default {
     must_int: '請輸入整數',
     min_out_max: '最小值必須小于最大值',
     max_out_min: '最大值必須大于最小值'
+  },
+  denumberselect: {
+    label: '數字下拉',
+    placeholder: '請選擇'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '請輸入關鍵字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '請選擇'
+  },
+  dedaterange: {
+    label: '日期範圍',
+    to_placeholder: '結束日期',
+    from_placeholder: '開始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '請選擇日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '請選擇年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '請選擇年份'
   }
 }

frontend/src/lang/zh.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
     datalist: '数据集',
+    name: '数据集名称',
     add_group: '添加分组',
     add_scene: '添加场景',
     group: '分组',
@@ -961,9 +962,10 @@ export default {
       task_status: '任务状态',
       dataset: '数据集',
       search_by_name: '根据名称搜索',
-      underway: '运行中',
-      stopped: '停止',
-      exec: '执行',
+      underway: '等待执行',
+      stopped: '执行结束',
+      pending: '暂停',
+      exec: '执行一次',
       confirm_exec: '手动触发执行？',
       change_success: '状态切换成功'
     },
@@ -1291,6 +1293,8 @@ export default {
     channel_inner_msg: '站内消息'
   },
   denumberrange: {
+    label: '数值区间',
+    split_placeholder: '至',
     please_key_min: '请输入最小值',
     please_key_max: '请输入最大值',
     out_of_min: '最小值不能小于最小整数-2³²',
@@ -1298,5 +1302,35 @@ export default {
     must_int: '请输入整数',
     min_out_max: '最小值必须小于最大值',
     max_out_min: '最大值必须大于最小值'
+  },
+  denumberselect: {
+    label: '数字下拉',
+    placeholder: '请选择'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '请输入关键字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '请选择'
+  },
+  dedaterange: {
+    label: '日期范围',
+    to_placeholder: '结束日期',
+    from_placeholder: '开始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '请选择日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '请选择年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '请选择年份'
   }
 }

frontend/src/styles/deicon/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">弧形框</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">弧形框</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe642;</span>
                 <div class="name">透明</div>
@@ -294,9 +306,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1626919869905') format('woff2'),
-       url('iconfont.woff?t=1626919869905') format('woff'),
-       url('iconfont.ttf?t=1626919869905') format('truetype');
+  src: url('iconfont.woff2?t=1626927148990') format('woff2'),
+       url('iconfont.woff?t=1626927148990') format('woff'),
+       url('iconfont.ttf?t=1626927148990') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -322,6 +334,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-weibiaoti-1"></span>
+            <div class="name">
+              弧形框
+            </div>
+            <div class="code-name">.icon-weibiaoti-1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-weibiaoti-"></span>
+            <div class="name">
+              弧形框
+            </div>
+            <div class="code-name">.icon-weibiaoti-
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-touming"></span>
             <div class="name">
@@ -682,6 +712,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weibiaoti-1"></use>
+                </svg>
+                <div class="name">弧形框</div>
+                <div class="code-name">#icon-weibiaoti-1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weibiaoti-"></use>
+                </svg>
+                <div class="name">弧形框</div>
+                <div class="code-name">#icon-weibiaoti-</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-touming"></use>

frontend/src/styles/deicon/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 2459092 */
-  src: url('iconfont.woff2?t=1626919869905') format('woff2'),
-       url('iconfont.woff?t=1626919869905') format('woff'),
-       url('iconfont.ttf?t=1626919869905') format('truetype');
+  src: url('iconfont.woff2?t=1626927148990') format('woff2'),
+       url('iconfont.woff?t=1626927148990') format('woff'),
+       url('iconfont.ttf?t=1626927148990') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-weibiaoti-1:before {
+  content: "\e603";
+}
+
+.icon-weibiaoti-:before {
+  content: "\e602";
+}
+
 .icon-touming:before {
   content: "\e642";
 }

frontend/src/styles/deicon/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "12617190",
+      "name": "弧形框",
+      "font_class": "weibiaoti-1",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "12617065",
+      "name": "弧形框",
+      "font_class": "weibiaoti-",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
     {
       "icon_id": "4454064",
       "name": "透明",

frontend/src/views/chart/chart/chart.js

@@ -205,7 +205,31 @@ export const BASE_BAR = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }
@@ -237,7 +261,31 @@ export const HORIZONTAL_BAR = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }
@@ -271,7 +319,31 @@ export const BASE_LINE = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }

frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue

 <template>
-  <div>
-    <div style="width: 100%">
-      <el-popover
-        placement="right"
-        width="400"
-        trigger="click"
-      >
-        <el-col>
-          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">
-            <el-form-item :label="$t('chart.color')" class="form-item">
-              <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />
-            </el-form-item>
-            <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">
-              <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />
-            </el-form-item>
-          </el-form>
-        </el-col>
+  <div style="width: 100%">
+    <el-col>
+      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini" :disabled="param && !hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.color')" class="form-item">
+          <el-color-picker v-model="colorForm.color" class="color-picker-style" @change="changeBackgroundStyle" />
+        </el-form-item>
+        <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">
+          <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />
+        </el-form-item>
+      </el-form>
+    </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.color')" class="form-item">-->
+    <!--              <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon--right" /></el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -100,4 +110,8 @@ export default {
   .el-form-item{
     margin-bottom: 6px;
   }
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
 </style>

frontend/src/views/dataset/group/Group.vue

@@ -100,7 +100,7 @@
                               <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
                               {{ $t('dataset.sql_data') }}
                             </el-dropdown-item>
-                            <el-dropdown-item :command="beforeClickAddData('excel',data)">
+                            <el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning">
                               <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
                               {{ $t('dataset.excel_data') }}
                             </el-dropdown-item>
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post } from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post , isKettleRunning} from '@/api/dataset/dataset'
 import { authModel } from '@/api/system/sysAuth'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
@@ -415,7 +415,8 @@ export default {
         id: 'id',
         parentId: 'pid'
       },
-      isTreeSearch: false
+      isTreeSearch: false,
+      kettleRunning: false
     }
   },
   computed: {
@@ -426,6 +427,9 @@ export default {
     //   return this.$store.state.dataset.sceneData
     // }
   },
+  created() {
+    this.kettleState()
+  },
   watch: {
     search(val) {
       // if (val && val !== '') {
@@ -467,7 +471,11 @@ export default {
         'node': node
       }
     },
-
+    kettleState() {
+      isKettleRunning().then(res => {
+        this.kettleRunning = res.data
+      })
+    },
     clickMore(param) {
       // console.log(param)
       switch (param.type) {

frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue

@@ -12,7 +12,7 @@
               <el-radio v-model="panel.backgroundType" label="color" @change="onChangeType">{{ $t('chart.color') }}</el-radio>
             </el-col>
             <el-col :span="18">
-              <colorPicker v-model="panel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" />
+              <el-color-picker v-model="panel.color" style="cursor: pointer;z-index: 1004;" />
             </el-col>
           </el-row>
           <el-row style="height: 60px;margin-top:10px;overflow: hidden">

frontend/src/views/panel/filter/index.vue

@@ -19,7 +19,7 @@
           <div class="filter-widget-icon">
             <i :class="(widget.icon || 'el-icon-setting') + ' widget-icon-i'" />
           </div>
-          <div class="filter-widget-text">{{ widget.label }}</div>
+          <div class="filter-widget-text">{{ $t(widget.label) || widget.label }}</div>
         </div>
       </div>
     </div>

frontend/src/views/system/task/TaskRecord.vue

@@ -2,7 +2,13 @@
   <el-col>
     <el-row style="margin-top: 10px;">
       <complex-table :data="data" :columns="columns" local-key="datasetTaskRecord" :search-config="searchConfig" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
-        <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="jumpTask(scope.row)">{{ scope.row.name }}</el-link>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="startTime" :label="$t('dataset.start_time')">
           <template slot-scope="scope">
             <span>{{ scope.row.startTime | timestampFormatDate }}</span>
@@ -56,6 +62,12 @@ import TableSelector from '@/views/chart/view/TableSelector'
 export default {
   name: 'TaskRecord',
   components: { ComplexTable, LayoutContent, cron, TableSelector },
+  props: {
+    param: {
+      type: Object,
+      default: null
+    }
+  },
   data() {
     return {
       header: '',
@@ -71,7 +83,8 @@ export default {
         useComplexSearch: true,
         quickPlaceholder: this.$t('dataset.task.search_by_name'),
         components: [
-          { field: 'dataset_table_task.name', label: this.$t('dataset.task.name'), component: 'DeComplexInput' },
+          { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput' },
+          { field: 'dataset_table.name', label: this.$t('dataset.name'), component: 'DeComplexInput' },
           { field: 'dataset_table_task_log.status', label: this.$t('commons.status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
         ]
       },
@@ -105,15 +118,43 @@ export default {
   computed: {
   },
   created() {
-    this.search()
-    this.timer = setInterval(() => {
-      this.search(this.last_condition, false)
-    }, 5000)
+    if (this.param == null) {
+      this.last_condition = {}
+      this.search()
+    } else {
+      this.last_condition = {
+        'dataset_table_task.name': {
+          field: 'dataset_table_task.name',
+          operator: 'eq',
+          value: this.param.name
+        }
+      }
+      this.search(this.last_condition)
+    }
+
+    // this.timer = setInterval(() => {
+    //   this.search(this.last_condition, false)
+    // }, 5000)
+    this.createTimer()
   },
   beforeDestroy() {
-    clearInterval(this.timer)
+    // clearInterval(this.timer)
+    this.destroyTimer()
   },
   methods: {
+    createTimer() {
+      if (!this.timer) {
+        this.timer = setInterval(() => {
+          this.search(this.last_condition, false)
+        }, 5000)
+      }
+    },
+    destroyTimer() {
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+    },
     msg2Current(routerParam) {
       if (!routerParam || !routerParam.taskId) return
       const taskId = routerParam.taskId
@@ -125,7 +166,13 @@ export default {
           value: taskId
         }
       }
+      // 先把定时器干掉 否则会阻塞下面的search
+      this.destroyTimer()
+
       this.search(current_condition)
+
+      // 查询完再开启定时器
+      this.createTimer()
     },
     sortChange({ column, prop, order }) {
       this.orderConditions = []
@@ -145,13 +192,13 @@ export default {
     },
     select(selection) {
     },
-    search(condition) {
+    search(condition, showLoading = true) {
       this.last_condition = condition
       condition = formatQuickCondition(condition, 'dataset_table_task.name')
       const temp = formatCondition(condition)
       const param = temp || {}
       param['orders'] = formatOrders(this.orderConditions)
-      post('/dataset/taskLog/list/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param).then(response => {
+      post('/dataset/taskLog/list/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param, showLoading).then(response => {
         this.data = response.data.listObject
         this.paginationConfig.total = response.data.itemCount
       })
@@ -159,6 +206,9 @@ export default {
     showErrorMassage(massage) {
       this.show_error_massage = true
       this.error_massage = massage
+    },
+    jumpTask(item) {
+      this.$emit('jumpTask', item)
     }
   }
 }

frontend/src/views/system/task/dataset.vue

@@ -2,12 +2,12 @@
   <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
     <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-      <el-tabs v-model="tabActive">
+      <el-tabs v-model="tabActive" @tab-click="changeTab">
         <el-tab-pane :label="$t('dataset.task.list')" name="DatasetTaskList">
-          <dataset-task-list />
+          <dataset-task-list v-if="tabActive=='DatasetTaskList'" :param="task" @jumpTaskRecord="jumpTaskRecord" />
         </el-tab-pane>
         <el-tab-pane :label="$t('dataset.task.record')" name="TaskRecord">
-          <task-record ref="task_record" />
+          <task-record v-if="tabActive=='TaskRecord'" ref="task_record" :param="task" @jumpTask="jumpTask" />
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -30,6 +30,7 @@ export default {
   components: { DatasetTableData, LayoutContent, ComplexTable, UnionView, UpdateInfo, TabDataPreview, DatasetTaskList, TaskRecord },
   data() {
     return {
+      task: null,
       tabActive: 'DatasetTaskList'
     }
   },
@@ -51,7 +52,18 @@ export default {
     })
   },
   methods: {
-
+    changeTab() {
+      this.task = null
+      console.log(this.tabActive)
+    },
+    jumpTaskRecord(task) {
+      this.task = task
+      this.tabActive = 'TaskRecord'
+    },
+    jumpTask(task) {
+      this.task = task
+      this.tabActive = 'DatasetTaskList'
+    },
     toMsgShare(routerParam) {
       if (routerParam !== null && routerParam.msgNotification) {
         const panelShareTypeIds = [4, 5, 6]