From efda2132ae9f87b828f9854600f0b6f7a5662d53 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 29 Sep 2021 15:38:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=A8=E5=85=B0=E7=A4=BE=E5=8C=BA-?= =?UTF-8?q?=E5=92=8Cforge=E7=BB=9F=E4=B8=80=EF=BC=8C=E4=B8=8D=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E9=80=9A=E7=9F=A5=E7=B3=BB=E7=BB=9F=E3=80=81=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=AD=89=E3=80=81=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=94=B9=E4=B8=BA=E6=9C=A8=E5=85=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/Header.js | 4 ++-- src/forge/Main/sub/DetailBanner.jsx | 4 ++-- src/forge/Settings/Setting.js | 2 +- src/modules/login/LoginDialog.js | 3 ++- src/modules/login/img/mulan.png | Bin 0 -> 67646 bytes 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/modules/login/img/mulan.png diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 41d7fcfd..9088218d 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -439,7 +439,7 @@ class NewHeader extends Component { :"" } - {current_user && current_user.login ? + {/* {current_user && current_user.login ? : "" - } + } */} {!user || (user && !user.login) ? diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 83268b9e..5e3ab944 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -86,7 +86,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa :"" } - { + {/* { item.menu_name === "resources" &&
  • @@ -95,7 +95,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa {projectDetail && projectDetail.source_count ? {projectDetail.source_count} :""}
    • - } + } */} { item.menu_name === "versions" &&
  • diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index d6d3cdc6..b1af2f99 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -16,7 +16,7 @@ const menu = [ {name:"合并请求",index:"pulls"}, {name:"Wiki",index:"wiki"}, {name:"工作流(beta版)",index:"devops"}, - {name:"资源库",index:"resources"}, + // {name:"资源库",index:"resources"}, {name:"里程碑",index:"versions"}, {name:"动态",index:"activity"}, ] diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 6311a5cd..8efd930c 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -5,6 +5,7 @@ import { notification } from 'antd'; import axios from 'axios'; import educoderLogo from './educoder.png'; +import mulanLogo from './img/mulan.png'; import './LoginDialog.css'; import { broadcastChannelPostMessage } from 'educoder' @@ -573,7 +574,7 @@ class LoginDialog extends Component { {settings.third_party.map((item,key)=>{ return( - {`${item.name}登录`} + {`${item.name}登录`} ) }) diff --git a/src/modules/login/img/mulan.png b/src/modules/login/img/mulan.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7753f76e7e662187df2a4726223e6e9997ac36 GIT binary patch literal 67646 zcmeHQ34B!5)t?Y{6%{QmwW1Xj6cCsgAA^ScvNhZl;nM~G6a=!n$llSJmWR?ISnLuuSC-1%c?z``t^FR0A zbI-f)jYi{vKQAv0{@DY&C>?mi zgZ96!k?G)DgX!>lSJ2UqZ=jRY?xu+EAEWrSuTlEm=~NWHi7IoWskyF-aE~h7D-he+ z*ggrmst>BJ&$0}C-wc`v{WIP*jWq@;iQh|Sc78_T-~NG)Ou8D_Y82!l@ILn0&nRfd zeFE3$#m`af%9kmA&8w8K{tdAov+RE;a^X`HI{QI7@x|@r|Nd2U@XY~=dNkzs_FxM9 z@=l6h{eP5yayiv#lc=@D(g1$g9wuWu7Sv~T>yC`GK0%{ElR#l@trkmVZX{*wokpRv zegjMf3XBfEsUiP~BPjg4KT`6xNmLNDipn#Bsjj?$TACZUU&rNLOTZGiHd9k=1yvU$ zkUqwjGWO4;m}P&ZB)+NDO&(GNya%+lv6@5Bq>#M0S zcr}I1z8^aFpo9O?(DBJPQRsVX*^o_n#}`q=oIlc`e-9LV27GiarEZ@@CS5Z74238<8QXqe!GVpnwPbs|Om@Mj8{^*fB~ zchHd!N712oFUPns6f{JpL;oI5hbLZ5$37cPL0|onBIZ5{|KK&s*f*1OkvlNfCu7b~ z$5=YNJ)f&9&l9!~>isL&tcDJ~?MbKR{fSBv_Ok6&p$z+tBOR#WlFNoJc+U0~^rAKC zQz>E1-|6r>gM{uvy?;qXVQVo*GuhQS>zn)h%DiaG_Mb~p@av9#d?Ouz-=_5KyKDc@ zJC_MNO4;!-`u{!f56T_d1N$57rzEa>mHgj>oxv7@XWT=&sO`cIAQ1Zq!!J3&+XaT~ z?AJX83=oBLs|h#x8K!VkU#_f5u}NV|5x{$j%Fm*_D1x+Cuog^w{6 zzHD6`bi-r9MHyd&T-Sp3uuq?|?H!Eq9&~ilFv{}tV%c#@ow&V}Ci_$LvKJ|0{(tpJ zI_$~gEnHJK~b!r_SJtH=nVQ15$T2O0`NTd2$q=ln>V9&<5u1dxfxd95)sn1ZMM zoc!O>P}KbKR9nI!_DehQoHP5-EQ|?5=*W8mDRbYK9IvW@R$c}5X)^%k9K)H6c~4W$ zVQ)G*aS#Q3Fbwmf1@M6_mp1Snq^~JTpzyEn6Kx}M?t_>|=5oMtDQIY4Gy?EF9QgaP zuO7er89MSV{9f<7iRJ81_BFucV4Cj-=m$I~aPqYnAJ`Xe3qxssq}yi_cpe4DBh955 z6z+YOz&>fiD-P%J_O)?o=0bOPp0$fkd~ziPOd3puK}(>@)?8@g?!I6E;PVd1kX@M- zOea7831k>VdB^6m43{RL=P0#Fmqej6$Iwyq1?js!)WW5GS(B-ZVir9Lzez)htNubQjpkZtGZn4Q2=ZpcJbpFLu+`w!87h;1Hk=mkU<;1 zhK^10q>$-1V{VtG!oDg$hJvPz!LyvJ`^kk4GWJhL8?nug_?czu_O~eDeGNq~{G((8 zZqW|_WL^`e)kkkeyZ5BfuWqI~L#B*9_x*;XgNXH9E@Iyt|L!N}I^bA%;<{H<&pNr! zO!s}Cj==`vmQFy-OpFD+>JI>0j_G9@lJ?W_j|Nl7w4Va|EEV?p=Xj2d=BfIV?;d`C&axbVJ<>3^L|5tAA6D^!53N9IUabyTF7mfvv`WQ56AtK6h3Pl z*6PKHwUxZSvY)IvXsFUr=H4kPT`Bbzx8zCHbFyZ01x0-~jsia!NEK;Exb1PQ_<~Oh zaF2%&%V|j4{!cpbp@#B~c&X<18Bz9uf+-01laJJcQPHS55as`h3${UiEd4~qNYK|D9aqSg!a>=^ZGfc@55{b>sR z{Bnx$x|y14N@SoKO{Ek%j%1h4GHRez7>8)?EGI-(5C~bGAmH#f#VZ#OP>@mD#q9$ zVeZwF$@OO0b6HltlJkI%FbmusL`mTaqY4eYI z(aDcBlyhLR+y}A!<@$SzxCFv^v$MjiLV zFSR7Dc#MKR8$earT&*=(5SNJXzD>+Sc`n*D@}T&ok5ih@zxzp{gOn|=A%-@xi#n8a z?LnpSJ0&>yy#kB__fzoXL1fa#bN%jL z@!h}eT3d0gr?9VnO3h|o8emN|h0zp@cAB_+JjVw4{ep9T#{}2Dz-yACzPXjcrdisveUcyc0WEct+H~->W$5 z_YHB)E0%_8I^{KrqGsQOwI{acP$jXO`!RPjyN_S=dpQ=zeL((^X%sS9LnTpb*e+(D zO&@^r?QMUKs6!vVnClP;&z&i9)@U&gy8)PXL1IdKgB$Pl-gS)1IIJ^Aab3vxWr4LJ|`nSEL0YkzL6(;QS zv41Y5+yj#+>~jrO=ZJXyi>~?r^eKyL3c@LDiU;wvQsUS`)YqfMT!7~mOo_|-@t5?| zTU$fo4izShOL@v(nVmYr84CYm0A>2T!gIj@kV6x|MZBiVn7#WA3jcBd)s-a6^^_(3 zh`5p!cM1Q~%li9&SwX$DV@TNE3IEe8A63NzQr0|*ao{p)t~Kx)fm<9I07Q6!=X_D# zS5flHhg5YWt$tk01$a&&QPkI%7dCf(ce|HVap~PwG0&4Q5!=rP5I+x+Qd#0Q^Z}R) zMlRlC&r1 zQ25kgDm)}?at}?G@w2w+t0`sG!`!C%`-Gjk0OVf|s>#^)Je`_05V2mJe0|~ZSz<20 z^8vdA|01-XdR_;P@IZd_H#cD}*d#Cnu9UI;e}L-%YOE^Y2Zo)V4I>Y8eiKD|T~5iX z5KF=}ocQ@-{K9dynxeiShkbN*mk ztiP@_mBPO8zGn^Bm0)&zzsLf1-?k zv)MpVGlx?8Cal?PYYS8k04T)Id9(BVCef*>9%RWAHrOuT_GGb_m$vy?ywjBCRq#RYEoFKgFp z4*9o-w=(b4^uc(xUhalc*;vwt&UYvu_xI*v+j=`)&}_7C4b|j`HG=Z{qp0nbCX=3` zzw)GP-@nV1v)>r`)le~Ra9tgV{YiIE`TmnT@!e4lN5|3LBivm);`y2*{yASCW{cmO z3c@IAnufF|zGAuLXM)&YUYWL!qNZ!8G>Ts%v8Jl*W5OR`pTHiau6BR?3yuJP2mHIr zkDk>>@OL6#`qt+pI7O@`#(OxWZ+u+#0dSI^_rz+CPZjvr>SE>cMJHy8{(}1qd(>C( zx5s-|@?!c3{?25H{q{Q57@fNM0gC_bT09SG;zeTv;TLesw>ER@)9?+3s^WR+o1eCe zyL7)ZYx+R@_y5$X43aGNwlT9VSLse}7;dyvf&Skf?^0gmbPsB%$dWnE_nU}uUIU*! zoAbti@V%y1I=$d$l)U_2xty5y&%J>nFR`#JA<&~ui0BgJ|TqMTj-E0=3B6{DP|7!z0z z_Q)0f>^~NVen)u+-tBqX_ZFRAc$;0m?aAUOFWPGeW&6C?^ZY|+1&2SPT5Ysb`(yka z@h;`-0%yp$nhHWG2KX~BNS}i~HS6O$v~tHk0G~lGE$$ z)!Cn?)_Lsg;fUGhGgfv}SMbmF{hNGkb8QL5%p5>@``+NZwZLg{W!fHre|h3Yxm~0yTCtr;Z07jcUE`*Ih*c{Dg1p6`-$;) zrK`m6c@AI^6>z_tvUDt^EV-S>m2^;q?!=cA>!qQ3gYB7d!NIp(*4vN24I@_=oX>fu z_@}tWKW^4gd_SgIHlWPSk5b~?ksRmcIbeE$-`f=DJpk)NZ13}D`#gtn0`fVb)a7@> zhOF-&%9Xe8v|?RI;&&sQUhk~#{&P0nm&LB^s9yQFG-{Dc9W%Cg?kiuDyX$WhH_MZN z5w8a-$=&@oil04@kL5C%o5qVif%^qV6zAnZCE;_iMzj*o6ihPly3?Y=?>W5AQGGp? zpYY9a%2@XRWo~>}rsPGV-Im|vMYm8Ld~~IbdEcy$rQ}7oy5u{K`}R`XbAW8!K#t?c`#j!b9)1YoYU|zU<6JC94v*+JazNVBLu+6h8}n0^~(%&D{70N?w3Z z_A9FXcu@lIZ; z%XIo%Px(DxE||0RPofN$b3{pVhGJe4)5({XZ`8{>Jikd>ew&JaSNM07)tJ25ZRKmV z)Kl(`Csp!wDvKPTNg~`|M&tW z%^8e%Pdx|kLP|ou5_KqJ1iB;dxU4s4i{s}%y`zoJcP$O|Qps^v_|JF$^{K?;Wkp8HMgDwX?Px080I)5k??&0NN)?|V2ocjGhN|~c^LLOuY_a;kS8OE3D z9w+!O61xt!hHx(x|E};?%A59s>-Nv@*Yt+$e9t;v1ZAxFnMyt-|I&ULFp^Sj{&7k{ zn`XN~;>Lh?f7&Q(^%%-reY;dlwCju&KXq9*-y?P2VA#*F9;Y*luBP(ndEAf5e0SXG zg#StB?LTF%&EC@%Imf@TB8{@vkE7HDJuf@!J7um%m++~{+#{={B6hL3rZ(>g=V1^K z-+HSm-1k@DIEY%r=K`(83->&Wdq5v)IrRBbYH2c2`VYhC%skkD82_@yWhSCHDYcrB}2#*fq%XJ6qS?HHSo;q!)bO{;b7Etb(6k{>t+1wx7Fh zjF`tUnB120Hs42C%ej4vV6f_U0Z?Ray*60j&vqcCCSwMrFBss~ayrHTl$VNkL$LGy zUx}eh{C{+B{7X-MB*93{H3h(NAn6aj$a(VEFZlq-`%`O6BW16+mhv`nY*_kkNGs)U z`6aGJAK<3s5`P8XF7a2C&06NX{c9P2MR|AIuha3*!dg>R;&RarYR+utjENHN(iVAx z(MK3cj=m0=FlVf^y)$f#nL`;1HEv7J@UMvUQt|Byf2Ew+%U$5VXM(D3<+Z)NpS$iB z%=>KL@hO6>W-h{W!1{82pnbE1yK;;CwdVXI!lo;tzrmq3ao>@-co1d62HcUFjE?93 zjK7lSvJmI}zp|_={B^)zS>B!Y%fqKi@QL_X=Hg+b-S=nq1HzP;EBA5k3HJSSR^LeZ zoA7K$@$D$xzNabk2jK69763@cqupOd0>G#HFH5o6>i1 z-XtaF%6*(02r4WOoh_;gv@3@aXz`Mza=Nhn~6950T)q}pEVDp{G$8Qk3 z8M(q=$!~e6^Zs91HrECIdf=}t?=Jgw1xFcrk?QqfqAiyNi@AU=GCM-9I>vc^9%w1r z^#{sYGK4JF=LDjznv_+P4eZ^GT;Z?e*D3y{LdsrjlP`Cr^Y*XbH^J?6QMCORXtUNe z8NiWB4!;Dy5AT1LB`}6hsKB;!fHM3$-+N4%zM|i(2%jRb=YRZuX#V=2T6M&Fauafi zzk<&$;on|9Z&erYSJdqe`l!tmW4yquxjKikmkc89?(u9BDah>7@4*89hcI_&E!Z-a zxDRZp<7I-@RFk}da+cuRvTj7q@UM*aQt?_I=A{2e`&Y{43jgB$6IA7u*Y?J~&gYk^ zb$(@m{}$s@U4eMk|E8VhZZ``^i)X?$sq01mW;``r_5*l+pxt%{YOZt~|EY@cQt?<3?zsPF{FU-_ z1%GAv-rCP!F^HPV;w5;fsUn4PmSWuB#lPWm_HAD>3RL(A-Vtck?!2FJmf;?l7fPww zm`Vk!hN$$_Tk@X`{>HPwzi_Sd_Fszj-&-;(?`sVESRS9*=Py3+6!0HF^?LCf_bmy} zv)!UD?gMt$>w-mn#rvPceQfK!t72wS{&G#PlPmm{Ji5YPS=J@~2PgEp?AoojBCcb5 zx5u2jPxz#zM?~x<5%`HUUT2HFR36v=9ClD=2>3rSHr8ftm%0GV2hF7Sxu@54aKZ3j z=c4`hHvTK{8-4kHHauVlg_~}nJov56ChI`8460NP1_*GJHyexsm6ht)AOldR4}a--;8jfgjuZC5I&1{JTLP1mAlI z>37^ot&PSe;L1^Ho9+9o%~hGC-8hPh z)?Z1@R$rjgZ+c32b@vwXb6m(pou-p%TA7KNAeZQj% zMP+_}qJ|>zY*SKAr!CJ-YT{;+VgG|v9X$nOBrkt;l-j6Kf0D`$Jw_D)&rx$#hNFTa zAAK%W2LJPd$;W!D4E~1-d$#q`y$^^vR?X>otnWxLqk5O4yD)ZD5AMsq9Tw75olp%uS5JZ}U8_9Qq#D9oThO9YEzqwt>dtP||I@3clYEs>|Lk`vaFA zYTYAoOIVh>o@!E>n_~7vmQu%Jt(oMEQX4=UI*XUlT4@Qzy@q{*6z{D zrBO?>F_}tyZo?eYgKA>F5b+(fvAeqyv+k}7$czM!Ar?~}8GgK1%#Vygui>3z^Q8e= zH%JNnQGLOF(r>zwbn6F`IeiWHqx?e8nC`~wLevL7`FWua#|J6`{w!?3uwAMs_ zPP(-NsCe^8!~}c=)=Ifs%vv&qzD5=M?zw<8j%p$&sbXkK9;E$7tv?z49=L#f+(VUz z9;C*i{hjqtTSVoDAGfv_^qrQPY-WpJ*gmVZyWNfDxz-21`CXFdK*sv~J;I)KYdxqk zmUbzh$Px#DxeD3w|*_~^%+eK z1qW4nU_3acR+})L4BM}~AUK#}9LN7#5dXhWwpST2ftn5CyE`nVoLcJiWDI->I>B%0 zp}()s*}*!=1wG_Ur+w`l*tLy;fsI{S-%!xD6 zA6!d@O`2{aQ;g&1|BQck-pjCg09BoM2Dpc-cIp(pS! z^BGB|sQ1ZImDU+|%!M1ZhpBAOy^x*z!JE+c`*1macF!MR?y4&LY&pov^Me_P3)D3f z9;C7#@1kPp!r*fw)tyE{ZxWBQ?hXY84o{9b?M9CBNf@zIj$4Qs{1O86_M1Cy^+ibQ(+fx zpq>7iD*b*#bt!YCqMf$F7e6qLs*XNNH6brkZOn(5lm0+WI)7@ZE#UZTr)!iMY!5uP z*M$EI^T;a&?uPBxz=kK0r8=F9GVZT{&g-3=?$WtC)&t$J9k7qM2Ysid*$_cBVgIBu z%*#tQz+c)l7=7uZ!cVYN^Y1vH-LnO@4@Zg5IXiFfI*xHR7Va0Am-&pc^2qjj=mGex zYq%d^27^G)fckOoqR~NDYzMc1yn#t!Yg3i*t*VdznG9QoP$}C2^j!Yq7^;bQ3-jhJ zXk(ec&v_d~edm?fCu!0jqgu>OEBzlK!`9(eUce8JJ?4b3;PmxQz#u?HEbMBjXY4ok(?vCpH!xg8z_= zc!B}3-$v1gqYhNpA&Iu%iu29z-%aq(a;T{!gzB?5Q*Hb-stWuoZ0$DOYoHt>D%*A$ zRRugwb*bM=nDdL6{NB|IpgtM1wWoh~%7b3{9fUst!?~a&v@=T!`+qr`FwRayZ2bY) zz*WNkQ^oQSdo^qsN@Y8*2aZ37Uv@WD9Qb8B{emj?+)m}YZW3`v!)8wzW2p}Ab1L?X z5%Jr)l)3Q#LgD|JVK8kRr03sJdItPl?oPV8*m;4@d5qw-M;tf74*|hJd1G|JlalHwTQL1KojRj$65rwCB$X(SX=b>?v5I|I zNr&U{D)u2z$77W^5UAs^N<0YY>bOA7-w;>F!Rqp!XL;=5rM|wqkJYtbf=3-22#_bgCfKg89sEBozuzGHjnc-*l)bv*9S9y_+rnH}46r(-Xrfao8BogJe; zDNvqA58UxsB_KLbl|blVRRWCfe5?`({iTXw94b37(ccE!7!v)lf*~Rp`xq_k5 zT%UrW@qDacU?v~iZYXZ2(2%&DLIdsNk$i*E;&NMs Date: Thu, 30 Sep 2021 11:26:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=B9=E6=A1=86-?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8C=89=E9=92=AE=E6=A0=B9=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E3=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/login/LoginDialog.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 8efd930c..02a6271f 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -562,8 +562,14 @@ class LoginDialog extends Component { this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码 - - this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册 + { + settings && settings.common && settings.common.register ? + + + this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册 + + :"" + }

    { From 35de29c677bfd8c7b7b5aa02dbfaa1f8ed8e0c32 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 13 Oct 2021 11:37:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=95=E9=83=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/Footer.jsx | 43 +----------------------------------- src/forge/Merge/MergeItem.js | 28 +++++++++-------------- src/forge/Merge/merge.js | 1 + 3 files changed, 13 insertions(+), 59 deletions(-) diff --git a/src/forge/Head/Footer.jsx b/src/forge/Head/Footer.jsx index 52c06858..79e4eef0 100644 --- a/src/forge/Head/Footer.jsx +++ b/src/forge/Head/Footer.jsx @@ -16,50 +16,9 @@ function Footer(){ var html = {__html:htmlString}; return
    ; } - return(
    -
    -
    - {value && showhtml(value)} - {/* -

    © Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

    */} -
    + {value && showhtml(value)}
    ) } diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 884c50fe..d5e7eb83 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -11,6 +11,8 @@ function turnbar(str){ } return str; } +const port = window.location.port; +const hostname = window.location.hostname; class MergeItem extends Component { constructor(props) { super(props); @@ -166,24 +168,17 @@ class MergeItem extends Component { )}
  • {item.version || "--"}
    • -
  • -
    - {item.journals_count ? ( +
    + {item.journals_count ? - - {item.journals_count} - - ) : ( - "" - )} - {user_admin_or_developer && item.pull_request_status === 0 ? ( + {item.journals_count} + :"" + } + {user_admin_or_developer && item.pull_request_status === 0 &&
    -
    +
    - ) : ( - "" - )} + }
    • +
  • 查重
    • ); diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 399c9bd9..d9e06aac 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -382,6 +382,7 @@ class merge extends Component {     +