0fA0lAy$OX{0p
zZJn7JSR)&ptk2O^029-yVP$NST#+A9l%hKqr*#NwS4yxiX2h)-l%k`tph&L+-Uw5B66T
zT1M{j64IZk<}|j7`=VsRX0Xm!P3KYSJv&XYpJKTmi{^oMgQYamNiP7JMWt7ZlASUn
zoBIIO$v?z_Y19>eCD*{DsPGFE$Kd8irfov=UT}ocfu1V=QRy$8A~lMp-g2NPJqb*+
zj5OOdrg%QH*A$plN-`Qj3fKGIJ*Nzl9cwI)Ns9cU#_4y{$8IK!0ER~VA_t#882y#a
z)4o81L63ssmHnz{JCS>4+-%#-*oZ8H)?*E>Wv?ma-TD(Zj`
zj{e5;__<`RYX+9H<>^986}ca%B?tDbk-jm#AEdZ9&ZS8d1XD2Cw0+Ms%r9;SS
zV=+QP`(dAgTs(VZQ(9svU9d^9D>IN9
z-AgnXwN@9A6kDGi*OU@kSztZrob?>iR+mWxNKaQz9ym!74dL2jj
zv0t(IW`VbUmoO}5yKrRB8$X{P7A;Q)?mAH5i$LT}32g`Ob9e220j!?!fYyeFjO&qI!vd
z`yX`!M|!e=S=+A{<~l(aPlTX`wGnHEQ(GkysV?h1cZf>bv&ZMksGg|vvZB|!1GUp{
zgo-pR?jtQm=ajO`tULT#nrhZoGo*GP7i9z2C5F2}K&-JsOCYw348`Qtm`rIBU&K#F
zGQ{gc;o_xI-OW#DT$0!hggnO54_i^QEle8m3x}kXzgv9b)Pm+882Gr)w({f{simwK
zFllGYnlXOnPw-Jh?mx({*ZXjqcbPDOJ$Af&E!9pAU6)
z$j6SPk@?=PTg4gL;RgczmnFP$PAH2-Jpf}Wd(!y)Im$dwEMg-6J{e3N^2#EG
zi_muE-04z3!P6vu^#P3N#B{qS+Sfsgn7p4)M?dy}Ydl^Z;HB(OH|j;O>G!|4R0k2Q96Q1Mf4edC(IF!h;r*&6YF5
z_@B}iiXnOaR@n=lkspY=5*LD}V&=5SJq)7EjL!w}A<>p}{(`cl@sU6qJQ6mag
zPNgIA;{ubWU*jojdPL&Y;CflbvQYleBtLRJ*Nww_I9D
znrtoZex`jjniYtDHxuBw#xNOJZdWn1dMk-VJ6Tc6>#n4Yx0GbSv2#D~V4Ex4|MAh2812+(`fDiD{q40ZkamdnaGtre)4t0&4o0?3_q*8
zeV!ajbO^+(Ved|t+37?ME4H9zMYj66+O~D~x6YXm>tcpSHnw9`Lg^4E(E9JS8XxRQPDG*jmK;R(i=E$tHTMt^Yo|^Vf;bYi(Dc5AZ
z`e)jIL!-{v{(=&`e4{+MSqS^?6(vSmoT8w(ulBeBIu$ybhzWl+=$y~_kXup*sf{Z6
zpmp2KQ@EYhJ)G)Lk*O7hf@`T7Mv71=Xp3o&JFF|
z3&<~fA@jmwX2HL@-u9DxeI77mF!^j$&y$rBjzjXh1_zb2HOh;GK_2<$dC
zCS8(iiV4tgC29GNQSAF$^|ePLItE$8OUW%z!SHOV=m*kcje#x{zD^${Nm2AcT8msw=#Am>5O9VAK{!BKT
z8GkpT9!QWalu^`%EeGY)fF1agVD$5Rid3ncJHIY>lZ|&QdEgRtGH{B(0UBNeqt{FQ
zI|JU@Q#5w`6$6Vf8Y4(4j%!zIp|`G?tNtt0fdOsl4YeIfd(xsjHu8cy=#E
zvI(C$Wc{&~s%%9yo$dd-LmmsiF&|+>!2d1&0UZY1d=QU1IUghq3PRQ1af
z*hyU1(#bbrjaIa4yO7rrpa5Y->PSec)^J03d@Ah>v1>U?pS5bYZk&AkFEzvj+lp1T
zyO8ttx%zcsYli+Jfe&NHnRyaC{Dj)GpZPTb0fJ$!rY`^V{QuM64>tspm`mzjMVT)9
z;cxdYyc00?Zp}X`YY@iNSFI=nq4=P0en$YYhw!KZgu54?GGR+{OixoQNpd5k@AJqP5k$Y7qzzI88T
z%QdTGBIzFZ#P({do*j`cKrR+Bou(zZ|Ejuo=nk9>rZfDBx}{EzM2uf8Pg9rp>Gfha
zq${-`EU$DxO(va9lMF1N^qH&dZ!r?hD9xHj@YapcjIDmcuh$u}WB-9JD!dfHf9`T*y`|0Jz-F@@csNnv`t)ieU{v~2I;Q$NOhws(U>$Zx0
zzWnebmn;}r(4u*en%r?;0Fvi|H%8FH!Zpe4m^I8v4q)m!Wee$nkPH_6rEtNdI;oXh
zmwl1}>BIZfy>=2|@{lf1(?!J;p31_+IGq`+G$xrlKYA)J*TGl)L*vhKOA0+bKmBT6
zQZy$u13ZB4@}X*mu-14(d(#kXqi-@apT6lJua
zQoCFJ#GME;j3(~M$ZT}1ZpeYMxWjBrw^LRce>`V7?9yb}OXC1vhD>tJ)gR@eNLSD!
zRo-!cmjIJ2N*|X&PgzM^NB<)td0?cKsPp(NcXb`asV
z)ejyCLE#{3JOsIP$Jv|_K4pde$sB-=wi&tYmqSc0m%J>?jDG)Gsl-Kt_Z$A1W2e9~
z>iyTrR@hPTKnb_SbvyQf7IUwzNoV~L544HTR?)!fK!#ke$8L!O4)$Yl?MaqK)Z(g!QCP9U7
z_rtwfs$MSi>i@`c*KYC+CU~wo=5bX_AcQ^sB8MLCk}s^NtvXCK+UuTHu8}X{8h5}4|L7SQ?$`w$ws60T}ma&TT%|{I+!+-
ze~Uz~GLyzWtXkzxT{uH58P(xZc+6%NQ2`O4vtep_hH06<$)RQIF!Aj5
z8CqbZWLV0YO1YOm&!IS%DjSV{KS_er#3bpakjNuklrVx<>4C2cN&c57@LX
zBOxqsXU&GN>EWNzg}C-rE2!A9eYOGUr@vi5@dr!7LvMl&(hgd!>^vL}q
zj|F&KfL{dmktEP^gwn9#3|eyG`E>K|y=iLRHHHx`ob{%1zmll;^jRwW7+)$q#iD7c
zNucQpK?Cmt$rCio$U^eX{!)RyNM38kkuP^I@w&HA>Z$FSYsG5hWfICe3Y(*Tf?&5e
zq9Tg}@xkn6i*Hx`tDbI1LOu#tmZ8prEjC92sbpUm+mJG1^+9zQZ?`{eo3n^4Qr(YW
zIdYR!k1dX}soq)gNV}^k?zRU!7b~@sGuyuSwZ=W`Rfr{JZ4-ukLbA7|?316l=93}%
z{Ma$R`u90e+uN4yb=RtyV>_t5LF9=GtulWgDYlHpnk<^Pn2F?>l8`2_Ow6_D_!8DA
zzH}>Lio>#%=zu^vHIDx$>GBNq2oCmbo2|BP<46ok1Y<(36Mz$y1gu7t{`20hX<^=eiEQ{MVEE9^7;Dt-#woJ85Xsv4a=t>u^XMK*yM0wcgJ0tIjTyei
z24RGp&G6XBd*b3a-nK;f*S*W@PftFGm?iIwqK-Kpr8>$>wt-8GIwy)7C`~
zNrl(4`SEW>)Z{jm$v$Smr>(>)vZ|dQXz0Oh`@_d$bQHP>i}5w2zp~}$E9rvHpp&Gd
ztUCPa#c@7N@|RDkzIp`*7&J)GZ6ovzNj`Ji_x{Uh;1~Xkg|msU51F0L#^zI_b_-ip
zz4eCba=%-<7tY$xf%`-=d4|ZK9Shdm?{aZsSed-fP}-N+fw@KXzktDPWpne$c5=Q3
z8?Lu6yoos3qUuiVj&FYfr)vo8YBhM;Tl1TsuW1qvPfSMqTte*hY@H4q(YmPZn@Knm2+&9po0DyUB|RR8
zv%twqT&F3dHKj#*i}Jyke&p=Jjbm;&I`63$V$xzHCxO+z;9|{e35oAVauY8ctKPI$
z+LNbvV@(QC10w;~V=MVEF00g6JY^~u{=Ya*evlUq(YK?9NQ}ga_{5FnmwQ83TGo|v
zWTa~OIWLIW;+q0<->J4uBA9<+q;nwN>g_5Hf<0c;RgBtV*|4mMb?DMGyT_mg!&D@P
zaOewpy2&8AuPY^y)5yPe3o0*7vrjAO*6dXZWT|Id3!AT`a-vNPynpz_TL4{}T)%NOcar9AA?3Z*GWap9Zow7uuN2h=zo7$
z^C*(phY~g)dG!IQt>Fblu#ug1nb!SfSrv2-<@gui5b!;dj%`vS`FpN#!UKF_6ZG>c
z06$uz_rwj<^Li=aQg}GNbJptW0@=8$Dz=$tIeEuhO$C911LjsTcS@FOlb15zUEMZR
zLAr{S%cvaTfTosoEtqSAV}e2Q>j2XxC9Edctv^tp51l@*pgz>ZC|lyxzofw&qo0yA
zM;!gWKoL889{!73+V{6{MAG-h-_o|Iqs9YaTl1-|n(yxVN*oVO`~P_Mll?%UUc>rl
z;PE5=Z*~arRq8768A+-iQ8=_8wrkxNY&0bg{7U{;`5FN#2T(001}-N;AfkBMQ>g8IZr6w+Jua%h$7vilyGXC5=v8fFt@e4P
zYsZW1+QbIVrRPm3=nm1ELoRwB1@-RE5O}T;)J^;s^YqUIKKkkKz
zQ7k^Y`aEGdi#oB)Xz%_vFYT1HW>cMiJvr$gfv!?Q-A^6o@S(+}My4mq;I9!GDP_5{
zJ_FT91m>i5@+k(elU
zIQWWQZ&M6bJJl4p4v&NaRX+M6^wZ5~jQB!L08KK@1v)*6?K$7${E}(ZU!}7CV}GdT
zPGhX)P!rwu;=bqMb27syyGQjdYE*6#3AV
zPoFi7*R}{eE!nb1UnQwn8bzr~TC%ZntRM0k@J9~S%qtc@ynDPC`4>O}QK0#C#?Bq`
zhagV*S@;_fb2Iua6I!zi?iT_;;#HRBW(1Rq7&S4`ctg6f`#NTgAF)5n%wp%06OZP?
zPrmN@%hq*Is{9jP=70%F`VRYXAG!U>cslc`=_VDHjg%M>ZM=dsXKwyyeG*E_oc`u=
zh)s}{cF7XqQJ-#AL~bhnBTq7tCuwlx_xOEv+pg(B4IxmrpMEp6!6nkw9Y5wvaZLeB
zu!U{&))_;KYRBCupiorD4-zjP>2
z|BH3c{0oe}%%+4xlLk?m1wuU9`%*&BEjT>ZEd1vvaXHkKhQtYXEl^%6_DHBfkwi2`
z8=m8%g;}-1;~YVz3wmF`2R(77r-h}TI(a9H_S+vFvvEJI3k1f
z;G7;fXD%pt2LPZ4a9((yZfZs|hzunqJlR0zt#SWzN{9=z=_kD7O(~AZ+^WzSt$nn3%Jt4GGN8Y%s^~xLhWr~TgaWw
z=k3%bLKI;8Y_XkHLtAX>)ZFVnm3YOiY<5&%iOaJ6orUR7o7en3Fu4R{zIbp4b%d>!
zgKy=ZmDiGCL?3)>yLHw{oC7OkklTvU2d3k3o?Om#2HYmI{~5J33`S3&?L6Ul38<{C
z_G>)xPIbQVgHUhzCYWZcEW6va*^rv?yQYRB_f2SL(DW~-K7sU$#LJN>x~;Sd
zs#n0{>cVt=?7x4epOsQYq$efLd=kx4UevBQcgUSdi?QkPJW!;z(r82CtGdEHKB&X|
zf2etg8ztH6m0A~J(XR7|0egPpd0fkrMhU$`aV}bs48OB3L7YyMcvW9dl}^+cFgq5u
z7DZ2~7{Mp%f*V*Xe8Tk5E@yTYW_g
z-)pI^(Dv?p`!K9PCWomG$8(3r^#HK1TbhSgyS^
zRC;Lk_i_+OUIkGNU)QCV@TnvJDm_=GSd4Rb4#@unl)}1r$j?wJC^HW$9QN^@H4Wau
zmvLIUfYGeu1@jvdXxkUYAB#`Y_%5M#1$svP2NlxlZAJ
zvFTg!Hg69>dVpQU0;OASb_52@Qy#=KK0qXj?#`3dP#JU4E@)@~zY#6%a&
ztJLueC*04#(#8IbGZ3e9EVZwaCKVQTs8FljP&(4lsg7C!tva5fnHSQIVxeRmdUPkg
z4E!NnQZ%7Sx3PoL*!S^W_!{g>vq)H+i95}BAr9MA$Xv;o$_$$w(%3UL-_S_8hfFcl
zP&RKdF}1QqNDp$owl376xSWm-*uI!wF{=K=`}U>|a9v_$`jMPMhBCGjAS0lKT6@&E
zyJF6bdR4^Z4HI+}X$$pSJ9RF_SJgG#z$BLc2X{MG)uB_K*4d?3N6%1XcqN)GWw6*|
zhIRA>kHWM*2xaUN{q?P0((3d8Ik*Vh8F}5Hs&+A@ub)!oubmghn;K>J0iq+xs66*t
zIG;Ix%}lI=bIs^N<mL^g_2K*;1IE?nVDBvqYtdStIcXgHKJZw
zyl&)p!3<~E`x6U1i$j>36Qnt_6%Gr_>0LGkpR@h|uiz2N?i`Q)K(qgFwmkXqWi0eE
zccs#^P%FvL(|xssn=JZY@@)8Yp!WM0%cf?wCJ!h9+MbOEMpe@Td6^ykmCXY7dqo
zJI?S+8vK=NeL^TNW$wj1vOXy6^^yFo*3%x)+I<838FbaXQ%MvD$^#@kD8Z>2s>cC3
zFGPyG4el&NTG(GUOVPO8DroO#G>HtnLz8f1C`0{
z8C4)|^Nkz;ndbGieEO{MHsKPYUw0fV$$j^mjTFz|W3ajyh$W@CaEmuzbZqY-Hd!d9
zV$c;_tUmiL5B~@yuImM^J)_cB<-t^iuF7=kAJOVmxpRGpf<6G#{dg{;7EBb|>*CB1
zW>$_XESTc@SrfiXzf+=hj$bU>q51Gyz<+>;JVr)*}-RT*=6?Jc1pe*LLcc;!*qiCY7$KD5p9uv=zgRytgl
zS)3)lf4dpX55CB77|yNjARQ8IZU^pNtZ>T^Jq~VT`3oS-z+)@&$2TS*eVGV>Oi%AG
z)bvF6b?n<;5gIC7YEuE8h5DX-^!@;uP0r9znEX3iUI
zmt$5MdHvQBhv`y2D}BkbROR18X>B=Fu7vlACszzq#MzsCjZcI~OSnj|B5)t25rHd7
zE^8Lj$;N>$PU+U)o)ZwK_+bhpUxt?;!Gaaa)p3+wpR46bWGUaHfbNz(dg@u^Yj~$D
zrMyhR`ZRI4c2ih8C5h>thn!BrbYVT>1g;HcYV_A`ee>JZyY`UJc=d`%UaeYNliijE
zc*Y%y>Y+OCODFWVNTOg(O+k27uhRGp~GSXJr6sf_{e0*fS|0GH;dU2&E3;0{0hhi}TKdt13
zWEo4_lm==y*a?tkzE;nNczNBfN0DD_HIQFBS#S(7of*yR(H$%detsCIpTm^O(cf!&
zW`TCVUj#^9tNgg7!2k>mpnb2ns)%U?KtwN@@>fZIb=feCI;JzX?M4j`uG^
zsgaER?2OUl+kl!Q-<9pAcPFWcoI;L31Il$dgDdFcLX*Kxa?d#OCRJ?_KD8|R6^ake
zn`#Mw5&i*(&_<{I>$O0Q6sg40j3#Sq65qi5efu5sYs$EaF!2Er?W4u!?-42wUsm)T
z0N1a;TxB|n{*-;#5)^Y3>=F?kNE|j~Pq?XxE;MJ$WH?i(5=UI_{2K1p3mdV-+lpacRek*Ng*Uy}d5hl49|=c1B-uT!?xtv{zZvzmz>Gg!<3A-%95n&LVbGVtAF7^#JFM9mRm*
zq=2jvR=bvS*(*OH3Qx`6x3>7ryx_ud9jtCnE#<~=fv4L@r?~T0|Apd^yRlVnrKuw;
h6q^>sM1=cdQ|GCSV_$
\ No newline at end of file
diff --git a/src/assets/svg/mdi_keyboard_esc.svg b/src/assets/svg/keyboard_esc.svg
similarity index 100%
rename from src/assets/svg/mdi_keyboard_esc.svg
rename to src/assets/svg/keyboard_esc.svg
diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 0911383..300f6ed 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -2,12 +2,9 @@
import Search from "./search/index.vue";
import Notice from "./notice/index.vue";
import mixNav from "./sidebar/mixNav.vue";
-import avatars from "@/assets/avatars.jpg";
import { useNav } from "@/layout/hooks/useNav";
import Breadcrumb from "./sidebar/breadCrumb.vue";
import topCollapse from "./sidebar/topCollapse.vue";
-import { useTranslationLang } from "../hooks/useTranslationLang";
-import globalization from "@/assets/svg/globalization.svg?component";
const {
layout,
@@ -17,12 +14,8 @@ const {
pureApp,
username,
avatarsStyle,
- toggleSideBar,
- getDropdownItemStyle,
- getDropdownItemClass
+ toggleSideBar
} = useNav();
-
-const { t, locale, translationCh, translationEn } = useTranslationLang();
@@ -48,42 +41,13 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
-
-
-
+
{{ username }}
@@ -93,14 +57,14 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
icon="logout-circle-r-line"
style="margin: 5px"
/>
- {{ t("buttons.hsLoginOut") }}
+ 退出系统
@@ -157,22 +121,6 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
}
}
-.translation {
- ::v-deep(.el-dropdown-menu__item) {
- padding: 5px 40px;
- }
-
- .check-zh {
- position: absolute;
- left: 20px;
- }
-
- .check-en {
- position: absolute;
- left: 20px;
- }
-}
-
.logout {
max-width: 120px;
diff --git a/src/layout/components/screenfull/index.vue b/src/layout/components/screenfull/index.vue
index a551305..978ba50 100644
--- a/src/layout/components/screenfull/index.vue
+++ b/src/layout/components/screenfull/index.vue
@@ -1,8 +1,6 @@
@@ -12,9 +10,7 @@ const { isFullscreen, toggle } = useFullscreen();
@click="toggle"
>
diff --git a/src/layout/components/search/components/SearchFooter.vue b/src/layout/components/search/components/SearchFooter.vue
index 557644d..051ca5f 100644
--- a/src/layout/components/search/components/SearchFooter.vue
+++ b/src/layout/components/search/components/SearchFooter.vue
@@ -18,7 +18,7 @@
diff --git a/src/views/login/utils/rule.ts b/src/views/login/utils/rule.ts
index a68a9d4..6b73d5a 100644
--- a/src/views/login/utils/rule.ts
+++ b/src/views/login/utils/rule.ts
@@ -1,6 +1,5 @@
import { reactive } from "vue";
import type { FormRules } from "element-plus";
-import { $t, transformI18n } from "@/plugins/i18n";
/** 密码正则(密码格式应为8-18位数字、字母、符号的任意两种组合) */
export const REGEXP_PWD =
@@ -12,9 +11,11 @@ const loginRules = reactive({
{
validator: (rule, value, callback) => {
if (value === "") {
- callback(new Error(transformI18n($t("login.passwordReg"))));
+ callback(new Error("请输入密码"));
} else if (!REGEXP_PWD.test(value)) {
- callback(new Error(transformI18n($t("login.passwordRuleReg"))));
+ callback(
+ new Error("密码格式应为8-18位数字、字母、符号的任意两种组合")
+ );
} else {
callback();
}
diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue
index 9b7248b..8db10d2 100644
--- a/src/views/welcome/index.vue
+++ b/src/views/welcome/index.vue
@@ -5,5 +5,5 @@ defineOptions({
- Pure-Admin-Thin
+ Pure-Admin-Thin(非国际化版本)
diff --git a/types/global.d.ts b/types/global.d.ts
index 06d9739..60acb4d 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -101,7 +101,6 @@ declare global {
HiddenSideBar?: boolean;
MultiTagsCache?: boolean;
KeepAlive?: boolean;
- Locale?: string;
Layout?: string;
Theme?: string;
DarkMode?: boolean;
diff --git a/types/index.ts b/types/index.ts
index 017550a..914094c 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -7,7 +7,6 @@ export interface StorageConfigs {
hiddenSideBar?: boolean;
multiTagsCache?: boolean;
keepAlive?: boolean;
- locale?: string;
layout?: string;
theme?: string;
darkMode?: boolean;
@@ -30,9 +29,6 @@ export interface StorageConfigs {
}
export interface ResponsiveStorage {
- locale: {
- locale?: string;
- };
layout: {
layout?: string;
theme?: string;
diff --git a/vite.config.ts b/vite.config.ts
index b1c7707..c10236c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -63,7 +63,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
},
plugins: getPluginsList(command, VITE_LEGACY, VITE_CDN, VITE_COMPRESSION),
optimizeDeps: {
- include: ["pinia", "vue-i18n", "lodash-es", "@vueuse/core", "dayjs"],
+ include: ["pinia", "lodash-es", "@vueuse/core", "dayjs"],
exclude: ["@pureadmin/theme/dist/browser-utils"]
},
build: {