Browse Source

Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release

pull/3/MERGE
qiaozhanwei 4 years ago
parent
commit
6ae183713a
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  2. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
  3. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
  4. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
  5. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
  6. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
  7. 2
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
  8. 2
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
  9. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  10. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue

@ -207,7 +207,7 @@
this.customConfig = 0
setTimeout(() => {
this._handlerEditor()
}, 200)
}, 350)
}
},
/**
@ -431,11 +431,11 @@
if(this.customConfig) {
setTimeout(() => {
this._handlerJsonEditor()
}, 200)
}, 350)
} else {
setTimeout(() => {
this._handlerEditor()
}, 200)
}, 350)
}
},
destroyed () {

9
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue

@ -321,9 +321,12 @@
}
},
mounted () {
setTimeout(() => {
this._handlerEditor()
}, 200)
// Added delay loading in script input box
this.$nextTick(() => {
setTimeout(() => {
this._handlerEditor()
}, 350)
})
},
destroyed () {
editor.toTextArea() // Uninstall

9
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue

@ -447,9 +447,12 @@
}
},
mounted () {
setTimeout(() => {
this._handlerEditor()
}, 200)
// Added delay loading in script input box
this.$nextTick(() => {
setTimeout(() => {
this._handlerEditor()
}, 350)
})
},
destroyed () {
/**

9
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue

@ -982,9 +982,12 @@
},
mounted () {
setTimeout(() => {
this._handlerEditor()
}, 200)
// Added delay loading in script input box
this.$nextTick(() => {
setTimeout(() => {
this._handlerEditor()
}, 350)
})
setTimeout(() => {
this.srcQueryType = this.sourceMysqlParams.srcQueryType

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@ -677,7 +677,7 @@ JSP.prototype.saveStore = function () {
Vue.$message.warning(`${i18n.$t('The workflow canvas is abnormal and cannot be saved, please recreate')}`)
return false
}
// return false
// Storage node
store.commit('dag/setTasks', tasks)
// Store coordinate information

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue

@ -232,7 +232,7 @@
position: absolute;
right: 0;
top: 0;
>i {
>em {
font-size: 20px;
color: #2d8cf0;
cursor: pointer;

2
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue

@ -23,7 +23,7 @@
<template slot="content">
<div class="create-token-model">
<m-list-box-f>
<template slot="name"><strong>*</strong>{{$t('Failure time')}}</template>
<template slot="name"><strong>*</strong>{{$t('Expiration time')}}</template>
<template slot="content">
<x-datepicker
:disabled-date="disabledDate"

2
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue

@ -29,7 +29,7 @@
<span>Token</span>
</th>
<th>
<span>{{$t('Failure time')}}</span>
<span>{{$t('Expiration time')}}</span>
</th>
<th>
<span>{{$t('Create Time')}}</span>

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

@ -466,7 +466,7 @@ export default {
'Edit token': 'Edit token',
'Please enter the IP address separated by commas': 'Please enter the IP address separated by commas',
'Note: Multiple IP addresses have been comma separated': 'Note: Multiple IP addresses have been comma separated',
'Failure time': 'Failure time',
'Expiration time': 'Expiration time',
User: 'User',
'Please enter token': 'Please enter token',
'Generate token': 'Generate token',

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

@ -461,7 +461,7 @@ export default {
'Edit token': '编辑令牌',
'Please enter the IP address separated by commas': '请输入IP地址多个用英文逗号隔开',
'Note: Multiple IP addresses have been comma separated': '注意多个IP地址以英文逗号分割',
'Failure time': '失效时间',
'Expiration time': '失效时间',
User: '用户',
'Please enter token': '请输入令牌',
'Generate token': '生成令牌',

Loading…
Cancel
Save