Delete the'babel-plugin-transform-remove-console'dependency package (#…

…873) * package * 修改工作流实例页面状态为运行时，禁止删除，删除package.json包里面的babel-runtime和jasmine-core * bugfix-user-specified queue takes precedence over tenant queue (#769) Solve the problem that the user queue setting does not take effect * update markdown docs which can not display images normally (#806) * issue#728 (#746) The mailSender in PasswordAuthentication() and setFrom() may not be the same in actual use, and it's best to set it up separately. please add a example about this. * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler (#812) * service start exception modify * master，worker start modify * .env update * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler * scripts name standardization (#813) * service start exception modify * master，worker start modify * .env update * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler * scripts name standardization * [BUG][#731]repair swagger annotation，interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete (#764) * 增加工作流导出导入功能，前端定时器表达式的秒和分钟的默认值从*修改成0 * 修改工作流导出导入功能由excel改为json减少依赖 * [BUG][#731]repair swagger annotation ,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete * [BUG][#771] The edit timer did not assign the original data * [FEATURE][#236] Cross-project dependency * [FEATURE][#236] Cross-project dependency(增加跨项目依赖) * misspell words (#817) * (Docs): Fixed some typo errors (#811) * Update EasyScheduler Proposal.md * Update frontend-deployment.md * Update frontend-development.md * Update 前端开发文档.md * Update system-manual.md * Update HttpClientTest.java * Update 系统使用手册.md * fix singleton with volatile (#818) * Replace StringBuffer with StringBuilder inside the method (#816) * flink task support(flink 任务支持) (#711) * flink任务支持 * flink任务支持 * Update zh_CN.js * Update FlinkArgsUtils.java * Update .escheduler_env.sh * 1.Delete the page section console.log; 2.Change project name； 3.Production configuration packaging clears console.log * Delete the'babel-plugin-transform-remove-console'dependency package * 1.repair [BUG]#884,2.Add Scheduling Time Fields to Workflow Instance List，3.Add a reminder for empty data
apache · Sep 26, 2019 · b73c38a · b73c38a
1 parent dde5cb2
commit b73c38a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 17 deletions.
diff --git a/escheduler-ui/package.json b/escheduler-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",

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -253,7 +253,12 @@
                 let msg = ''
 
                 this.store.dispatch(api, searchParams).then(res => {
-                  this.previewTimes = res
+                  if (res.length) {
+                    this.previewTimes = res
+                  } else {
+                    this.$message.warning('该时间段无数据')
+                    this.$message.warning(`${i18n.$t('There is no data for this period of time')}`)
+                  }
                 })
               }
             },

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/escheduler-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

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/escheduler-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>

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/escheduler-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">

diff --git a/escheduler-ui/src/js/module/i18n/locale/en_US.js b/escheduler-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'
 }
diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-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': '容错标识',
@@ -492,5 +493,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': '该时间段无数据'
 }
diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/package.json b/escheduler-ui/src/lib/@analysys/ans-ui/package.json
@@ -49,7 +49,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.7.0",
     "babel-preset-env": "^1.5.2",