From 7e4770bc14b40bd4590f7eb539e39d7a65f887f2 Mon Sep 17 00:00:00 2001
From: qinoy <qinoy8521@163.com>
Date: Tue, 30 May 2023 17:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E5=B1=95=E5=BC=80=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...oft.apps.coe.method.process.subprocess.jar | Bin 45778 -> 47882 bytes
 .../graph/GraphNodeExpandHandle.java          |  98 +++++++++++++++++-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar b/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar
index 1995ed13ad6506fc9bf2aae25c8c81c22e6a1578..5d564a2be4667c62beb0d105673a6d7b0b515acb 100644
GIT binary patch
delta 9988
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
O_F6QU#EQS)_J05gOBx6O

delta 7773
zcmYjWWmJ?=*QKPpyFt3U8)+m(U{tz0hZsUS1crv8ySt@JK)SmI80nHw;S=Al?vJz2
z-Z$1gYdve-XPq7W6JZvLfT^v9h=dLYhYAPRAD4*9i10V^vA@I*JTEa(;3bZT|BYZI
zc=;Dlf!BP240zqY(0B$fi1C6<Sd$blc*}BwjF27&KIXOt=^ASh$Pzw<6StTe_EwaY
zp+>K!j&)xk)7f?%>qH7NhL^(5rZqRtgc@~2o`;Oh{FfqB3!<cZX)Glgp#=$}YK<BE
zhZE3WKmDyIYqz#Q2=Dp};v^0n)(5L4+|q>)T6n!V)|+|5MKKgHn2_0{5ibSakTQQ2
z+S+l_8lS!eSrnv^U3sp=ww<x|@qirsEO8?w>^eNFE#^%C#q4|Ha<=uIc&~NFMa)JW
z93?-d<93=-zgo!qIt;tu8pu2xp-TI8poi~lpXS{ebv)94in<Yv*jj1!fiWuUh8)F7
z_tI&+dWJ^&H%WZth=B#;Et~w;H?i`sxE=W{&gYP!pq+1T=7ErKZEjzNqLdJlUlQy4
zs+m3@-b&*n#tqVbXWSk8d_W`%ZuD&SysMy!LWB*nIHuYVxR?biU4CU7>&)p|p%pCR
zmb<WIuU~vmp}Q`_wu2L`ClV#2#h{MH@?~Xi<^;H|+wH@s@i_NI17BHGA|EeWabPDe
zs3GhX2!&|f{o`J2sH?h2`k-id#`87Ld^kG`%s2TSSf~M<j^WG<k*3+jp!dy`Tf!Er
z*5;r(7o5;>KPdO+C*>^&>dUu5vbIf-D%Zj<=BL}1SivAfi{=;jz;+&-!oI~bt6b7G
zt=wV)GrzG1?$EEW#v+_>Hk?pV{>+(w3S#}Kowz8w&x#a~7Cg_N%yElZp5GM$3s7~=
zoqY<fH}tDpWcz?^<dE4XMK>b#9Oghnzt$FQ{~289zQhZr-+JRb^#rf2hJvc#R~{ja
z00;LKsnJ8sSK{U4I`^^!*?SW#5p5XOlHr8*(F+~yY=4yBM=_v{^6eDa4w7j>V=f6U
zvSf@q<!w+(REmcPz}T^TXBY!|vPx8742~)k>Kj!HDGSY4#h|>(50B+NAt?eIckvwK
z4J=hPfzuH8srBpS!|VXbr?sBv-z0E2+nK?BJ5_xGT((Dcy_yyvC?7*wHu6#s@`wzz
z))@b*cEY7zc@?fk@|@Yr$Y7-j80j1@_fRP`-x^cwJ|x^4tLY62r;p|c3G`Y`tb0AE
zcDvH;x+}PL=M@&g>_I~~iKof@Clz6C*c*EvqXBjVECVax@)i1Iw#-F;*yo^BcYZH=
zUBY*{*)3MpKHuCy4VOi_H`rJA>HHauT{?ZlM^(N7qg&S1>lXg8)b3yu6dN-O$U0Le
ztrqHf&lvOR<Y09bxIxFjzn={_rzlJ!Eh;3&mzmizm*a*fy1!59ER)Azkfn3lZEr&B
zk&KG8$OOrj)X7v?32QW9Q_~QDl~kX!>AUQAS7G|<V)ucte`OR&j(jKDK;w3TUJv=K
zHt+Gb2t%!QA40NPVupO`li%aN#xMwElj^sTclTvaBQvRBa(6N!vzO{2Joo1e@9_LZ
z^Mf(p-hi1uIm05|g(ES6{O#@+N1{fAgQC;8<;i`$F;3j8@OK6Fo-ttqLWikZr}x}2
zX15$kTM|7Gcro7B;BmGt#ZW}Biw)P9YTICOHCew(^><h9$@Y~?xVfpF1Xk21Te-q|
zF*vUpolP^orCI$3I}w^HbD!6HE9q>aE9&|+ed*)_Q6b_CE>n&Hs7MlNifM-g?Xem-
znTM&xky<oZhNLW0>y<I|CAP-uXiYV8_u95*A<a;bB;B+^-kw)q<Dq7!qOxXN)vV*S
zS>KoXiy>Ba?qB`oQ;i35!^MCJj3ckboO*Za1z`8CSlLM|Z>!#$H5_rbBVn2}JtM0z
zw5JBIT=mt#0Fm#myqBI`R`lUq1RF=ZGZEC2M{e@S7_aOBUWx<9%$vQ!>iz^<e3y>?
z5evMaOH==;!MjVuV8>QjtKEouJoZBi_1~n@yqCINwr0}U2`#tBHoMk7F~p~*I*+0=
z6y%#im)L=ycG&{UcMO>W<F?X$NP3{(jgE%~&oBIfb)QGXtrQ7qNM2h&e<#t6M}M{^
z;h5rd;ftA^Ya!RgudpSe6Af%MXtDUBSw~F-La)u^i1VF86&OisR-sJZUx29Ar4m)W
zS1nL~!1J5bjhbdo*3IfPGp!7Gv@ku(V?4Ig@!o)6AU_(Bt`X558DS&R^<*Tol>C8U
zMa1Ax3^7-1sp42h=R?2Qd^<RH`9n058z@u@&NHTewAvbW-7AHr$ndXa<_Dj(t8E*A
z7V8l#<*DQm^n}%f3=v&e<u|Ql7d5&y=1(;lwy53Jy6#7y`|JJRd7G}+pnyQ?S9l5P
zrGyC<DC~v%roV6XPxp9Owjwr?@3h^+Qe~yYJDg=a?l|aaw`*zWNZaDIy{9}scly;b
zT;-s<OD_?BhM)P8upDDhkK<@2-4cTc`mKaWpmTOX`v}kU0DGgtjNc1@(rE{_R$g&w
zLUQ+|e)#yhq_8rNvyyL|Gc;LFElwZ#{Yah|Ob8sr6Nv1qI8tKj2o4n~q9+wmXO;1V
z%ViDi>9dZUdcw(*^g?`eamkC5?MHt$wz)%WxeeP?Fn3<dovuS=2y&l78CuW+J<s^X
zrP8GgSt+CsxgPBz2}L7`4XWI{4V1yGtm^Qc+y;Io8~y#r{&1UiJr@P4)1hiC@QutY
zoUc;6Ah-yZU>0*~xDU(-_c{4Q$(;s65S;aGGGWeWChmyVzSvORqi-PGb<i&_NYN`u
z(NP>PP6{4Ct&;9vBYT~|f)XtcDl`8?cJ#iOsQY{*#d%Iz`zNOhe(4xftq}GS`G+d=
z6L}3CVUs15qD7U1R86HaiXj+ZEC{cM`Is5PVHPKo6zYurG$gL_sk%49hVm?~#<=$}
zanpu?21SnV*mULyL5O3w2JVq4RwJKHqo`AKozh6=dO_>CZ6f{j<n<sEh>s~olQ$HQ
zIPhu5OmE*+QzGiRAa9nMHd6DwL<oP=2~;8WEqXm&mTRg88bMIJGOOaWQh4mOqm1Ad
z3Y&2Ya_|>uRd(mM0fgLY+9z?-F;|*rI8MsDxNqA#)%ttg-q0IoSmK|JvC9uK_8xNx
zLcc<vr*e*no6%gZm!v=1gQgHxiCymamLWE@%SN+1th1l6#fKz*UW(G@^x=Az4mSGe
zNf_o2GoSRDN0TEfKSgFrS{a2GH98-nX|uRc;OZ#&nE1ykxe`Ex^(%9G5B(G53{4Pq
zh*);M)NyLdpVFamt+zz}gj@6f@`H1&%@ln{W5;F$LF`VM<s>0w6SUUydYN2wK)Fm`
zx^V2Gd$$Lt%~*+$`y-?+wsR<EnG>*EIyElB29VY1isp3<qw0>0*%f^Ch$(w|VEM;)
zVGXfpS5fs7!a6Dj>rbI?&unwa9s>1IYIjN%a*Kp~P1`*d**FvgmJOMx{vpg*Ywt)!
zPr!C3rB8@2Z?bkZaioYN3LKmq4jkOeFC-xxDk>`6-=}#a&<gY(<D(ulMd~$whIqz0
zBM<Uu&=>_+y}yjs43|(Y$Ogd7f~@#e#c8zH!YVyOrXU6VUa8uky12!l)zo$4eY2_$
zT8F8(Y4xH(Yx8M~@ml6l%g_3amQJr`nD>+4VTMd%3FF=K^DpU1(4;r@^MkVwR4XDL
ze@3o*MBel!NeT3PkS_r&4-$h}vH}u!DX4)d0Pv!)Bnu#I*I38jxKMcgrX=DC(yjYu
ztGE>%=64f-^C##@zL3W5hC%pGX@q7zjo+x6Ge&SOYI!d3$oeL}DO^H8{Tz7Y2Gmk|
z9@mggdn9oJZfW$~OxGSQIX%Y3KDTBCvfn<p!MtlQK;Iq@OSU>;PQrisG;+P>zB+YG
zX>gBLJ>O10&!9Lx7G^zdY0v<V7#_j6)H9^nxQBi=yq!hUU4tgHoH)d8bfjifRj!GI
zLkUT0Md`Fd3ank!9Z6b=2IWo6wh}Ayw-SoceEB=<`{feV30ly(A`#O)m{ZQqK?a}5
zxICu>XiekG_&6ob6x5b{YVIBrr+H2dE^%D22Dd+D8tGSYSyKB#!=67Y0(oxvrI9*t
zB35a)Pk~WLd+Svnxe%FgoXjYyGiDQ$S>MGllluFvk;qIw6H0!0C3;e{TJ&(eh>=KS
zinzM^nONRtArB=WqEe}Pq;dxVJOg<giWq|xh}Q1&Jb061+HyFQV!(=Hx-u2Tj^RMH
z)81F@s|G=qpSWL0eogATqPf@+!_1Aox^Dt=tE_}4JYumjt$11v(aQb7F{_zbnc_kj
z5HyZ#i}21xr62w6_G){O#IhCK6D;Or7DswYFh3z|eL~L`emV^`yw|s_k(-!*ASwtG
zG>llyyvoavZPUx%;sT+;L?IYYpJbtlTRX~$9<S4IEW+qa5eP~v>E6WVZ&^G-%?R-?
znnN|U8VtE|@)jeI>=V(w<_$g-B#=z3k(tNm#XUcMBP2W=YoqnCIay=5p+?&7bLZkV
zTE@1&+k`-e-H6QMTP_pLF{FSnJYfo15dEN@w;OrtP%vQzljx1UwLDMG$IOJ_?wgNx
zZ)f)%h-;)+iIWr@07<DO9$T61vRv-OT-vle<BQWW0_DY=q9(b|!d9*sy|bx2V#31Y
zZ-+vMt<~!GVHcwvPn!G{Emmy0b}bGf$}_L1R03?ef?zia7QPZrKSSQFr9bh~fe2EF
zMXa&4XPdc}Q;t6Erogd#JH(N#FC!9leot7z@Y>y7CALm=T>Z5_5L8IIA1Hx%K?tp}
zt5a0c+s;G@1SWHqI#T?O-3c@M{>rp3y}YR}IZcFJe60EuFE({_bcLMTBJ&eoO=F?*
zSZHcQ=XO&T({xI@-3Zh)iyX@V5u{0>wJJY{P&68xv0H7$@#$x4WC}|+m7xi|-fhBe
z9#Ou=y$xA}DFq*k*&ZzQ#t8W}crJTinW2w|@Y{?7t#0sAF|$k<e>_!j+KAaO+<}<7
zEA5CCK_-{F{o_?tt5@9Aj1Qjf1Fs$;80R*_G*w1}t=Ed<L)vXixb1so8ju5jjA}Sr
z);RmHQAQ3=$8l#B?qR*2%~$nrqJ=+nx_Pbj)X6MY@sWvRsetkBJYyBQ=2p%Y_CoRB
z^OJqGq8Rux%pus8N`^vCWSD8sL)Akh*CD3lxfoQjeR7%U+!i-p9%Sxr0sfOlBV^(P
z+bxQZW{?t#*Xp_>62A{HK7zy?>E4+<MCIIyDY8_6RW`&Ni=5&}j{T{ZjtGl1#BS$;
zG+R~cjmrQxm(?hpBLvIr(~C==<N@rak=JbT07tEPpQy>hYn?$qNZREq@(*R#Zh(B(
z>i9C_k)|DI;0@3B@A=NmT3NkUo{r^(5w<fIhcq<Zr$^J(T3A%=-k_rv@vY8)!%lG=
z>@BZ>i-FdzyZ!IyfoH?{ug|DATlY3byl_AVsovN)-PgYv2E=m+hfZdEiE0<iQEaZs
zYnJZmA>0SZ5Q=uRh?MzCPp1Q7h!BBK#l(vJefWSp4mA~Uw^3f4W<Y7+izMI8^cmwH
zfYDC#Wp?f&yjVm|HwbjpPO;f(zBC;=74m(@ntJXYA7b2&mGO?yI(^c<{S}@|R<^s?
zhcO--PW0R$ar(2{W##pZ_6F&W0eT2)^Q*}3M74Y4f=)}mk{^OcJFsvj-!3)FDnJ9{
zYLkPp#KOYv(Aup@It&!(qeQ9%SIg8n0K2=D%+oSa!-mKHSfH4%?h%uaib}N(S~X#g
zRAKaF$q?U!Ph-lYEl-|Zvu}Zb(%PuE=Y_Hm`B|W*!42R1nm{+omkW{^*8+zb(P5tJ
z&yxXNM6MrDNdJi82irF?w#w1cqOb6dlL-Oo<~)C+L23_A#Xw1|W&GxkA0k!NON$DF
z#8MgKfA}LhTZ1}$C~*)HT_ce2Kep*co0^o)6^0y>*y89!x_-ZGoK{tRpB?ayXCYo*
zEEh@pG#L-R3-<j7fz<>YUQx!#6l#M_UkAfl6=tVp7kBC#G@;BWAd#ndec$RH<s)ba
zdRrSa3{kTFBI+ejlS0Q>fGa1^ZuZfa9uJK1kV()H6%R^${iWNt9rvwzA&Ir8??KrD
z`?2<?)ns!_x^t!3>1H-k0=2Ac#X_T%NV-<e^CN%*Rn$V*F0KpU;Rv(Qtg6VJKEdYu
zgUH+W0N%yJSe0}!12^|g(&+^nf^vt<Mt8yuywf;iIn!u*vg)RfT{Xg)q$0!mmXh&)
z7bW-g;8W18`K3oviP#Tf0I8svD?b_KBw0)`!Tn^zu0{IWX_gpb|Acv2Cu6D#VS><w
z*FRmMNbiU|_!&U;c~mg@$o7feSG%NkeP74%P6uv=My&UJ4l?j!tFb;|8e2{sIIVbE
z9?;u|EPHg+N@ertFK3znaz&TUKJ4yLJTO1hdGmwP<8I-b9ie-_XO8Z3rdLU@DTvo}
z$3}jn?Mu__2&Li*Ie+3C$?7w&+gty9%u+KM6<H<)i&ngJP-cJYoimXmIC5~l*Jh+B
zscYl^267}kZ06bXy=_+2rHkV*w7-j>t+w15+Ywqee5=GEq4@^ntO^h(3G9MP{{4A-
z)d3sSl;JWJWu%PRF}T+#mcHJn$Cea8&!kKEu)bkFm^JbA`H{2(prdx16p&dY(FwQA
z9A~$gjvwo4(l)^vpv00x;F45luC)=b=Vh?pONAJr?t4ZD`NcKb@z}pu>X7C+w0Lg-
zao!X61irm`1f{b7sJbcXyI35x;-AjrT4)1Fk#1=7PvDNoJ3ngdX$60jXKZNaMnC&8
zP&c)j0FNaXX~-W|2QwnU8|UA1uL>Ix-mVI}^1R(gR#vW@v1eEMvPhn<O%ZDzHSE2Y
z>L+(a3z2-1$W(#M7e9?Azox;N9s{4FRGifx(>m%1)-+U{H6Pbie7%Cgd!q5y4D*7L
zUAs=1Q34|?*zX7osY|+k{@Gtvo>YC78mp~ZRjwIBEIMTn9>%!vxgeCP9%a^^EJR3d
z997|$@exXyrM$}bMouZz4{k`R7}W|$7aUlPY?&3hy=$;zLaj`VOp3@2B$q)OZbK5d
z<|VH1Cytd+<8q#XXLGusDZ(!a6@UkktjT8HBluEO0tyNSJXAYdJ)|{&-3@jL%;$xy
z?{-s*u?cmN%d5&C;U0b#J(h|f+uFs=9a0wAYNU{gd(uFd-9%GNuFG+uD|+e}aDU`7
z)eg0Th-ccH(if+F=hX$9f>UK!)!^^=n6~6DI)hC-I89O5w%1de(rXH|{`MUcJeW<@
z*I?iT7p&=acs_9(6ssfBMypc=dlDeC&ZaWq^pR4W(_;d$jR*fmLHfW~<Z)+>{?Dty
z#4}{9zI2A6(rDjc==jo~_3$-G(5O`VzoBo4u@&eqI|^zbYF(EBRQOitZLdEl=)#0X
zEnE+npAt%JJ^YB}J9UA6WT>FzkNckInCBCS0+sOUkOPS18+Y=`E_W1LK*}9va<N{w
z@1COm=GaNjwZg*O*N;A$aR+k>=d&Ka)>Wb^6zFr;j5+_j>P9&CuacY!Rgxj^*zzlB
z{!!%_Xs=UWyDZ)_;T|-Zs@a7!c5^cx67Avl$tds<N_hzXp3%`Y%zX~j+uT1I#RZRB
zeNo=5y<f}|<JlClTAsLAc!%DBFU=fFhgs}YXrE_*800yP$dk@J@FlnZ2(RqflJrS<
zrw0M3m$7~<bmRn7d8qy!c8|IdY(VYxsN4ZQL!ddFwT9{1K+TuLVNS7j%YLsnLQ^T4
zgl9@;*x+7;o()Oh*Z@G9clpJkU&K0S3Wro7x>3r#RV6dl0zkMP><E2xj_QxYfqo7#
zersM6X9G=bUuQw6n=-%3OYj0)6+Ed5uJyGDray#i7MG=2WtO%<%6t=2v1VWK(L4F<
zh*dI8vI-R{rIpIZL6eL>ngndyP-Mfz+Mu_nd~0|zUcF@A{jnf#S$<*o;4ED(G)-N)
z(k!V`IZd>iTiO8XWNU;t?mTEOu!qmxTJ<b~=SgwYQE|+0`cUp`h0ck+balex`X9ZR
z$ToZ}2yGpD+yX0sQ$@&;y<K)hdH2TQXDC1qd_F!hI&|y??Z5&01u+Np=v?d#Y?jUp
zY@eO?E~Mc`K7puZ58hsM7=CM>*kxo|Vl(EVN$^RhhPRZae1Fm(++3V@#pKe1>E}<D
ze8v03LTT_V#k=CPt_ROGc|_noMR(yBXPO%ujsX|!s;{0LTZaMMb|`CSw(TzS{<}K2
zHipCk)cv)oZhP*?;pHTE8p5C$_z4<JB33+cbOQ(xtOkY73%#+w(-sGCQ5B8bp$CM8
zHq|KI!F~pkyutXjK==?1$Q$QGNkeHG6X*YJLVc4W3WoS8$Ll?!=QVz1V4tJjK=Px1
zWb4{j`P^R`w99|dY#sbV3h7bSXEKo17f#3vHJut6W$M!~UKdr^os^bz=>EW)h)rd{
zjs0U<vM`7y#PLi&=O-pa<;#pTZSq-gt`xR37ZQ|v+AujS+B&)iShrVrgCqbW4p?4I
zc}{lgiAExTjci|W*-R-r2QPKz&57Pr%r>g|x?_kc*QJbKS*@ky(v$bCd`RDjVi<Ds
zh|4i>m&)tFbI8u+)mS-NN=ohDs^f$XB?k)^Ie?J+Ot+O4428fSpr*9V22fKL&tPdw
zVeQiDk<;0RQ>D9K9`&j8q_S^UQBC}mHwXR1;zQpJA>zC>3LhJ9QirH1cS|x@!oB)N
zmeNgM{O8p6bo^5JhTJ8PD(8yx{(EcUXcs&VkRamO8+WHC2JV5_40f0I<s9*lhL-#Z
zHxP8gU~}*2@=S2_RH}Nsk>|#=+j-QC+IXA-h>>L|x~aebvVNu3$s7oPyV$Cw|1GdQ
zYN-D?7mGVkN6|+*0f@|rwZ4v6*@Z#O&;d|=VA!1{OEgYK)~J|}ZTdy0pO?*Qx6n|+
zI&>ClYaHzuPG@^`EUkVz`n)K->}f8Rqz@{+iP&~LcFt&W_yaZkb*29~=*h(PPm11y
z2?{J);(cpc-mZVAq}vUT>B^b1!aD6u&e*rkK<sc(@W*?p_|gybJkQZ~JMXGpqAHJC
zMfgAwh-Y_jzj4rS1h>Bu$6pXZk<}8M(dY5+f9Xcp5^`~nEhAC3piGY;LMs!LRD(b#
z0}Qfr<!-#+0;(P&bgmPL*+-{v?=tN>N8^6n!Bbog5%1C@{QAO{7{CP+e0QQfQKjmq
zF-AsS>A><wUxhL2_t-L|cP3+a#?&Z|!1{cY!nRY=wETo&c_z1a8TGp|^Vj4IgSyZk
z%jJ3HpS7<)eL#pKXe?p1p(L}8K#6DuS%!7aZ}eW`rM%bCkD-m_Nh7pCeDek%!p|R;
zin{%i=6HfD^=n%~^t)0rljKB`Np+^QVlTIh*C3XLR^azxhqvgBO8cI0g=kcxL^Tx^
zKiRzvoDI*5lgLXqev0OT$eYG&#0t1~E-P0PyK7uneSPpX_P^;3r;q5`Qfn2WgXXOZ
zr6RO6KA~XiSf9{`(IeKgg}tNR9X7F1zaTvEPZkcT&Sq5x7eNFcOXbx60NLVvD4pfn
z*f`(oFn5`NiOWY*Z-3aKGWLPcWz^95)Z$Tduw)Np5_|>1#$g^cc^PHw+P~WQ_9pdH
z@cXZ@@XS&<2f5Uk7--M5t76F5LERY4``@Ux4*cNl+AE<91H7~3KUo~HWs2+<!aD@N
zt>Pj9)X}=tA71Uq!M3!h+6i~xfk*3b45Ka6AZsEn4P%)gsQ5hF!P*1YriPT2J<(xe
zDAmcJdGq?oJ^xGlDX3=1S_~f!PKWJ3-KYOCFuM)l{*K0{L`0<jSd<El%BdabFTNyV
zJ_PecE2w^PG{MW&|13?S8krYnSflU)kQ%iY_)+uXY=Wh00WXkSYyKA+k?LmPU+7Z(
z$_q3!Y+|R!bsPMjIR(yXOhU-x1LrqOgI${>5Deu1rea`NlQhD&xBt{fBTTSoGaG^w
z;4d{qd)cmC{kM$<hHoK4z;gb#{6`}?*rbJm_GR+_SE>6_*#C|PuYU(}fQZ2-E&s}T
zY@tMGiu$VxfYn=h5ip|vr4mV~;LcXk|CB+A&=dDheci^5Kp6iojct=dcu4)1BDKHx
zw_v*Vzw6TfDS7#5VE=YD1k#NErqtlazf>&ie`m)FNx;AkHUyKLf6{6P8?s69%Ps#4
Dv6>1R

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java
index e4a13a86..08f8762b 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java
@@ -1,5 +1,6 @@
 package com.actionsoft.apps.coe.method.process.subprocess.graph;
 
+import com.actionsoft.apps.coe.method.process.subprocess.constant.LinkerDefConstant;
 import com.actionsoft.apps.coe.method.process.subprocess.constant.SubProcessConst;
 import com.actionsoft.apps.coe.method.process.subprocess.mode.Node;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
@@ -7,6 +8,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.ShapeUtil;
+import com.actionsoft.bpms.util.UUIDGener;
 import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.exception.AWSException;
 import com.alibaba.fastjson.JSONArray;
@@ -163,7 +165,11 @@ public class GraphNodeExpandHandle {
         double[][] vertexPosition = expandAdjMatrix.getVertexPosition(elements);
         // 7、构建新的连线
         NodeExpandLinkerRender linkerRender = new NodeExpandLinkerRender(vertexPosition, expandAdjMatrix);
-        linkerRender.toAssembleLinker(direction);
+        JSONArray linkers = linkerRender.toAssembleLinker(direction);
+        for (Object o : linkers) {
+            JSONObject linker = (JSONObject) o;
+            addEndToEndGraphElements(linker);
+        }
     }
 
     /**
@@ -415,9 +421,99 @@ class NodeExpandLinkerRender{
         this.expandAdjMatrix = expandAdjMatrix;
     }
 
+    /**
+     * 根据连线方向 组装连线
+     * @param direction 连线方向
+     * @return
+     */
     public JSONArray toAssembleLinker(String direction){
         JSONArray linkers = new JSONArray();
+        for (int i = 0; i < vertexPosition.length; i++) {
+            double[] fromPoi = vertexPosition[i];
+            List<Integer> nextNodeIndex = expandAdjMatrix.getNeighbors(i);
+            if (nextNodeIndex.size() > 0){ // 说明当前节点有连线
+                for (Integer nodeIndex : nextNodeIndex) {
+                    double[] toPoi = vertexPosition[nodeIndex];
+                    double[][] turnPoi = "horizontal".equals(direction)
+                            ? calculationLinkerPointInHorizLayOut(fromPoi, toPoi)
+                            : calculationLinkerPointInVertLayOut(fromPoi, toPoi);
+                    double[] angleArr = calculationLinkerAngle(fromPoi, toPoi, turnPoi[1], turnPoi[turnPoi.length - 2]);
+                    // 构建连线
+                    JSONObject linkerObj = JSONObject.parseObject(LinkerDefConstant.linker);
+                    linkerObj.put("id", UUIDGener.getObjectId());
+                    // 折点
+                    JSONArray points = new JSONArray();
+                    for (int j = 0; j < turnPoi.length; j++) {
+                        if (j > 0 && j < turnPoi.length - 1){
+                            JSONObject pointObj = new JSONObject();
+                            pointObj.put("x", turnPoi[j][0]);
+                            pointObj.put("y", turnPoi[j][1]);
+                            points.add(pointObj);
+                        }
+                    }
+                    linkerObj.put("points", points);
+                    // 起点与终点
+                    JSONObject fromObj = new JSONObject();
+                    fromObj.put("x", turnPoi[0][0]);
+                    fromObj.put("y", turnPoi[0][1]);
+                    fromObj.put("angle", angleArr[0]);
+                    fromObj.put("id", nodeIds.get(i));
+                    linkerObj.put("from", fromObj);
+                    JSONObject toObj = new JSONObject();
+                    toObj.put("x", turnPoi[turnPoi.length - 1][0]);
+                    toObj.put("y", turnPoi[turnPoi.length - 1][1]);
+                    toObj.put("angle", angleArr[1]);
+                    toObj.put("id", nodeIds.get(nodeIndex.intValue()));
+                    linkerObj.put("to", toObj);
 
+                    linkers.add(linkerObj);
+                }
+            }
+        }
         return linkers;
     }
+
+    private double[][] calculationLinkerPointInVertLayOut(double[] fromPoi, double[] toPoi) {
+        return null;
+    }
+
+    private double[][] calculationLinkerPointInHorizLayOut(double[] fromPoi, double[] toPoi) {
+
+        return null;
+    }
+
+    /**
+     * 计算angle值
+     * @param fromPoi 起始节点坐标
+     * @param toPoi 结束节点坐标
+     * @param firstTurnPoi 连线第一个折点坐标
+     * @param lastTurnPoi 连线最后一个折点坐标
+     * @return [0]: from的angle [1]: to的angle
+     */
+    private double[] calculationLinkerAngle(double[] fromPoi, double[] toPoi, double[] firstTurnPoi, double[] lastTurnPoi){
+        double fromX = fromPoi[0], fromY = fromPoi[1];
+        double toX = toPoi[0], toY = toPoi[1];
+        double firstTurnX = firstTurnPoi[0], firstTurnY = firstTurnPoi[1];
+        double lastTurnX = lastTurnPoi[0], lastTurnY = lastTurnPoi[1];
+
+        if (fromY == toY){ // 水平
+            return fromX < toX ? new double[]{LinkerDefConstant.ANGLE_LEFT, LinkerDefConstant.ANGLE_RIGHT} : new double[]{LinkerDefConstant.ANGLE_RIGHT, LinkerDefConstant.ANGLE_LEFT};
+        }else if (fromX == toX){ // 垂直
+            return fromY < toY ? new double[]{LinkerDefConstant.ANGLE_UP, LinkerDefConstant.ANGLE_DOWN} : new double[]{LinkerDefConstant.ANGLE_DOWN, LinkerDefConstant.ANGLE_UP};
+        }else {
+            double fromAngle = 0.0;
+            if (fromY == firstTurnY){ // 水平
+                fromAngle = fromX < firstTurnX ? LinkerDefConstant.ANGLE_LEFT : LinkerDefConstant.ANGLE_RIGHT;
+            }else if (fromX == firstTurnX){ // 垂直
+                fromAngle = fromY < firstTurnY ? LinkerDefConstant.ANGLE_UP : LinkerDefConstant.ANGLE_DOWN;
+            }
+            double toAngle = 0.0;
+            if (toY == lastTurnY){ // 水平
+                toAngle = toX < lastTurnX ? LinkerDefConstant.ANGLE_LEFT : LinkerDefConstant.ANGLE_RIGHT;
+            }else if (toX == lastTurnX){ // 垂直
+                toAngle = toY < lastTurnY ? LinkerDefConstant.ANGLE_UP : LinkerDefConstant.ANGLE_DOWN;
+            }
+            return new double[]{fromAngle, toAngle};
+        }
+    }
 }