whj 1 年之前
父節點
當前提交
af3b87ec6e
共有 5 個文件被更改,包括 22419 次插入718 次删除
  1. 21725 1
      package-lock.json
  2. 9 4
      src/components/Menu/menu.js
  3. 9 4
      src/components/Menu/mixMenu.js
  4. 1 1
      src/utils/install.js
  5. 675 708
      yarn.lock

File diff suppressed because it is too large
+ 21725 - 1
package-lock.json


+ 9 - 4
src/components/Menu/menu.js

@@ -2,7 +2,9 @@ import Menu from 'ant-design-vue/es/menu'
 import Icon from 'ant-design-vue/es/icon'
 
 const { Item, SubMenu } = Menu
-
+const IconFont = Icon.createFromIconfontCN({
+  scriptUrl: '//at.alicdn.com/t/c/font_3266072_5m7ce94jj1.js'
+})
 export default {
   name: 'SMenu',
   props: {
@@ -143,9 +145,12 @@ export default {
       }
       const props = {}
       typeof (icon) === 'object' ? props.component = icon : props.type = icon
-      return (
-        <Icon {... { props } }/>
-      )
+
+      if (icon.includes('icon-')) {
+        return <IconFont {... { props } }/>
+      } else {
+        return <Icon {... { props } }/>
+      }
     }
   },
 

+ 9 - 4
src/components/Menu/mixMenu.js

@@ -2,7 +2,9 @@ import Menu from 'ant-design-vue/es/menu'
 import Icon from 'ant-design-vue/es/icon'
 
 const { Item, SubMenu } = Menu
-
+const IconFont = Icon.createFromIconfontCN({
+  scriptUrl: '//at.alicdn.com/t/c/font_3266072_5m7ce94jj1.js'
+})
 export default {
   name: 'SMenu',
   props: {
@@ -137,9 +139,12 @@ export default {
       }
       const props = {}
       typeof (icon) === 'object' ? props.component = icon : props.type = icon
-      return (
-        <Icon {... { props } }/>
-      )
+
+      if (icon.includes('icon-')) {
+        return <IconFont {... { props } }/>
+      } else {
+        return <Icon {... { props } }/>
+      }
     }
   },
 

+ 1 - 1
src/utils/install.js

@@ -17,7 +17,7 @@ import { Icon } from 'ant-design-vue'
 import iconfont from '@/components/IconSelector/iconfont.js'
 import ImportForm from '@/components/custom/ImportForm'
 const MyIcon = Icon.createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/c/font_3266072_qij35wdydjq.js' // //at.alicdn.com/t/font_1314041_9qgpnn1vvko.js在 iconfont.cn 上生成
+  scriptUrl: '//at.alicdn.com/t/c/font_3266072_5m7ce94jj1.js' // //at.alicdn.com/t/font_1314041_9qgpnn1vvko.js在 iconfont.cn 上生成
   // scriptUrl: '//at.alicdn.com/t/font_3266072_mx3m5426u3.js'
 })
 

File diff suppressed because it is too large
+ 675 - 708
yarn.lock


Some files were not shown because too many files changed in this diff