diff --git a/frontend/src/assets/iconfont/iconfont.css b/frontend/src/assets/iconfont/iconfont.css index 13a706ea2..cec4075e6 100644 --- a/frontend/src/assets/iconfont/iconfont.css +++ b/frontend/src/assets/iconfont/iconfont.css @@ -1,9 +1,9 @@ @font-face { font-family: "panel"; /* Project id 3575356 */ - src: url('iconfont.woff2?t=1664421291278') format('woff2'), - url('iconfont.woff?t=1664421291278') format('woff'), - url('iconfont.ttf?t=1664421291278') format('truetype'), - url('iconfont.svg?t=1664421291278#panel') format('svg'); + src: url('iconfont.woff2?t=1673865903517') format('woff2'), + url('iconfont.woff?t=1673865903517') format('woff'), + url('iconfont.ttf?t=1673865903517') format('truetype'), + url('iconfont.svg?t=1673865903517#panel') format('svg'); } .panel { @@ -14,6 +14,42 @@ -moz-osx-font-smoothing: grayscale; } +.p-file-ppt:before { + content: "\e6e2"; +} + +.p-file-html:before { + content: "\d123"; +} + +.p-file-word:before { + content: "\e6e4"; +} + +.p-file-excel:before { + content: "\e6e6"; +} + +.p-file-pdf:before { + content: "\e6e7"; +} + +.p-file-mp3:before { + content: "\e6e8"; +} + +.p-file-svg:before { + content: "\e6e9"; +} + +.p-file-jpg:before { + content: "\e6ea"; +} + +.p-file-video:before { + content: "\e6eb"; +} + .p-star:before { content: "\e60f"; } @@ -146,6 +182,10 @@ content: "\e7ac"; } +.p-txt:before { + content: "\e6e3"; +} + .p-file-zip:before { content: "\e606"; } diff --git a/frontend/src/assets/iconfont/iconfont.js b/frontend/src/assets/iconfont/iconfont.js index e58c70979..a2bf259a4 100644 --- a/frontend/src/assets/iconfont/iconfont.js +++ b/frontend/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3575356='',function(h){var c=(c=document.getElementsByTagName("script"))[c.length-1],l=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,t,v,o,m,z=function(c,l){l.parentNode.insertBefore(c,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}a=function(){var c,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_3575356,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?z(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(v=a,o=h.document,m=!1,p(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,i())})}function i(){m||(m=!0,v())}function p(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(p,50)}i()}}(window); \ No newline at end of file +window._iconfont_svg_string_3575356='',function(c){var l=(l=document.getElementsByTagName("script"))[l.length-1],h=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var a,t,v,p,i,z=function(l,h){h.parentNode.insertBefore(l,h)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}a=function(){var l,h=document.createElement("div");h.innerHTML=c._iconfont_svg_string_3575356,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(l=document.body).firstChild?z(h,l.firstChild):l.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(v=a,p=c.document,i=!1,o(),p.onreadystatechange=function(){"complete"==p.readyState&&(p.onreadystatechange=null,m())})}function m(){i||(i=!0,v())}function o(){try{p.documentElement.doScroll("left")}catch(l){return void setTimeout(o,50)}m()}}(window); \ No newline at end of file diff --git a/frontend/src/assets/iconfont/iconfont.json b/frontend/src/assets/iconfont/iconfont.json index 6e4975306..062e2b741 100644 --- a/frontend/src/assets/iconfont/iconfont.json +++ b/frontend/src/assets/iconfont/iconfont.json @@ -5,6 +5,69 @@ "css_prefix_text": "p-", "description": "", "glyphs": [ + { + "icon_id": "26815641", + "name": "PPT", + "font_class": "file-ppt", + "unicode": "e6e2", + "unicode_decimal": 59106 + }, + { + "icon_id": "26815643", + "name": "HTML", + "font_class": "file-html", + "unicode": "d123", + "unicode_decimal": 53539 + }, + { + "icon_id": "26815644", + "name": "word", + "font_class": "file-word", + "unicode": "e6e4", + "unicode_decimal": 59108 + }, + { + "icon_id": "26815647", + "name": "excel", + "font_class": "file-excel", + "unicode": "e6e6", + "unicode_decimal": 59110 + }, + { + "icon_id": "26815651", + "name": "PDF", + "font_class": "file-pdf", + "unicode": "e6e7", + "unicode_decimal": 59111 + }, + { + "icon_id": "26815652", + "name": "音频", + "font_class": "file-mp3", + "unicode": "e6e8", + "unicode_decimal": 59112 + }, + { + "icon_id": "26815654", + "name": "SVG", + "font_class": "file-svg", + "unicode": "e6e9", + "unicode_decimal": 59113 + }, + { + "icon_id": "26815655", + "name": "JPG", + "font_class": "file-jpg", + "unicode": "e6ea", + "unicode_decimal": 59114 + }, + { + "icon_id": "26815656", + "name": "视频", + "font_class": "file-video", + "unicode": "e6eb", + "unicode_decimal": 59115 + }, { "icon_id": "974125", "name": "star", @@ -236,6 +299,13 @@ "unicode": "e7ac", "unicode_decimal": 59308 }, + { + "icon_id": "26815646", + "name": "txt", + "font_class": "txt", + "unicode": "e6e3", + "unicode_decimal": 59107 + }, { "icon_id": "22761832", "name": "文件类型-压缩包", diff --git a/frontend/src/assets/iconfont/iconfont.svg b/frontend/src/assets/iconfont/iconfont.svg index 1166af676..42e3cf61a 100644 --- a/frontend/src/assets/iconfont/iconfont.svg +++ b/frontend/src/assets/iconfont/iconfont.svg @@ -14,6 +14,24 @@ /> + + + + + + + + + + + + + + + + + + @@ -80,6 +98,8 @@ + + diff --git a/frontend/src/assets/iconfont/iconfont.ttf b/frontend/src/assets/iconfont/iconfont.ttf index 3ae81ea07..6cb47955f 100644 Binary files a/frontend/src/assets/iconfont/iconfont.ttf and b/frontend/src/assets/iconfont/iconfont.ttf differ diff --git a/frontend/src/assets/iconfont/iconfont.woff b/frontend/src/assets/iconfont/iconfont.woff index 1f03d16c8..4bcba45ce 100644 Binary files a/frontend/src/assets/iconfont/iconfont.woff and b/frontend/src/assets/iconfont/iconfont.woff differ diff --git a/frontend/src/assets/iconfont/iconfont.woff2 b/frontend/src/assets/iconfont/iconfont.woff2 index 5c243e635..cfe41d682 100644 Binary files a/frontend/src/assets/iconfont/iconfont.woff2 and b/frontend/src/assets/iconfont/iconfont.woff2 differ diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts index 18ff5fe2d..8f709acd1 100644 --- a/frontend/src/utils/util.ts +++ b/frontend/src/utils/util.ts @@ -137,6 +137,16 @@ let icons = new Map([ ['.tar', 'p-file-zip'], ['.tar.gz', 'p-file-zip'], ['.tar.xz', 'p-file-zip'], + ['.mp3', 'p-file-mp3'], + ['.svg', 'p-file-svg'], + ['.txt', 'p-file-txt'], + ['.html', 'p-file-html'], + ['.word', 'p-file-word'], + ['.ppt', 'p-file-ppt'], + ['.jpg', 'p-file-jpg'], + ['.xlsx', 'p-file-excel'], + ['.doc', 'p-file-word'], + ['.pdf', 'p-file-pdf'], ]); export function getIcon(extention: string): string { diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index 01949427c..98eb84b01 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -185,7 +185,7 @@ let searchReq = reactive({ pageSize: 15, name: '', tags: [], - updated: false, + update: false, }); const router = useRouter(); let activeName = ref(i18n.global.t('app.installed')); @@ -338,7 +338,7 @@ onMounted(() => { if (path == '/apps/update') { activeName.value = i18n.global.t('app.canUpdate'); mode.value = 'update'; - searchReq.updated = true; + searchReq.update = true; } search(); timer = setInterval(() => { diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index ba0890809..b7d1adb6d 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -1,192 +1,168 @@