nas/music-tag-web
1
0
Fork 0
mirror of https://github.com/xhongc/music-tag-web.git synced 2026-03-20 04:05:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

wanshang

Browse Source
This commit is contained in:
charlesxie
2022-02-11 17:28:16 +08:00
parent c2fe6a5537
commit e7c99e91c2
9 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/graph/behavior/drag-node.js
View File

@@ -112,10 +112,6 @@ export default G6 => {
if (targetNode._cfg.model.nodeType === 0 && sourceNode._cfg.model.nodeType !== 3) {
return this.graph.emit('before-edge-add', false, {msg: '禁止从开始节点结束！'})
}
//从作业流节点结束
if (targetNode._cfg.model.nodeType === 3) {
return this.graph.emit('before-edge-add', false, {msg: '禁止从作业流节点结束！'})
}
let msg = ''
this.graph.getEdges().forEach(line => {
//重复连线

5
web/src/views/job_flow_mgmt/single_job_flow.vue
View File

@@ -671,11 +671,6 @@
this.graph.emit('before-edge-add', false, {msg: '禁止从开始节点结束！'})
return false
}
// 从作业流节点结束
if (targetNode._cfg.model.nodeType === 3) {
this.graph.emit('before-edge-add', false, {msg: '禁止从作业流节点结束！'})
return false
}
let msg = ''
this.graph.getEdges().forEach(line => {
// 重复连线

3
web/src/views/job_flow_mgmt/single_job_flow/headerPanel.vue
View File

@@ -306,7 +306,8 @@
}
})
// 删除作业流节点及连线，避免干扰
const flag = this.deleteFlowNode(paramData)
// const flag = this.deleteFlowNode(paramData)
const flag = true
if (!flag) {
this.validatorFlag = false
return false

53
web/src/views/job_flow_mgmt/single_job_flow/taskMake.vue
View File

@@ -131,7 +131,7 @@
getJobFlowList(str) {
this.jobListLoading = true
const params = {
category: this.form.system_id
page_size: 20
}
if (str === 'search') {
params.name = this.form.name
@@ -156,7 +156,8 @@
getNodeTemplateList(str) {
this.jobListLoading = true
const params = {
category: this.form.system_id
template_type: this.form.makeType,
page_size: 999
}
if (str === 'search') {
params.name = this.form.name
@@ -274,12 +275,50 @@
},
// 处理查询
handleSearch() {
if (!this.form.makeType) {
// 当前作业为未编排,查询获取作业列表
this.getJobList('search')
} else {
// 当前作业为已编排,查询获取作业流列表
if (this.form.makeType === 0) {
this.getNodeTemplateList('search')
} else if (this.form.makeType === 1) {
// 编排类型切换成已编排时，记录此时的跑批id
this.midRunId = this.form.system_id
// 编排类型切换为已编排时，当前跑批系统id不为空，默认获取作业流列表
this.getJobFlowList('search')
} else if (this.form.makeType === 2) {
this.getNodeTemplateList('search')
} else if (this.form.makeType === 3) {
this.jobList = [
{
'id': 45,
'creator': 'product',
'name': '条件网关',
'type': 4,
'nodeType': 4,
'icon': 'e6d9'
},
{
'id': 46,
'creator': 'product',
'name': '并行网关',
'type': 4,
'nodeType': 4,
'icon': 'e6d9'
},
{
'id': 47,
'creator': 'product',
'name': '汇聚网关',
'type': 4,
'nodeType': 4,
'icon': 'e6d9'
},
{
'id': 48,
'creator': 'product',
'name': '条件并行网关',
'type': 4,
'nodeType': 4,
'icon': 'e6d9'
}
]
}
},
// 处理跑批系统id变化