From 4220e7769c1688fc7fb8b19ac9ece0cc787d1377 Mon Sep 17 00:00:00 2001 From: GONGONGONG <506419689@qq.com> Date: Wed, 10 May 2023 15:16:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(front):=20=E5=AF=BC=E8=88=AA=E8=A7=84?= =?UTF-8?q?=E8=8C=83(closed=20#1501)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index-dev.html | 6 +- frontend/index.html | 48 ++++---- frontend/src/bk_icon_font/fonts/iconcool.eot | Bin 21528 -> 21984 bytes frontend/src/bk_icon_font/fonts/iconcool.svg | 6 + frontend/src/bk_icon_font/fonts/iconcool.ttf | Bin 21360 -> 21816 bytes frontend/src/bk_icon_font/fonts/iconcool.woff | Bin 13228 -> 13540 bytes frontend/src/bk_icon_font/style.css | 6 + .../common/MixinsControlDropdown.vue | 96 +++++++++++++++ frontend/src/components/common/footer.vue | 6 +- frontend/src/components/common/navigation.vue | 110 ++++++++++++++---- frontend/src/css/app.css | 34 ++++++ frontend/src/i18n/en.js | 4 +- frontend/src/i18n/zh.js | 4 +- frontend/src/router/index.ts | 2 +- frontend/src/router/modules/global-config.ts | 2 +- frontend/src/setup/i18n-setup.ts | 2 +- .../views/agent/agent-setup/agent-import.vue | 6 +- .../cloud-manager-add/cloud-manager-add.vue | 2 +- .../cloud-manager-add/cloud-manager-setup.vue | 2 +- .../cloud-detail-table.vue | 4 +- .../views/plugin/plugin-list/plugin-list.vue | 2 +- 21 files changed, 280 insertions(+), 62 deletions(-) create mode 100644 frontend/src/components/common/MixinsControlDropdown.vue diff --git a/frontend/index-dev.html b/frontend/index-dev.html index eccd93b44..9999ffaa0 100644 --- a/frontend/index-dev.html +++ b/frontend/index-dev.html @@ -36,6 +36,8 @@ const LOGIN_URL = '' const VERSION = '' const CMDB_URL = '' + const BKAPP_NAV_OPEN_SOURCE_URL = '' + const BKAPP_NAV_HELPER_URL = '' return { SITE_URL: SITE_URL, @@ -66,7 +68,9 @@ TAM_ID, LOGIN_URL, VERSION, - CMDB_URL + CMDB_URL, + BKAPP_NAV_OPEN_SOURCE_URL, + BKAPP_NAV_HELPER_URL, } })() window.$DHCP = window.PROJECT_CONFIG.BKAPP_ENABLE_DHCP === 'True' diff --git a/frontend/index.html b/frontend/index.html index 04d6f8a37..61d6d45e1 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -40,37 +40,41 @@ const LOGIN_URL = '{{ LOGIN_URL }}' const VERSION = '{{ VERSION }}' const CMDB_URL = '{{ CMDB_URL }}' + const BKAPP_NAV_HELPER_URL = '{{ BKAPP_NAV_HELPER_URL }}' + const BKAPP_NAV_OPEN_SOURCE_URL = '{{ BKAPP_NAV_OPEN_SOURCE_URL }}' return { - SITE_URL: SITE_URL, - STATIC_URL: STATIC_URL, - REMOTE_STATIC_URL: REMOTE_STATIC_URL, - RUN_VER: RUN_VER, + APP_CODE, + APPO_IP, + BK_DOCS_CENTER_URL, + BK_PAAS_HOST, + BKAPP_ENABLE_DHCP, + BKAPP_NAV_HELPER_URL, + BKAPP_NAV_OPEN_SOURCE_URL, + BKAPP_NODEMAN_CALLBACK_URL, + BKAPP_RUN_ENV, + CMDB_URL, DEFAULT_CLOUD: parseInt(DEFAULT_CLOUD), + DEFAULT_SSH_PORT, + DESTOP_URL, + GLOBAL_TASK_CONFIG_PERMISSION, + GLOBAL_SETTING_PERMISSION, + GSE_LISTEN_PORT, + LOGIN_URL, NGINX_IP, NGINX_PORT, - APPO_IP, - GSE_LISTEN_PORT, PROXY_LISTEN_PORT, - WEB_TITLE, - USERNAME, - GLOBAL_TASK_CONFIG_PERMISSION, - GLOBAL_SETTING_PERMISSION, + REMOTE_STATIC_URL: REMOTE_STATIC_URL, + RUN_VER: RUN_VER, + SITE_URL: SITE_URL, + STATIC_URL: STATIC_URL, + TAM_ID, USE_IAM, - APP_CODE, - WXWORK_UIN, - DESTOP_URL, - BKAPP_NODEMAN_CALLBACK_URL, - BK_PAAS_HOST, - DEFAULT_SSH_PORT, USE_TJJ, - BK_DOCS_CENTER_URL, - BKAPP_RUN_ENV, - BKAPP_ENABLE_DHCP, - TAM_ID, - LOGIN_URL, + USERNAME, VERSION, - CMDB_URL + WEB_TITLE, + WXWORK_UIN, } })() window.$DHCP = window.PROJECT_CONFIG.BKAPP_ENABLE_DHCP === 'True' diff --git a/frontend/src/bk_icon_font/fonts/iconcool.eot b/frontend/src/bk_icon_font/fonts/iconcool.eot index 471f31e0dd6ada1141b621f63bcaa3e4432cf60b..e2749c12bd610066694e2a94e9b660bd65eb7d45 100644 GIT binary patch delta 939 zcmXw1TWAw$7(L%)l4&Lxb*kywcN9C2sg^@P^{RyC}Hx*0&+wyiAa3lbwVIcWO|1U$+UjYyA zqb-Setk0a77~tAjMlivI5_eqWHTR%4kvcv+<}5zvd9N5(lS93+_MRgz0rdvwU!-Eg zX*x?)oLkKMn!#8qK33sRc!0fk0O@Rc=-Bc5>!%+8?P~$qZTFE`7YA`Mqq3u^*fYQ7 z3p_Fttl_6d@Bh)Bq-u)WPv|yfvI*%H*|($$yFy-g@aSASC<({hYAr{VUv?BSMY!FM z1#`@>(1c&qi$<|YM8zJlS9FL$ktr6rW>}C|D3*#fA}GRQ2j|+vK9MdK?ToX!ns|mE z4Tzu{N&JpcjPZRHPwl_t8T~L~ID$U(;t+b+hs*xtJYm0cUUom=$)&3=d&)H+w;l$> zuVruxM6wKShDepcV;~00;DHe7GI%sZrVRAhRi201;+hjRFN{hfXp9;+v$LMemJugV zoOC>vCb0>x)Sg$r|*o-6w(!H3BcV{2Ns}6Q$ZE(t#zl6v>ZksWhx&j%$)T96OHDUoy>N2c7i|qHv=BjU>&yc zaayKc5>%j0$dyy)X?4lg-H0pC6+pIa_a~Wu)opE0I8cAKqW!(3hBhd_4gS1i LV`!uOp>y4Tr55wW delta 490 zcmXw!Pe@cz6vn?Z^XAPslR6^gC@x->L>5#aV^IFdXs2mvQJZm|&lw*zZ+zJ-ULmN6 z6ea$dyJ;1*6LRI-C=^%=34&I+3-q*e=OSCQc^w_PmmlZebH4A~bN4^cn>Er?BY-=+ zs;9L&t8I6+=k?4FfTjW5w;a=bTmBUT!dW0%Gf{Y!@Bf}%1`^kRo11pd96!@J+#%Y1 zA#F<{nhU>@^GD&F?UcNik>H#3JMOtyn6%8xX3rE5ccuQ-F+G>&>9o{RayN>mlUs>3 z*$JTU5C|=}lTS;T=@(ys0Z)cFQsZ>C)dGoF*ln}wMr&^zA)!eE*lUUY{vXvkHIk)v z=sgvEJM@lJQmcQMKe2+c2%nrTNsP-wd1%xw))bPGiNWJ)ZsH5v&e!=C_wgMb;$jep z!eiokZsv=e=1#sXl|dc}0yU>KG?4gHxPmS`z$26}izV4*wV{2g&R`T-jKP%2bw&Df z^*6FywRSwNtTDf=PiR*&06(rEa&V!77{N{jX#p-)fT?;DpR3}=piwfmjh}w<)RS&M V(toJQ&;Q)r@wbN#LTc;Y`F}{Ahyefq diff --git a/frontend/src/bk_icon_font/fonts/iconcool.svg b/frontend/src/bk_icon_font/fonts/iconcool.svg index 83394ed8a..3eb7c096e 100644 --- a/frontend/src/bk_icon_font/fonts/iconcool.svg +++ b/frontend/src/bk_icon_font/fonts/iconcool.svg @@ -305,6 +305,12 @@ + + + + + + diff --git a/frontend/src/bk_icon_font/fonts/iconcool.ttf b/frontend/src/bk_icon_font/fonts/iconcool.ttf index f357f20d2f3f81b2ee0a20f6ccd773ad2be33c7c..53911203a0b26659d6b880dd59d753be7fb0c4c8 100644 GIT binary patch delta 914 zcmXw0OK1~O6g@XH?KG2&8Z}iTYR9Qc#c$I|Y;9~bid4i;3l+PtjcwYfNt*hjic+cQ zLKGq+E<{98)cOG-P+YW7QAE^*LQxO`J_ON)pokkKiFX=(Gl%=$x#!+@F7NwodVG&E z#^8H^P5@}@N=DOP8b6H!QXEifdlScc_V1vIvE{E(;2Gd+-yEqrJ~7LrotC@0o!f? zjx*`LLx&%(7##<8E(2ue#ZjXv24XE^dP{w=V`}3sxMU{S!tOfv|5%(TLN1qD_*?;p z&GNGAV%B`RLH*frx=z-2s<1kx8BGT#Q=kN-$=x!JD&Kz)GKIOwhiQ|{fY5|b)QCE< zRz$>Bu}!pyl<2n}Nj_Pmi$&|LJZBEE+=p6((T)U;Vh9=jF5!jsTN=|k5yf6~qYHb` zksX&ca*p#2_Ug{QE9;e;I{|T^1lB?%O5iGpWC>gkkt%^ZL8MFIo)G;dpu)slfDm; zNN(QAY-?*P___ZL;6fFaV*@{}X?Sc?HWbgyO12#cnn4dc*4epfEb5Pg4lW0GC02BBGUDBD^nm4XUE3ss|dO>IrFcxlYfHgVBxlD0WS5fnre z5tI6FJ(TuRir2kJu@HMGg@Px&3Hp0$PdVs$J25z)$IQHW^Zp#{v*s68?_E6s*b0D` zw#&;O_x^+cH3I~1%@>yPPmeP-z<3Ny95^}t`tIn9VbWd@h8!Y-Idz-rL&AN>tyH%H z{%`VYdF~WSHt*--Zvnkb^ItBnmf1SHO*4~vtH|A4Jrr{cAlU?zjdJN-CB3rw19(=Y zBd*>b_9kpF(h^Sl?8sc#$Q2BY2;lr)@bV`6CqA?eHAQ_0N{gjv?b+fE`^<`7gMDJc zQF})7*ECoL>UH&qvQB^Jp|LnEnCK=ZgsSY6G5Ju&y)%tDWRL}?BRT{REQ?g27XI2giX!X%3(RYSX+SQvL2}4K x8?*@Nwm}w<#Wujj2mL6lThFbE)v(Sy$9R+QUL~6vv&Gc(PtQ#KRYYXw!G9S)c|iaG diff --git a/frontend/src/bk_icon_font/fonts/iconcool.woff b/frontend/src/bk_icon_font/fonts/iconcool.woff index d08774a207bd239895c442550d73bed2622d0a13..a4d8faa5b4363f989e9ae800697c7bc4d61b6e78 100644 GIT binary patch delta 12901 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 P{ipgz?KI6E?W6FiM*aYb delta 12622 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 diff --git a/frontend/src/bk_icon_font/style.css b/frontend/src/bk_icon_font/style.css index 4e09de086..eeca11c4a 100644 --- a/frontend/src/bk_icon_font/style.css +++ b/frontend/src/bk_icon_font/style.css @@ -299,6 +299,12 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype"); .nc-parenet-node-line:before { content: "\e169"; } +.nc-lang-zh-cn:before { + content: "\e170"; +} +.nc-lang-en:before { + content: "\e171"; +} .nc-copy-2:before { content: "\e16a"; } diff --git a/frontend/src/components/common/MixinsControlDropdown.vue b/frontend/src/components/common/MixinsControlDropdown.vue new file mode 100644 index 000000000..824295040 --- /dev/null +++ b/frontend/src/components/common/MixinsControlDropdown.vue @@ -0,0 +1,96 @@ + + + diff --git a/frontend/src/components/common/footer.vue b/frontend/src/components/common/footer.vue index 52aabe693..11f59bbd7 100644 --- a/frontend/src/components/common/footer.vue +++ b/frontend/src/components/common/footer.vue @@ -23,11 +23,11 @@ export default class NmFooter extends Vue { private created() { this.version = window.PROJECT_CONFIG.VERSION; - if (window.PROJECT_CONFIG.RUN_VER === 'ieod') { + if (window.PROJECT_CONFIG.BKAPP_RUN_ENV === 'ieod') { this.link = [ { name: window.i18n.t('联系BK助手'), - href: window.PROJECT_CONFIG.WXWORK_UIN, + href: window.PROJECT_CONFIG.BKAPP_NAV_HELPER_URL, target: '_blank', }, { @@ -40,7 +40,7 @@ export default class NmFooter extends Vue { this.link = [ { name: window.i18n.t('技术支持'), - href: 'https://wpa1.qq.com/KziXGWJs?_type=wpa&qidian=true', + href: window.PROJECT_CONFIG.BKAPP_NAV_HELPER_URL, target: '_blank', }, { diff --git a/frontend/src/components/common/navigation.vue b/frontend/src/components/common/navigation.vue index ab35d2694..dcf416cb2 100644 --- a/frontend/src/components/common/navigation.vue +++ b/frontend/src/components/common/navigation.vue @@ -31,34 +31,48 @@