diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue index f58dfd748..cb9d9443c 100644 --- a/resources/assets/js/components/MicroApps.vue +++ b/resources/assets/js/components/MicroApps.vue @@ -56,15 +56,14 @@ export default { return { showSpin: false, loading: false, - appUrl: '', appData: {}, } }, - deactivated() { - }, mounted() { this.showSpin = true; this.appData = this.getAppData + + console.log(this.url) }, watch: { loading(val){ @@ -72,17 +71,6 @@ export default { this.showSpin = true; } }, - url(val) { - this.loading = true; - this.$nextTick(() => { - this.loading = false; - let url = $A.apiUrl(val) - if (url.indexOf('http') == -1) { - url = window.location.origin + url - } - this.appUrl = import.meta.env.VITE_OKR_WEB_URL || url - }) - }, path(val) { this.appData = { path: val } }, @@ -166,7 +154,7 @@ export default { window.dispatchEvent(new Event('apps-unmount')); }, handleError(e) { - console.error("子应用加载出错了",e.detail.error) + // console.error("子应用加载出错了",e.detail.error) }, handleDataChange(e) { // console.log('来自子应用 child-vite 的数据:', e.detail.data) diff --git a/resources/assets/js/microapp.js b/resources/assets/js/microapp.js index 7995b45b7..cee475855 100644 --- a/resources/assets/js/microapp.js +++ b/resources/assets/js/microapp.js @@ -1,9 +1,5 @@ import microApp from '@micro-zoe/micro-app' -const getUrl = (url) => { - return import.meta.env.VITE_OKR_WEB_URL || $A.apiUrl(url); -} - export default function() { let urls = ""; let route = "/"; @@ -24,24 +20,15 @@ export default function() { return code } } - + // 微应用名称 modules["micro-app"] = [obj] modules["okr-details"] = [obj] - + // 微应用 microApp.start({ plugins: { modules: modules } }) - - //预加载 - microApp.preFetch([ - { - name: 'micro-app', - url: getUrl("../apps/okr"), - disableSandbox: true - } - ]) -} \ No newline at end of file +} diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 750099a7a..14a61bfaf 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -580,7 +580,7 @@ export default { $A.modalError({ content: msg, onOk: _ => { - this.$refs.code.focus() + this.$refs.code?.focus() } }) }