Browse Source

bug1

pull/1/MERGE
gongzijian 6 years ago
parent
commit
66a26d2ef2
  1. 21
      escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  2. 5
      escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

21
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -353,6 +353,9 @@
},
fromThis: this
})
// set run flag
this._setRunFlag()
},
/**
* Sub-workflow selected node echo name
@ -360,6 +363,16 @@
_onSetProcessName (name) {
this.name = name
},
/**
* set run flag
*/
_setRunFlag(){
let dom = $(`#${this.id}`).find('.ban-p')
dom.html('')
if (this.runFlag === 'FORBIDDEN') {
dom.append(rtBantpl())
}
},
/**
* Submit verification
*/
@ -384,13 +397,7 @@
}
},
watch: {
runFlag(val){
let dom = $(`#${this.id}`).find('.ban-p')
dom.html('')
if (val === 'FORBIDDEN') {
dom.append(rtBantpl())
}
}
},
created () {
// Unbind copy and paste events

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

@ -192,18 +192,21 @@
receivers: this.receivers.join(',') || '',
receiversCc: this.receiversCc.join(',') || ''
}
let msg = ''
// edit
if (this.item.crontab) {
api = 'dag/updateSchedule'
searchParams.id = this.item.id
msg = '编辑成功!不要忘记上线'
} else {
api = 'dag/createSchedule'
searchParams.processDefinitionId = this.item.id
msg = '创建成功'
}
this.store.dispatch(api, searchParams).then(res => {
this.$message.success(res.msg)
this.$message.success(msg)
this.$emit('onUpdate')
}).catch(e => {
this.$message.error(e.msg || '')

Loading…
Cancel
Save