Merge branch 'dev' into pr@dev_memory_component

frontend/src/lang/en.js

@@ -1520,13 +1520,13 @@ export default {
   },
   dataset: {
     scope_edit: 'Effective only when editing',
-    scope_all: 'Global effective',
+    scope_all: 'Effect globally when the dataset is previewed',
     spend_time: 'Spend',
     sql: 'SQL',
     sql_result: 'Result',
     parse_filed: 'Parse Field',
     field_rename: 'Rename Field',
-    params_work: 'Effective only when editing SQL',
+    params_work: 'Effective only when editing: parameter values are effective only when editing data sets; Global Effective: It takes effect in dataset view, preview, and view where dataset is used.',
     sql_variable_limit_1: '1、SQL variables can only be used in where conditions',
     sql_variable_limit_2: '2、Example：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',
     select_year: 'Select Year',

frontend/src/lang/tw.js

@@ -1514,13 +1514,13 @@ export default {
   },
   dataset: {
     scope_edit: '僅編輯時生效',
-    scope_all: '全域生效',
+    scope_all: '數据集預覽時全域生效',
     spend_time: '耗時',
     sql: 'SQL 語句',
     sql_result: '運行結果',
     parse_filed: '解析字段',
     field_rename: '字段重命名',
-    params_work: '僅在編輯 sql 時生效',
+    params_work: '僅編輯時生效：參數值僅在數据集編輯時生效； 全域生效：在數据集查看、預覽、以及用到數据集的視圖中均生效。',
     sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用',
     sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',
     selesql_variable_limit_2ct_year: '選擇年',

frontend/src/lang/zh.js

@@ -1513,13 +1513,13 @@ export default {
   },
   dataset: {
     scope_edit: '仅编辑时生效',
-    scope_all: '全局生效',
+    scope_all: '数据集预览时全局生效',
     spend_time: '耗时',
     sql: 'SQL 语句',
     sql_result: '运行结果',
     parse_filed: '解析字段',
     field_rename: '字段重命名',
-    params_work: '仅在编辑sql时生效',
+    params_work: '仅编辑时生效：参数值仅在数据集编辑时生效；全局生效：在数据集查看、预览、以及用到数据集的视图中均生效。',
     select_year: '选择年',
     sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用',
     sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',

frontend/src/views/dataset/data/UpdateInfo.vue

@@ -574,7 +574,7 @@ export default {
         startTime: '',
         rate: 'SIMPLE',
         cron: '',
-        endTime: '',
+        endTime: 0,
         end: '0',
         extraData: {
           simple_cron_type: 'hour',
@@ -779,6 +779,7 @@ export default {
         this.taskForm.name =
           this.table.name + ' ' + this.$t('dataset.task_update')
         this.taskForm.startTime = new Date()
+        this.taskForm.endTime = new Date()
         this.update_task_dialog_title = this.$t('dataset.task_add_title')
       } else {
         // update
@@ -908,6 +909,7 @@ export default {
           }
           this.incrementalConfig.tableId = this.table.id
           task.startTime = new Date(task.startTime).getTime()
+          console.log(task.endTime)
           task.endTime = new Date(task.endTime).getTime()
           task.tableId = this.table.id
           const form = JSON.parse(JSON.stringify(task))
@@ -1030,7 +1032,7 @@ export default {
     onRateChange() {
       if (this.taskForm.rate === 'SIMPLE') {
         this.taskForm.end = '0'
-        this.taskForm.endTime = ''
+        this.taskForm.endTime = 0
         this.taskForm.cron = ''
         this.showCron = false
       }

frontend/src/views/dataset/data/UpdateRecords.vue

@@ -530,7 +530,7 @@ export default {
         startTime: '',
         rate: 'SIMPLE',
         cron: '',
-        endTime: '',
+        endTime: 0,
         end: '0',
         extraData: {
           simple_cron_type: 'hour',
@@ -707,6 +707,7 @@ export default {
         this.resetTaskForm()
         this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update')
         this.taskForm.startTime = new Date()
+        this.taskForm.endTime = new Date()
         this.update_task_dialog_title = this.$t('dataset.task_add_title')
       } else {
         this.taskForm = JSON.parse(JSON.stringify(task))
@@ -854,7 +855,7 @@ export default {
     onRateChange() {
       if (this.taskForm.rate === 'SIMPLE') {
         this.taskForm.end = '0'
-        this.taskForm.endTime = ''
+        this.taskForm.endTime = 0
         this.taskForm.cron = ''
       }
       if (this.taskForm.rate === 'SIMPLE_CRON') {

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

@@ -295,7 +295,7 @@ export default {
         tableId: '',
         rate: 'SIMPLE',
         cron: '',
-        endTime: '',
+        endTime: 0,
         end: '0',
         extraData: {
           simple_cron_type: 'hour',
@@ -391,6 +391,7 @@ export default {
     this.taskDetail = { datasetName, id, tableId }
     if (!id) {
       this.taskForm.startTime = new Date()
+      this.taskForm.endTime = new Date()
       return
     }
     this.getTaskDetail(id)
@@ -418,7 +419,7 @@ export default {
     onRateChange() {
       if (this.taskForm.rate === 'SIMPLE') {
         this.taskForm.end = '0'
-        this.taskForm.endTime = ''
+        this.taskForm.endTime = 0
         this.taskForm.cron = ''
         this.showCron = false
       }