diff --git a/frontend/src/assets/icon-font/iconfont.css b/frontend/src/assets/icon-font/iconfont.css index 580a442dc5..bc9ed2e575 100644 --- a/frontend/src/assets/icon-font/iconfont.css +++ b/frontend/src/assets/icon-font/iconfont.css @@ -1,7 +1,7 @@ @font-face { font-family: iconfont; /* Project id 3462279 */ - src: url('iconfont.woff2?t=1715932148897') format('woff2'), url('iconfont.woff?t=1715932148897') format('woff'), - url('iconfont.ttf?t=1715932148897') format('truetype'), url('iconfont.svg?t=1715932148897#iconfont') format('svg'); + src: url('iconfont.woff2?t=1716970683831') format('woff2'), url('iconfont.woff?t=1716970683831') format('woff'), + url('iconfont.ttf?t=1716970683831') format('truetype'), url('iconfont.svg?t=1716970683831#iconfont') format('svg'); } .iconfont { font-size: 16px; @@ -10,6 +10,21 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-icon_github::before { + content: '\e7b9'; +} +.icon-icon_forum::before { + content: '\e7ba'; +} +.icon-icon_vip::before { + content: '\e7bb'; +} +.icon-icon_plan::before { + content: '\e7b8'; +} +.icon-icon_scan_code::before { + content: '\e7b7'; +} .icon-icon_generate_report::before { content: '\e7b6'; } diff --git a/frontend/src/assets/icon-font/iconfont.js b/frontend/src/assets/icon-font/iconfont.js index e44ad5bd2c..277b0af043 100644 --- a/frontend/src/assets/icon-font/iconfont.js +++ b/frontend/src/assets/icon-font/iconfont.js @@ -1,16 +1,16 @@ (window._iconfont_svg_string_3462279 = - ''), + ''), (function (h) { var a = (a = document.getElementsByTagName('script'))[a.length - 1], l = a.getAttribute('data-injectcss'), a = a.getAttribute('data-disable-injectsvg'); if (!a) { var o, - i, c, + i, v, t, - z = function (a, l) { + m = function (a, l) { l.parentNode.insertBefore(a, l); }; if (l && !h.__iconfont__svg__cssinject__) { @@ -34,26 +34,26 @@ (l.style.height = 0), (l.style.overflow = 'hidden'), (l = l), - (a = document.body).firstChild ? z(l, a.firstChild) : a.appendChild(l)); + (a = document.body).firstChild ? m(l, a.firstChild) : a.appendChild(l)); }), document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) ? setTimeout(o, 0) - : ((i = function () { - document.removeEventListener('DOMContentLoaded', i, !1), o(); + : ((c = function () { + document.removeEventListener('DOMContentLoaded', c, !1), o(); }), - document.addEventListener('DOMContentLoaded', i, !1)) + document.addEventListener('DOMContentLoaded', c, !1)) : document.attachEvent && - ((c = o), + ((i = o), (v = h.document), (t = !1), d(), (v.onreadystatechange = function () { - 'complete' == v.readyState && ((v.onreadystatechange = null), m()); + 'complete' == v.readyState && ((v.onreadystatechange = null), z()); })); } - function m() { - t || ((t = !0), c()); + function z() { + t || ((t = !0), i()); } function d() { try { @@ -61,6 +61,6 @@ } catch (a) { return void setTimeout(d, 50); } - m(); + z(); } })(window); diff --git a/frontend/src/assets/icon-font/iconfont.json b/frontend/src/assets/icon-font/iconfont.json index 1c0399f517..016389e620 100644 --- a/frontend/src/assets/icon-font/iconfont.json +++ b/frontend/src/assets/icon-font/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "icon-", "description": "DE、MS项目icon管理", "glyphs": [ + { + "icon_id": "40529317", + "name": "icon_github", + "font_class": "icon_github", + "unicode": "e7b9", + "unicode_decimal": 59321 + }, + { + "icon_id": "40529315", + "name": "icon_forum", + "font_class": "icon_forum", + "unicode": "e7ba", + "unicode_decimal": 59322 + }, + { + "icon_id": "40529316", + "name": "icon_vip", + "font_class": "icon_vip", + "unicode": "e7bb", + "unicode_decimal": 59323 + }, + { + "icon_id": "40501306", + "name": "icon_plan", + "font_class": "icon_plan", + "unicode": "e7b8", + "unicode_decimal": 59320 + }, + { + "icon_id": "40446095", + "name": "icon_scan_code", + "font_class": "icon_scan_code", + "unicode": "e7b7", + "unicode_decimal": 59319 + }, { "icon_id": "40376562", "name": "icon_generate_report", diff --git a/frontend/src/assets/icon-font/iconfont.svg b/frontend/src/assets/icon-font/iconfont.svg index e869d79f93..c474346167 100644 --- a/frontend/src/assets/icon-font/iconfont.svg +++ b/frontend/src/assets/icon-font/iconfont.svg @@ -14,6 +14,16 @@ /> + + + + + + + + + + diff --git a/frontend/src/assets/icon-font/iconfont.ttf b/frontend/src/assets/icon-font/iconfont.ttf index 5e6635a5fa..c3e1d280a7 100644 Binary files a/frontend/src/assets/icon-font/iconfont.ttf and b/frontend/src/assets/icon-font/iconfont.ttf differ diff --git a/frontend/src/assets/icon-font/iconfont.woff b/frontend/src/assets/icon-font/iconfont.woff index c723e5dbd0..addd3fcd6d 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff and b/frontend/src/assets/icon-font/iconfont.woff differ diff --git a/frontend/src/assets/icon-font/iconfont.woff2 b/frontend/src/assets/icon-font/iconfont.woff2 index d0ed232628..f01e712853 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff2 and b/frontend/src/assets/icon-font/iconfont.woff2 differ diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue index c6902c7682..16dcdcbe73 100644 --- a/frontend/src/components/pure/navbar/index.vue +++ b/frontend/src/components/pure/navbar/index.vue @@ -101,7 +101,7 @@ + + + {{ t('settings.help.forumHelp') }} + + + + {{ t('settings.help.gitHubProject') }} + + + + {{ t('settings.help.enterpriseVersionTrial') }} + @@ -169,7 +181,7 @@ import useUserStore from '@/store/modules/user'; import { getFirstRouteNameByPermission } from '@/utils/permission'; - import { IconInfoCircle, IconQuestionCircle } from '@arco-design/web-vue/es/icon'; + import { IconInfoCircle } from '@arco-design/web-vue/es/icon'; const props = defineProps<{ isPreview?: boolean; @@ -265,8 +277,21 @@ } function handleHelpSelect(val: string | number | Record | undefined) { - if (val === 'doc') { - window.open(appStore.pageConfig.helpDoc, '_blank'); + switch (val) { + case 'doc': + window.open(appStore.pageConfig.helpDoc, '_blank'); + break; + case 'forumHelp': + window.open('https://bbs.fit2cloud.com/c/ms/8', '_blank'); + break; + case 'github': + window.open('https://github.com/metersphere/metersphere', '_blank'); + break; + case 'enterprise': + window.open('https://jinshuju.net/f/CzzAOe', '_blank'); + break; + default: + break; } } diff --git a/frontend/src/locale/en-US/settings.ts b/frontend/src/locale/en-US/settings.ts index b50bdfd5ba..15839e9d64 100644 --- a/frontend/src/locale/en-US/settings.ts +++ b/frontend/src/locale/en-US/settings.ts @@ -14,6 +14,9 @@ export default { 'settings.navbar.help': 'Help center', 'settings.help.guide': 'Use Guide', 'settings.help.doc': 'Help docs', + 'settings.help.forumHelp': 'Forum Help', + 'settings.help.gitHubProject': 'GitHub project', + 'settings.help.enterpriseVersionTrial': 'Enterprise version trial', 'settings.help.APIDoc': 'API docs', 'settings.help.versionInfo': 'Version info', 'settings.help.version': 'Version', diff --git a/frontend/src/locale/zh-CN/settings.ts b/frontend/src/locale/zh-CN/settings.ts index a54b48e487..1c98bda04d 100644 --- a/frontend/src/locale/zh-CN/settings.ts +++ b/frontend/src/locale/zh-CN/settings.ts @@ -14,6 +14,9 @@ export default { 'settings.navbar.help': '帮助中心', 'settings.help.guide': '新手指引', 'settings.help.doc': '帮助文档', + 'settings.help.forumHelp': '论坛求助', + 'settings.help.gitHubProject': 'GitHub 项目', + 'settings.help.enterpriseVersionTrial': '企业版试用', 'settings.help.APIDoc': 'API文档', 'settings.help.versionInfo': '版本信息', 'settings.help.version': '版本', diff --git a/frontend/src/views/api-test/components/requestComposition/response/index.vue b/frontend/src/views/api-test/components/requestComposition/response/index.vue index 56fb9f98b6..274a67db86 100644 --- a/frontend/src/views/api-test/components/requestComposition/response/index.vue +++ b/frontend/src/views/api-test/components/requestComposition/response/index.vue @@ -235,7 +235,7 @@ .response-head { @apply flex flex-wrap items-center justify-between border-b; - padding: 13px 16px; + padding: 11px 16px; border-color: var(--color-text-n8); gap: 8px; }