Browse Source

Merge pull request #3969 from break60/1.3.3-release

[fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
48261c5e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 36
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

36
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -379,7 +379,8 @@
* Task timeout alarm * Task timeout alarm
*/ */
_onTimeout (o) { _onTimeout (o) {
this.timeout = Object.assign(this.timeout, {}, o) this.timeout = Object.assign({}, o)
this._cacheTimeOut(o)
}, },
/** /**
* Click external to close the current component * Click external to close the current component
@ -439,9 +440,32 @@
_onCacheParams (o) { _onCacheParams (o) {
this.params = Object.assign(this.params, {}, o) this.params = Object.assign(this.params, {}, o)
this._cacheItem() this._cacheItem(o)
},
_cacheTimeOut(o) {
this.conditionResult.successNode[0] = this.successBranch
this.conditionResult.failedNode[0] = this.failedBranch
this.$emit('cacheTaskInfo', {
item: {
type: this.taskType,
id: this.id,
name: this.name,
params: this.params,
description: this.description,
timeout: o,
runFlag: this.runFlag,
conditionResult: this.conditionResult,
dependence: this.cacheDependence,
maxRetryTimes: this.maxRetryTimes,
retryInterval: this.retryInterval,
taskInstancePriority: this.taskInstancePriority,
workerGroup: this.workerGroup,
status: this.status,
branch: this.branch
},
fromThis: this
})
}, },
_cacheItem () { _cacheItem () {
this.conditionResult.successNode[0] = this.successBranch this.conditionResult.successNode[0] = this.successBranch
this.conditionResult.failedNode[0] = this.failedBranch this.conditionResult.failedNode[0] = this.failedBranch
@ -457,7 +481,6 @@
dependence: this.cacheDependence, dependence: this.cacheDependence,
maxRetryTimes: this.maxRetryTimes, maxRetryTimes: this.maxRetryTimes,
retryInterval: this.retryInterval, retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority, taskInstancePriority: this.taskInstancePriority,
workerGroup: this.workerGroup, workerGroup: this.workerGroup,
status: this.status, status: this.status,
@ -530,12 +553,12 @@
name: this.name, name: this.name,
params: this.params, params: this.params,
description: this.description, description: this.description,
timeout: this.timeout,
runFlag: this.runFlag, runFlag: this.runFlag,
conditionResult: this.conditionResult, conditionResult: this.conditionResult,
dependence: this.dependence, dependence: this.dependence,
maxRetryTimes: this.maxRetryTimes, maxRetryTimes: this.maxRetryTimes,
retryInterval: this.retryInterval, retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority, taskInstancePriority: this.taskInstancePriority,
workerGroup: this.workerGroup, workerGroup: this.workerGroup,
status: this.status, status: this.status,
@ -592,7 +615,7 @@
* Watch the item change, cache the value it changes * Watch the item change, cache the value it changes
**/ **/
_item (val) { _item (val) {
// this._cacheItem() this._cacheItem()
} }
}, },
created () { created () {
@ -686,7 +709,6 @@
dependence: this.cacheDependence, dependence: this.cacheDependence,
maxRetryTimes: this.maxRetryTimes, maxRetryTimes: this.maxRetryTimes,
retryInterval: this.retryInterval, retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority, taskInstancePriority: this.taskInstancePriority,
workerGroup: this.workerGroup, workerGroup: this.workerGroup,
successBranch: this.successBranch, successBranch: this.successBranch,

Loading…
Cancel
Save