From 77028321816f00799cc3f70d3f0d6bde27c34522 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Sat, 31 Oct 2020 19:51:24 +0800
Subject: [PATCH] perf: layout style optimization

---
 .env                                          |   2 +-
 CHANGELOG.zh_CN.md                            |  10 +++
 src/assets/images/logo.png                    | Bin 14626 -> 28304 bytes
 src/components/Breadcrumb/Breadcrumb.vue      |   2 +-
 src/components/Menu/src/BasicMenu.tsx         |   4 +-
 src/components/Menu/src/SearchInput.vue       |   2 +-
 src/components/Menu/src/index.less            |  32 +++----
 src/components/Menu/src/props.ts              |   4 +
 src/design/ant/index.less                     |   5 ++
 src/design/index.less                         |   5 +-
 src/design/public.less                        |  10 +--
 src/design/var/index.less                     |   8 +-
 src/layouts/Logo.vue                          |  31 +++++--
 src/layouts/default/LayoutContent.tsx         |   5 +-
 src/layouts/default/LayoutHeader.tsx          |  29 +++++--
 src/layouts/default/LayoutMenu.tsx            |   5 ++
 src/layouts/default/LayoutSideBar.tsx         |  11 +--
 src/layouts/default/UserDropdown.tsx          |  50 +++++------
 .../default/actions/LockActionItem.less       |   4 +-
 .../default/actions/LockActionItem.tsx        |   2 +-
 src/layouts/default/index.less                |  81 ++++--------------
 src/layouts/default/index.tsx                 |  14 ++-
 src/layouts/default/multitabs/index.less      |  76 ++++++----------
 src/layouts/default/multitabs/index.tsx       |   2 +-
 src/layouts/default/setting/index.vue         |  10 ++-
 src/layouts/iframe/index.vue                  |   7 +-
 src/settings/projectSetting.ts                |   6 +-
 27 files changed, 200 insertions(+), 217 deletions(-)

diff --git a/.env b/.env
index 51d5db51..fdd62d5c 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@
 VITE_PORT = 3100
 
 # spa-title
-VITE_GLOB_APP_TITLE = Vben Admin 2.0
+VITE_GLOB_APP_TITLE = Vben Admin
 
 # spa shortname
 VITE_GLOB_APP_SHORT_NAME = vue_vben_admin_2x
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 62a1be5f..f8d8e881 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,13 @@
+## Wip
+
+### ⚡ Performance Improvements
+
+- Layout 界面布局样式调整
+
+### 🐛 Bug Fixes
+
+- 修复表格类型错误
+
 ## 2.0.0-rc.7 (2020-10-31)
 
 ### ✨ Features
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 6977038cfa560f6ff882af845bf4dec4559d2e0e..16f2e7ab7c74552c5653652547ebce7adc4901dc 100644
GIT binary patch
literal 28304
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

literal 14626
zcmd73^;a9;7cNY3EwrV$6^c8-JvbCC?jE4HyL)jh!Ci|(a4EF7OK@p%f(9$vH=pl&
zf4YCc%}Um+nXEIj_n9rve)c)B>Z<a1*kss9NJw~!3NoLOkY0U2{N7@sBd#=ES&|?Q
zs5U?qAQDnz63&x38sePBQsJ`-5|SSS5>iM664C?WQph0^k|!4u(y<v5l5iFh60u8e
zr-mrv4|I!9@-m1c;&U(E6^uAwxhUwnBOwvd|Mz>P`1#`n5|Ut)q6|>WXZ3W$Zf0XC
zaQW{1Jojqr>_HSMCXz-WIbGo^p*06`+mIK923UCx%y0M6f5=hTQLNQ?3Btw*>0U@A
z7l;MqE6%x^EKH3*$Uf2nCY3>dd^C0-Z@ps;6k|o`!}MZKea~+H{hPkO`PD;=#H@j;
zfOJQ-9RNbQK>NF$>;Lc0dm1isfT5WB@&Ea+jEc@i$Zq)keL?PfCV|!dT1W=DgINqM
z=4thsmj*HzJM^>aSby)wvhK=(oPQ^#3eCsm^xwW2dZMJ_520e$P>hIq?*nhUB&lV!
zE^3_CBK3lBqC&2=L+3Hk62Zi(NX(eVd!Gru8g05r3tR|1)CM#i933cegoM>~Iue)Q
zDL7t!ZDE+F>$N(EWW4LYs&O)O^DUzxtonB*aaG4_p4Ixh1cej-)L}2*gn;5|R#wjw
zg){l^N!PN_D|s*3h9Xy=VQbQ7zxkgGKJ_T+^CjmeLb|TqKZsk@e>m*v7^4fE{$WA@
z|8*gc)O-vzu9PKcBK3IWI+R+fCP#A;Dx#3uwI%3%ovZJunKn*`R-`~$YFbTkj2_tV
znN)cHRb_%zjrq!i+^iWEga)^h>-$J2y2JRsx=(|p?>xE*Jz7zX4zFp}=-S@cO-{bQ
zK+n29i&zMOA`<fc8_gf&18fyVKfT>c4`_%h!(My&_c*K7;CrD6eDCZS-Aj{`O1XD_
zaW^HgR+GQ!#p7(d3xAzE)QsLz8fWdkLsL_DESd2k)7O-zK}1yKw$*RxcjjXd{O-nu
zmEv9^NdH*7O{}8@F}cd-&u6q3v7rZP#u+(o?`7!7(He2Hr84QBsl1jWc{DYU&}wF6
zJL>kf@mfV!i%T5o3NU(`k0FfTbg-pTnB&hjF&{=iTz9%k!HtyEc>3RSF@T2hh8Z)Q
zDdvfjr~?)XZAM1a=;#<^&+YPwJt>!-p9wmTOZkdop01OY!f8j?MGV~6UUNQTzb^?H
z;>Di3*J2Y4sI)DW*4$Mx*IK8QW4=nsLpJ_pa=sGWbC8(t2IG9uq^#@287<2QQ~wzB
za1JfA`>XeUH#Gm-vo?X{^~r-1FY@;LpTNaPCk(jk_3V{!aa<oPB&gpJU5x8OR0~!7
zb|tuYulg~?NZ3x8DE9j-ivD0p;Bbj-GK}3dAtZBN4u6%bWyHLhc8#s5MK4hP>)rjo
zQ}qXvThpcE5<UlKeIeuk`^7*djs(I8=sM0c#{J#Dih7d(+5lUwGz|V^5qEn0pM1zt
z#Gxa_z5Q$0erS+$u7LoL>u0w4(wf4(&CDd!T^EA<r}gur->yFngP-GnLb$WKrLz-j
zg)Et6+xhU}jd+{_cs;uvN*?nK)|S7D>KMggvEJZnVDPr~>+v8R?5-YASI_1;mY>Af
zDR!Q=H|zcOX95Fv<PD>a`gglUs>zg**ij?M1T$e%G`4bwI$V{>6H+tx_1?|6QklLq
zWawTFs8lDYX995_CqFtdW7Z0-HT7+c(MeAaMjorm?ik=0C=VI{D^$fIqs)uE0Ghfa
z@x7M7hYhx?LSdkQSDT+L!XQ0AGu&u@sKu(SI_M?i38joKSnAqP6z9i18C3~TjJ2sS
zCsL+2(3+X#qWpnO9B`G5K`=ttHs5T&aJ=Enw|<B7&j{cD_j2EZ@>pr2Hnx=g@zy``
zjR{^+t$ZkT?Phw8pIie+uibKYk5s1giZ1DGGOaWRgl@d=EF_;r#NhQ=_NZwN>PCLd
z(^fxu&6z#?rIe<ny!Voq9Az4%OAOzn-eDJ6@J~BO%9ZLU&JXf{eCfWoq?s|zEH5Z0
zc0y*`q$jmEJIyrmNhH0h*iy4f_EPqT=g%tdb;m<rl+UOZ;6<Vet;hVvEx*3H*<&`R
zGHCH?*R8gGX}aPm;d~h8;HeT(g0$@o1+sf1obw<2+}3;1Saq`iVHp$CPwkwK8!p3%
zO6OaeW3?jgRc?T3szl}wpbi*4(I{)_eCXT<ofLfd47(`?25yFf%}fsZm^9k@GwVNh
z#C&KV>;bI&)Qe4Zig7i{;$m5D##=W&mhOuLN7j$J7S49`m>HWSE*ZqoTQ+#9zgnr9
z!)XexSW;7soQ0(9^yAb7;ibl<h0T!NcNFAitw+N!OsL5GdMYq^`o23X;&ov*#k~Dd
zs3Mp1ZKUugE?@$l{!|uIF&=-Z)Vlhvy#@~sBFKNJ-I^W5-U+^5d%H&V!pEvI4E_1<
z!ZZ<WR!nw#kle(H(r-mOLKfulv4lqO+f~VHPGdU<wQM$dfDmy2hpdMnafF%oj78Ft
zp)m0Lm3TT&)lRCMl>LC;QD?tc#<%EBlUp4i!Jid8L->^`3+d{qWMBCH>z)O^m`sUr
z<UC)7o2erBMW&k-8wI*tO%Qu34nm>q5ptm!yZgqVWNKDXe=FZVfVbo2kivvT^?ll$
zGLQ&%k&%_0>1%WDf#XW2v)7_}gR^uxy{Ht%H}<JUS%eWfCriPLYb&!eld6$x(Rg?G
z;Q@j;KfQSaNCE8CWf9*|dMMTeNZ#9WY7!VE5(0jm;-2IeQ?K!?KN|Lx$Rkty+t^YC
zFTgkuhMzry)>DHCzwG^%;|Kg0cb(on1&g*@q|*|cWjkoPv$z+w#(pkzsHQq$4X)*S
z7#wP{U*!A*-$Xboclh-f&7C(gz79)H$Iwmr$RAxC;rHF32ori-mY*y4m?Ne|w#S5i
zp}*@2qxsXLdCU*0O$&B=eqDE)X1Gn?3}#A`o1C#Dqr{vfAK!y#!4Se@|Bmb;?VNF1
zzymgF(G^eCl~{hbzv0;l6Gre=!IyxQ{iXlZ-$kfT+;_<u)JJ(F_H1x=?C&M)GLExp
zSrkX}k;q8C<petqS2L_p*TpUnteD4)D|Vl#gMZsCp2Zh%9sID7uGlj*H*o!RLH?P8
z`0pEmG&L>2>r70!KT66GzW&x465p3JMGk@B$?)k6l2`0`1&Vo-fGT_k$kUDD%q1i(
ztyKBAHA7B{wb*7L@lU$AmLsgF+uSVXi~P%pwYA9%xFjVEVjAl}XaNZKc{UpcY}Q-9
zwX8BY{c=;%1rpVQti#v-`DbU=)*zJGCVrVJoe&dnY;hZwW5xJNqwfHoMPfUS=A$Gd
zx*1f`u$1U$zQ;d41utlIp$K@VCw*9d$Z;;UTM<?Q9%4WKQkzz?-<|rr8%pKYP?Ks%
z`<<GIs6&Ei?DgsqO=J!=#MoMXsxPgxgiC9K4_DNP`A%P9De!wy3xh|bP{y<Gb{ZvT
z0UNS_U{>%KTK(i8!)LBgw&;Yf4)U>DL~(V)otYd#=cp^bc}w!;?88YAxb=3eb{o5I
z7hyzQ;q;SCj!3=0O^>MH#d;oV9traF8XGh$Og1pFo`r<4J#>(y!%YZyZjE>iaUhZO
zo_Y4Om7qNTAegn-{_om<d;5rY!GTDsQbCuDtGI&dmFpcx9lj-HIn95E67AS+xxWBN
zkNy6B$I-7Fs?(>=Y~*U5A-29k#YmE1m4Mt7Csxq@<Gk3fUdx&&qw$E;TddPOJN5Cc
zB;W1)44kp$U^V;#B(B(%ZVP`cd~h6HOOFDUbpGjbAVW=JC=|2~S3wvuxt;j~_GsYp
zmh+ALL+y(K)wQsN2z{{0a|3vuCi1wU-*MlHSX1IeNhC*+lIeC~y{TfqPIXYF;1O?9
zcLQR@fmSqravnU^)%VXEW~@Kcg<iY4c17W$MD?+$D{RV9q$>R_T<LKC>cQM8(hz>W
z=fKb!T2!(QK4O11qGnPOf5`c#r-`=2mt1c74LqQ}-OF}S;L)?bfEPADG8NrOv4^RT
zE~|EQM>C!5*(Y;@7%s)3#5s~6A{yKS5e6HqAounh^P9lt6b^X+V}-bGmE;pB*2xKM
zP))d07O8<-K;K*RND`X^@GPu}?lwGE#RAvh^ww{hYVSvHgU#Zp5@KW%tJW=k&pP0G
zT^sdC%BrMLHsmsji?zj--owpk+5+&WBfznPUyI2By_%uHy_DJ4m9mt^0~~NWU&J-m
zI{^y}<ZQbU4IK9S2sg$x-o!gi?ncqZsKy-yer$Tl{bqaA!-GS%)U>|Hf|#z4m0LUM
zYJ@<lT4aIuaS!I=<r)N6RXSNVa-Z55ol0=ZG*Mt3<hM>%DO<eUEyEPiN%|&WGS%8n
zV?}JKZwZC|o%zv^`H$|_G$RIQR6X{O#MG;1GefhTZy)GE$ptmkL}`1Kj#ewend6%B
zpI-W)u2u*w5q8EFbT)qj`rTn&vIj}fxg|2!c*j+)G2?qP*ut7{B$aP(GSVII-gSIy
zT)6k?ER=a5b7v9oJ{V#=cChFYuz30jagW`gGtK5X^s_Tm-@@~iEvzi23UfBE9tsa(
z+rIIYofqze!^}Hgl@Ga14n2Fj_ZkeQ57B)z^|hUjqecknvu^wfF$0Q;ci$l(n~HLQ
z-lm4cL?uy2gT5W4grEvn#}Y?Mc#AYA#(@$5U)<5j&nN5cI`*PJKumXR_XVrT%b>=V
z@1@pXm-^o`lJ^Rbk@&>1KR!_gGe+Gtg#|kg=ycy2gO<x60V^o#I1V@!QzTT>r1=i!
z_6YH(6oH3txuxhYibO}mP&hF#SbV9>LA-G(;ggu<(e-{(nN{3ZN>j6Xy(fUsdD>ha
z_?Xr%_qIMFYZ?4+sDgm***O!wXV?jwU>n`LIO}IFPSmvD{u}N$gBBxS#S4s|R$?Yp
z$%F#tF3Jr4?$<wO=NfsgrM7)SJh(CRIgk?{Ulf0TjN$E4-t0KQZ2ZAI5BZchYZ5mH
zOYYkNl|@k@t#YJgMZ(h_^SCL0Dl`nLfh|Qn(<V;LgDkSO3{3)OcVPg%h<^&<q4bB=
z%3N`H@HljkX#H%bmv|#+xx1|3<G>K0Z{BizOTWd6R)l{zopk(qXK?U7o|>IuePPM>
zxgiT3uOXKok?B1BzMzXSA;PT1@dOX13ND2}uDFwroyA{<i@fP)X*->b-d+DPn(J4A
z_HmO<zeDp9#2c2zXBsPqTaTj<CK3&K)6&`^`|4R~qCt|U<d5aiNSHYlz($UNF)!dI
zeWy{*=UF$H6|K-SBWwoa!o5Jp(y*s!X-po2y=|XmaixpXqEVFI`BJ4y#RLdW^CbS3
z@#}4PX0+yeTiGlUlP#~Om5*r>SEa3mo|$1YkJl>&m}Rpr<LZJf<Q<+UER5q#BbS(Q
zyV8y79?7banM949FT|O7&ZLjz+q?^mGA5*?zSVDfFKhZTS?s?z6Gm(@UIv*`UC)k<
zBkBcmz`lsGc<N2z6)f5pg+m^la+II7#Z9=Lnn;7!Sapy=om!y#A@eu6=I>U*5U44(
z)cGK1P&GII;fu+*bl|j@?+iyuUaEwl#6+P=;xy|a@p93i9ylr4f((ltnWc4ag6&&H
zz?5a#r^wfq$ze0H50Pqo$S3StPUH|b*i3T?W?XJzjNEI42?&NA&2`>0`|eD1d>kjS
zm|2PRjI6?(kJoMf+DEbv|Cg*fD*pkkD9&pCW-zD{8*U~rlFu_SEZNAm&Cx1}L@(V%
zN#a4{ZtH-d^$k3$X{$!2nv@%0%;S4IUyvc7vjN#1KzL7z+ah^&CN&KGzNX`tDzs8g
z@}MBKzV?A7dQxgVkwVizhAyt$?JWHXyra|0%MZ7jPDWOjL3q4m-yL8xfAh82(C@_F
zgO}bVd=c3&8N$$Qqe<Dg&u^Qs{e<f5x#F5FHU5fM?5a7DQWapSeLD*IqJ<djVhlVV
z(|Ub_jPVHks2TeO18Zsn=ah#RhP6RurEe5BbCIYCm%C0+(FMunBloHb=fBAyjNnKH
z`pG6IeKVmxMqL@vE*7Q__Il;rOHXZ-c&^P=$)z7rvHPucjf`$yQ^!Qa(Wmo${=fUJ
zWWawsg6n@G>zf5{x>a7gsny|rsMCZWEaG1^OBomzZAfj*SnvP`I-#yX#Ki<MS+Nu=
zP4N4ay(<%+Ktzz_FhRWM-*-V!;$ou;&7QWUkvz(Jkw5G^xK`W3wu_;vQG{_oSqHjK
zqAVnv2s+E(mpVQ=^eTfE>0vYe%bT}d4%_mNtpT+5?NwSo2&SXGMgi0v)<Qgo76P3L
zVD3I-k@7b)f2L#mU27N<4NY=MdePi=zXbsx8MUaN3H;P1c~9JGeVOe4`s`abeBUI9
zYrYvob>vxX%38uFpW<YVYYJNalm2v=zB67ynZy?*AbyoIt5vGHiLejqZR)4LEn|jG
zWDvLEh76RBR9RgKT*(iD-SxJmD6)0F<^-Pt4B^!?B<2>rj=7@+lRPgIaTF$=kEwT@
zXhq(a_(1^%2JJO6uWz)SPO7YkFu5m<vywc*kcg^Zufir^(TY~!+3}4AQWq&O1<*v)
zad))pV!b|qBO%NJ;h<dvoR5IL*`^HnxIzqyTrubOgVA?S?Dul%qQqWWRyi38){9?a
zN~mofn|)3zqDHX>;}|JT?QyphUoizSV+K+eJTH822o2xRp*n1Z&$21JpT{5)><h|z
zkm}AWNcBdE=Kkq^wUcVoOG>~qrIjJtShE{TnW!bS!-DWHk*B!|kdTYzo87tu9Vb%A
z+&JHqCY;3#VQRnQUb=&_7TX7oRwisCV=>FOGjjO<Cdr!iG7ZFPw{iYgefwe5c;vY`
z^VL&(8F!4tJC$U2PvBQV3RB<sQO*J*t-ONN)Rl3ss+N`ibFW*s`&AX=`?0z{MrQ=0
zHCmQ}5P;C+&RZ*}{d_Ol-I~}|3o%u#X+wp8ie47XLF6{N!Ci!_ztIQ1D9ftmx4>oW
z_Zk`UQv0eAMehZ;?=)}F*@{ej_0G+C+Fd#xJj>=JLx@qHn(SSaV=kNm#mAAvbHH&<
zz)iA_vI!6_^wU-Z+5*in*9*{mOUc`--bIjvCv&hQfk+K*wa~>z=<28;g7jOtgud2a
zc0cvEX@S3Y29A~?GFccfs%)$%@i_cHj8u%z)?FK<XUi_mITJ+R)QEu3E4&V1VlDFW
zithpbYa^O+_qSX3-yQ1z(-INJrRq+o{W@$8C*`rra8mM9+amN8)3j|Fm%42li2i&k
z*UwF@$8&bDh7)U!n=&1xKP?_+<4g5jw6zj=n7+C0HQ9!k6rS_;qEy?QM|mmCMpomL
zN$1kiUS1zOX~Hc(#B)3Q>|HX<*FVi2C}&3*N7mibq{p7Ql2M&jiW@Ks?6bsmebL!y
z!f`iw=IUnRAU^WuTRZuxL-cO#*Udp*>e9QYl8Q)YH9XE2#0^-s+%r1&!_`AiPSL5T
z(9dd+!}km#?j<E|#`N=F*`qlE?Bd??D@~LS3WjbU1T$v7u*H#7X9M`)3t;8G3s9e`
zAzZi7UKsOvEVwAgcRMqIhMLOncHhtG^keqyAT7WE(0yyGtm^{af1PoKUsdNHycy)$
zGZWJd6?}Q}>3fMgxXTmoL?q*H(|qI+FKcRT+8Yrf-o72d+t$JFxxDlx*ix%Va%<?F
zDX&Ea3Q;<&sdBH4bfG<;KtjcumuotzRMUgHCTo=ifA>u5ObifMVjPx@C&jtCawDK}
znshSw;*wz0=eS?6eE8Z6`vZxT$y<J5Jr-`dxIDjNp-cROuo-1A#pEC>r=zmz{lkq-
zHudv7v7hrzIW#Vl0h427#j}BrJ|vr_c<S$x_sI3cjng`=Q^M(Nr$yZ;&Gk`m2m7?>
z%GtYjXGcQMBd+otq6K8*9CL8ZWwOg6F2g;^0Z@U7b_!O*1dhSoo0-(gmj3UaFB4TS
z9=FGyhW;k)POxY-515GTOgG<3_gd%FE6mw@*ESlT^J}dg9~C^#S9a#l#ztvCg@`;u
zIsD%AN0j-`7`NROetFavZTh)UO9QHdTq4#Oa#vDrHq6@eo#EAC%F6pmIh!8UBC5s$
ztIMmc+I)A+tJyS_UkL4C)tEHmX?_Nmd3M91r+NDY3j%%j6-@$p5C6pLI%uv>#vSh;
z|1F((;ZysMM~bQRZf<=)XR(blmz$3FK&cmV{Siap;d^I5$ctG?)8X9wa;??q%RoqO
zD9~x)mj@hK^F4{(Gv;|ExhOKP>bJh^L0XN1@q(2n{uq+ZymUl~c*cUy#(`K8(}PP$
zPreV;MOz~ey#OPVN-g+0tcW<mZE><wuNoPd!`Xl|Ut>j(&R~Hbsi|F#o(200DPN@d
z93W?v`_6KK*&JFdAM#Ci<EN*)3R)4T=s}H*iG!0+Bjs6}i@fzAVdI8TpHa)0%FKXD
zi-(ztF3Pi~Y2$McVePL&FOvz#*i`!jT%Q@WVzaK(j@a6FPr;>WLu>z{#YSbLvFleO
z%HL(zRRL<7hm2|1-%08;RWiK1gKR9Re>Z&>d(=-|`}^-o_VbsL9@hZls`j+l;x^1N
zh2YRS&sA6SX!<5(i%ycg7@RdocHoj1W9w+PF|9eHIwHmpe<Hd!aAY?39~`qCoFk--
z+a1rVpIg5icG!AkR8D+i58R0iW?WL!-PreZokT7A_gDK=Ezn<W=Ju71M*$ygoJY1G
z8?m1Z84sz(a%?8#V;XY9PcLyxSB|0G-ci3DS15U$tD|oC(XYRYA#*g!*+vk?z#J97
za?H$TQ}<!4C2GqDf{{1T6ljRzwjC6vzTsAQ`OxrH+$<vRb<CHC;y9*VtM3_N)fqR(
zR*YOo3HE0^!~|c`+CIRN{Od%f;_Y#?-z}1D@UR+3HhR02a+KD7TA2koFr|`uTxK1q
zZWFk)L>`2sqxHHhVibu4K^psK?EU4>Zk*~V)PKqG`-3$JS=lojE8~ACC4T8W1{oVs
z?^7#sn}ghg*F72E8LIj-I6oBnIxxeELyAA7d94C&N}W}5K4Cd;eQbz%w~LNK?LH!(
z(0fhh5@6`mv7bg#|3IS!Am8qg*QUlKdtGd?<NI@(kxE*{DShrWlX7B8>PWTCp#@z(
z(d06ooP5&{h=6P$(qWBK09~h~q;2*b*Q&?!Z22S+5L4*f(8;y6Ok>v!2On)fgDVMT
zSa%~*yX!byy=Ial9YaH?v^uB8X<F7$d{~Ff&HXd$nyr%`i65qZK#35RB<qx#u``8{
zb8hTSB>Je%M$6q2<#DoWb)B-<QI3<bqHc=v=3at^hxG3qc0a=F_lPFNepK|`UjKAH
z+j}RCzwO1|uX?oGj*8g<C3(uN2dZ{Ujwz%XOf-pXf7;%BY4jT-RB;?%QPo^{{28_R
z#1i5&RN2JDM8E@9?b`oY%4q1x{I+m`x?65ZqaClEy8YDoFlSKv&U*2We+=hLXn}af
zn_ZB`{RfQ><7D&F=bQfciHVk`;<Cv_Hps3e8Cumu+n!^kvG+qJOhpb-`AF+WN%lK4
zp#PKEJ^+*!YCR_aZu^6}D<)Nic`Ye{```+6_WxYrS_?C_&^`BHJM{c<Rmcs;JbbAX
zZ*Xz?w5d=Fb+B{#GC6^+(}}6=U<gO}M3#ll0lAIb%1~x@F%e<K8+Mt33c2MkIGSn?
zUY2vs8&IWTqnVuIkTZ;D)~{5~vzGm=HD@!`KLvSw)V%+#LKge+$b69YoQQ~*<gJ5x
zXh^WMyyC{DT;|ZwB?DlLN_2A5%f+M}FUuWMrL0pT2_9tSQR=!N|JCN3@0OhjX+>j^
zeVoV{h15c-{)gP<Z9yi(i`9=17F}Zk1k=*V*Ke||s&$Uu6Urpfa+Q(@8nT~;th$FP
z@18hXH|n91Hkw;~-B&T3geY%1#N0f-NjMt^5}kiCjG@MN6d^O%BC^=m{bBU?(SiWC
z38tN$^u)b(_d-?S^lbPb=V9}YBeKR-7z*rox0gJiBAI*Tn1Vi-z8=r)DCfk3i%zY9
z6edf6tm#v5Gqk4f9N!K};)%CI^{A8JrBz-tl1mGnEEh{d3-8E6LTwPtW*x?Qth-S@
zuHnG6n}P8i(p5ijjpb{%9sCh#(8F!wSzM=@pKCpyKr%;4p=aReqzlXL##%93>v(~1
z>+kSF!Uqo$CzZR?ELH4Q_36WfZAfI`IEFY6K@$AdpH2CIhZ4^va@}(q;(HPc3x1pz
zA5t*of#X_E_M(&`Wld&fQmyairLH?7J!|Q4DjaPf)*@+%%*RSHc@OP6$VA{-AI6|n
zK(peOlBPnL)Is>udb(oZd$b}t&V@X=jzDO{<8f?|p3K9W{jDi1697;IGB-w&YvtV4
zDvmtX9hBo5wB}ji+`ie)?b|Fb<6U?eC=^r7^0%DJ!MT0vHp)|l1I=jNVCL>={l3Oi
z#pZt!U#EEKmE5%sgkyGXvFcl%vK3gSWGhdpuaZVqjg%rAdH4c>l9+!2PW^Vku!ICX
zQ@dmqNE<prSe>bbGO)@+dA3(6xy<@wUR2=pbYB#pYKQFIKco+b3Ba2lg?@d-<o|R3
zGan%UG*P6^*jou;8Ny*3(B(fv8}B%az65q?|KgU{4rx|4i2sGa(~N1IJi|7|?w!m(
zQHzj!(oO#?IWTx$(-kE>E!bfgEmdw>%bf8va8|RQxD(QEmlo}aX7K5`U8jm4>J}1T
zjm9pkuQdssb*8OmHs`l{VP+5CPASk}wx~=w%n6wDa823lBHzBf+sgwlZ25k!n5If?
zGP$vL>G*XM5=@<tl2G{jB}AMsoqXp$F_6)&QJL>sVdTop`YysBtpOgc+R^OUiu~(A
ztmIB;nhVnDN-2kOo5*+#8$@%77$D2_Z>q3Tci;SGdqA3SXY`-E?uNC&aH=!S7-!5b
zBUocg`YmrpUUJUsf!7ujuAdFeEZ|;${49;UKgV2wtFyA;VVPa#KW3n14wHT$ept3i
z+UPzH;KA*B-(aFNQ5bXMq1iAn62E3Fu-c70py6~bLr;|w0GQ8To6FC!WhneoVj!yT
zAsqo8eZn&2eP_5Jq6{_Se7nQ!D@(X)w0b$CDle@o@N3WcUu%{k<*CO>W`TH`{S1E5
zgnO7pce!PqtnJ7|`ka9hjBD9P=?4dbevZGYg{i8oY%b??uOuB#ReIfIA}3%r^MAYa
zG21}Yj@FzBF6^Ms^5hX=QDS61B)f04>XYpMWxG%E@z4P(S{hnG<@Hfi3Z#a?nKy&V
zvws8HH>?KPl}*U;2=v3|;kRK`28jZZyv>P6OOd$Z3ZUy>0z0dtrHMS48&3d3--}a~
zY6|2tE#3jU<v(gR$Yqpv);~s7Jv1cP_={Uf^0JCIAsenvHFh5umYD!0U>mt5N<iKe
zphSd4_m&~bo;gjpjuEx}=3o`K{nfS8jL7>9a!UyW^&#p0uH`^RWUBg|`z>~o!eIxZ
zUND?`-Sx$7Y}XSXs|#3SsAbHi5M53H5peA2F|R34{v~yt;cq%+{n@=CGP>fhi20|t
z*d<zw>&FGO4)VQM+vqe?gQT>0stkmn(lYiDdU>vhb`I7YM(VK1K$u@zBP@Zt?zDI=
zshaweRBcpkIoG`FR{DHhRrinDV?(DD#lT>Zg2bK)ZN$6T!L;aONn(N*vMkkh@)2)6
z$tJt<K<B7t$MT`dZV`Ahhjl`-8WGUl+Rm3sw`bRBD@SqD%0wFzUw**qSUbmLqrSW<
zU!<P%VbdxnOqQW_b67iDk#bVu5c;o?uX<JY+<B=`BEk)zVWI>1J4vQyZO_80$E=ZH
zPp*R|^QNSA_oei7Vh92_&FVg)&Hin<mMX6ikn;&}YAA7LI1ft2v0|l~F}?vW%%XnS
z;uYgvFC!DLJ9gG!+PYG@<oj4iVz)rLICk5@^_o@I13Vj2X$JS&eb^Cbei>Qo-efFB
zS@g-Tq1R7$b;7wU!4sjtcbo-XbvG|cSnGN-c=FD3;{^dCZj+;Kf!Z6b$G1iS7({*X
z3vmzTmTvPu#?Xmf1uj=Hi>v3pUNwIga58qbioYpCADxX!v|+R8BU>#`o^P&0<oP*A
zx0NE=`=?dtVplexs>Dan>ET>nXEwYLpJ{#Ysp+nr4Hj(;DmK0&GWItB&@sIyvqo?X
z@lGqnmvw-RmPL;wy{%Xd09ht@cCyr2ZYLDn5{YTHWEZ{tWvbNV(flg3VAZP@UqG+M
z8^s$*1bVpAPV&mu^|QV8>==lIf=vI_pnJtGx$dND`&m1mY!5So!%v^R7*qo@sPIr)
zZ{tq>X!m=6`nDa;$~;|HhMQH4BIsjY!a?ZR;UE(R^kl`y`QVJfsi8^5$p9Ph5kOf;
zzLxm}Pw!@i>Gw7UGLSn}jl%LOWxQ2}2Y5+T`8%pAjMoaZ=QQc|I?;;CYPi$<YWpJp
z)dY*DB1-1@C=B%;jK!DgHILcM(dbMs4GD*8@DaC~Xq?k-$lO=1CRq`$o<`3+MS7?R
zUW&@#l(7!caUH4JBc%4zJf7S`=g@haZ0_KCG95LHmiiPn?vMW97C(RA3>C(VZP5Jf
z73r_uK^o)yx_bg=Ou0r(U@_m`CG1Q5&7fHj?;v%XHGoI9=fl*wG|@1q7+We%6CQbJ
zI}a+M<abtTj8opz7C7Hn6La2LQ9ec&(;5Vky3!b|{jbida_M5ZD_KYW*+EXjOG0V~
zVlXhMh-6;mNV56f=}HVl(++q2VY6|m10`QdZ51=48;XO0okt74V3Vq#L$a=wx5!UA
zPojFfuRI4!?%FPrqXY9XYj8QgTN7mS7uj~3ocD+qS0{y>#lhZ<-y6a;*(Y4FyJ}Va
zSeoK6<vqrMIm}-s(G64aru5Ply~GRSep`xopEdE23UpA^eiG9Dmg+kwnKJIBzhXUO
zo}yTL80{Gp!K`H8!S(#j^h%)H?c;io#V2a6sI|O=b7_CXNb<^c84;pftx7M;Y)CG>
zK^zVu06`pVj1ZvDB21fliA|F5z3f`9*POtlm6^&;DNU~-TO^_l9*x>T-GbWNcr4dL
zZBH8Ua-nu?D5u$TD&ibz2pCi)M>HWq{#RX19tnmUrk|zw$az*@O`7jKEqj(n8+*@X
zb#KICiRkU1t$Wi|o22M#W+Om-_$gja8#vv?T5Z&n47=go0Oe1g05fy;@EKF_B@nHF
zU=a^`qYN*ph_1x<4}dj;)zLrc0a$tgMuzZ+`)0?lGwqu`$9|S?mUPIJzuyd!6^vHt
z54WV{BjWmX`X^lp2knio_TP3+p*)za3>5qWs&Tnl!T9pm4;)|XcP11>&X_W81e-OB
zsEzOQJ3@*YWlQv(=iE13qZ~gi6uv?9fm9p;RTX0Hpt-hHqB-4>62IQf6;46)2hUg!
z7Ib^E2tTnvW0bO~zaZN^(6%r)Yz2C5*?WCdx;VyfpkI<1R_IzQ#FqN@SHvpOOT?*i
z1ti<^K*S=uim{IUUXpbN!O<`T(xv%=TH-1&wxmN-25^w44@F(MmF(|-5dFrb-2(2q
zMr_dFOS47m{Iax?b4nk;9Z^Y)Z4DwpU}&50*+z$k_sW|dp>;zZk~g^qcok~{6AXbO
zxn9ak<W;o!Q3;ay#6IZPvY`kTz3|SSJzPD*IssLvh*qsF;mnRaxJGxQHTURy*<Q1Q
zT}w+vr9(}}k@?}9ttlL)S1CGhFOa`w>qg^XYX^Gl7ZC>`JRF?>%~9LcW&>SNv^P%-
z{}U2&1s=Sme<!TFip#_^XS2TbNzVW5?y+;0eTcm0$?!SxF?D<*4tveM=hh3s&Bxb?
z)f#uHFfbX&WGJ}T1?f2&2|8Xu8uuLLi6%|Bi^w;a@AnMUnT1yy9Gvy$39nL&0=mo(
zPW@@>^><yP16R#eRra8^oc*TbDFpq*|1`?`Z>9S-dj-L*)5rqM>mOhu)fWh!(m;RK
z!dEE>!Br?A&Y*2|A|iW!J7!-Wgk=O~Zl2~IemsLsb)dUVVrOd(a{$=}l5n{@=tNgZ
zZL}qNFUO(4klV#1qS6aT#DW&y0@xTa+Dh%!+z2d#v{R6tQw}8P9yI~Y27l1;!(22-
z+Uzy;_UNED6<E2L;9Xn(Y`73+VbKLJc=dj0b2Ozh8Ny*LpVL^R04nZ$_1GQsfe}yC
zkvoZe!X5!u%Lt?i$YL+}%p_a{8oX;)dqnBa9cB=Ht`LB<MYj*0r0vg$D(37)SYloc
z16YsR=9x=Yn&Gs?=2&qn+bh53z3J_9H*1KxS(1)blDEsW-tIMPjnguH!>t;W_@(ix
zngXHFg$nTXAlZ9G@h+l|z%Ho$Qk5|G>|Rn{4K;tGb>M<dGkcmqVEooQ%V#d+SCu*c
zr{vzyLoH%j3PUbD)WNtLNVv}LNJwzr7~)#}b$C@9NPz5fhTn-tTOT)~NwbASTHC2&
zgN3I9;T5o~btv!f;Qr~WB#t@ccm6-pL!b%4&3^3MA!S+kke23YEtl4N1kG?jr_*Pv
z*zK#3u*K_EH!D~H-VYRfYJH|I{d$DuuL}dz`r?OC0C%~~1P&)FuXP`oB@Bo384Q+p
z3|4difPSv{%j|jUhww?mrXNhx4|H_CIYou`ImDMeQ%<8cJb9icv5M2SnhFAvq`GRo
z!*4=4Np^A2WBC~mA7d>(qF$`_Q7y!DBL$FV5QjMGkVZ~zW-;ZDsZ@P8UBIu2soI@%
z>)Nn&gx|8SfgRVr7=VkZzG8WqlrrTf)uDEyg2dBStjw~mRiFs?XZc!^@8WBJTHzK_
z4@<fECj?9hS$e7LL+hp)_=eic&ZTc`uf^@dgOYKozCxt~UoJPlGKdcwT}^?hZ6XK`
zEKOe0;z1@()^M`l9)=2HR9Oj%(<gR$9u|2~ukc1-{kp(jEQ)*0DyWUh_1l;Oa{nKC
ziN$c#2Ho&8?L6YjE{n`pL+WXxr0kBhk<6}hubQ%u36Ow<z=W#=Sc3f$HMwPA5%6o4
zc+0q57MYZ0_Nm?U@pnrvK2;0OoNo3JUA$XGVDDAuNfJNv<;G9q2p%EkYBhT^XY~$4
ztvln{>1PCBeRsON<Kak?wt-C<Qy-KSLOcteT-&Z5oynY+`hH%SWRI_?r4a!kl%QJm
z;%#Y(%<}95JcvC;2IwYp3Qt&uQ5bsqb3|8`TOx5j1N+|p#(UFSbm(49A>EO>^%}dy
zs=RzBOb1$>hO14i{j%1<e!q(7^Cl<@!D4SjQbtstP?!?>b#lgSc^Xz)Y=k$>K2{6t
zIff0`Z5z@|WAA5xDI9b*D#t%`(x6@pP~#G&=*sS5z3Gi`c^G?!&6!!tfRH0MXaHSY
zbFohB3TWC~zJSRnL&oOcP{^n~keOHJ+9<b6#_3NUg`<)?NJmls-~^MW;IkZA1O%;@
zV?+~~b8@%*Fpi=(=dj%J6GK}?!>yg&0M*t*IGM-rid6WwLBt%fM~cZ>hl4=xQp6D}
zD7id>pek?>B2QU%y<>#hkjYp)EO2nv-Kjpc*nrY{Gs=^d_OR>Un;av;0{g9EoUakr
zuuYBAj5VPn!C2=nh47$~+Gi6=*O8^ugs++3PT#c{A%ISau}HD~kJ0jDzeTp-^B^{-
zYF=RgSi*7K5A@Y<(8>{iHt}Huvin~9hd?BP%k+c@e7ARFrkR>J{MEP$wJ;rZRTFID
zM6uD?s2gWqrMXVn@_Z%eK3p%b<-~ZZ8xqdcM*Hm)enV6QoltIRN*oYwU0&v374cUR
zzuLTEFszf%No&hNwA5tfBZc*ZG{1rPk8-}OrZ^@0oX6kV;yiT9_syB*<22p<L?FKo
zS@MWXRA1=`PVCO;`=VJG=aGbq*C!KDHuxPOMBhrz8#q=e2V_fZjx~!LvKeGAz-!}@
zb=)6bFD85SiXd0{c#fjLQ^gj0g)#!0H=nQe{B*^TMlH;jP2QyM3vt-gyFdbqpp_MP
z`g7id+KOps^u@^~?z_qp8P*y^m-?kz<fS);|Br{onBQ*a&O~Oj(Z?)ISTvf(DuWF|
zZmuKp1AyBr@};GL^*`y|X9E=C3NJr7;G75TwZUD8r2?<s1Y1r7UQu_U>sh74DO|4S
zUT}n|X?Ep~gr%2+*8hB+k5L_kxqaG<Y^*Jpcd&6=1*sqik+;8Zh>Cgpbqp0m5YFss
z>NT88N~w<g00lN31gE}ylNi3(3uf)AiwsqN0%C5L1uqt`Lrx0hd|r1%+?{^q6%>*-
zmor!iGkVCvv>%Ob%S$Z)Z8R1v;iqx@kO9z&>kfetiNziYXx3l4&NkxrY@{NwB>0@g
z0)OIIpU2nez1A%=_?=S9%9<U0-V@`Z$8Jh!CEz0Y8;Z~SdG=ROUs_}4EoR1*;7So!
z1QRT}3iHP<yT0?fYfmFz-K6$T=b_er%o#%Z)g#+O+hSoec%VPph<P$6=047Acb`S}
z&eXcEh&)^q+@c>h()OkowfiSVt@s5*6AppSRT?m>vloxyd<IW5B|yt<5%q}2n$CRU
zXtv4(d@LnK{AZ|K`sx2)*Oxl8I3ElHXpeu1s7RV1`;z&*Boi+E<aIcz#*#v+fB8M6
zsL`7+_Dyz=KKbq$gdOp#XSTZR)ZUJt>+=vlUXG0%4ukWs6PIu%9z-pt8-lRRUw~qf
zHUvx_ZY)o()gShNNqM2sS^osuVt3;Pkot)C8zP)6gJ@dX=f|!}GNa_(EC2Ro*(G;;
ze-$TH&6VtR5AHcxT2cCX)MOg{HLISK0=2;aDs7}c>zUo&e_)AVRm6%c%J-d!?E@Ic
z#7$^$>p0O@ZhzHw$MT0wFf_zsh-FT&LK!m}bhkOQd(Mhq{>g$`Kp>^1yqP+@Z1C&2
zoO_*(9-MQGxH5EuMstg+)vhlP^RN2M3?3HU?Is_1BO7|`#$}%yeo1*O6s#@b?Q@5V
zV!@%>-fF{WF)+n$#I%^#V~u!+jVx*12t}s3XjGhtsqd6R$BHv18`|%?L5n?Im~nPl
zdRy&h*Xgi?;qpp<i-Fg?1BiuXwNYs*=5jl|%oWCfYjk25ud)U;CL>{>>TErUPauOp
zYmL(qi;*Y7EN>)^{ZQ&-M$(X{-9FejPvs3cHMq&S&)YijFMu~lj=E3JWh9Al=E`le
z1KNA?939k@H$%QARMC7#?00D3sr%&a08P<U`2Z#Flo3rO-i@a*CECRTnt(@s*z+I(
ze>(s1XU-FejbaSM^k3V?M_rtx_8BoD?$h6?I?2@GNCv}V5O}wR)?lq0+<vy)Ikgab
zsUt1=3UePr>;EDM-UKq{^7Z+taAoZzp14N)&zY&3Ojhh}jcb!fp!-6~E?PSs?-Iy*
zw%Se;u)*DHo(BhCM*aQjp!wkru75<!D+0O4-jJ6wIIFI>>Ev`%#oPqWxOJ!#;{0E%
zfxYmbqhCUC6%LsxJ?mxvw1AhMK!{pxr#Y*~B6?B9OBqgo)ml*XGt?Fu(0WTT0dQiY
zAcY628e!tefviB^%RC7g2F)(GWof1m9cVCqod~IQ5BHz!JX<T94WdCEz7|K03LE2h
z<;JA^9k@v3FlOHw^xgMyfsn!{DD1QG51f1GJVK{To?&ly&Lrlh;TSK%+tK^!^ZR?o
zNZ(I5^VMloQq)X38!vIK%Gdn9B`aoD>t<_N-L12EsTk_E?skYOfeb$$66qjmbte$$
z+?R+YiXH$=KCkN(gKbyiO9k(7tmN~at(4e!Y{7<~DJ$eU1(^P13QdoHNCAY7sT}Dw
zd@fo|utO}G&Fr291u1y)H{~gsf9)hFVdz9uH#idpj5~^3SqPqJ^J{{A9Ngb$TcrP8
zSb+9H>s6hvZXm(KR?wzu-{0Key_$M>M(~wvzJyn~*bMr{-igJj)nyk5{d8GM1Zwt+
z-APB!^NKTzHYUt9=)^CLu1?^KipDu%iFCUIagVX;yqVz2?q{_w5LZoUh1^(7xH^&$
zPdz1rsrL2FQdu_(XI-D3YoJ)K8vd4f#oflS$>!`g8)SF@4BX@RNgUDIJmoKAADuvI
z9$`p4^2JAH`I75w?ESfGQ!n8v5}g_A?WBHNvmsnnYJ+dbZVTdR*ZD)ibO*QmljSyf
zm?-lItBqA~&oO#!TusnN4@gO-Ktcv5?a8Z^q+=kGr<d|D<zhZgHrQB_bLhcbvVUf|
zm>#D3P?s&}+Ph#@oUP5FHY)IcC<&eH&nE!|Jmt=jZ8zAV0+PK*0j}b-N||-Bh#)H_
z&=uQ%6(fq$9nS;A61-e(tS;jt!PWxs7B5-*Ds4s$>D(|c<;6P+!M@s0FXG1?HP^JT
z<T_!Ks-Z)2uP12sCk|yRAfd#PeIG|~64tZjfCn8QIVq%9iR0Z_>$-0?*yV2R7;Me?
z`2>ih-y@bIj2m<6E~Gg$1k(PGe5Op6qN{#v6C{`8;<^2gg0O>q_Cin)Z-`yr3|=CZ
zU6F3DwXXYV>rVMd{J9_MLw)%RFm4^{PO;fn96iz0I^)V{wE}StcuEG?R1^GUDz{aJ
zl4n3fj&=e}7ZtSbdN`eCZ#uF@`&UQ%b>f8Kq;K%UP=y@1rb#B=5xK|KQ}qfPY0`ZN
z5d{qA?kF;UoUa>gwWk2L%U00<KPHAxd<Ck%0a<t=8164$<&>dTSzMZZ?dO5dZE2{I
zT88iKvIpYj$aUn&p)Fu#Nh|K(xHV3PzpgP_kQk7+nwB}S_w9hHb)BxT!)zQWIc0lX
zXY>0+VP8C(I%)NEhu$C`S=efDVI9{NxZvxdUOa?0dpZf!AS+rDZ7pILYLGCos@yUe
zj}w&wPExh(RB~D=cuRr<&o<j6*j<27w1e=g82(@0S2xPH{SV_8OO$lbLbStw+Z7dM
LRb}d=%)<UZm7TgG

diff --git a/src/components/Breadcrumb/Breadcrumb.vue b/src/components/Breadcrumb/Breadcrumb.vue
index f57849fd..b37bd043 100644
--- a/src/components/Breadcrumb/Breadcrumb.vue
+++ b/src/components/Breadcrumb/Breadcrumb.vue
@@ -37,7 +37,7 @@
   .breadcrumb {
     height: @header-height;
     padding-right: 20px;
-    font-size: 12px;
+    font-size: 14px;
     line-height: @header-height;
     // line-height: 1;
 
diff --git a/src/components/Menu/src/BasicMenu.tsx b/src/components/Menu/src/BasicMenu.tsx
index d4d1047b..030ebe9b 100644
--- a/src/components/Menu/src/BasicMenu.tsx
+++ b/src/components/Menu/src/BasicMenu.tsx
@@ -66,7 +66,7 @@ export default defineComponent({
         offset += 54;
       }
       return {
-        height: `calc(100% - ${offset - 30}px)`,
+        height: `calc(100% - ${offset - 38}px)`,
         position: 'relative',
         overflow: 'auto',
       };
@@ -147,6 +147,7 @@ export default defineComponent({
     }
 
     const showTitle = computed(() => {
+      if (props.isTop) return true;
       if (!props.isAppMenu) return true;
       if (!props.collapsedShowTitle) {
         return !menuStore.getCollapsedState;
@@ -247,7 +248,6 @@ export default defineComponent({
     return () => {
       const { getCollapsedState } = menuStore;
       const { mode } = props;
-
       return mode === MenuModeEnum.HORIZONTAL ? (
         renderMenu()
       ) : (
diff --git a/src/components/Menu/src/SearchInput.vue b/src/components/Menu/src/SearchInput.vue
index 7c504fe7..2a2424b1 100644
--- a/src/components/Menu/src/SearchInput.vue
+++ b/src/components/Menu/src/SearchInput.vue
@@ -94,7 +94,7 @@
       .ant-input {
         color: @text-color-base;
         background: #fff;
-        border: 0;
+        // border: 0;
         outline: none;
 
         &:hover,
diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less
index 7e57fd05..c1c3e789 100644
--- a/src/components/Menu/src/index.less
+++ b/src/components/Menu/src/index.less
@@ -4,7 +4,7 @@
   color: @white;
   background: linear-gradient(
     118deg,
-    rgba(@primary-color, 0.7),
+    rgba(@primary-color, 0.8),
     rgba(@primary-color, 1)
   ) !important;
   border-radius: 2px;
@@ -32,6 +32,7 @@
       font-size: 12px;
       flex-direction: column;
       line-height: 24px;
+      align-items: center;
     }
 
     & > li[role='menuitem']:not(.ant-menu-submenu) {
@@ -93,6 +94,8 @@
   }
 
   &-bg__sidebar-hor {
+    overflow: hidden;
+
     &.ant-menu-horizontal {
       display: flex;
       border: 0;
@@ -105,23 +108,16 @@
       &.ant-menu-light {
         .ant-menu-item {
           &.basic-menu-item__level1 {
-            height: 38px;
-            line-height: 38px;
+            height: @header-height;
+            line-height: @header-height;
           }
         }
 
-        .ant-menu-item:hover,
         .ant-menu-submenu:hover,
-        .ant-menu-item-active,
-        .ant-menu-submenu-active,
         .ant-menu-item-open,
         .ant-menu-submenu-open,
         .ant-menu-item-selected,
-        .ant-menu-submenu-selected {
-          color: @primary-color !important;
-          border-bottom: 3px solid @primary-color;
-        }
-
+        .ant-menu-submenu-selected,
         .ant-menu-item:hover,
         .ant-menu-item-active,
         .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open,
@@ -261,10 +257,13 @@
   }
 
   &.ant-menu-light {
+    overflow-x: hidden;
+    border-right: none;
+
     .basic-menu-item__level1 {
       &.top-active-menu {
         color: @primary-color;
-        border-bottom: 6px solid @primary-color;
+        border-bottom: 3px solid @primary-color;
       }
     }
 
@@ -306,16 +305,9 @@
   }
 
   &-light {
-    border-right: 1px solid rgba(221, 221, 221, 0.6);
-
     .ant-layout-sider-trigger {
       color: @text-color-base;
-      background: @trigger-light-bg-color;
-
-      &:hover {
-        color: @text-color-base;
-        background: @trigger-light-hover-bg-color;
-      }
+      border-top: 1px solid @border-color-light;
     }
   }
 }
diff --git a/src/components/Menu/src/props.ts b/src/components/Menu/src/props.ts
index 60193c9a..ad28f487 100644
--- a/src/components/Menu/src/props.ts
+++ b/src/components/Menu/src/props.ts
@@ -54,6 +54,10 @@ export const basicProps = {
     type: Boolean as PropType<boolean>,
     default: true,
   },
+  isTop: {
+    type: Boolean as PropType<boolean>,
+    default: false,
+  },
   beforeClickFn: {
     type: Function as PropType<Fn>,
     default: null,
diff --git a/src/design/ant/index.less b/src/design/ant/index.less
index 17e24c19..8f4bf94f 100644
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -2,10 +2,15 @@
 @import './input.less';
 @import './btn.less';
 
+// TODO beta.11 fix
 .ant-col {
   width: 100%;
 }
 
+// .ant-form-item-label {
+//   text-align: unset;
+// }
+
 // =================================
 // ==============descriptions=======
 // =================================
diff --git a/src/design/index.less b/src/design/index.less
index 542632b4..166a5e50 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -36,7 +36,8 @@ input::-ms-reveal {
 }
 
 body {
-  font-family: 'Microsoft YaHei,微软雅黑,Arial,sans-serif,Helvetica Neue,Helvetica,Pingfang SC,Hiragino Sans GB';
+  // font-family: 'Microsoft YaHei,微软雅黑,Arial,sans-serif,Helvetica Neue,Helvetica,Pingfang SC,Hiragino Sans GB';
+  font-family: '-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji';
   font-style: normal;
   font-weight: normal;
   line-height: 1.428571429; // 20/14
@@ -149,7 +150,7 @@ object {
 }
 
 .ant-layout {
-  background: #f1f1f6;
+  background: #f0f2f5;
 
   &-content {
     position: relative;
diff --git a/src/design/public.less b/src/design/public.less
index cb8ab901..2bcaa9f2 100644
--- a/src/design/public.less
+++ b/src/design/public.less
@@ -5,11 +5,11 @@
 }
 
 // TODO 滚动条样式-待修改
-::-webkit-scrollbar-track {
-  // background: rgba(0, 0, 0, 0.06);
-  // border-radius: 2px;
-  // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
-}
+// ::-webkit-scrollbar-track {
+//   // background: rgba(0, 0, 0, 0.06);
+//   // border-radius: 2px;
+//   // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
+// }
 
 /* 滚动条滑块 */
 ::-webkit-scrollbar-thumb {
diff --git a/src/design/var/index.less b/src/design/var/index.less
index a9736c91..48029ce7 100644
--- a/src/design/var/index.less
+++ b/src/design/var/index.less
@@ -3,13 +3,13 @@
 @import 'breakpoint';
 
 // tabs
-@multiple-height: 36px;
+@multiple-height: 30px;
 
 // headers
-@header-height: 36px;
+@header-height: 46px;
 
 // logo width
-@logo-width: 40px;
+@logo-width: 36px;
 
 //
 @sider-drag-z-index: 200;
@@ -18,4 +18,4 @@
 // app menu
 
 // left-menu
-@app-menu-item-height: 44px;
+@app-menu-item-height: 42px;
diff --git a/src/layouts/Logo.vue b/src/layouts/Logo.vue
index f2b133ed..de506c1b 100644
--- a/src/layouts/Logo.vue
+++ b/src/layouts/Logo.vue
@@ -1,18 +1,23 @@
 <template>
-  <div class="app-logo" @click="handleGoHome">
+  <div class="app-logo" @click="handleGoHome" :style="wrapStyle">
     <img :src="logo" />
-    <div v-if="show" class="logo-title ml-1 mt-1 ellipsis">{{ globSetting.title }}</div>
+    <div v-if="show" class="logo-title ml-2 ellipsis">{{ globSetting.title }}</div>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, PropType, ref, watch } from 'vue';
+  import { computed, defineComponent, PropType, ref, watch } from 'vue';
   // hooks
   import { useSetting } from '/@/hooks/core/useSetting';
+  import { useTimeout } from '/@/hooks/core/useTimeout';
+  import { useGo } from '/@/hooks/web/usePage';
 
   import { PageEnum } from '/@/enums/pageEnum';
+  import { MenuTypeEnum } from '../enums/menuEnum';
+
   import logo from '/@/assets/images/logo.png';
-  import { useTimeout } from '/@/hooks/core/useTimeout';
-  import { useGo } from '/@/hooks/web/usePage';
+
+  import { menuStore } from '../store/modules/menu';
+  import { appStore } from '../store/modules/app';
 
   export default defineComponent({
     name: 'Logo',
@@ -44,11 +49,24 @@
         }
       );
 
+      const wrapStyle = computed(() => {
+        const { getCollapsedState } = menuStore;
+        const {
+          menuSetting: { menuWidth, type },
+        } = appStore.getProjectConfig;
+        const miniWidth = { minWidth: `${menuWidth}px` };
+        if (type !== MenuTypeEnum.SIDEBAR) {
+          return miniWidth;
+        }
+        return getCollapsedState ? {} : miniWidth;
+      });
+
       return {
         handleGoHome,
         globSetting,
         show: showRef,
         logo,
+        wrapStyle,
       };
     },
   });
@@ -59,12 +77,13 @@
   .app-logo {
     display: flex;
     align-items: center;
+    padding-left: 16px;
     cursor: pointer;
 
     .logo-title {
       display: none;
-      font-family: Georgia, serif;
       font-size: 16px;
+      font-weight: 400;
       .respond-to(medium,{
        display: block;
      });
diff --git a/src/layouts/default/LayoutContent.tsx b/src/layouts/default/LayoutContent.tsx
index 21d65df8..36f26173 100644
--- a/src/layouts/default/LayoutContent.tsx
+++ b/src/layouts/default/LayoutContent.tsx
@@ -4,7 +4,6 @@ import { Layout } from 'ant-design-vue';
 
 import { ContentEnum } from '/@/enums/appEnum';
 import { appStore } from '/@/store/modules/app';
-// import { RouterView } from 'vue-router';
 import PageLayout from '/@/layouts/page/index';
 export default defineComponent({
   name: 'DefaultLayoutContent',
@@ -15,9 +14,7 @@ export default defineComponent({
       const wrapClass = contentMode === ContentEnum.FULL ? 'full' : 'fixed';
       return (
         <Layout.Content class={`layout-content ${wrapClass} `}>
-          {{
-            default: () => <PageLayout />,
-          }}
+          {() => <PageLayout />}
         </Layout.Content>
       );
     };
diff --git a/src/layouts/default/LayoutHeader.tsx b/src/layouts/default/LayoutHeader.tsx
index 27eceb5d..9574a77f 100644
--- a/src/layouts/default/LayoutHeader.tsx
+++ b/src/layouts/default/LayoutHeader.tsx
@@ -1,11 +1,12 @@
 import { defineComponent, unref, computed, ref } from 'vue';
+
 import { Layout, Tooltip, Badge } from 'ant-design-vue';
 import Logo from '/@/layouts/Logo.vue';
 import UserDropdown from './UserDropdown';
 import LayoutMenu from './LayoutMenu';
-import { appStore } from '/@/store/modules/app';
-import { MenuModeEnum, MenuSplitTyeEnum, MenuTypeEnum } from '/@/enums/menuEnum';
 import LayoutBreadcrumb from './LayoutBreadcrumb';
+import LockAction from './actions/LockActionItem';
+import NoticeAction from './actions/notice/NoticeActionItem.vue';
 import {
   RedoOutlined,
   FullscreenExitOutlined,
@@ -14,19 +15,24 @@ import {
   LockOutlined,
   BugOutlined,
 } from '@ant-design/icons-vue';
+
 import { useFullscreen } from '/@/hooks/web/useFullScreen';
 import { useTabs } from '/@/hooks/web/useTabs';
-import { GITHUB_URL } from '/@/settings/siteSetting';
-import LockAction from './actions/LockActionItem';
-import { useModal } from '/@/components/Modal/index';
-import { errorStore } from '/@/store/modules/error';
 import { useWindowSizeFn } from '/@/hooks/event/useWindowSize';
-import NoticeAction from './actions/notice/NoticeActionItem.vue';
 import { useRouter } from 'vue-router';
+import { useModal } from '/@/components/Modal/index';
+
+import { appStore } from '/@/store/modules/app';
+import { errorStore } from '/@/store/modules/error';
+
+import { MenuModeEnum, MenuSplitTyeEnum, MenuTypeEnum } from '/@/enums/menuEnum';
+import { GITHUB_URL } from '/@/settings/siteSetting';
 export default defineComponent({
   name: 'DefaultLayoutHeader',
   setup() {
     const widthRef = ref(200);
+    let logoEl: Element | null;
+
     const { refreshPage } = useTabs();
     const { push } = useRouter();
     const [register, { openModal }] = useModal();
@@ -35,6 +41,7 @@ export default defineComponent({
     const getProjectConfigRef = computed(() => {
       return appStore.getProjectConfig;
     });
+
     const showTopMenu = computed(() => {
       const getProjectConfig = unref(getProjectConfigRef);
       const {
@@ -43,7 +50,6 @@ export default defineComponent({
       return mode === MenuModeEnum.HORIZONTAL || splitMenu;
     });
 
-    let logoEl: Element | null;
     useWindowSizeFn(
       () => {
         if (!unref(showTopMenu)) return;
@@ -80,6 +86,7 @@ export default defineComponent({
     function handleLockPage() {
       openModal(true);
     }
+
     return () => {
       const getProjectConfig = unref(getProjectConfigRef);
       const {
@@ -99,7 +106,9 @@ export default defineComponent({
       } = getProjectConfig;
 
       const isSidebarType = menuType === MenuTypeEnum.SIDEBAR;
+
       const width = unref(widthRef);
+
       return (
         <Layout.Header class={['layout-header', 'flex p-0 px-4 ', unref(headerClass)]}>
           {() => (
@@ -112,10 +121,12 @@ export default defineComponent({
                 )}
                 {unref(showTopMenu) && (
                   <div
-                    class={[`layout-header__menu `, `justify-${topMenuAlign}`]}
+                    class={[`layout-header__menu `]}
                     style={{ width: `calc(100% - ${unref(width)}px)` }}
                   >
                     <LayoutMenu
+                      isTop={true}
+                      class={`justify-${topMenuAlign}`}
                       theme={headerTheme}
                       splitType={splitMenu ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE}
                       menuMode={splitMenu ? MenuModeEnum.HORIZONTAL : null}
diff --git a/src/layouts/default/LayoutMenu.tsx b/src/layouts/default/LayoutMenu.tsx
index e86f4e03..e6cdb34b 100644
--- a/src/layouts/default/LayoutMenu.tsx
+++ b/src/layouts/default/LayoutMenu.tsx
@@ -45,6 +45,10 @@ export default defineComponent({
       type: Boolean as PropType<boolean>,
       default: true,
     },
+    isTop: {
+      type: Boolean as PropType<boolean>,
+      default: false,
+    },
     menuMode: {
       type: [String] as PropType<MenuModeEnum | null>,
       default: '',
@@ -199,6 +203,7 @@ export default defineComponent({
           flatItems={unref(flatMenusRef)}
           onClickSearchInput={handleClickSearchInput}
           appendClass={props.splitType === MenuSplitTyeEnum.TOP}
+          isTop={props.isTop}
         >
           {{
             header: () =>
diff --git a/src/layouts/default/LayoutSideBar.tsx b/src/layouts/default/LayoutSideBar.tsx
index d5c8ed17..8c6f2b9c 100644
--- a/src/layouts/default/LayoutSideBar.tsx
+++ b/src/layouts/default/LayoutSideBar.tsx
@@ -7,7 +7,7 @@ import { menuStore } from '/@/store/modules/menu';
 // import darkMiniIMg from '/@/assets/images/sidebar/dark-mini.png';
 // import lightMiniImg from '/@/assets/images/sidebar/light-mini.png';
 import darkImg from '/@/assets/images/sidebar/dark.png';
-import lightImg from '/@/assets/images/sidebar/light.png';
+// import lightImg from '/@/assets/images/sidebar/light.png';
 import { appStore } from '/@/store/modules/app';
 import { MenuModeEnum, MenuSplitTyeEnum, MenuThemeEnum } from '/@/enums/menuEnum';
 import { SIDE_BAR_MINI_WIDTH, SIDE_BAR_SHOW_TIT_MINI_WIDTH } from '/@/enums/appEnum';
@@ -39,15 +39,16 @@ export default defineComponent({
       // const collapse = unref(collapseRef);
 
       const theme = unref(getProjectConfigRef).menuSetting.theme;
+      if (theme === MenuThemeEnum.LIGHT) {
+        // bg = lightImg;
+        return {};
+      }
       let bg = '';
       if (theme === MenuThemeEnum.DARK) {
         // bg = collapse ? darkMiniIMg : darkImg;
         bg = darkImg;
       }
-      if (theme === MenuThemeEnum.LIGHT) {
-        bg = lightImg;
-        // bg = collapse ? lightMiniImg : lightImg;
-      }
+
       return {
         'background-image': `url(${bg})`,
       };
diff --git a/src/layouts/default/UserDropdown.tsx b/src/layouts/default/UserDropdown.tsx
index ec1e756e..83c0acd1 100644
--- a/src/layouts/default/UserDropdown.tsx
+++ b/src/layouts/default/UserDropdown.tsx
@@ -21,6 +21,11 @@ export default defineComponent({
       return appStore.getProjectConfig;
     });
 
+    const getUserInfo = computed(() => {
+      const { realName = '', desc } = userStore.getUserInfoState || {};
+      return { realName, desc };
+    });
+
     /**
      * @description: 退出登录
      */
@@ -41,10 +46,20 @@ export default defineComponent({
         openDoc();
       }
     }
-    const getUserInfo = computed(() => {
-      const { realName = '', desc } = userStore.getUserInfoState || {};
-      return { realName, desc };
-    });
+
+    function renderItem({ icon, text, key }: { icon: string; text: string; key: string }) {
+      return (
+        <Menu.Item key={key}>
+          {() => (
+            <span class="flex items-center">
+              <Icon icon={icon} class="mr-1" />
+              <span>{text}</span>
+            </span>
+          )}
+        </Menu.Item>
+      );
+    }
+
     return () => {
       const { realName } = unref(getUserInfo);
       const {
@@ -65,28 +80,13 @@ export default defineComponent({
               <Menu slot="overlay" onClick={handleMenuClick}>
                 {() => (
                   <>
-                    {showDoc && (
-                      <Menu.Item key="doc">
-                        {() => (
-                          <span class="flex items-center">
-                            <Icon icon="gg:loadbar-doc" class="mr-1" />
-                            <span>文档</span>
-                          </span>
-                        )}
-                      </Menu.Item>
-                    )}
+                    {showDoc && renderItem({ key: 'doc', text: '文档', icon: 'gg:loadbar-doc' })}
                     {showDoc && <Divider />}
-
-                    <Menu.Item key="loginOut">
-                      {() => (
-                        <>
-                          <span class="flex items-center">
-                            <Icon icon="ant-design:poweroff-outlined" class="mr-1" />
-                            <span>退出系统</span>
-                          </span>
-                        </>
-                      )}
-                    </Menu.Item>
+                    {renderItem({
+                      key: 'loginOut',
+                      text: '退出系统',
+                      icon: 'ant-design:poweroff-outlined',
+                    })}
                   </>
                 )}
               </Menu>
diff --git a/src/layouts/default/actions/LockActionItem.less b/src/layouts/default/actions/LockActionItem.less
index 822c4868..21e4c643 100644
--- a/src/layouts/default/actions/LockActionItem.less
+++ b/src/layouts/default/actions/LockActionItem.less
@@ -1,9 +1,9 @@
 .lock-modal {
   &__entry {
     position: relative;
-    width: 500px;
+    // width: 500px;
     height: 240px;
-    padding: 80px 30px 0 30px;
+    padding: 130px 30px 60px 30px;
     background: #fff;
     border-radius: 10px;
   }
diff --git a/src/layouts/default/actions/LockActionItem.tsx b/src/layouts/default/actions/LockActionItem.tsx
index c4914c77..51d024d2 100644
--- a/src/layouts/default/actions/LockActionItem.tsx
+++ b/src/layouts/default/actions/LockActionItem.tsx
@@ -24,7 +24,7 @@ export default defineComponent({
       schemas: [
         {
           field: 'password',
-          label: '锁屏密码',
+          label: '',
           component: 'InputPassword',
           componentProps: {
             placeholder: '请输入锁屏密码',
diff --git a/src/layouts/default/index.less b/src/layouts/default/index.less
index 5d2a726e..5781fd29 100644
--- a/src/layouts/default/index.less
+++ b/src/layouts/default/index.less
@@ -1,12 +1,6 @@
 @import (reference) '../../design/index.less';
 
 .default-layout {
-  // .ant-menu-submenu .ant-menu-sub {
-  //   transition: none !important;
-  //   // transition: background 0.2s cubic-bezier(0.645, 0.045, 0.355, 1) 0s,
-  //   //   padding 0.2s cubic-bezier(0.645, 0.045, 0.355, 1) 0s !important;
-  // }
-
   &__content {
     position: relative;
 
@@ -72,6 +66,10 @@
   .layout-sidebar {
     background-size: 100% 100%;
 
+    &:not(.ant-layout-sider-dark) {
+      border-right: 1px solid @border-color-light;
+    }
+
     .ant-layout-sider-zero-width-trigger {
       top: 40%;
       z-index: 10;
@@ -99,25 +97,13 @@
     }
   }
 
-  .setting-button {
-    top: 45%;
-    right: 0;
-    padding: 8px;
-    border-radius: 6px 0 0 6px;
-
-    svg {
-      width: 1em;
-      height: 1em;
-    }
-  }
-
   &__tabs {
     z-index: 10;
     height: @multiple-height;
     padding: 0;
     line-height: @multiple-height;
     background: @border-color-shallow-light;
-    box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.12);
   }
 }
 
@@ -194,11 +180,17 @@
   }
 }
 
-.ant-layout-header {
+.ant-layout-header:not(.default-layout__tabs) {
   height: @header-height;
   line-height: @header-height;
 }
 
+.ant-layout-header.default-layout__tabs {
+  height: @multiple-height + 2;
+  line-height: @multiple-height + 2;
+  background: @white;
+}
+
 .layout-header {
   display: flex;
   height: @header-height;
@@ -351,22 +343,20 @@
   }
 
   &__menu {
-    // display: flex;
     margin-left: 20px;
     overflow: hidden;
     align-items: center;
-    // flex-grow: 1;
   }
 
   &__user-dropdown {
-    height: 52px;
+    height: @header-height;
     padding: 0 0 0 10px;
   }
 }
 
 .user-dropdown {
   display: flex;
-  height: 100%;
+  padding-right: 10px;
   font-size: 12px;
   cursor: pointer;
   align-items: center;
@@ -374,49 +364,12 @@
   img {
     width: 26px;
     height: 26px;
-    margin-right: 16px;
+    margin-right: 12px;
   }
 
   &__header {
     border-radius: 50%;
   }
-
-  &__divider {
-    width: 1px;
-    height: 30px;
-    margin-right: 20px;
-    background: #c6d9ee;
-  }
-
-  &__exit {
-    margin-top: -40px;
-    font-size: 12px;
-    color: #c6d9ee;
-    text-align: center;
-
-    > section {
-      height: 20px;
-    }
-  }
-
-  &__info {
-    display: flex;
-    margin-right: 12px;
-    flex-direction: column;
-
-    > section {
-      line-height: 1.8;
-    }
-  }
-
-  &__name {
-    font-size: 12px;
-  }
-
-  &__desc {
-    font-size: 12px;
-    .text-truncate();
-  }
 }
 
 .layout-breadcrumb {
@@ -425,8 +378,8 @@
 }
 
 .ant-layout-sider-trigger {
-  height: 30px;
-  line-height: 30px;
+  height: 36px;
+  line-height: 36px;
 }
 
 .hide-title {
diff --git a/src/layouts/default/index.tsx b/src/layouts/default/index.tsx
index c3fc36ad..bcedf0e0 100644
--- a/src/layouts/default/index.tsx
+++ b/src/layouts/default/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, unref, onMounted, computed } from 'vue';
+import { defineComponent, unref, computed } from 'vue';
 import { Layout, BackTop } from 'ant-design-vue';
 import LayoutHeader from './LayoutHeader';
 
@@ -30,6 +30,7 @@ export default defineComponent({
     const getProjectConfigRef = computed(() => {
       return appStore.getProjectConfig;
     });
+
     const getLockMainScrollStateRef = computed(() => {
       return appStore.getLockMainScrollState;
     });
@@ -40,6 +41,7 @@ export default defineComponent({
       } = unref(getProjectConfigRef);
       return show;
     });
+
     const isShowMixHeaderRef = computed(() => {
       const {
         menuSetting: { type },
@@ -54,12 +56,6 @@ export default defineComponent({
       return show && mode !== MenuModeEnum.HORIZONTAL && !unref(getFullContent);
     });
 
-    // const { currentRoute } = useRouter();
-    onMounted(() => {
-      // Each refresh will request the latest user information, if you don’t need it, you can delete it
-      // userStore.getUserInfoAction({ userId: userStore.getUserInfoState.userId });
-    });
-
     // Get project configuration
     // const { getFullContent } = useFullContent(currentRoute);
     function getTarget(): any {
@@ -68,6 +64,7 @@ export default defineComponent({
       } = unref(getProjectConfigRef);
       return document.querySelector(`.default-layout__${fixed ? 'main' : 'content'}`);
     }
+
     return () => {
       const { getPageLoading, getLockInfo } = appStore;
       const {
@@ -77,10 +74,11 @@ export default defineComponent({
         multiTabsSetting: { show: showTabs },
         headerSetting: { fixed },
       } = unref(getProjectConfigRef);
-      // const fixedHeaderCls = fixed ? ('fixed' + getLockMainScrollState ? ' lock' : '') : '';
+
       const fixedHeaderCls = fixed
         ? 'fixed' + (unref(getLockMainScrollStateRef) ? ' lock' : '')
         : '';
+
       const { isLock } = getLockInfo;
       return (
         <Layout class="default-layout relative">
diff --git a/src/layouts/default/multitabs/index.less b/src/layouts/default/multitabs/index.less
index ca8074e0..ba41421f 100644
--- a/src/layouts/default/multitabs/index.less
+++ b/src/layouts/default/multitabs/index.less
@@ -1,8 +1,6 @@
 @import (reference) '../../../design/index.less';
 
 .multiple-tabs {
-  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-
   .ant-tabs-small {
     height: @multiple-height;
   }
@@ -13,7 +11,7 @@
       margin: 0;
       background: @white;
       border: 0;
-      box-shadow: 0 4px 26px 1px rgba(0, 0, 0, 0.08);
+      box-shadow: none;
 
       .ant-tabs-nav-container {
         height: @multiple-height;
@@ -22,17 +20,26 @@
 
       .ant-tabs-tab {
         height: calc(@multiple-height - 2px);
-        font-size: 14px;
         line-height: calc(@multiple-height - 2px);
         color: @text-color-call-out;
         background: @white;
-        border: 1px solid darken(@border-color-light, 6%);
-        border-radius: 2px 2px 0 0;
+        border: 1px solid darken(@border-color-light, 8%);
+        border-radius: none !important;
         transition: none;
 
         .ant-tabs-close-x {
-          // display: none;
+          width: 12px;
+          height: 12px;
+          font-size: 12px;
           color: inherit;
+          transition: none;
+
+          &:hover {
+            svg {
+              width: 0.8em;
+              transition: all 0.1s;
+            }
+          }
         }
 
         &:hover {
@@ -50,37 +57,12 @@
         svg {
           fill: @text-color-base;
         }
-
-        &::before {
-          position: absolute;
-          top: -2px;
-          right: 0;
-          left: 0;
-          height: 4px;
-          background-color: @primary-color;
-          border-radius: 16px 6px 0 0;
-          content: '';
-          transform: scaleX(0);
-          transform-origin: bottom right;
-        }
-
-        &:hover::before {
-          transform: scaleX(1);
-          transition: transform 0.3s ease;
-          transform-origin: bottom left;
-        }
       }
 
       .ant-tabs-tab-active {
-        height: calc(@multiple-height - 3px);
         color: @white;
-        background: linear-gradient(
-          118deg,
-          rgba(@primary-color, 0.8),
-          rgba(@primary-color, 1)
-        ) !important;
+        background: fade(@primary-color, 100%);
         border: 0;
-        box-shadow: 0 0 6px 1px rgba(@primary-color, 0.7);
 
         &::before {
           display: none;
@@ -88,6 +70,7 @@
 
         svg {
           fill: @white;
+          width: 0.7em;
         }
       }
     }
@@ -95,12 +78,6 @@
     .ant-tabs-nav > div:nth-child(1) {
       padding: 0 10px;
     }
-
-    .ant-tabs-tab-prev,
-    .ant-tabs-tab-next {
-      color: @border-color-dark;
-      background: @white;
-    }
   }
 
   .ant-tabs-tab:not(.ant-tabs-tab-active) {
@@ -108,20 +85,19 @@
       font-size: 12px;
 
       svg {
-        width: 0.8em;
-      }
-    }
-
-    &:hover {
-      .anticon-close {
-        color: @white;
+        width: 0.6em;
       }
     }
   }
 }
 
 .ant-tabs-extra-content {
-  line-height: @multiple-height;
+  margin-top: 2px;
+  line-height: @multiple-height !important;
+}
+
+.ant-dropdown-trigger {
+  display: inline-flex;
 }
 
 .multiple-tabs-content {
@@ -133,7 +109,7 @@
     color: @primary-color;
     text-align: center;
     cursor: pointer;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+    // box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
     span[role='img'] {
       transform: rotate(90deg);
@@ -143,8 +119,10 @@
   &__content {
     display: inline-block;
     width: 100%;
-    padding-left: 10px;
+    height: @multiple-height - 2;
+    padding-left: 0;
     margin-left: -10px;
+    font-size: 12px;
     cursor: pointer;
     user-select: none;
   }
diff --git a/src/layouts/default/multitabs/index.tsx b/src/layouts/default/multitabs/index.tsx
index 2fbf8043..4154fa40 100644
--- a/src/layouts/default/multitabs/index.tsx
+++ b/src/layouts/default/multitabs/index.tsx
@@ -159,7 +159,7 @@ export default defineComponent({
             size="small"
             animated={false}
             hideAdd={true}
-            tabBarGutter={2}
+            tabBarGutter={4}
             activeKey={unref(activeKeyRef)}
             onChange={handleChange}
             onEdit={handleEdit}
diff --git a/src/layouts/default/setting/index.vue b/src/layouts/default/setting/index.vue
index 962fc506..0a1e3311 100644
--- a/src/layouts/default/setting/index.vue
+++ b/src/layouts/default/setting/index.vue
@@ -28,13 +28,21 @@
 
   .setting-button {
     position: absolute;
+    top: 45%;
+    right: 0;
     z-index: 10;
     display: flex;
-    // padding: 10px;
+    padding: 10px;
     color: @white;
     cursor: pointer;
     background: @primary-color;
+    border-radius: 6px 0 0 6px;
     justify-content: center;
     align-items: center;
+
+    svg {
+      width: 1em;
+      height: 1em;
+    }
   }
 </style>
diff --git a/src/layouts/iframe/index.vue b/src/layouts/iframe/index.vue
index 8c9a53d5..0dc90496 100644
--- a/src/layouts/iframe/index.vue
+++ b/src/layouts/iframe/index.vue
@@ -9,14 +9,15 @@
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
-  import { useFrameKeepAlive } from './useFrameKeepAlive';
   import FramePage from '/@/views/sys/iframe/index.vue';
+
+  import { useFrameKeepAlive } from './useFrameKeepAlive';
+
   export default defineComponent({
     name: 'FrameLayout',
     components: { FramePage },
     setup() {
-      const { hasRenderFrame, showIframe, getFramePages } = useFrameKeepAlive();
-      return { hasRenderFrame, showIframe, getFramePages };
+      return { ...useFrameKeepAlive() };
     },
   });
 </script>
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index e5f19efa..9e0d9a58 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -55,7 +55,7 @@ const setting: ProjectConfig = {
     // 是否显示搜索框
     showSearch: true,
     // 菜单宽度
-    menuWidth: 180,
+    menuWidth: 200,
     // 菜单模式
     mode: MenuModeEnum.INLINE,
     // 菜单类型
@@ -65,7 +65,7 @@ const setting: ProjectConfig = {
     // 分割菜单
     split: false,
     // 顶部菜单布局
-    topMenuAlign: 'start',
+    topMenuAlign: 'center',
   },
   // 消息配置
   messageSetting: {
@@ -83,7 +83,7 @@ const setting: ProjectConfig = {
     // 开启快速操作
     showQuick: true,
     // 显示icon
-    showIcon: true,
+    showIcon: false,
     // 标签页缓存最大数量
     max: 12,
   },
-- 
GitLab