1.repair [BUG]#884；2.Add Scheduling Time Fields to Workflow Instance List；3.Add a reminder for empty data 4.Delete the'babel-plugin-transform-remove-console'dependency package (#995)

dolphinscheduler-ui/package.json

@@ -23,7 +23,6 @@
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.6.1",

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@@ -253,7 +253,11 @@
                 let msg = ''
 
                 this.store.dispatch(api, searchParams).then(res => {
-                  this.previewTimes = res
+                  if (res.length) {
+                    this.previewTimes = res
+                  } else {
+                    this.$message.warning(`${i18n.$t('There is no data for this period of time')}`)
+                  }
                 })
               }
             },

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue

@@ -21,7 +21,8 @@
     data () {
       return {
         isSpin: true,
-        msg: ''
+        msg: '',
+        parameter: {projectId: 0}
       }
     },
     props: {
@@ -54,7 +55,8 @@
     },
     created () {
       this.isSpin = true
-      this.getDefineUserCount(this.projectId).then(res => {
+      this.parameter.projectId = this.projectId;
+      this.getDefineUserCount(this.parameter).then(res => {
         this.defineUserList = []
         this._handleDefineUser(res)
         this.isSpin = false

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@@ -12,31 +12,34 @@
           <th>
             <span>{{$t('Process Name')}}</span>
           </th>
-          <th>
+          <th width="70">
             <span>{{$t('Run Type')}}</span>
           </th>
-          <th width="140">
+          <th width="130">
+            <span>{{$t('Scheduling Time')}}</span>
+          </th>
+          <th width="130">
             <span>{{$t('Start Time')}}</span>
           </th>
-          <th width="140">
+          <th width="130">
             <span>{{$t('End Time')}}</span>
           </th>
-          <th width="70">
+          <th width="60">
             <span>{{$t('Duration')}}s</span>
           </th>
-          <th width="70">
+          <th width="60">
             <span>{{$t('Run Times')}}</span>
           </th>
           <th width="100">
             <span>{{$t('host')}}</span>
           </th>
-          <th width="70">
+          <th width="60">
             <span>{{$t('fault-tolerant sign')}}</span>
           </th>
-          <th width="50">
+          <th width="30">
             <span>{{$t('State')}}</span>
           </th>
-          <th width="220">
+          <th width="210">
             <span>{{$t('Operation')}}</span>
           </th>
         </tr>
@@ -46,9 +49,13 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span class="ellipsis" style="padding-left: 4px;"><router-link :to="{ path: '/projects/instance/list/' + item.id}" tag="a" class="links">{{item.name}}</router-link></span>
+            <span class="ellipsis" style="padding-left: 4px;"><router-link :to="{ path: '/projects/instance/list/' + item.id}" tag="a" class="links" :title="item.name">{{item.name}}</router-link></span>
           </td>
           <td><span>{{_rtRunningType(item.commandType)}}</span></td>
+          <td>
+            <span v-if="!item.scheduleTime"></span>
+            <span v-else>{{item.scheduleTime | formatDate}}</span>
+          </td>
           <td><span>{{item.startTime | formatDate}}</span></td>
           <td>
             <span v-if="item.endTime">{{item.endTime | formatDate}}</span>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@@ -12,7 +12,7 @@
           <th>
             <span>{{$t('Process Instance')}}</span>
           </th>
-          <th width="80">
+          <th width="90">
             <span>{{$t('Node Type')}}</span>
           </th>
           <th width="40">

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -232,6 +232,7 @@ export default {
   'Service-Worker': 'Service-Worker',
   'Process Name': 'Process Name',
   'Run Type': 'Run Type',
+  'Scheduling Time': 'Scheduling Time',
   'Run Times': 'Run Times',
   'host': 'host',
   'fault-tolerant sign': 'fault-tolerant sign',
@@ -487,5 +488,6 @@ export default {
   'Http Check Condition':'Http Check Condition',
   'Http Condition':'Http Condition',
   'Please Enter Http Url': 'Please Enter Http Url(required)',
-  'Please Enter Http Condition': 'Please Enter Http Condition'
+  'Please Enter Http Condition': 'Please Enter Http Condition',
+  'There is no data for this period of time': 'There is no data for this period of time'
 }

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -232,6 +232,7 @@ export default {
   'Service-Worker': '服务管理-Worker',
   'Process Name': '工作流名称',
   'Run Type': '运行类型',
+  'Scheduling Time': '调度时间',
   'Run Times': '运行次数',
   'host': 'host',
   'fault-tolerant sign': '容错标识',
@@ -493,5 +494,6 @@ export default {
   'Http Check Condition':'校验条件',
   'Http Condition':'校验内容',
   'Please Enter Http Url': '请填写请求地址(必填)',
-  'Please Enter Http Condition': '请填写校验内容'
+  'Please Enter Http Condition': '请填写校验内容',
+  'There is no data for this period of time': '该时间段无数据'
 }