Commit 4d70e3ce authored by 向偲彪's avatar 向偲彪
Browse files

Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

parents c49825db fadfb281

dolphinscheduler-common/src/main/resources/common.properties

+1 −1
Original line number Diff line number Diff line
@@ -62,5 +62,5 @@ yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s 


# system env path

#dolphinscheduler.env.path=env/dolphinscheduler_env.sh



development.state=false

kerberos.expire.time=7
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,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"  icon="ans-icon-timer"><!--{{$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'"  icon="ans-icon-upward"><!--{{$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'"  icon="ans-icon-downward"><!--{{$t('上线')}}--></x-button>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Copy')" @click="_copyProcess(item)" :disabled="item.releaseState === 'ONLINE'"  icon="ans-icon-copy"><!--{{$t('复制')}}--></x-button>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Copy Workflow')" @click="_copyProcess(item)" :disabled="item.releaseState === 'ONLINE'"  icon="ans-icon-copy"><!--{{$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'"  icon="ans-icon-datetime"><!--{{$t('定时管理')}}--></x-button>

            <x-poptip

              :ref="'poptip-delete-' + $index"

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

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ export default { 
  'Project Manage': 'Project',

  'Create Project': 'Create Project',

  'Cron Manage': 'Cron Manage',

  'Copy Workflow': 'Copy Workflow',

  'Tenant Manage': 'Tenant Manage',

  'Create Tenant': 'Create Tenant',

  'User Manage': 'User Manage',

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

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ export default { 
  'Project Manage': '项目管理',

  'Create Project': '创建项目',

  'Cron Manage': '定时管理',

  'Copy Workflow': '复制工作流',

  'Tenant Manage': '租户管理',

  'Create Tenant': '创建租户',

  'User Manage': '用户管理',