diff --git a/web/src/main.ts b/web/src/main.ts index 1ae3337..344ac52 100644 --- a/web/src/main.ts +++ b/web/src/main.ts @@ -1,8 +1,8 @@ -import { createApp } from 'vue'; +import {createApp} from 'vue'; import App from './App.vue'; import router from './router'; -import { directive } from '/@/utils/directive'; -import { i18n } from '/@/i18n/index'; +import {directive} from '/@/utils/directive'; +import {i18n} from '/@/i18n/index'; import other from '/@/utils/other'; import ElementPlus from 'element-plus'; import 'element-plus/dist/index.css'; @@ -14,14 +14,14 @@ import piniaPersist from 'pinia-plugin-persist'; import fastCrud from './settings.ts'; import pinia from './stores'; import permission from '/@/plugin/permission/index'; -import eIconPicker, { iconList } from 'e-icon-picker'; +// @ts-ignore +import eIconPicker, { iconList,analyzingIconForIconfont } from 'e-icon-picker'; import 'e-icon-picker/icon/default-icon/symbol.js'; //基本彩色图标库 import 'e-icon-picker/index.css'; // 基本样式,包含基本图标 import 'font-awesome/css/font-awesome.min.css'; import elementPlus from 'e-icon-picker/icon/ele/element-plus.js'; //element-plus的图标 import fontAwesome470 from 'e-icon-picker/icon/fontawesome/font-awesome.v4.7.0.js'; //fontAwesome470的图标 import eIconList from 'e-icon-picker/icon/default-icon/eIconList.js'; -import { analyzingIconForIconfont } from 'e-icon-picker'; //引入解析json的函数 import iconfont from '/@/assets/iconfont/iconfont.json'; //引入json文件 import '/@/assets/iconfont/iconfont.css'; //引入css let forIconfont = analyzingIconForIconfont(iconfont); //解析class @@ -32,9 +32,9 @@ iconList.addIcon(fontAwesome470); // 添加fontAwesome 470版本的图标 let app = createApp(App); app.use(eIconPicker, { - addIconList: eIconList, //全局添加图标 - removeIconList: [], //全局删除图标 - zIndex: 3100, //选择器弹层的最低层,全局配置 + addIconList: eIconList, //全局添加图标 + removeIconList: [], //全局删除图标 + zIndex: 3100, //选择器弹层的最低层,全局配置 }); pinia.use(piniaPersist); @@ -42,6 +42,6 @@ directive(app); other.elSvg(app); app.use(permission); -app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(VueGridLayout).use(fastCrud).mount('#app'); +app.use(pinia).use(router).use(ElementPlus, {i18n: i18n.global.t}).use(i18n).use(VueGridLayout).use(fastCrud).mount('#app'); app.config.globalProperties.mittBus = mitt();