From 8539707f50610c8eb4ae7ef7151e1b7eec5721f6 Mon Sep 17 00:00:00 2001 From: zttProjectSpace Date: Tue, 21 Jan 2025 11:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E5=92=8C=E8=B0=83=E8=AF=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/debugBtn.png | Bin 0 -> 1279 bytes src/assets/images/debugBtnDis.png | Bin 0 -> 1210 bytes .../createapp/components/CustomControl.vue | 4 +- src/views/createapp/components/workFlow.vue | 89 ++++++------------ .../workFlowConfig/CustomSaENode.vue | 5 + .../components/workFlowConfig/useLayout.js | 6 +- .../createapp/components/workFlowDebug.vue | 36 +++++++ src/views/createapp/index.vue | 2 +- .../style.scss => styles/createApp.scss} | 0 .../workFlowArrange.scss} | 49 ++++++++++ src/views/styles/workFlowDebug.scss | 66 +++++++++++++ 11 files changed, 194 insertions(+), 63 deletions(-) create mode 100644 src/assets/images/debugBtn.png create mode 100644 src/assets/images/debugBtnDis.png create mode 100644 src/views/createapp/components/workFlowDebug.vue rename src/views/{createapp/style.scss => styles/createApp.scss} (100%) rename src/views/{createapp/components/workFlowStyle.scss => styles/workFlowArrange.scss} (75%) create mode 100644 src/views/styles/workFlowDebug.scss diff --git a/src/assets/images/debugBtn.png b/src/assets/images/debugBtn.png new file mode 100644 index 0000000000000000000000000000000000000000..cd9e7e5e8578dc8370129bbf7d57f92f9df21e19 GIT binary patch literal 1279 zcmV1uUO@dkoEs+sMMg=uOs(nb4RV6DDihC|nE>tKv z^w2{OoYG%V_yysV1J_DH2riLw%E<@`t=g{Js9INwh)BiCP*#wDA%di2dRWi07z4)a z?u6jyVtdy+e&^kp@03nOU! z9FZ(F2uA%zcm`B-KG)XT{2<=mGSu-|%QfH&D$F_q2;ez_In!EP+j+aY?)A@Sf(H9L z|7mOUQ0i*uZ3K4}2@eG!m@xldTz>Or_b2y&Yl3S)en9|Syx4UA>vZ?`LU2W)*3i&2 zR;~Hv;a8>YN%sKX#AeNf5dZ|E`j_3EA8O|Tgy2f*YUgbr2f#bBF?sURg{C%5X$8Y995@aIl3j5!H`0+B5t#vY(P8>=&ikCvQzR1|?zyrlcF|$Fm}77t8<`1_ z8DQkyVV}`cWc2jDbIGna89j|*S{P;lBX2R-m5oGKBtg(HE$pJ>b@VVYx;y;sqT|Jh zu!+O~8SFAQ4)44qnTR$J1~vuc9jg}2-5^(<2KidsD;yXtcG1DeTO<=lkED|jm;v^Z z<3;mo^Bne!s0SGzAlOl&$%^pJuX;}1*glcIlvZ!Yy?BtfyfzLq_oU4I`2q+y3rJ!9 zl$Pr2A=TGYS9?!#zfpMh0wA&!tO%}NK<9C6#T`QpmK`FeR zAuO*6yD;+JW&wL?1qlD~I9vmS`|@Pw*Arj5QQ88a@a&%;6&)ZH0}Rt*Y<$W~jT@!c zCz=L^X?Y#rC~diIg_H>bH^Bc8qTUzlTvvjo`Sud)#l-imV5ORuDM~`417`jfSZI8VkK3aums~xRUNnuI0wJpK`WmCWePre3=2KN_ zB1bSM-+Cj!S=*dcqb7PxYjF(#!DtM@48VG6dl-#}N|i-`5KQd6-CdWTW5miks32RI zUw))%tg4X~KAOgA-dg-u?vv`*dq-mZ*L!nvZ|$qn_T=w>E&d_|6KbV~fW|{>etCH3 zzukL)x1YHB)>*;mr3+1Mdb+#4yqW6EZk=6ux%t#t+nii4Z4V&;xm7MF%(|)|& pq#uSEIRFGR#K`qu@6Gv7{tu_74x>Zt{j>l8002ovPDHLkV1gjGUQ+-7 literal 0 HcmV?d00001 diff --git a/src/assets/images/debugBtnDis.png b/src/assets/images/debugBtnDis.png new file mode 100644 index 0000000000000000000000000000000000000000..b92a4232f10a32a0e6c0af1c9f9b10ad5b80c595 GIT binary patch literal 1210 zcmV;r1V#IaP)h7+UrV@x+0ON5@}N-Tg9qPU6Xhh_?#T5NeDfElEOzqF@_wz zzwi0~vyO%d9zT0g2T%uaKe<(({LVF`2>^}Fjh)F4H1^HoXD@aD{3S(_I-0Bz)PRZL zTgHvt!(zeQDp>iunx?H`!mMjR9LI47y8g7?dF@8SlRnPkqb6v;c<|=U+*a+|%CCsy z2MR=sWcTI4@o_X9{+YaQHa0hQhygJGWHXt+e_H$c_c%sLnM{Fb8k~cp-nRcf+)HjX zR+8GU18DyI!|Hbceo-Y*0>*9YW@I~_1K@iAuXOTBHnUOy@S7@S(um^+#*N&=zTP>p4bo)R?*C|LQs$z`1ykW6(80UN8%-dCVS6*N};yl*W6 zO9NC3P|eZ+)dEzrG(fcg)nrussO@+F0Dlky0L*-D^fGeNwMaF<4?_5ZkQ%_=2LRK^ zp;EM@8X?U9KL~Ny?a}v@k_9tA3Y3`Q2O$oF9%|LHG!vv5V7sGQuaqoQO4itCrjbLX zWWjd4(aZHvGs;qQNf`u5?UF#JQ7Mg@zaMXigs@!?X8!z^bQ!oA;15C?Xj(r9&WxA`GClx&TM0J3V^8y;g z=awk~Ve0^50sv&QEBGpVxu5zN4G~2rv@B6bSqS}D`)02H+i!O{EBTa#-wiIj0bIHO znf64%ZlVah7DHSNU>89m5Lq@C18UWBs>rmOW3e4?rbI~ELW&H`+{P$Xgvh(~|AZ)e;CGklDO0Pxw%=!+0yfbDqLZ+B@e zM$yTox&hfk03##z+g)KZ0e1t~eLK5}AvwWW%K(5|mO;mW!*1`wS!EvhB}7uPz9e|E zPS|gE&)wOvWsI3eatuisJhR4JGeSW6)-^3z!VYfa-q`a2rVNroXA>j5;AQ|3Ijv?U zlO=2*YzBB*?V3goHKR&a9ll5yX&vMV5dhj6W_>hva(k1Ez6h7ecaF z8lYN$YL*757NDA?0jdS4hBY8orb0e6R%$>T#~n3VNnZMBHg(|gzX=xpB`Ja_y4UhpB@#@Rve@uRbZg+4sZk{AJe8D_MSzfS
- {{ `${zommChangeValue * 100}%` }} + {{ `${Number((zommChangeValue * 100).toFixed(0))}%` }}
@@ -47,7 +47,7 @@ const props = withDefaults(defineProps(), {}); const zommChangeValue = ref(1); const dropDownVisible = ref(false); const handleSacl = zoomValue => { - zommChangeValue.value = zoomValue; + zommChangeValue.value = Number(zoomValue.toFixed(0)); props.handleChangeZoom(zoomValue); }; const handleVisibleChange = visible => { diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue index 24290547..82c27493 100644 --- a/src/views/createapp/components/workFlow.vue +++ b/src/views/createapp/components/workFlow.vue @@ -1,6 +1,6 @@ - diff --git a/src/views/createapp/components/workFlowConfig/CustomSaENode.vue b/src/views/createapp/components/workFlowConfig/CustomSaENode.vue index 8195ea14..dde63133 100644 --- a/src/views/createapp/components/workFlowConfig/CustomSaENode.vue +++ b/src/views/createapp/components/workFlowConfig/CustomSaENode.vue @@ -57,6 +57,7 @@ watch( .vue-flow__node { min-width: unset !important; padding: 0; + margin-top: -4px; .nodeSaEBorderBox { div { text-align: center; @@ -84,6 +85,10 @@ watch( } } +.vue-flow__node:has(.default){ + margin-top: 0px; +} + .nodeSaEBorder { width: 56px; height: 56px; diff --git a/src/views/createapp/components/workFlowConfig/useLayout.js b/src/views/createapp/components/workFlowConfig/useLayout.js index 1dd933ac..9827bf73 100644 --- a/src/views/createapp/components/workFlowConfig/useLayout.js +++ b/src/views/createapp/components/workFlowConfig/useLayout.js @@ -48,7 +48,11 @@ export function useLayout() { // set nodes with updated positions return nodes.map(node => { const nodeWithPosition = dagreGraph.node(node.id); - + console.log(nodeWithPosition,'nodeWithPosition',node); + let position = { x: nodeWithPosition.x, y: nodeWithPosition.y } + if(['1','2'].includes(node.id)){ + + } return { ...node, targetPosition: isHorizontal ? Position.Left : Position.Top, diff --git a/src/views/createapp/components/workFlowDebug.vue b/src/views/createapp/components/workFlowDebug.vue new file mode 100644 index 00000000..086b8379 --- /dev/null +++ b/src/views/createapp/components/workFlowDebug.vue @@ -0,0 +1,36 @@ + + diff --git a/src/views/createapp/index.vue b/src/views/createapp/index.vue index 081d7a05..8d420795 100644 --- a/src/views/createapp/index.vue +++ b/src/views/createapp/index.vue @@ -1,5 +1,5 @@