From e7c99e91c207b73d2485f575ce7be768115feb0a Mon Sep 17 00:00:00 2001 From: charlesxie Date: Fri, 11 Feb 2022 17:28:16 +0800 Subject: [PATCH] wanshang --- .../__pycache__/serializers.cpython-36.pyc | Bin 7858 -> 7922 bytes applications/flow/constants.py | 7 +++ applications/flow/filters.py | 5 ++ applications/flow/models.py | 4 +- applications/flow/views.py | 2 + .../components/graph/behavior/drag-node.js | 4 -- .../views/job_flow_mgmt/single_job_flow.vue | 5 -- .../single_job_flow/headerPanel.vue | 3 +- .../single_job_flow/taskMake.vue | 53 +++++++++++++++--- 9 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 applications/flow/filters.py diff --git a/applications/flow/__pycache__/serializers.cpython-36.pyc b/applications/flow/__pycache__/serializers.cpython-36.pyc index 9c93a8158e2db08c4f018c231ddf6cc2eb1e135e..33d613a98b3530c4ed570d6a0f264c56286a8640 100644 GIT binary patch delta 1686 zcma)+OK6-`6vw|i^Ue3nW9FNg%uF)RyuX-O(;&4IV@y(86KP`AJ|s@kBzLTtChg>A zS`@z|+U$ft;eac(P!L=QL4yl-^|2B`5En9rqToWaQN*1DJm(rhn4-uqznnSu-1EQu z@45MS=#L?5puXPv{cVI!i z)$RF97EkfurtdZ@ALl`y-f}h>Q&!%)s8r07RvXLuI&)db7!!~&NX^Fdh~va9;S z^=p;lwTkP&w)T2JoIow;(cfl|!Do6OI|aY#BYq!CLccM{_F&l%tOP$A&z#sp(MEZO z`)jJF@`i-6W_kuj{)B?D<*B70Z=^$&_ju5=W<#FIL-4E_J?|VG75`%1@l31?ALKe^ zE-Z5q9^Ld|MMU;$;xYLvihbe<1@lc9C1e!yO!(aF+(7xXOe7bnAjLDtw5OM_jdbKo zbi^vzr3^Y^a*I1C9N}3W=Lz1-TX+(EO!FLXz0%0rc>9*0DHj#4oKv1tE-Bbknay(L zdByFR6fJ0#ND@+r1xC<aEG(wyie?$Vfps;SzcX4-t9^eT0V*zxpY9gph}V-I_m1 z;UM90#NwaW!u3_Pmlummd{qo#&drG@Xgy3ACdeL7!l!mC8-ZOr;f_+4#zx*}t+-sf1%IYL+*LCR* zv+xsvAL@ShcZhmuY|Mkvu#tR$s?QTH5OhQ}uzZ~tm&94P6N&X!)w9LQ+*Qo4stALr zOw3>~>8he;^9*i?ho*6{MCCqNE~Zgyr}ZVdMXTLnVpKB7g5hqz=F?y<5rL`j*0d~>QXRD6 zMM5WmCUw%){^|2?1-M@0FkR0PyK?X1?^?Tzqnn@->0$C-qL;DuCe>>QgBiM!5tq@k ziJhkCK4T{#5^H6Hfar3CK7ZO|F=btBb;nW5QRlF*Xbh@xCmL zcU8qnof8&@585>yUq`#D@hs~66>n$nLpJdXn*y`B<i|=?<*n!gugm%NMK)L&>+I zHT!JpTY%kU?if9i`}nOrTHxsYQ2Cn#c}IZ_48PwQPnpc7XC!FG@sbMZ3A^BE_~~_y GJL=z_XQXqHZ7v+eFxaIkvzyV1?~;vy}lJx);5O zjwg)-<1aBL%QlU#J~%NZz8UqwnD}B0G1X+RnrLPgUp4-IXU1WT#x&>C-#zE|?|#p( zz1#mmzqLOSu?D_V&wsl2mi1oHN-K(T7}x3~d=gw?-$0L=v)}RqC1XQ5qRhPp7u2gs zp4p6UFs3|rV_GSjC9P!pI?wVZh=g3$yqyc3W-JIVY5f5&3SVe1z=-}Pdkk*t-RuxV zj3HJ7CyYL}1Dl3mQ*W5Z)_441sa96_a!vJBUgIijrf;AXbQQEM-{iHf;#>I;T9&jl z-z?SfIv(8!to+WScovmA4(+_oR`4759Jv?c^&0_viuo$W#Cd~!s>fUj%9YH=(M-y; z4QRR2O86@LWOmFKscxEQkr`hvVIKMNpX1A0CA*Zxm&cy46Nkrm6Ho9YcX=aE@ifoy zX1?cAEpOqin?a^bD_l9DOe&`p%&Fv?xN=hQ+Q7FiqA)i@9bnpLdpwk1bP^ch0YVp{ zoA4lEAK@XwK?Fo~cThY^j|T|7gg!*^SIpoAD%!#DJc8k# zEgC3`Ly$c@N!BnSM|g@b0w0BYH0o}341NyhLKd@_1F6U_!8Q?r zIF)E&y(AfIC0Y|CkY|Y={JJ-t^JIC@<76~>CUpar9Ag78k?d}!QLm^twhO`{*FnN= z!LB7=M8O)}W~|cZwy}3%-u;1%!)Rmbkt(tN(&?WvRE^L8$?z4f|CE7R2@z@87mGCHz!li;3rhfx5N;4Z;!-KEk { 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 => { //重复连线 diff --git a/web/src/views/job_flow_mgmt/single_job_flow.vue b/web/src/views/job_flow_mgmt/single_job_flow.vue index 715e238..64a19c7 100644 --- a/web/src/views/job_flow_mgmt/single_job_flow.vue +++ b/web/src/views/job_flow_mgmt/single_job_flow.vue @@ -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 => { // 重复连线 diff --git a/web/src/views/job_flow_mgmt/single_job_flow/headerPanel.vue b/web/src/views/job_flow_mgmt/single_job_flow/headerPanel.vue index 9c74722..1de493e 100644 --- a/web/src/views/job_flow_mgmt/single_job_flow/headerPanel.vue +++ b/web/src/views/job_flow_mgmt/single_job_flow/headerPanel.vue @@ -306,7 +306,8 @@ } }) // 删除作业流节点及连线，避免干扰 - const flag = this.deleteFlowNode(paramData) + // const flag = this.deleteFlowNode(paramData) + const flag = true if (!flag) { this.validatorFlag = false return false diff --git a/web/src/views/job_flow_mgmt/single_job_flow/taskMake.vue b/web/src/views/job_flow_mgmt/single_job_flow/taskMake.vue index 7d44522..6c21e4b 100644 --- a/web/src/views/job_flow_mgmt/single_job_flow/taskMake.vue +++ b/web/src/views/job_flow_mgmt/single_job_flow/taskMake.vue @@ -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变化