-
Notifications
You must be signed in to change notification settings - Fork 580
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(1.0.0-beta.4): fix bug of vue-router@4 when disable memory-router
- Loading branch information
1 parent
ee83566
commit f1b96b5
Showing
18 changed files
with
232 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /** @jsxRuntime classic */ | ||
| /** @jsx jsxCustomEvent */ | ||
| import jsxCustomEvent from '@micro-zoe/micro-app/polyfill/jsx-custom-event' | ||
| import { useState, useEffect } from 'react' | ||
| import { Button, Spin, Col } from 'antd' | ||
| import { LoadingOutlined } from '@ant-design/icons' | ||
| // import { EventCenterForMicroApp } from '@micro-zoe/micro-app' | ||
| import config from '../../config' | ||
| import './vite4.less' | ||
| import microApp from '@micro-zoe/micro-app' | ||
|
|
||
| // 注册子应用vite4的数据通信对象 | ||
| // window.eventCenterForVite = new EventCenterForMicroApp('vite4') | ||
|
|
||
| const antIcon = <LoadingOutlined style={{ fontSize: 30 }} spin /> | ||
|
|
||
| function vite4 (props) { | ||
| const [data, changeData] = useState({from: '来自基座的初始化数据'}) | ||
| const [showLoading, hideLoading] = useState(true) | ||
|
|
||
| function handleMounted () { | ||
| console.timeEnd('vite4') | ||
| hideLoading(false) | ||
| console.log('主应用-生命周期：mounted -- vite4') | ||
| } | ||
|
|
||
| function handleDataChange (e) { | ||
| console.log('来自 vite4 子应用的数据', e.detail.data) | ||
| } | ||
|
|
||
| function jumpToHome () { | ||
| microApp.router.push({name: 'vite4', path: '/micro-app/vite4/'}) | ||
| } | ||
|
|
||
| function jumpToPage2 () { | ||
| microApp.router.push({name: 'vite4', path: '/micro-app/vite4/element-plus'}) | ||
| } | ||
|
|
||
| function jumpToPage3 () { | ||
| microApp.router.push({name: 'vite4', path: '/micro-app/vite4/ant-design-vue'}) | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| console.time('vite4') | ||
| // const releaseBeforeEach1 = microApp.router.beforeEach((to, from, appName) => { | ||
| // console.log('全局 beforeEach: ', to, from, appName) | ||
| // }) | ||
|
|
||
| // const releaseBeforeEach2 = microApp.router.beforeEach({ | ||
| // vite4 (to, from) { | ||
| // console.log('指定 beforeEach: ', to, from) | ||
| // } | ||
| // }) | ||
|
|
||
| // const releaseAfterEach1 = microApp.router.afterEach((to, from, appName) => { | ||
| // console.log('全局 afterEach: ', to, from, appName) | ||
| // }) | ||
|
|
||
| // const releaseAfterEach2 = microApp.router.afterEach({ | ||
| // vite4 (to, from) { | ||
| // console.log('指定 afterEach: ', to, from) | ||
| // } | ||
| // }) | ||
|
|
||
| microApp.router.setBaseAppRouter(props.history) | ||
|
|
||
| return () => { | ||
| // releaseBeforeEach1() | ||
| // releaseBeforeEach2() | ||
| // releaseAfterEach1() | ||
| // releaseAfterEach2() | ||
| } | ||
| }, []) | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className='btn-con'> | ||
| <Col span={6} className='btn-con'> | ||
| <Button type='primary' onClick={() => changeData({from: '来自基座的数据' + (+new Date())})}> | ||
| 向子应用发送数据 | ||
| </Button> | ||
| <Button type="primary" onClick={jumpToHome}>控制子应用跳转首页</Button> | ||
| <Button type="primary" onClick={jumpToPage2}>控制子应用跳转element-plus</Button> | ||
| <Button type="primary" onClick={jumpToPage3}>控制子应用跳转ant-design-vue</Button> | ||
| </Col> | ||
| </div> | ||
| { | ||
| showLoading && <Spin indicator={antIcon} /> | ||
| } | ||
| <micro-app | ||
| name='vite4' | ||
| url={`${config.vite4}micro-app/vite4/`} | ||
| // url={`http://127.0.0.1:8080/micro-app/vite4/`} | ||
| data={data} | ||
| // onBeforemount={() => hideLoading(false)} | ||
| onMounted={handleMounted} | ||
| onDataChange={handleDataChange} | ||
| onAfterhidden={() => console.log('基座：keep-alive：Afterhidden 已推入后台')} | ||
| onBeforeshow={() => console.log('基座：keep-alive：Beforeshow 即将推入前台')} | ||
| onAftershow={() => {console.log('基座：keep-alive：Aftershow 已经推入前台'); hideLoading(false)}} | ||
| onError={() => console.log('渲染出错')} | ||
| // destroy | ||
| // inline | ||
| // disableSandbox | ||
| iframe | ||
| keep-router-state | ||
| disable-memory-router | ||
| // disable-patch-request | ||
| // keep-alive | ||
| // default-page='/micro-app/vite4/page2' | ||
| baseroute='/micro-app/demo/vite4' | ||
| > | ||
| </micro-app> | ||
|
|
||
| {/* <iframe src={`${config.vite4}micro-app/vite4/`} width='100%' height='600px'></iframe> */} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export default vite4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .test-vite4 { | ||
| color: red; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ import { | |
| import { | ||
| assign, | ||
| } from '../../libs/utils' | ||
| import globalEnv from '../../libs/global_env' | ||
|
|
||
| export function patchIframeRoute ( | ||
| appName: string, | ||
|
|
@@ -51,3 +52,34 @@ export function patchIframeRoute ( | |
| childHost, | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * actions when memory-route disable | ||
| * @param appName app name | ||
| * @param microAppWindow iframeWindow | ||
| * @param baseroute base route for child app | ||
| */ | ||
| export function actionsForDisableMemoryRoute ( | ||
| appName: string, | ||
| microAppWindow: microAppWindowType, | ||
| baseroute: string, | ||
| ): void { | ||
| microAppWindow.__MICRO_APP_BASE_ROUTE__ = microAppWindow.__MICRO_APP_BASE_URL__ = baseroute | ||
|
|
||
| /** | ||
| * Sync browser router info to iframe when disable memory-router | ||
| * e.g.: | ||
| * [email protected] get target path by remove the base section from location.pathname | ||
| * code: window.location.pathname.slice(base.length) || '/'; (base is baseroute) | ||
| * NOTE: | ||
| * 1. iframe router and browser router are separated, we should update iframe router manually | ||
| * 2. withSandbox location is browser location when disable memory-router, so no need to do anything | ||
| */ | ||
| const rawLocation = globalEnv.rawWindow.location | ||
| updateMicroLocation( | ||
| appName, | ||
| rawLocation.href, | ||
| rawLocation, | ||
| 'prevent' | ||
| ) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.