diff --git a/package.json b/package.json index a2cafc9..249a5c6 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "v-viewer": "^1.5.1", "vditor": "3.9.3", "vue-aplayer": "^1.6.1", + "vue-color": "^2.8.1", "vue-runtime-helpers": "^1.1.2", "vue-simple-uploader": "0.7.6", "vuedraggable": "^2.23.2", diff --git a/public/resource/font_2024484_7ls286itnz9.js b/public/resource/font_2024484_7ls286itnz9.js new file mode 100644 index 0000000..a233768 --- /dev/null +++ b/public/resource/font_2024484_7ls286itnz9.js @@ -0,0 +1 @@ +window._iconfont_svg_string_2024484='',function(c){var l=(l=document.getElementsByTagName("script"))[l.length-1],a=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,t,p,i,M,d=function(l,a){a.parentNode.insertBefore(l,a)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,a=document.createElement("div");a.innerHTML=c._iconfont_svg_string_2024484,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?d(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(p=h,i=c.document,M=!1,F(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,z())})}function z(){M||(M=!0,p())}function F(){try{i.documentElement.doScroll("left")}catch(l){return void setTimeout(F,50)}z()}}(window); diff --git a/public/resource/font_2024484_qwtkvngfp5d.js b/public/resource/font_2024484_qwtkvngfp5d.js deleted file mode 100644 index 5449abf..0000000 --- a/public/resource/font_2024484_qwtkvngfp5d.js +++ /dev/null @@ -1 +0,0 @@ -window._iconfont_svg_string_2024484='',function(c){var l=(l=document.getElementsByTagName("script"))[l.length-1],a=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,t,p,i,M,d=function(l,a){a.parentNode.insertBefore(l,a)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,a=document.createElement("div");a.innerHTML=c._iconfont_svg_string_2024484,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?d(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(p=h,i=c.document,M=!1,F(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,z())})}function z(){M||(M=!0,p())}function F(){try{i.documentElement.doScroll("left")}catch(l){return void setTimeout(F,50)}z()}}(window); diff --git a/src/api/file-api.js b/src/api/file-api.js index ab2cb43..be0b2d0 100644 --- a/src/api/file-api.js +++ b/src/api/file-api.js @@ -64,6 +64,18 @@ export default { }) } }, + // 为文件分配标签 + setTags: function(params, data) { + return request({ + url: 'setTag', + method: 'post', + data: data, + params: params, + paramsSerializer: function(params) { + return qs.stringify(params, { arrayFormat: 'repeat' }) + } + }) + }, // 将文件设为公共文件 setPublic: function(params) { return request({ diff --git a/src/components/Icon/Icon.vue b/src/components/Icon/Icon.vue index 34a3d12..e005796 100644 --- a/src/components/Icon/Icon.vue +++ b/src/components/Icon/Icon.vue @@ -5,7 +5,7 @@ import { Icon } from 'ant-design-vue' const IconFont = Icon.createFromIconfontCN({ - scriptUrl: document.location.protocol + '/resource/font_2024484_qwtkvngfp5d.js' + scriptUrl: document.location.protocol + '/resource/font_2024484_7ls286itnz9.js' }) // 把此段代码贴到iconfont项目页面的控制台中, 以获取图标列表 diff --git a/src/components/Icon/IconFile.vue b/src/components/Icon/IconFile.vue index 7876819..b3ce2b2 100644 --- a/src/components/Icon/IconFile.vue +++ b/src/components/Icon/IconFile.vue @@ -30,6 +30,18 @@ +
+
+ + + + +
+
+ + +
+
{{ item.ossPlatform }} @@ -235,6 +247,34 @@ export default { margin-left: 0.5rem; } +.icon-tag { + color: #52c41a; + position: absolute; + z-index: 1; +} + +.pc.grid.icon-tag { + font-size: 14px; + left: 0; + bottom: -18px; +} + +.mobile.grid.icon-tag { + width: 1.3rem; + height: 1.3rem; + margin-left: 2.8rem; +} + +.pc.list.icon-tag { + font-size: 1rem; + right: 1.3rem; +} + +.mobile.list.icon-tag { + font-size: 0.5rem; + margin-left: 0.5rem; +} + .oss-folder { position: absolute; } diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index f97912f..835a3f7 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -807,7 +807,8 @@ >
- + + + +
+ + + + + + + + {{tag.name}} + + + + + + 新标签 +
+
+ 保存 + +
+ + + + + + +