Merge pull request #60 from millionfor/dev-20190415

Dev 20190415

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

@@ -59,7 +59,7 @@
             <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Timing')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null" v-ps="['GENERAL_USER']" icon="iconfont icon-timer"><!--{{$t('定时')}}--></x-button>
             <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('下线')}}--></x-button>
             <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('上线')}}--></x-button>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Management')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Manage')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>
             <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('TreeView')" @click="_treeView(item)"  icon="iconfont icon-juxingkaobei"><!--{{$t('树形图')}}--></x-button>
           </td>
         </tr>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('Cron Management')">
+    <m-list-construction :title="$t('Cron Manage')">
       <template slot="content">
         <m-list></m-list>
       </template>

escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <m-list-construction :title="$t('Cron Management')">
+  <m-list-construction :title="$t('Cron Manage')">
     <template slot="content">
       <m-list></m-list>
     </template>

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'resource'"></m-secondary-menu>
-    <m-list-construction :title="$t('File Management')">
+    <m-list-construction :title="$t('File Manage')">
       <template slot="conditions">
         <m-conditions @on-conditions="_onConditions">
           <template slot="button-group">

escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue

@@ -2,7 +2,7 @@
   <div class="main-layout-box">
     <m-secondary-menu :type="'security'"></m-secondary-menu>
     <template>
-      <m-list-construction :title="$t('Tenant Management')">
+      <m-list-construction :title="$t('Tenant Manage')">
         <template slot="conditions">
           <m-conditions @on-conditions="_onConditions">
             <template slot="button-group">

escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue

@@ -2,7 +2,7 @@
   <div class="main-layout-box">
     <m-secondary-menu :type="'security'"></m-secondary-menu>
     <template>
-      <m-list-construction :title="$t('User Management')">
+      <m-list-construction :title="$t('User Manage')">
         <template slot="conditions">
           <m-conditions @on-conditions="_onConditions">
             <template slot="button-group">

escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue

@@ -2,7 +2,7 @@
   <div class="main-layout-box">
     <m-secondary-menu :type="'security'"></m-secondary-menu>
     <template>
-      <m-list-construction :title="'Warning group management'">
+      <m-list-construction :title="'Warning group manage'">
         <template slot="conditions">
           <m-conditions @on-conditions="_onConditions">
             <template slot="button-group">

escheduler-ui/src/js/conf/home/router/index.js

@@ -215,7 +215,7 @@ const router = new Router({
           name: 'file',
           component: resolve => require(['../pages/resource/pages/file/pages/list/index'], resolve),
           meta: {
-            title: `${i18n.$t('File Management')}`
+            title: `${i18n.$t('File Manage')}`
           }
         },
         {
@@ -247,7 +247,7 @@ const router = new Router({
           name: 'udf',
           component: resolve => require(['../pages/resource/pages/udf/index'], resolve),
           meta: {
-            title: `${i18n.$t('UDF management')}`
+            title: `${i18n.$t('UDF manage')}`
           },
           children: [
             {
@@ -307,7 +307,7 @@ const router = new Router({
           name: 'tenement-manage',
           component: resolve => require(['../pages/security/pages/tenement/index'], resolve),
           meta: {
-            title: `${i18n.$t('Tenant Management')}`
+            title: `${i18n.$t('Tenant Manage')}`
           }
         },
         {
@@ -315,7 +315,7 @@ const router = new Router({
           name: 'users-manage',
           component: resolve => require(['../pages/security/pages/users/index'], resolve),
           meta: {
-            title: `${i18n.$t('User Management')}`
+            title: `${i18n.$t('User Manage')}`
           }
         },
         {
@@ -323,7 +323,7 @@ const router = new Router({
           name: 'warning-groups-manage',
           component: resolve => require(['../pages/security/pages/warningGroups/index'], resolve),
           meta: {
-            title: `${i18n.$t('Warning group management')}`
+            title: `${i18n.$t('Warning group manage')}`
           }
         },
         {
@@ -339,7 +339,7 @@ const router = new Router({
           name: 'servers-manage',
           component: resolve => require(['../pages/security/pages/servers/index'], resolve),
           meta: {
-            title: `${i18n.$t('Servers management')}`
+            title: `${i18n.$t('Servers manage')}`
           },
           redirect: {
             name: 'servers-master'

escheduler-ui/src/js/conf/home/store/security/actions.js

@@ -140,7 +140,7 @@ export default {
     }
 
     let param = {}
-    // Management user
+    // Manage user
     if (o.type === 'user') {
       param.alertgroupId = payload.id
     } else {

escheduler-ui/src/js/module/components/nav/nav.vue

@@ -28,7 +28,7 @@
       <div class="clearfix list">
         <div class="nav-links">
           <router-link :to="{ path: '/datasource'}" tag="a" active-class="active">
-            <span><i class="iconfont">&#xeef4;</i>{{$t('Datasource')}}</span><b></b>
+            <span><i class="iconfont">&#xeef4;</i>{{$t('Datasource manage')}}</span><b></b>
           </router-link>
         </div>
       </div>
@@ -121,7 +121,7 @@
             </router-link>
             <router-link :to="{ path: '/datasource'}" tag="li" active-class="active">
               <i class="iconfont">&#xeef4;</i>
-              <span>{{$t('Datasource')}}</span>
+              <span>{{$t('Datasource manage')}}</span>
             </router-link>
             <router-link :to="{ path: '/security'}" tag="li" active-class="active" v-ps="['ADMIN_USER']">
               <i class="iconfont">&#xe671;</i>

escheduler-ui/src/js/module/components/secondaryMenu/menu.js

@@ -59,7 +59,7 @@ let menu = {
 
   security: [
     {
-      name: `${i18n.$t('Tenant Management')}`,
+      name: `${i18n.$t('Tenant Manage')}`,
       id: 1,
       path: 'tenement-manage',
       isOpen: true,
@@ -67,7 +67,7 @@ let menu = {
       children: []
     },
     {
-      name: `${i18n.$t('User Management')}`,
+      name: `${i18n.$t('User Manage')}`,
       id: 1,
       path: 'users-manage',
       isOpen: true,
@@ -75,7 +75,7 @@ let menu = {
       children: []
     },
     {
-      name: `${i18n.$t('Warning group management')}`,
+      name: `${i18n.$t('Warning group manage')}`,
       id: 1,
       path: 'warning-groups-manage',
       isOpen: true,
@@ -91,7 +91,7 @@ let menu = {
       children: []
     },
     {
-      name: `${i18n.$t('Servers management')}`,
+      name: `${i18n.$t('Servers manage')}`,
       id: 1,
       path: '',
       isOpen: true,
@@ -112,7 +112,7 @@ let menu = {
   ],
   resource: [
     {
-      name: `${i18n.$t('File Management')}`,
+      name: `${i18n.$t('File Manage')}`,
       id: 1,
       path: 'file',
       isOpen: true,
@@ -121,7 +121,7 @@ let menu = {
       disabled: false
     },
     {
-      name: `${i18n.$t('UDF management')}`,
+      name: `${i18n.$t('UDF manage')}`,
       id: 1,
       path: '',
       isOpen: true,
@@ -129,12 +129,12 @@ let menu = {
       disabled: false,
       children: [
         {
-          name: `${i18n.$t('Resource management')}`,
+          name: `${i18n.$t('Resource manage')}`,
           path: 'resource-udf-resource',
           id: 1
         },
         {
-          name: `${i18n.$t('Function management')}`,
+          name: `${i18n.$t('Function manage')}`,
           path: 'resource-udf-function',
           id: 2
         }

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

@@ -67,10 +67,10 @@ export default {
   'Project Home': 'Project Home',
   'Project Manage': 'Project',
   'Create Project': 'Create Project',
-  'Cron Management': 'Cron Management',
+  'Cron Manage': 'Cron Manage',
-  'Tenant Management': 'Tenant Management',
+  'Tenant Manage': 'Tenant Manage',
   'Create Tenant': 'Create Tenant',
-  'User Management': 'User Management',
+  'User Manage': 'User Manage',
   'Create User': 'Create User',
   'User Information': 'User Information',
   'Edit Password': 'Edit Password',
@@ -220,7 +220,7 @@ export default {
   'Download Details': 'Download Details',
   'Return': 'Return',
   'Save': 'Save',
-  'File Management': 'File Management',
+  'File Manage': 'File Manage',
   'Upload Files': 'Upload Files',
   'Create UDF Function': 'Create UDF Function',
   'Upload UDF Resources': 'Upload UDF Resources',
@@ -316,11 +316,11 @@ export default {
   'Process': 'Process',
   'Process definition': 'Process definition',
   'Task record': 'Task record',
-  'Warning group management': 'Warning group management',
+  'Warning group manage': 'Warning group manage',
-  'Servers management': 'Servers management',
+  'Servers manage': 'Servers manage',
-  'UDF management': 'UDF management',
+  'UDF manage': 'UDF manage',
-  'Resource management': 'Resource management',
+  'Resource manage': 'Resource manage',
-  'Function management': 'Function management',
+  'Function manage': 'Function manage',
   'Edit password': 'Edit password',
   'Ordinary users': 'Ordinary users',
   'Create process': 'Create process',
@@ -409,4 +409,5 @@ export default {
   'Queue manage': 'Queue manage',
   'Create queue': 'Create queue',
   'Edit queue': 'Edit queue',
+  'Datasource manage': 'Datasource',
 }

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

@@ -67,10 +67,10 @@ export default {
   'Project Home': '项目首页',
   'Project Manage': '项目管理',
   'Create Project': '创建项目',
-  'Cron Management': '定时管理',
+  'Cron Manage': '定时管理',
-  'Tenant Management': '租户管理',
+  'Tenant Manage': '租户管理',
   'Create Tenant': '创建租户',
-  'User Management': '用户管理',
+  'User Manage': '用户管理',
   'Create User': '创建用户',
   'User Information': '用户信息',
   'Edit Password': '密码修改',
@@ -220,7 +220,7 @@ export default {
   'Download Details': '下载详情',
   'Return': '返回',
   'Save': '保存',
-  'File Management': '文件管理',
+  'File Manage': '文件管理',
   'Upload Files': '上传文件',
   'Create UDF Function': '创建UDF函数',
   'Upload UDF Resources': '上传UDF资源',
@@ -315,11 +315,11 @@ export default {
   'Process': '工作流',
   'Process definition': '工作流定义',
   'Task record': '任务记录',
-  'Warning group management': '告警组管理',
+  'Warning group manage': '告警组管理',
-  'Servers management': '服务管理',
+  'Servers manage': '服务管理',
-  'UDF management': 'UDF管理',
+  'UDF manage': 'UDF管理',
-  'Resource management': '资源管理',
+  'Resource manage': '资源管理',
-  'Function management': '函数管理',
+  'Function manage': '函数管理',
   'Edit password': '修改密码',
   'Ordinary users': '普通用户',
   'Create process': '创建工作流',
@@ -366,7 +366,7 @@ export default {
   'User Center': '用户中心',
   'Please enter method': '请输入方法',
   'none': '无',
-  'name': '按名称',
+  'name': '名称',
   'Process priority': '流程优先级',
   'Task priority': '任务优先级',
   'Task timeout alarm': '任务超时告警',
@@ -408,4 +408,5 @@ export default {
   'Queue manage': '队列管理',
   'Create queue': '创建队列',
   'Edit queue': '编辑队列',
+  'Datasource manage': '数据源中心',
 }