From 291bf570b2106cb99b0e689af7d6ccaacc9e5c1c Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 25 十二月 2024 18:10:42 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3 --- src/main.ts | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/main.ts b/src/main.ts index 6065dc7..4694019 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,19 @@ // 导入全局的svg图标 import '@/plugins/svgIcon' +import Iconify from '@iconify/iconify' +import epJson from '@iconify/json/json/ep.json' +import faJson from '@iconify/json/json/fa.json' +import faSolidJson from '@iconify/json/json/fa-solid.json' + +Iconify.addCollection(epJson) +Iconify.addCollection(faJson) +Iconify.addCollection(faSolidJson) + +export * from '@iconify/iconify' + +export default Iconify + // 初始化多语言 import { setupI18n } from '@/plugins/vueI18n' @@ -46,9 +59,15 @@ const { setupApp } = WujieVue -import { micros, getUrl } from '@/utils/micors' +import hostMap from "@/utils/hostMap"; + +import { micros } from '@/utils/micors' import lifecycles from '@/utils/lifecycles' // 生命周期函数 + +// import credentialsFetch from "@/utils/fetch"; + +const isProduction = process.env.NODE_ENV === "production"; // 创建实例 const setupAll = async () => { @@ -79,6 +98,13 @@ setupAll() +const degrade = window.localStorage.getItem("degrade") === "true" || !window.Proxy || !window.CustomElementRegistry; +const props = { + jump: (name) => { + router.push({ name }); + }, +}; + // 模拟接口查询,实现动动态子应用加载与动态路由添加 const setMiro = () => new Promise((resolve) => { @@ -89,12 +115,27 @@ component: () => import(`@/views/micro/index.vue`) } router.addRoute('home', obj) + const attrs = isProduction ? { src: hostMap("//localhost/") } : {}; setupApp({ - name: value.name, - url: getUrl(value.name, micros), + name: "fast", + url: hostMap("//localhost:90/"), + attrs, exec: true, - ...lifecycles - }) + alive: true, + plugins: [{ cssExcludes: ["https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"] }], + props, + // 引入了的第三方样式不需要添加credentials + // fetch: (url, options) => + // url.includes(hostMap("//localhost:90/")) ? credentialsFetch(url, options) : window.fetch(url, options), + degrade, + ...lifecycles, + }); + // setupApp({ + // name: value.name, + // url: getUrl(value.name, micros), + // exec: true, + // ...lifecycles + // }) } resolve(true) }) -- Gitblit v1.9.3