diff --git a/frontend/src/assets/icon-font/iconfont.css b/frontend/src/assets/icon-font/iconfont.css index 916d378fcf..f52a59433f 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=1693882799546') format('woff2'), url('iconfont.woff?t=1693882799546') format('woff'), - url('iconfont.ttf?t=1693882799546') format('truetype'), url('iconfont.svg?t=1693882799546#iconfont') format('svg'); + src: url('iconfont.woff2?t=1695722459901') format('woff2'), url('iconfont.woff?t=1695722459901') format('woff'), + url('iconfont.ttf?t=1695722459901') format('truetype'), url('iconfont.svg?t=1695722459901#iconfont') format('svg'); } .iconfont { font-size: 16px; @@ -10,6 +10,33 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-icon_drilling_outlined::before { + content: '\e764'; +} +.icon-icon_stroke::before { + content: '\e762'; +} +.icon-icon_color-picker::before { + content: '\e763'; +} +.icon-icon_share::before { + content: '\e761'; +} +.icon-icon_mail::before { + content: '\e760'; +} +.icon-logo_wechat-work::before { + content: '\e75f'; +} +.icon-logo_dingtalk::before { + content: '\e75d'; +} +.icon-logo_lark::before { + content: '\e75e'; +} +.icon-icon_line-height_outlined::before { + content: '\e75c'; +} .icon-icon_folder_expansion1::before { content: '\e75b'; } diff --git a/frontend/src/assets/icon-font/iconfont.js b/frontend/src/assets/icon-font/iconfont.js index 98fbecf13c..1f9cac9c2c 100644 --- a/frontend/src/assets/icon-font/iconfont.js +++ b/frontend/src/assets/icon-font/iconfont.js @@ -1,5 +1,5 @@ (window._iconfont_svg_string_3462279 = - ''), + ''), (function (h) { var a = (a = document.getElementsByTagName('script'))[a.length - 1], l = a.getAttribute('data-injectcss'), @@ -10,7 +10,7 @@ c, v, t, - m = function (a, l) { + z = function (a, l) { l.parentNode.insertBefore(a, l); }; if (l && !h.__iconfont__svg__cssinject__) { @@ -34,7 +34,7 @@ (l.style.height = 0), (l.style.overflow = 'hidden'), (l = l), - (a = document.body).firstChild ? m(l, a.firstChild) : a.appendChild(l)); + (a = document.body).firstChild ? z(l, a.firstChild) : a.appendChild(l)); }), document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) @@ -49,10 +49,10 @@ (t = !1), d(), (v.onreadystatechange = function () { - 'complete' == v.readyState && ((v.onreadystatechange = null), z()); + 'complete' == v.readyState && ((v.onreadystatechange = null), m()); })); } - function z() { + function m() { t || ((t = !0), c()); } function d() { @@ -61,6 +61,6 @@ } catch (a) { return void setTimeout(d, 50); } - z(); + m(); } })(window); diff --git a/frontend/src/assets/icon-font/iconfont.json b/frontend/src/assets/icon-font/iconfont.json index f01d1c7441..310670bf07 100644 --- a/frontend/src/assets/icon-font/iconfont.json +++ b/frontend/src/assets/icon-font/iconfont.json @@ -5,6 +5,69 @@ "css_prefix_text": "icon-", "description": "DE、MS项目icon管理", "glyphs": [ + { + "icon_id": "37505843", + "name": "icon_drilling_outlined", + "font_class": "icon_drilling_outlined", + "unicode": "e764", + "unicode_decimal": 59236 + }, + { + "icon_id": "37384148", + "name": "icon_stroke", + "font_class": "icon_stroke", + "unicode": "e762", + "unicode_decimal": 59234 + }, + { + "icon_id": "37384147", + "name": "icon_color-picker", + "font_class": "icon_color-picker", + "unicode": "e763", + "unicode_decimal": 59235 + }, + { + "icon_id": "37315020", + "name": "icon_share", + "font_class": "icon_share", + "unicode": "e761", + "unicode_decimal": 59233 + }, + { + "icon_id": "37275130", + "name": "icon_mail", + "font_class": "icon_mail", + "unicode": "e760", + "unicode_decimal": 59232 + }, + { + "icon_id": "37243383", + "name": "logo_wechat-work", + "font_class": "logo_wechat-work", + "unicode": "e75f", + "unicode_decimal": 59231 + }, + { + "icon_id": "37243340", + "name": "logo_dingtalk", + "font_class": "logo_dingtalk", + "unicode": "e75d", + "unicode_decimal": 59229 + }, + { + "icon_id": "37243341", + "name": "logo_lark", + "font_class": "logo_lark", + "unicode": "e75e", + "unicode_decimal": 59230 + }, + { + "icon_id": "37243297", + "name": "icon_line-height_outlined", + "font_class": "icon_line-height_outlined", + "unicode": "e75c", + "unicode_decimal": 59228 + }, { "icon_id": "37233527", "name": "icon_folder_expansion", diff --git a/frontend/src/assets/icon-font/iconfont.svg b/frontend/src/assets/icon-font/iconfont.svg index e1d9f3fb87..52179c8778 100644 --- a/frontend/src/assets/icon-font/iconfont.svg +++ b/frontend/src/assets/icon-font/iconfont.svg @@ -14,6 +14,24 @@ /> + + + + + + + + + + + + + + + + + + @@ -68,7 +86,7 @@ - + @@ -90,7 +108,7 @@ - + @@ -428,7 +446,7 @@ - + diff --git a/frontend/src/assets/icon-font/iconfont.ttf b/frontend/src/assets/icon-font/iconfont.ttf index fb708371a8..5de64a69e7 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 5f6aed1fe1..73d36cf603 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 358393c7b0..85e4f77b36 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/ms-tab-card/index.vue b/frontend/src/components/pure/ms-tab-card/index.vue new file mode 100644 index 0000000000..897facdbd0 --- /dev/null +++ b/frontend/src/components/pure/ms-tab-card/index.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/frontend/src/views/project-management/log/index.vue b/frontend/src/views/project-management/log/index.vue index 9f550cd589..701f985955 100644 --- a/frontend/src/views/project-management/log/index.vue +++ b/frontend/src/views/project-management/log/index.vue @@ -3,6 +3,9 @@ diff --git a/frontend/src/views/setting/system/config/index.vue b/frontend/src/views/setting/system/config/index.vue index 1ea81d63fc..f933cdd5d8 100644 --- a/frontend/src/views/setting/system/config/index.vue +++ b/frontend/src/views/setting/system/config/index.vue @@ -1,27 +1,17 @@ - + diff --git a/frontend/src/views/setting/system/log/index.vue b/frontend/src/views/setting/system/log/index.vue index 0b43f629d7..c6a98994fb 100644 --- a/frontend/src/views/setting/system/log/index.vue +++ b/frontend/src/views/setting/system/log/index.vue @@ -3,6 +3,9 @@ diff --git a/frontend/src/views/setting/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue index 212ca43bae..e5e5c1011a 100644 --- a/frontend/src/views/setting/system/resourcePool/detail.vue +++ b/frontend/src/views/setting/system/resourcePool/detail.vue @@ -336,6 +336,9 @@