From b50bcef4d87d5ac0151932f5896bc3c8531c26e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 12 Aug 2022 10:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=BC=95=E6=93=8Etab=E6=98=BE=E7=A4=BA=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/forge/DevOps/Index.jsx | 17 +++++++++++------ src/forge/DevOps/ops.scss | 18 ++++++++++++++++++ src/forge/Images/devops.png | Bin 0 -> 10271 bytes src/forge/Main/sub/DetailBanner.jsx | 2 +- 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 src/forge/Images/devops.png diff --git a/src/AppConfig.js b/src/AppConfig.js index f771b9eab..a55649ce0 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx index e6aceea36..f1bb1f18f 100644 --- a/src/forge/DevOps/Index.jsx +++ b/src/forge/DevOps/Index.jsx @@ -1,7 +1,7 @@ import React, {useEffect} from 'react'; import { WhiteBack } from '../Component/layout'; import './ops.scss'; - +import devops from '../Images/devops.png'; import { Route, Switch } from 'react-router-dom'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; @@ -32,8 +32,7 @@ const Params = Loadable({ }) export default ((props)=>{ - console.log('props', props); - const {jianmu_devops} = props; + const {jianmu_devops, isManager} = props; useEffect(() => { window.addEventListener("message", iframeHeight, false); @@ -44,7 +43,6 @@ export default ((props)=>{ function iframeHeight(e){ - console.log('e',e&&typeof(e.data), e); if (e && e.data && typeof(e.data) === "string") { let myHeight = JSON.parse(e.data); if (document.querySelector("#devopsIframe")) { @@ -65,9 +63,16 @@ export default ((props)=>{ } return( - + {/* 嵌入devops */} - {jianmu_devops && } + {jianmu_devops && isManager && } + {!isManager &&
+
引擎配置
+
+ +
暂无权限,仅仓库管理员可访问
+
+
} {/* 旧引擎页面 */} {/* X%U`|Q2Xv!8vU4fND0NSR1MAP|M7hKdmg1V#hD zA}}K0Ka*QenSnphr%IY8FyJQu_8S1kwRDxO+zoNx5Eh#%&BI8^+W#O{_Vekp!<_;o5n&N!d6 zm^k7O88MNQ^9v`E@6MXpPF4%SoM>izicy)Wd^gd!xdp#zHkVY7@V!y!+Cx3hM(~@SWs|7YixK^imLUJlFTTW zFc0;XRHHz~AYU#%x1h<4;`>2CUC|yKdiITyA~_Ud$M=#hqA(n(?_a!KduSH)!{;eu zWmt*-hPcPR(!G!tko8n}6z=MX?#b+;C?Q6O_<|MKubDaKK;7QItk#TDP z@&zWdD>w1kP3xrkjOv|W?S*T9^&;cp*|#-4_q=v*`BK{t>=f436>)13qjN4QZ%;sH zYh|dR0W^d2M$J>MGC z%pvIFzW7dbac+QsX%lpCf%Gy_68=QP>BE+b>XyK~jdbH5VnS*aZ5g7^xQ^hUMjgnf zv=8g&#P33?Y2nE}Sl)+wCdst(SaihQu{MPp*^!NTC`;OxKHk>0ahn4TH&vD?Pbd^R zBV6T9)xxPNEzGRx9PPK@$)*^hUvBtmFe!-P70vm_I-yYbIToVIk4zXRo1C8k>*Z)j zIGQPpMGIToKEI2ai{~7(l{K-ZvDe*#2RtiK=x4Pa`y~q!&FzRZD=ovSU=iV}g}1@u z4;4wmB!d(g>jHV4U_1WpS-$Lxl%VQHDh@x}SV#>Ybv<1X43vpAIH0!uQ0^U6f3HKS zdPd^e#@{7+#w$%v32vRZ;|JvM#T_-vZVGKU0Wryd=Zbn~(-RgHI9-)~5~5?miNXJW%zu z8g2(W|6+UT#<2M-b2>7fofsJQ8dS7i<}In(0b4g6sEzmMj#e<1RwT_pi8~rz42OWs$#?j5m==XF`dbBJ1Jao;Wq{4AFzaL3)(DAx-mx@rJ#X_=4Ra&UX*+J1+hW^2_>Z_ zU*D&QpcND3V?(ZFLQUB_b6dkVT>tFxDL=6^fX74a3Ifyy+uIWwO$*g{{$4`TdDY{Y#GwczJ#xhaIPM9eN70 zWQ%rHtwY88J+#~KanGd%bv@}nxhW_QaYeUvx}7I_5FwCG^Q$a7VMOQ&$`Su-s44>j z0+ks0bdnX0=Luz+NqFwJYI-z5c4Zkh?jM#YrHYGroEKtL5bH&{?~14g7TJ=xsQ1}( zB8qjt@vdfR`q}&R*TwUMr!0b@DKZ=~u$sq3r*`&CyvAJxwb{ibmNVkn18JjuZ&x&( z4;45**a>MTdKa`5aBZ&HF2)4Za1HBw>S*oQn$8A&8pj&yzMm*DkcRgV3jB6z zy6&$5?kF%!8QD}0&Fj8*Yan6ujn3}}nRIopPh=DuJfdr{{EwJECoCgFosIfGMycFK zxRZkPA4K(Ad26-t>?T`GPpEQRmb`qQh_d_U7E-Abvru#jv5xMibc}*ndv||KZ0=+2 zBI7h%1F9d) z8|xO963Y?pkgmr-D!~dDGB`UZQVz>QtYV00y9+>9PUI5~M*CRdfmZJ`xe+5X?)|yO z%A$T2g8LcC^jEM9;tnToX~SYxu7{l)AbANv9k0Ul9ug&B5|xhRfzS^^uBe;;u>zwX z^#I{n#xO4#UOpmXM*ck&>NU!XTzPOiAHj#IKusXKeH#D%&azCixoI*9f>}`!17Y#I zF_IqV)fmoR!!DtkO7&gMN{RsY+L!7;DFi|r6^g0QQ(i~$x7YUTLU0+}Duf1kXIG&o zAlBz!>jwcl{QZBo<$vFWe_*^W&FM$0c(|hud*)3^dwagrG6)t^>Cq)k1gKIa_F7~- z!gWfiHjsC?408LzH}0}cGgCCqX#+#^{N2&=$K!!ZkxSM$&j1z82M$$(;3o4?QsOy5 zap=Q)G(nS$L6u3^E!UV#gJiaXd$b^E%y3JwDas&{Q%Y>_`X$}4ICC`DNuQvm$+I5o zOht%#!5JX5JJRT;jm5af!N=t=RH=R#;US#Ni2Nf*{z*kMR;h)Q|>G zaRxLf{^FHW`dpghsN+u(%R3*=#M*~Us%nox9kso(H;7@k=p|k^Qb){C1!YnO1=w1P zZ&S0H6?0-RKxdzf}<8~!Kk5@qBjqrP~#p48;$AXUy3gEL&F$zE$qIy z0p{UT)^wqqJNsalmbc!1N`P=3p8pR4)R@%KLZ_$+ajXe-O8kkFPx|{|DS?0IbSC>z zQsHBAKqa=Qps5*JACl1rkiWN>4m(=e`CSkT-bIQ3u%ZiAJ5OFQ$z@7ed|T27vWz*jRg zy%$Oao`9LGdOo!!g?kFV(Fx9-nZ(#GXZKpj5a1#Z> z+@K^bFf55y>_i^v#FccZgT?s0uxIXXX@(}=SA(sb^8(+7Ut0e#H8e%-LEid`B%LP%B_^=OteDz1Xrtrl{6!A6D8Dok5ZvRZFeb>ar8ClI zmQfNky+zIP9$v_gOt&wP6(WOWM)SihcVDD`$8di9JSe{~{ibIkQ29(xn15dUPe;a` z7X-G)ElcmsU9@?YimPh%!yUwSh`kE@CEo&g0!(h(g9W17%Gcdn>abEs(^@K1Eao$7n)wl3V zM^(U>q|`@N#pt~!Mk~}*tx_(DL~gv z2J@%a*O5yXvg0Jicj&!_lQ2=T%uIkf9)$n4$#ao&Pr!2sfoFBu1TT!m!E-bL-~fLu zW@@z*>we}E!aWULLJ*pp6Ab^m3CpDa?MBvWzyR8Vzz%#=Ogy=`joz~3hr9yJBa8e4nRB5*KL&f>u0$-n{~9Zeg2PSl zs9z7A4#ms1a|s1Prj-Hh|g@3qsKVv)z@4Hz%p6hShIJf8CT$g`2&O~yfd zpI+sGcx^e+BYoC{>d(nCBU(2}M#3an(=x+m~Q?=~^*kFVaq5nGEpQROtr46C zH&6OD;`rS&e}Ji}-;T*AUgXqHXHt_az46X{53J7}FQv&`5#9Y+jbNCVC+uXlZ)sKX za?!gzqDE=s{g3QAFizonT?sQhmj2Hdk;4n0kvFrmoc@C4xuOUI zqje&MMSn{RB3Ixz2(jMs0Q=7~BexcI5u$=$GOW^m+s7=(l{6RnIs)7hTtZ&b?m||@ znghwW^Zw<5PeBp2`!~_%)2EuUz32Wqkts(E@V{OvQ`?rBHy(AM@vll^CX|C#fQYp@ zd3haP`=ei*1XXQ5CgDR?-^PekL{czVCixB2kP3Gb015vYv9WnQvk<7RNlhQYzu?yYb0IB) zj)E$+YD=c9LftPphqtjnpcU)Bx(5F4AQ81Aeb$cwPm{QI2m6o3gV1s<&A*ADV02PP z3MuZ6dz+iaP1Y}-;}8D&4idm1IG#`;3TV2=4^4(z+-n&^Ae6rmK#8t@*3`OF@Rb}j^g2;EPWN{fI@X!@SJSOl225{6#!Vwp?WK(IhA?8;bBgp zAxbpH?>LPRy8ENqEe4BGpmeStqJe`u0s>Y_>8=oT+!`3lO5$wz;t>*pqn{V-CWQ$+ zQEDQ==7~iXh!Vqf*sVfTK^>6K@ei5cCQC1Amq0jv6~Ss4(jxB&5ZY$VAb{OMh!sD) zg2Ym;L)1^KC+`D*l~`~J7`N#sIK0osl?W5nJ*n!7zWA*eWjmcxw=(yA$&v;9GuY;kez!G*q{ z14_JO&aQENJdkCum7bK*!1sz>OEZ4UJVaLjYs=lfm-jhA^v-$-*0GPv{AAbkKmWt~Pwb{{6Zi|GK zpK=WE^{CnOy;|M9%YAZOC2qdZ0znNmb?PyLpxM0{Ej2HZ&-Uq5%x!X728$$b1M(EN zg~xJ0==JMswN!waQ~?5;Gl+rtD%6h7kEdB#@0Ta=f!5f(76;W-0P~wD;@1t3&pPhl ztG1s%nO@D=SDEqU+B94LNdVwWfm_l@i(2BwpHzf6wm`OFUb97!>8I9F7iaI!ChMH3 z;kAZkN6lEww!%s^k`@+pB7i?^5e(jb(9|EPkQLk{B@DqyJ*3NJfD26%qm{N|ayc3w zxZj+wXb4|fd3*1tlrtS%!cbHHI?5nkgef%)K{DMlJnoizH}+X@O{&x6*Z)lfhnroO zMhN@fzd3JnF0CR*mn%vDqZhyN?L8^1$n>l62Lq0dwiD>^keqz|k7Mc&LBnhnU)yZ5=)q{_y61yrF#63U-yG%acW}kFa?a z_dYKXLu0Ds!8b3CA( z35_FMyqaX7yNVmNRz4}J&BY+-ubwP*-MGl|yGb`$56axee*Pv)v_A68aKB$OHY(J1 z!K>mE_(RvG_2C#i$@;MI^yzD>>u%Bjm@YOAnLWuxoNwLa#yd(Ve`PuQ zB~5M9d-*kI+IoU|`ebMH5+M&HfoeHix1R9b4<%&Cm20|2k|qpb(%V*aFjDdjwm7)W z9|v^k_Dw(9VNU8(HsvGouX+B(@0#td59_kMn&%*bHbJLbvFxS|}*RxlRqsDBj7VX?!h>$B5 zL$%*cNpOQMTqjGREn49xR@E->*qu-pvXdeIZ*h-*{RR;E#Tx{)@4)t|#j2q3G57Gi zs@8S-E(Z`Uj!@UyCIvZu*n+{%VOEihH=}+NwUR9S&z?+BwoC5e7Dc|U=CEu zc2;!dyvT#zOkm`k3MQz%mJn}Aw>jPGVllL+09<6(#Nx|!WXU2)ITKX%z<-QJe!FbT zJh~6sAy7eDe?khthH!rP>Ar>?ec_`9A$aU_NZ(0{MpH4k!*gNU_f4-Vt~jTm!Ps8O zijAKPnos0qDXl?(`%0bK^061amHfayil`6NQMyh6g}xK-^QABi&x2j_lVH3J<%IDu z3{{<*_||_0{j-CBa`jya#@^Z^g;rI!Z>;AV+$NBIP0?lNdA2p~s%k;BM zBQR}F1{qoR298G~qs=I?kM|!1yvU#8EfAEJC5j*gpmu(e+g27e?-^x@jzpAhHeJYgwylQn281hR2pfqE@X(?6z;g6N~ zvWku`#eA73i>|ab4bRD0ECn!LY4UOa7E{&!mRRW7f$Fugc!Ins?f}la`PY2R@}|T&?E78;r#Vds z&1VI}9oX{RLCNP>kNB;rj=!#9cL;zr`eQN8oQWulgYSJp%CsOIGb*^w7+)F-ptw=i z`d@h75YffH$rkczh2U$6MeVkK4e#&+-DFK8^4^dk&`wr{6T4un*>xgl#o|udHMqox z_ql#_(2>PuvuXBq-hJyiVUoq@ z>Uj1C^R&_L0@MJ%mZ1ggc@0EF{@UbhBl$CxU;n zJ8s-2fHfKnqgk=YP4xxhMjqx7p~RlOaeSj_O^u${7{6v|?Z}Ko5KOtjNf6NaGy!x( zP6_{Ub8EnB&`q+Ob988E=&?$0#KNqJ6l&-S)q*?ze(NpvMqIP{Wj}So!ogqO``EUT ziM-=S>77<^>sifS3|s0z;h&@$BLKlhf^fww3EOhQA4UVy?f6i&ICkkOFo=TLh|yy^ zD{Cw3rsO#`)qz-V^<``7mKJcr0YtDyFBN*m_tqYn>cto8qzWI_EzDhS%r1X#2MG`Z zBsmFuZvhrEH^Q8i@VZCK!$Hs^Z*h-bC9OGp#pt33acsZwNK*g=2qNHnn^CTES;qDu z_;r(sHm@Gx?uS*_!F_KAON#5WzSU>epP?{;?OVw4Kd@YD$;H_*$9jp72LIed^pJf- z`A+X=-57d_%l-YrNEhu=0g$Q(%An_n70u@N38`dEuo)Bc?!yH z_-v_7;{srr&mXyrLI5tx_(sN}{QOv2mO(QA-fPZ*U>m*Hza<ydEk!MVoAWLkv&hW*lxR)uIa2m@c693;f9Kj=EL8Y{#V$K(;5mrl~a08 zm9xlJ;h&j8&dDjxM8>{zeTdKJSR9Dp0p$N{4e7s=(*K^J<(A0b)_wB%5OVNT5Qy7D z1h`e!xu?cneq{z?v{#fy4g@MLql9O%z4c!HrKEBUns(qBQXd}ZX~%_JQBo!L0^zQy zCMTu-?))A5JfVJ-$O)D@Pa_Zy;pAmI1B3rubAyC zCid4KtBev2kj0!arY4RBC0d4y>m|U&h5fB8>f9vT{vDZh6R_Xmn@@$Y7zdJ5a|8V5 z1{3ig%=b?dSTHnOGoyk7C7Kl^RmdE}%U^j|>-@=U`pc;84UnvT)1Q;FJ3t=Od5XoL zn-T4%Xc9zMWjX4-$9?s_EA?`RF-_Ul3lm0=;`MF{8fP}_$v1qq|z=ir6{$bE8~FvuER15i8VNoB%O z#dn7+UzM4i3_$Sy88S)0h=+$cXrqjQ&tMlo=a1s(U!%%_y1+#!Cjz%SIM!m6(x&4? zP1;}%6sB9e07BYJuap{y@vyc?NDg2(@+6Neg^^DDj5W$&bAXkuOztbXnxhNNM3hR3u~ zxV$k(w?1u^$oPX3%;y@W+#VM1((T`>{te6l)rT1pK2pP-?>=rYmPbN zz_5p-?mdZ1O_ZM9M1pxJZ$dm?uwrm}iB&~CK1CXFrz>Gra{X79M92zoS?Q@!06Ojz ztX?q1pA*XkEBbN_zp`vJk@HPl`5;U!^?h}iPPxv$vAnKcjiVz=7SWvFveFJ34&PlD zR3-slDfH8gzl(QT-uQZ!uTEnl`lC7Sw#W6`Dz)n=8Zd=U_??VM3Wdp%o|LSs_ZdE% zR(FR^XbHTOLvGW_d>QG}y*=<(@26Rm&j!cOcZvvHy(o0E-&mZ@Rnp8GPp>W!@mm3k z$~MT;AhaFV@;p;1CLH0Rq4>)8t@P{ryW?M^u5Z>knq*H0eKv3ny{!grJ=W{2$elM=CJhu9yW!j2(Ey*{l zAM!~(>V5N+bz7>Vz6%X=6U_|p*d|4}F6*2>>Fz+W^sOC8505QUwyMQhH#lJ@2`Y>Z z37{Kq&aTgGo}MU*a1@~&y0;pAE4%Gs$$S30g=e*6lpT+*;bztzJ0RRL71E^juig&< zO9~{8vh}N|-{8oVpP=V7#Eed(1bW8OQ|DQ8n^lBgYJ7R>fY8lYbOhy@0UD0N(`!5r zIJjpXHc|2~_N;flo)Wf`EF;F0JQM)F+g-W+X#;p*a9;8r;%+?1k<&8%8SZY_gGa3z z4R#G0<_>Fq;do`Z-UVr?%7je%AXsIlCjZ<9W^X#;&=0l0#gfunBV5$tCJzt5G_<}X zXruTQDF6yH_2(L%X{Lj3xy-93ZUlz<%KK}A7U|~dnmL+z+-w5s8GOn0rcyIf#h13^ zlwOG~OiGrtJtyr9RQ=|6KvaC{t0-bT%i1hM!vNlqIAUlPd7^nO5aCbHD3UnUGd!#7 zo}Hr*?!?2^9zHN?&qBXqoIu)HL0|8ZXnNnW+;jUc$=(C|6Ogj#4R>fm+B;$XzSQ)M zpaXe$0(yLxThpI#9(vsDNSYfE0wv7D$`K}__y(u@omEDTX_{)C*>W+QW$kZ=+02DN zi{h-QDRa9GGT8|Ia9zl26CvKa8V~r?pS+m6d;xR@oFox7?srhMeIR)}HnTWEGutyC z!;;3fFaM#a-DE?BP+2Hl@S@P;_)oLS|dT z2fTlJTG+aLl602d)VSC)OE2}mpx_%5Yp~^@bGmf}QW0{oAn1sP4Un z1-^?1Kaf`ySTuio3^Jg4ptq)#;O{}WA=kJ-=cHqi`;+>(g)YHR4}sWlh(WtXh!|@u zX4GzE^@)!?3*C){l{=Vm_gS2Cem60o1~I}TZFpSNSn}#q8RPH@jt&@OV$v%LWoB9hM3k{_=G9C+5pt7Z&UP^CM zxjlbPO=+eEYW+$*$AU|_{$%Agu)Plct;-NI?mL8Ia>l@mKai%Xo=T+>2KV0p)ANj$ literal 0 HcmV?d00001 diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index a56f371d9..7025e4294 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -85,7 +85,7 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur } {/* 引擎仅对当前仓库管理员可见 */} { - item.menu_name === "devops" && isManager ? + item.menu_name === "devops" ?
  • {/* */}