From c75fe7135a6084bc96493b63b4a1bf183f353aa8 Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Mon, 20 Feb 2023 18:41:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=BE=E6=A0=87=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mayfly_go_web/src/assets/icon/mongo.png | Bin 0 -> 1311 bytes mayfly_go_web/src/assets/icon/mysql.png | Bin 0 -> 1898 bytes mayfly_go_web/src/assets/icon/postgres.png | Bin 0 -> 2582 bytes mayfly_go_web/src/assets/icon/redis.png | Bin 0 -> 1827 bytes mayfly_go_web/src/theme/app.scss | 10 +++++ mayfly_go_web/src/views/ops/db/SqlExec.vue | 9 ++-- .../src/views/ops/machine/SshTerminal.vue | 41 ++++++++---------- .../src/views/ops/machine/SshTerminalPage.vue | 2 +- .../src/views/ops/mongo/MongoDataOp.vue | 4 +- .../src/views/ops/redis/DataOperation.vue | 6 +-- server/internal/db/application/db_sql_exec.go | 2 +- server/internal/db/application/mysql_meta.go | 4 +- server/internal/db/application/pgsql_meta.go | 4 +- server/internal/machine/api/machine_script.go | 4 +- server/internal/tag/application/tag_tree.go | 5 +-- server/mayfly-go.sql | 2 +- server/pkg/scheduler/scheduler.go | 4 +- 17 files changed, 44 insertions(+), 53 deletions(-) create mode 100644 mayfly_go_web/src/assets/icon/mongo.png create mode 100644 mayfly_go_web/src/assets/icon/mysql.png create mode 100644 mayfly_go_web/src/assets/icon/postgres.png create mode 100644 mayfly_go_web/src/assets/icon/redis.png diff --git a/mayfly_go_web/src/assets/icon/mongo.png b/mayfly_go_web/src/assets/icon/mongo.png new file mode 100644 index 0000000000000000000000000000000000000000..0288ee5fe50c9c328dce33b267f24f88042d64fa GIT binary patch literal 1311 zcmV+)1>pLLP)Px(*-1n}RA@u(nO$gHMHI*X=kA)SSTQeJY88}9o|KA3L5;RxY;0|)#o||OL()5w zXjZ#a@IghZAfmNxtW9>#TqG5R`p{OaZCXVev?yv7Kfn(VDO9nD;EP2Q*n4D_U0K#- zv-e|T3z?^IIcLuQch1b5$t>XvA9RN6$1Fg-3g&XT^Cu=I78ql`ZC0h5R)K+mf%)U( zz{04o5D zhhf+m1i@IE5UB$wrJexrv=b>J4-(M`fNua?PDDQyi^bc6AowmVh*SZz)^~}>?y|V& znfX!ox7K>Gh0PFCwB*0P~1wpD|{2wLq=)IuY4b{ub)lv3vcI0)coB0AxDUdQn8@DH^DecykMh)Pv)g<)n+3Xw_$wAL?($Rp)-zt&p& z`c%S{Qf~oR3E+4bhV4NR{G0?LF+g8m-;yv4kCa7hXXbo8LA|}b3p1I_`v5Khu#=ew z{#O94^&t^i2H@z##6-u)$jIN*2~tWu1YpqF5zz``j9Y%OMxqKRr4#_;B72^ zYx~m>)ZN{EK}$=^!=C5uDijLGqs$o@Kq<8kz$y{hVXbv{n#4mX<<`I32fLWLJIaJ{ z0JZ_x2w;?%m)8q+QT`AEwA2gH`|IGcO2hh(OZlIn?IN-<>OP1A;KXkeksqzKSJVTz zFn{=a0@@@D`+gg|t#s*2d&B`)1;8yMFmql1(-NSkr)PdPoBhQBgkgA75Ck7imDNT8 zDt$mimRoB}J*LqSxdLut-}gTuqH6&>#>~$q0qF1VZz~pyUjdloni(^1ZdAOpiwp1! z5j`#efbaXIxty38y9@cgzl?|uxuEVoZ>@c0vaC%9(9_d1H=E76>|X|8 zH#6T8CHt`};2f1w?!|3A0QY=yBQyVA8+oS% zGMW2pU)$;dD5Xlraar(-%v^ewi8^BKfl8374(dJ~3&U_-^}FX(0M&j(^rOUb?K>?rStF>CG8%H)#)XsvT1@>0cSx?VCJSYiMdKx@4gK(C05RUdkc+ literal 0 HcmV?d00001 diff --git a/mayfly_go_web/src/assets/icon/mysql.png b/mayfly_go_web/src/assets/icon/mysql.png new file mode 100644 index 0000000000000000000000000000000000000000..7caeeed53e74d369f1dcfe6aaac5bd3d94320fb2 GIT binary patch literal 1898 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 s`dsg-R(Y0-`m}p-C2ti0X07O zVM0PeA_<8gQ3J%FU^Ic~U!#E-6_7|tB%)$OV78?#g+fb(ico7S^xe*GTj&Ezp@lw< zIk(+)yE}Jgg-VI(NpAXM=id8$=YHQgccuozOw7bg%tUN7=jA;d@(XK%ez7tr34=jN z=vDmU0Yws)81Ch0^mt|m{lfa7BnE?i5!8op0m&gr!@Uw6Uav)wgl&pn90=z6AhaNt z1OA_(_=V1(U)-vQ;uF&bJSchGiX`q;Bw;uj+~Dz282EM{bgftpp(P8U_x;UqE&pqE zGLkriYlM8h)Vl&242Jtq%Rxyv#LI5)mJc8jBO~lj|E?W6CnAmp{bG?K2}}PI;5BJ! z54B6)m5N{ZLk&P^Q6BVtxCMsJ`~omK3b8S)w8LN9KZTCx7U{|>D2eBAuPTq{!8-=t z?e)%L#`Ft{-o_}GuI0<%%G%Y?v-uquZfa!U2P;lN|L$FI^^=dGXVXRqJ?)RpJ}8o) zMkItjX_KVK|26OqpD#IL%!vg%m%a#B-gup9x_kXw(6#IpO+rXyY;X`do?oo`d#ld_ zzon-_NwOKfp%e;iR;U+T@$!cSKIX-7t3}u@IVZKJyArCr#R!*XclvTOQ6N)iI>4^t5}w` zVx+SZy4Ss_Z%&krcS1Ji$wcxefbTOJ;h56_Eutq*Zoj6@gQF%BpFpW48EUgL;|ztS z>v?x041B*IhAL0Pt-3lGI(r7L|MVmDytfHL3+L+s$2Fp#!#)0VWkR{b21OOfK2Id^utGuMmU?A0xhCjb2F?+cp{^{z3Lhp8)MJtfmZw? zJCzeQtEx{X2%O}f03i)(lQ0YA4m;Glv$>mhzWf5q_-J1|iGc$@Xako-sL9HJW0qtt zaG8*r0!mkWXD~d#C2)A|TyucZodH6Icng(TEl``Cq272<>kD$3d~W_;J#O$|5JHRd zxQ0HLp2|GH+wTPK=gNe3pU~In$^N`n>+;toNu*5@wlxdx8|RqgWAqm_upC~m7sbTerd#_BsdQ8p{oxiaJCwutT_E`b)WyFdEjHc4P0i#0M-81{+R zef!3wlYwKSQ)%nz7t&gHv`JYdl=ibR2jC2RP3oTmsP#9k*Io zW#E-N)F&EDi-^|1(`piORM&6T@Q6(5H7)^}(t+3ssDI2to60o<$0d)8Wib)ZC^PJ; zJij#Pd4!NYnUD>90)*`2n$=`vn>UH-Swk6MR@FAgxtLLu1h09OX?Ud2WV}^owd5CB zt+Tn{BR(*jpDDJO&ui%xo7yE#Q$tx`39fM1q0;GK=2JVpM4DHT$;7TS;Zofsx_fG~ zGdFR;xA?@>icjdphZ_ZcMk7A4jQfPw)U;k=ip+d-mzc+UjM}=bKF=7J0R9+fD6f9g zN#ydENb@R5HnS7sB?M2s%x>dXA=J2ok?tJ1F7T?CsO=GaSCJ{*dn74||7AiZWSLAzlU7;dH8rNyZ1wJZ+G*!X zvO&Lj4at;#S!gm@42i@RgW-NTDQT%pNENpi7>#UG-ctHKEVJJLm%~0YcV)N9iMm>55{DWe&?8Ay*RyPDq1H$eJnnbUsyq$B)?z5YnLm zy!r?sD>XlhOm`H{ne%9XkaYn{D+82XmnrR*2{{-b>% R-2eap002ovPDHLkV1muhWoiHb literal 0 HcmV?d00001 diff --git a/mayfly_go_web/src/theme/app.scss b/mayfly_go_web/src/theme/app.scss index 1bce375d..82a04976 100644 --- a/mayfly_go_web/src/theme/app.scss +++ b/mayfly_go_web/src/theme/app.scss @@ -342,6 +342,7 @@ body, font-size: 12px } +// 图标垂直居中 .icon-middle { .el-icon { display: inline-flex; @@ -350,4 +351,13 @@ body, cursor: pointer; vertical-align: middle; } +} +.img-icon { + display: inline-flex; + justify-content: center; + align-items: center; + cursor: pointer; + vertical-align: middle; + height: 16px; + width: 16px; } \ No newline at end of file diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 4ef39b2e..f8c47980 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -28,7 +28,12 @@ @@ -64,8 +69,6 @@ - - diff --git a/mayfly_go_web/src/views/ops/machine/SshTerminal.vue b/mayfly_go_web/src/views/ops/machine/SshTerminal.vue index 7824f8dc..5c0c8262 100644 --- a/mayfly_go_web/src/views/ops/machine/SshTerminal.vue +++ b/mayfly_go_web/src/views/ops/machine/SshTerminal.vue @@ -1,5 +1,5 @@ \ No newline at end of file + + diff --git a/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue b/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue index 749d8db9..1e2db757 100644 --- a/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue +++ b/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue @@ -12,7 +12,7 @@ import { useRoute } from 'vue-router'; const route = useRoute(); const state = reactive({ machineId: 0, - height: 700, + height: 0, }); const { diff --git a/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue b/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue index 779d7d51..6a50eb6f 100644 --- a/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue +++ b/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue @@ -7,9 +7,7 @@