From f3bb9d3253e500e8eda15223c2a999cfdd3c34b4 Mon Sep 17 00:00:00 2001 From: zy7y <13271962515@163.com> Date: Sat, 17 Sep 2022 22:36:59 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/controller/common.py | 5 - backend/controller/role.py | 10 +- backend/controller/user.py | 11 +- backend/mini.db | Bin 45056 -> 4096 bytes backend/mini.db-shm | Bin 32768 -> 32768 bytes backend/mini.db-wal | Bin 0 -> 341992 bytes backend/router/url.py | 26 +--- backend/tests/test_case.py | 2 - frontend/src/components/table/conf.js | 36 ++++++ frontend/src/components/table/table.vue | 123 +++++++++++++++++++ frontend/src/views/main/system/menu/conf.js | 8 -- frontend/src/views/main/system/menu/menu.vue | 88 +++---------- frontend/src/views/main/system/role/role.vue | 60 +++------ frontend/src/views/main/system/user/user.vue | 58 ++------- 14 files changed, 209 insertions(+), 218 deletions(-) create mode 100644 frontend/src/components/table/conf.js create mode 100644 frontend/src/components/table/table.vue diff --git a/backend/controller/common.py b/backend/controller/common.py index cda8437..0c837db 100644 --- a/backend/controller/common.py +++ b/backend/controller/common.py @@ -20,11 +20,6 @@ async def login(auth_data: LoginForm) -> Response[LoginResult]: return Response(code=400, msg="账号或密码错误") -async def about() -> Response: - """关于""" - pass - - async def websocket(ws: WebSocket): await ws.accept() try: diff --git a/backend/controller/role.py b/backend/controller/role.py index 81abfb5..5084400 100644 --- a/backend/controller/role.py +++ b/backend/controller/role.py @@ -4,14 +4,8 @@ from fastapi import Query from core.utils import list_to_tree from dbhelper.menu import get_menu -from dbhelper.role import ( - del_role, - get_role, - get_role_menus, - get_roles, - new_role, - put_role, -) +from dbhelper.role import (del_role, get_role, get_role_menus, get_roles, + new_role, put_role) from schemas import ListAll, Response, RoleIn, RoleInfo, RoleQuery, RoleRead diff --git a/backend/controller/user.py b/backend/controller/user.py index 5f0ca22..7283737 100644 --- a/backend/controller/user.py +++ b/backend/controller/user.py @@ -2,15 +2,8 @@ from fastapi import Depends, Query from starlette.requests import Request from core.security import check_token, get_password_hash -from dbhelper.user import ( - del_user, - get_user, - get_user_info, - get_users, - insert_user, - put_user, - select_role, -) +from dbhelper.user import (del_user, get_user, get_user_info, get_users, + insert_user, put_user, select_role) from schemas import Response, UserAdd, UserInfo, UserPut, UserQuery, UserRead from schemas.common import ListAll diff --git a/backend/mini.db b/backend/mini.db index 9b5f6120537e2bad9f96576c9b07c0d082ed1aaf..e2a2455a104f1cf6a5d6b143f3ac8831aaaf3ab5 100644 GIT binary patch delta 33 ncmZp8z|^2HL7J73fq{W>Vxv7bBZHoQEiaJAAh21mVH!UGfVc+| literal 45056 zcmeHQdu$w6x!;+ceat@Q*bc36i_^&_CUKptXJ;QXyO)UTCQEjLABnxL8dS+z+nZ(^ zd+n@uX`7Nu-L$z5p`;W-DNUgT(p0KQT3XUVC>25=0Ro9z-3tCdfRtT3JOsBF1QNQs z_dLe4v%9mmw2VNIv$FS_Ip3V`{N{JQIp@roZ_ZBaA1;*h;=zT|e6B1;9UTsqb^NO+ zIvfrb{`=wo`o{}5xb+<<8Pj&VP1X?}I~MeIJABSXN8q=CCj#4ihxuQ6Z*pDm)SUkX z6X}OCa1Al=VV|daXe+b4xlo+V-(8r!dur*PrK!qNzBE-@n5q>@9EyUl{pbD=cecK4aYX@ z`1C@vL$?g4TaEfe_<>MD5LGt4Cp|9i8`nmL#t(?^PahD6CbMJOD6}w=9?goQWAJ}+ zcvu{~S-kS{<*T2(Al^Kl+r$UdV#2xT8~@(DTZhJXWroJLMH2n>s+%0u_D`mfL$1B}boKO0_3A4YW)3%Il%;;?ddR`ff1>*E zL-j)!b4yEiEtFt&8)e9qrL$<*O2+Zk(zYxNnUxx{XU+X?7CtLL9HydhM|&*w^q>;5B4(AO;T)lQ#Y zdllvL^?%r9)$^e0nwp1y(5Ge;iMgKn5-90eC93X8EX||T~M=JT^OkQur z)_0u^KGUS!hRkh;hxVTk7~GznS}@u(RP;J-w!sP>Na@IE2l|(Gpsnp0=>wZuu=#u$ z_Evi*;DD9rA3R<=^IYwr3s+u!s|FKq7n)H(S`RIl2Np&l`0%xhFV&vEzxJuGR=<84U)Mp{$#=PB2e==& zghRpa2g89=0l)t~-=BOH{@47R_ZQxA&v!jT?pNSJ^g|h-3{VCr1J^JE%ib=*!HVS(4=)QgTNmAxcV0R#Fi)tR|z1EDcCfN|N48PbP9m|9o$#Ftbn$r9!*& zbNO;Ubc}VO0a$7l?+&8v!Fv}EAKRTCPG{50Os5%2_jRpBCBkY{lA@7zP#X1c_NMyz z&o)7sT%3gyN(K}%zl5Re8=J^3yE@DmHf?Cd5DP0xRF&fGFf{7PT_TwtGUzZcaOjpP zRl$%3(Ke=I-(+^#4NN#TZMNV-4lA^bxcQD6JqxwVU*Z^AK=&y{8lK`samI2144 zLtx-dOh`b$Kz3sPaO|)kL<%ROQc`UTq)~4MQag1HO#tEnlR=K*E1b>0t87vzHltORZ4_oY9bMd zwL{XVCrF6T8c2p_XN~I7T@}H=HRJZ1sIYPoDHe{!qH(32t2XJ$+$5n`H(5g-GIiC&9qMv}u(B`&uI(x@ju)-FC>JN}>nL@OR#fK(6|cjU{17zAoP zkXyKT6BnDUAV^_3nT$l*d8yQ>*SWwmzy<{4vLzt&%htewE?cj+0Y`Idnn=afupEm- zBGz@%q9-`oxhKJ)yQhIecTW#N(#AbuNr`YoNlKFSh0>ze8Np4e!3c3r0z-FC1OvOL z=*9qg(*68S#?jN4m3OA3k9K9f7@^8RI=m<@`M9``|={v5h)I1kY&cZs6VwoD_z=u@blL4I#KjJ!xN7 z8^KM&+G+)dTRI&a-bP;-9NNIlIo||aObI7rYFtq)8^1)VNl(1130yXxn{Ne&{ago! zx6u~{hc+O%ds%{Q=teJ|_HOFJVcBswqLHO&q8+wI{pt&sS1*5V?ZP)!U%6n^>I8AM z7I+_GNa4HM79NFTn1mW>TX>_M6y8M4(Bk4!d7+eVDLn{YaJayu4)6vz2mS**3SPa2 zhqm<8DFc)N$^d16GC&!i3{VCr1C#;E0A+wO@V8|kz&U#v6qSNzDA)k2@1e;Q52!i< zysqnXIky_e;jk@Vr&CWt2jgg*FvK3jIZ#r7(T$<`qb?uRbqUWpz;D4%!Qk38MsCn z=;D|@hBZeEc9A4=)Ly5agyV2X07HkKWQu148#!ht!?ueo6G#qoq*u_KL<$U$Bt6Up zTlbrjNH~(uoJ3;#cykgtAFnxynD_WOzK0<(EbdN@?_}k?*Dba=q|W7x?XdwxOQ@HaOb((xlZSI zocB5l$1<5~@W&jFsNw)^^xsiq*DTn~J1j z(QrH_#Z`+qJ&3AB?-sNHyG;4Co9!~?(fTb+sVP}SCm2b_k_n3ww9>oW+BUmPvD#Kk zQ&IvsgCZxDgxngMrKVc-T$lE4yG(UzeRi4Z(6-oR3TT_{G9_psyG#YOO?H_IXrf)F z{Mt=+neu5H?J~t{y>^-MYVWeklt;VKE>kY;2D?mgT8~|(oSAnLQ@pvyv1&x#OwVcE z7NC?=ERu>Q!%-N(tVUa#D=WRztzB=IDOS7A(o|G|-4kp?rG#XOs#VYWw0GELiq|&S zWy+K3!lw9!Ap?FTNtVJ%RZYgMgNxxIjry)kr%jeRGaWWr>c{|_EP;$*lO-V&w8>I1 z6R^orAmg{ml0W0K$&xR_+hmE)cx|%e&3J6G# zOU?{ylO=W!Lo79PRd1)IL(l)i!Z`={GnfRw2eZO|3SR=h0VALW(%@%cC-^bAUHE}; z4*Upw2*ibNgYSVI;9H;!`oP!09OxBZ0bc>vfeRoABL`gIN#TEluYkvdKY&Ms-+)s> z6+9sP^ex}|(F~LU$^d16GC&!i3{VCr1C#;E0A+wOaBVW+;TVQ-d%{?Kar+znVdxgIyiGYt1myz6#$W63(N$I{1Mhb7Ox14|FP!Obx| z)76DVXD1dN9asQ>g&<%N3}O)oVBz;;;qzg^^H_MjSa>{GxZPN|Tv%`%7EUJ?EX#2` z&!gx6p5R#rcpBUy{7!HR6T!2>Q`e@O(X*xuPzERilmW^BWq>k38K4YM1}Fo6F9!1D zvHHM(Io`;KC5=k4q(!`rmEIf_Uj6u|n|4RxlX7NcWW$DrhspK0r-Y(dEEs5|hrh}Y zk)y-p8UBV&Gi)P5R81&W3%^?GW%wB(Q3@LxmRej7^Nl5?sPg}W0h{#@8T{Kv9_DXo zT4z&_%u=EeD^88bER+83Lh;C5dH6R?9_kPDnNL?q=}}WsGMTVkuCi6%R4rteEOmPu zdEDRKR0dpY83isWN-So*CTEL&sj`?aRUdrj>hWiYWpw|~3a>NZu<-id%g<@KlmW^B zWq>k38K4YM1}FoR0m=YnfHFWCczX;icd|TsBcZ2f+0}Ae4sV%NB_hWyCQtBfdy~GL zhd;ScBHvr&=`9g?%ka_LCbG#n`DkIREPY@kxo2Pa$ew(BY5$!c$g0H&^=Lucbzsj# zX0kYXM|oN;?3E7Pm3J(6F&I>LZ!;)#A0G|NiA22ZkMlI?bF=e>B3i&N3x6!Y}%v3{VCr1C#;E0A+wOKpCJ6PzERilmW^BW#Av40iUynA@dll*V)bE zIRy0l-xut3fJ@*`uu*tTSP^yx-w2)$-VPJ#hcZAJpbSt3C%WADJd3~qH0{WSdY?5 z@7Bnwe~pV_tEqT26;;DARaKIfA^NR)j@3v&{a;U@#W$Uz9!Q|X6EVwEY}KRZ|32_CTL14=@G`gp ze+BS$@ZaE9;D_Kl|IC*;JvYh#Wq>k38K4YM1}FoR0m=YnfHFWCpbY#YFo2gB^uV?M i;7WsTo~$s)d5L7n>VGU*{f{N9|FN8|bn23<|M!1eHZV2- diff --git a/backend/mini.db-shm b/backend/mini.db-shm index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..c3ca016720d765870ceacb615a3b5811d3f3d65a 100644 GIT binary patch literal 32768 zcmeI*Sxyx}6o>H-5H5oXD99BBK|vI_jEXWjFe!rqlHjWgVIw>c!UJ0%EWs`KN(h_a z0jfx2d==73LB2{V=cLp9@6*2pR2Pp*#MK^l88mE!S{L@#UVCZ(VE1Ha<9K_uczSmD z^UtrY&CTD%|GYm$U96aU_Rq>L|1II&l!sjrcI@wDwKA(!SuJF>I@Fr1ugz+l`!XXw zf1CQ~62CpxXc9eQf9VkW=nxHD3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4@X25hx4i zOjLz46l%FkJ&iYKa3@vZ+5+V~CPUDKW$- zV~jJ!M`oDk>y^`eP=S;M3aq3&p0g>Cqd*Pca!fZ`fs_U6SW0<3XHy_YfqSgxm~ONJ zDGS_ZE#>i?O@SN*8u*c8y3q=xEbxH%4+5703Mim}0tzUgfC36Apnw7jD4>7>3Mim} S0tzUgfC36Apnw9mQQ#c4_Bd$( delta 84 zcmZo@U}|V!;+1%$%K!t6lP@w#i(0Ttu$fN2&50o+0+WHM{|^Kcb7VF@V3czN5>a*l D=6w{= diff --git a/backend/mini.db-wal b/backend/mini.db-wal index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4cef61882f8aa7c6e16a1603043bac7ad4725404 100644 GIT binary patch literal 341992 zcmeI*3w%`No&WKfOm36g0IiMa(hfrrqcWLWGBdGOQ-}sj2BVgBnE8Vu76a@yHA*k6C)dw=eH`No5n z3|#xTxXGA&`_k)sfA{-^^M2ZR!{YXkVqM-9>`>EW5_^rnxy$2F^><)xhCYI-P`JxLP*|cM53#KK8)ivBOqZZ~m3~l;K>RNOtp_N@?Z;1Ij<4>aAedNHA$W!-69(iu)o14Vi6_klzJNb8h z{QH7EKmGZO4}GTTKKVC$^s59p$Aka^2q1s}0tg_000IagfB*thQ$U{kH^u4*o-&NQ zTzbPUFW(DH%@>=kLI42-5I_I{1Q0*~0R#|0AVolzBlyIRH|Opu`t+WYnv_4tdHEUfvwEWaQ7?l!BaB2TW?x2cujS6FRoF?ty}0&)a4as+2N zMAkk2L26Q1k=Ze;(Kkqu8L_lnjr z_Wjh3-4-oW`zNDbK=da^zk|9C49DK-=yy=W?PB^D zI3M1U*+v8qKmY**5I_I{1Q0*~0R;5p6s|98`pUQam)>=fdV$;|H#LWlbp4e27sxUH zI$kdzW|s?;yl^OB)>G|BT zgW~CrN<_uuj}@o(ZSqXCh>Ob;*JacToa-Uus29-2G-RB@_!x$aQ^+`lDdQB%zwvWp z^#WCeul&a^kA6Rk{sqqZ8!}IT00IagfB*srAb^yym5H{L6P*nqCn)F#R+(&BM`jBX1%exVL@$m!=)~Vqs%(S<06|j zjeJW!uAq#1foG46ZXHM%_JjhVaF5N}SXaGx@uDS7Nq!4!uB~of++=mCQQJh9%2?cD{>l?+06k7YbwUKQHBO3<>zx7z8_dw#; zl<^48@^}RDZ~VMiy}%y~cYgn=>=*xq{skuLM>5t60R#|0009ILKmY**5I_KdaTUD3G5mm2bO26XiTIRkl-q-8UU00Iaga6*9xD)Q9R zw|!T|Pv3@nl%PC)D=+iYPv6R$IemKyr*9>g{*;HaGU-%o^O8k3G}oxzdLP<1wCPCV zyhdkx>n-{Ry2LqL?Oe$IzZ0iR5_jzm^z_``6>LkK?{&I-Nl&7lUpcUTcu#NqF$?OK zG&VI<%hQ^+u*ibPUUKzy7f;*b^0x+-i8CK82$2f{jW zqBKzgAkJ70QZJw$jTnz$mhr)^_#0@4(ixV=J$adx{st;<<_+|Wj%V6?U`oXk^#bnL z$AieuwWIx;BYXa4jVP`@^aE>-qVaN0Qnv*|z6as=WgCIk>TmjY|6 z%z35r<{8(!bV(hWDpp3UUMWbgsf*u{!n#u^toxw7KZ){in^oWcm8gCl-uh&u z??}6>D=R1?M{w55y5r^d@jl(i5zy}-If8{XpSRlD+wM?PCyZ0r|G2ec^u7&)&;Dbg z;I}oX1VX2jEIG>&l@I#PBS(`=f9Dz5v}0)FwnYoocb*Oc|$8{*7M{s~321L;o#5`}NL0k|Q{m zf0XfD2q1s}0tg_000IagfB*srd}so?dV${H&+h!e{yCdZQZG=Lw6?N;g43=SC@^)8 zQ7<5FWJ2IP61cY@ue5rev3HK{d-v#x_!iltm{+NED)An`)Km9`V}Jdg{;0$k@X4q4 zWk+T5OL%$upp1Hfb3Jg+2R&;;y+C7Ab=^|YRo@AFZ#&E9*r*o})kE|5)!r%kK)JhI)cb^#4zXD#xoNTQ1ulE|UuV|Oz34*idx5tMmbcE@hO=M<5I_I{ z1Q0*~0R#|0009ILIQIgDM$;^FECnQ$uh~%gk@Rl$E9^c`rPJ%nRI9IVAKv<8r0+;dxBE>>pd+nNzdYQd1f$*W zYxD93`)y%Gy>?wq6FGwTcm#(Yd+{p`FCDvp9Kjjw?mQR)1Q0*~0R#|0009ILKmdUW zDxk{|$T13aIfAc#VOssi8{YY%%n_I@FRM8MalwQD0tg_000IagfB*srAbZay~8!X7$iq9(SO}pKLij!009ILKmY**5I_I{1Wrdlmm`oF0$q-v zW8c-EyYIXE6`3Q*wmcWj5r`Qk1Q0*~0R#|0009ILKmY**5STauYHA?4q9c1;asFvrGsefB*srAbXRd2JOYO{E@8?pRo&g)6Y2^o zX}gv9rIvjU#>XSL@AvNxK2-e0<>UxB+#!Gf0tg_000IagfB*srATSjLbUA_?v4y%E z!Aq{~-@d=&;#Qd>$g%8?TY~Y zas>BQ=Kgh`Yx7>2BgnOE*K!2gEiYS05}eali6=t<0R#|0009ILKmY**5IFAz3bV~K zjasQo?m5d5c;EPkSF%2Gs6*BZRclZQ zgp_hQzqG!wi5vmr5sXo*Ut#xoDxF?mv{ql;sZzS#Z(=-xGaQc~r(o-^fAH7^Z;&H6 zPY(8MCISc`fB*srAbSUHcnjsBh0` z|KsuM{e{XZC8Wd)_}kR0Y5{-wn(kZfURblZrm2P;0pk%ksvM4y{aZ#hJe^Xi&v*n= zdOU(!XQB7+pZ(_Th;bUA{xmoES5 z1MmH_U*-t%En$6*AWV|r!+YI$W&{vG009ILKmY**5I_KdDI<^^8qf-Q@{@1Udg%Oc zas5Mjlh(#|JQ z2%KK4(^KWDsB${(-iivZ%ah^wlhQu?%(3BPyHnC1)!p4ap{}4(9}cZ*?^MK4Amu%) zdqPTwIG~&4L49ZAV1NCE@BMksuLg^+`NHcjkt3LTZ*^=D0tg_000IagfB*srAb}1Q0*~0R#|0009KXRiM{UpcV07 zE<53$H9NhC-|etFeIA#~m7$0>rClrHA33luvUXj(h<{P%@~(IZ{|Y6PsNcV?rimPZ zlJHf5za{*i$fhMymZAB7r~P^i6g zMOr2QT}JH?xZvV^gX{({Eyt9S6F6D>ndJyv;djelx#^W}kRuq^H#!!E00IagfB*sr zAbt(B~+ zvrFq6o5&Fa%hz<@ayR1zyU!N05J6ukk9Ko%x`TqOe{wr!sfG$T+C|Y$ng8#ZVXJy~4tmkBopwRNEv2p~TB1w>H%5?+~ zKmY**5I_I{1Q0*~f%8#7mk>~Er3#a8nv^+$x^L9Jy<){R2W7oLkvW_pM<5!Q5I_I{ z1Q0*~0R+xm;GQC_ZnaGI!at{Uj52b5pf!=D}OTBTIA1{GPTE$7wpeR2d^{XXLntWu%{{A!+o@dy}?!0T|iwZo2fSV<|> zZx%K9>81Me$Wk6H)mP``54BWZ&d6W0i%i-v@5;Gmuh~$VKJtiDpA$&0)z`O^Bk)?C zo+?*GRmyk;XEq+e&sG^8t-SN?$H@_#`P)28KmY**5I_I{1Q0*~0R#|0VB!hras)+U z{d75k{@4HRGmjj+P$5KfGGj3l!)7I%AGNG%+E700IagfB*uMRG>G%IH?ojTip{m{$`O2wB*6)hX+!`41Q0*~0R#|0009IL znA8Hvp#iNRtT_25t%uhsnIm}h$~S)a&~sP(ll;P#&i$PtJ}CIk>b009ILK;VN3 z^cIz<6_Qt#%Wn4#^V7SacKhsZpR>}PsT??^UCVGrBc2aF5!taJvUBZd|K@n9W}=8c zTDc!=Z@as^L+K359&>P&-Pxs&qt2ne9jRZ zzqi!)i4FcM$Ps+74>{Zm0R#|0009ILKmY**5I_Kd$t9r65tN8^*X0OGe);PB-Oo4v zN#+PjO5V}s2uj|uge`rRWtLA_>MbM*CfCc(+9H4e0tg_000IagfB*srBnx~z+jx~R zD^melNpfi5{K^p+U$H#5+4wz&tQWB4y>`MJfoNtz009ILKmdUWEzp~5N$Pih_M8jS zdQbK^>>ih+!kMXjKczkS(^I@;zflPUTUW;W-M=-g1XpXt`|7M(txk@hitz}>`E&ZC|}yMonhT9wTbvuseMom&=uDj0k=E@YW|IeMd$P?2D{j7vEPG zbuRCUuf__696=l-x_hcGiX0bVVa?*2rkZ>5v=^mJz9@4_(+?mnkKN&NSNPl+UX+w} z?M2Z-+3^>px=obtM|X|Zpb`ivYP^H-2&!y#BKVZnZM_&C4|V0_ zjEw7CWIEZ(RoH!=N~hPCVW)EH+qIo4W#yWbKu7w@sk?VnPMw!O)RmJnV&&FkY3o*< zaYz8S-RpNdJdRB3rf;9b;}QJg+wZ@8o1^3bas(6lLmn%K00IagfB*srAb+&t4372-=8x^O|-{l_f)znT^Z~5_3e@EheYkIR?L|w-?YGMu!L*WB^*Mr9OGpw-`q!TgKmY**5I_I{1Q0*~0R*PFKr}RvRBJbl z9Ko^OBLgoCKR=K)Ejxd%S?d;Y>>R<4^5U0E?<_FLdV%S=FP$_;AnwA100IagfWQP3 z=rvAHuHhe}3vG|b?(zHmPEUp&g;UzK&a+20?HJm)Exm?6M|K5W6)nz|^J;N6IRaUy zp48bq;}I|(fgG}e@d#|qvG|W>5sm+-oukWf0A&0pKR@{pHhX4TZ}F~5yTf1UbysFM zgr&4=9ky$uti=yu3zb!h8bi|7gB$@l0{?t+1dK-z>tEoq;cJ`!F!1L0$PrAikGQN3 z0tg_000IagfB*srAb2q1uf!O)vO<0O@@o=SU#$LVoZWT<>q+g%>F zPixm|UQ>$qM^UB(8OMe`{C?uGR(tP-oR(1vvt81mp<1I&D?t2>Om_ z(X99ZL>n$ci!($MSu$3k9ym&K)g#!dFHLLj-Qa0WSoEh8JA)=~r6)3ePYHL&%`Q_T^W$1Pva;=sl*k`cpo4lLNnj?S!0tg_000IagfB*srATTuqK5xu3nCt3F=ce_v z;qlok{642Ep8$PSukoVZ>fM{ZWEUf@?B-Taf* zqbob)_X0Bt{>5N9V(GBVDLG!Usida(z2c{eR}{}G`bp7-qN@wvF8o?yps-Zji3tG& z5I_I{1Q0*~fr%tgJ3~FKW;Tv>TCLLI_c)xHMn>`3liO$1PCwz2d~UzvL`zDvPp_Re zPD`3rYZ<2{S!zqhX-Oru#pAT3;@YBdT2fJM;W#a+u(n{FmQ+w{9;YRlYxBoxN%^&T zFUL_Y3hZ=qF$7gs29b> z>P1nJdQn)YUKA9l7iP11k)N+#Vm-PbKmKUQr0x`pc00IagfB*srAbV7NyKo^p;L zUv5+^NAQJz{`vp7ZH^{HW@9}0xC#AFp+B(`hwc!be{`T)b>00(lr|XjoSJvKsr_#K1Rp9mo zofZDZWvlDzKdUThT3r*q^9!H#b}SCLUDtJ0yPcnDzOAD5y1FmjcIQnC#AeBwfq0I< z@cwVQ`c`-SQ054XmUj%|9}@xyAb>YLS7$blnMm+E9Zs(&b0Q(RT`aXw{*U!9F#qF^-4)q=_z5jX@SYftAo+QjM*sl? Y5I_I{1Q0*~0R#|00D&nYppHlIzYn#$tN;K2 literal 0 HcmV?d00001 diff --git a/backend/router/url.py b/backend/router/url.py index c5230b3..c168e7c 100644 --- a/backend/router/url.py +++ b/backend/router/url.py @@ -2,25 +2,12 @@ from typing import Any, Callable, get_type_hints from fastapi import Depends, routing -from controller.common import about, login, websocket +from controller.common import login, websocket from controller.menu import menu_add, menu_arr, menu_del, menu_put -from controller.role import ( - role_add, - role_arr, - role_del, - role_has_menu, - role_put, - role_query, -) -from controller.user import ( - user_add, - user_arr, - user_del, - user_info, - user_list, - user_put, - user_select_role, -) +from controller.role import (role_add, role_arr, role_del, role_has_menu, + role_put, role_query) +from controller.user import (user_add, user_arr, user_del, user_info, + user_list, user_put, user_select_role) from core.security import check_permissions @@ -121,11 +108,10 @@ class Route(routing.APIRoute): has_perm = {"dependencies": [Depends(check_permissions)]} -# has_perm = {} +has_perm = {} routes = [ Route.post("/login", endpoint=login, tags=["公共"], summary="登录"), - Route.get("/about", endpoint=about, tags=["公共"], summary="关于", **has_perm), # 用户管理 Route.get("/user", endpoint=user_arr, tags=["用户管理"], summary="用户列表", **has_perm), Route.post("/user", endpoint=user_add, tags=["用户管理"], summary="用户新增", **has_perm), diff --git a/backend/tests/test_case.py b/backend/tests/test_case.py index df7c710..d73701a 100644 --- a/backend/tests/test_case.py +++ b/backend/tests/test_case.py @@ -91,8 +91,6 @@ params = [ component="/setting/about/about.vue", pid=2, identifier=None, - api="/about", - method="GET", ).dict(), ), # 按钮 diff --git a/frontend/src/components/table/conf.js b/frontend/src/components/table/conf.js new file mode 100644 index 0000000..4696f31 --- /dev/null +++ b/frontend/src/components/table/conf.js @@ -0,0 +1,36 @@ +import { ref } from 'vue' + +// 菜单类型映射 +export const menuType = { + 0: '目录', + 1: '菜单', + 2: '按钮' +} + +// 请求方法颜色映射 +export const methodColor = { + GET: '#61AFFE', + POST: '#49CC90', + DELETE: '#F93E3E', + PUT: '#FCA130' +} + +export const tableTree = () => { + // 1.适配菜单表格 + // 展开行 https://blog.csdn.net/weixin_52691965/article/details/120494451 + const expandedRowKeys = ref([]) + const expand = (expanded, record) => { + if (expandedRowKeys.value.length > 0) { + let index = expandedRowKeys.value.indexOf(record.id) + if (index > -1) { + expandedRowKeys.value.splice(index, 1) + } else { + expandedRowKeys.value.splice(0, expandedRowKeys.value.length) + expandedRowKeys.value.push(record.id) + } + } else { + expandedRowKeys.value.push(record.id) + } + } + return expand +} diff --git a/frontend/src/components/table/table.vue b/frontend/src/components/table/table.vue new file mode 100644 index 0000000..044602e --- /dev/null +++ b/frontend/src/components/table/table.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/frontend/src/views/main/system/menu/conf.js b/frontend/src/views/main/system/menu/conf.js index 0599e8d..fd1a4ef 100644 --- a/frontend/src/views/main/system/menu/conf.js +++ b/frontend/src/views/main/system/menu/conf.js @@ -72,11 +72,3 @@ export const menuType = { 1: '菜单', 2: '按钮' } - -// 请求方法颜色映射 -export const methodColor = { - GET: '#61AFFE', - POST: '#49CC90', - DELETE: '#F93E3E', - PUT: '#FCA130' -} diff --git a/frontend/src/views/main/system/menu/menu.vue b/frontend/src/views/main/system/menu/menu.vue index d71880c..450f4e5 100644 --- a/frontend/src/views/main/system/menu/menu.vue +++ b/frontend/src/views/main/system/menu/menu.vue @@ -1,35 +1,17 @@