diff --git a/src/components/iconfont/iconfont.css b/src/components/iconfont/iconfont.css index 614eeaa..493bf0c 100644 --- a/src/components/iconfont/iconfont.css +++ b/src/components/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "anticon-jeecg"; /* Project id 2798517 */ - src: url('iconfont.woff2?t=1639559463058') format('woff2'), - url('iconfont.woff?t=1639559463058') format('woff'), - url('iconfont.ttf?t=1639559463058') format('truetype'); + src: url('iconfont.woff2?t=1705570227820') format('woff2'), + url('iconfont.woff?t=1705570227820') format('woff'), + url('iconfont.ttf?t=1705570227820') format('truetype'); } .anticon-jeecg { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.anticondraftgroup:before { + content: "\e65e"; +} + .anticonothermeeting:before { content: "\e621"; } diff --git a/src/components/iconfont/iconfont.js b/src/components/iconfont/iconfont.js index ff46c92..33f5975 100644 --- a/src/components/iconfont/iconfont.js +++ b/src/components/iconfont/iconfont.js @@ -1 +1 @@ -!function(c){var t,a,e,o,l,n='',m=(m=document.getElementsByTagName("script"))[m.length-1].getAttribute("data-injectcss"),i=function(c,t){t.parentNode.insertBefore(c,t)};if(m&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function h(){l||(l=!0,e())}function d(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}h()}t=function(){var c,t;(t=document.createElement("div")).innerHTML=n,n=null,(c=t.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(c=document.body).firstChild?i(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),t()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(e=t,o=c.document,l=!1,d(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,h())})}(window); \ No newline at end of file +window._iconfont_svg_string_2798517='',function(a){var c=(c=document.getElementsByTagName("script"))[c.length-1],t=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var e,o,n,i,l,m=function(c,t){t.parentNode.insertBefore(c,t)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}e=function(){var c,t=document.createElement("div");t.innerHTML=a._iconfont_svg_string_2798517,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(c=document.body).firstChild?m(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),e()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(n=e,i=a.document,l=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,h())})}function h(){l||(l=!0,n())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}h()}}(window); \ No newline at end of file diff --git a/src/components/iconfont/iconfont.json b/src/components/iconfont/iconfont.json index 530c808..c657c36 100644 --- a/src/components/iconfont/iconfont.json +++ b/src/components/iconfont/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "anticon", "description": "", "glyphs": [ + { + "icon_id": "3009589", + "name": "cus_draftgroup", + "font_class": "gongzuopai", + "unicode": "e65e", + "unicode_decimal": 58974 + }, { "icon_id": "26512409", "name": "cus_othermeeting", diff --git a/src/components/iconfont/iconfont.ttf b/src/components/iconfont/iconfont.ttf index ff11092..6e7035b 100644 Binary files a/src/components/iconfont/iconfont.ttf and b/src/components/iconfont/iconfont.ttf differ diff --git a/src/components/iconfont/iconfont.woff b/src/components/iconfont/iconfont.woff index 7a84d10..ca410f3 100644 Binary files a/src/components/iconfont/iconfont.woff and b/src/components/iconfont/iconfont.woff differ diff --git a/src/components/iconfont/iconfont.woff2 b/src/components/iconfont/iconfont.woff2 index 1aa78c0..2ef9273 100644 Binary files a/src/components/iconfont/iconfont.woff2 and b/src/components/iconfont/iconfont.woff2 differ diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue index c26c7e4..eb32cb5 100644 --- a/src/components/menu/SideMenu.vue +++ b/src/components/menu/SideMenu.vue @@ -172,11 +172,5 @@ } } } - // icon图片默认是选中的图片,如果没被选中,就设置灰掉 - .ant-menu-item:not(.ant-menu-item-selected) { - .icon-img { - filter: grayscale(100%); - } - } diff --git a/src/components/menu/index.js b/src/components/menu/index.js index 4e76128..4ef5846 100644 --- a/src/components/menu/index.js +++ b/src/components/menu/index.js @@ -146,13 +146,6 @@ export default { ) }, renderIcon (icon) { - // 图片做菜单icon,cus_img_xxx.png, xxx_act.png放在assets/imgs/icon/ - // (act是激活后的图片,未激活时通过样式置灰) - if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_img_') !== -1) { - const img = require('@/assets/imgs/icon/' + icon.substr(8) + '_act.png') - return () - } if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_') !== -1) { let className = `anticon-jeecg anticon${icon.substr(4)}` return