fix: 为插件路由增加前缀以确保不会导致其他路由出现问题

pull/81/head
moonrailgun 3 years ago
parent 49fb6f156a
commit eae93144ae

@ -1,4 +1,4 @@
import { Loadable, regCustomPanel, regRootRouter } from '@capital/common'; import { Loadable, regCustomPanel, regPluginRootRoute } from '@capital/common';
import { Translate } from './translate'; import { Translate } from './translate';
const MainPanel = Loadable(() => import('./MainPanel')); const MainPanel = Loadable(() => import('./MainPanel'));
@ -11,7 +11,7 @@ regCustomPanel({
render: MainPanel, render: MainPanel,
}); });
regRootRouter({ regPluginRootRoute({
name: 'com.msgbyte.openapi/route', name: 'com.msgbyte.openapi/route',
path: '/openapi', path: '/openapi',
component: MainPanel, component: MainPanel,

@ -8,7 +8,7 @@ import { Helmet } from 'react-helmet';
import { useRecordMeasure } from './utils/measure-helper'; import { useRecordMeasure } from './utils/measure-helper';
import { getPopupContainer, preventDefault } from './utils/dom-helper'; import { getPopupContainer, preventDefault } from './utils/dom-helper';
import { LoadingSpinner } from './components/LoadingSpinner'; import { LoadingSpinner } from './components/LoadingSpinner';
import { pluginRootRouter } from './plugin/common'; import { pluginRootRoute } from './plugin/common';
import { PortalHost as FallbackPortalHost } from './components/Portal'; import { PortalHost as FallbackPortalHost } from './components/Portal';
const MainRoute = Loadable(() => import('./routes/Main')); const MainRoute = Loadable(() => import('./routes/Main'));
@ -78,17 +78,19 @@ export const App: React.FC = React.memo(() => {
<Route path="/main" component={MainRoute} /> <Route path="/main" component={MainRoute} />
<Route path="/panel" component={PanelRoute} /> <Route path="/panel" component={PanelRoute} />
<Route path="/invite/:inviteCode" component={InviteRoute} /> <Route path="/invite/:inviteCode" component={InviteRoute} />
{/* 这个host用于处理独立页面的modal */} <Route path="/plugin/*">
{/* NOTICE: Switch里不能出现动态路由 */} {/* 这个host用于处理独立页面的modal */}
{/* <FallbackPortalHost> {/* NOTICE: Switch里不能出现动态路由 */}
{pluginRootRouter.map((r, i) => ( <FallbackPortalHost>
<Route {pluginRootRoute.map((r, i) => (
key={r.name} <Route
path={r.path || `/fallback${i}`} key={r.name}
component={r.component} path={r.path ? `/plugin${r.path}` : `/plugin/fallback${i}`}
/> component={r.component}
))} />
</FallbackPortalHost> */} ))}
</FallbackPortalHost>
</Route>
<Redirect to="/entry" /> <Redirect to="/entry" />
</Switch> </Switch>
</AppContainer> </AppContainer>

@ -148,7 +148,7 @@ export const [pluginMessageExtraParsers, regMessageExtraParser] = buildRegList<{
/** /**
* *
*/ */
export const [pluginRootRouter, regRootRouter] = buildRegList<{ export const [pluginRootRoute, regPluginRootRoute] = buildRegList<{
name: string; name: string;
path: string; path: string;
component: React.ComponentType; component: React.ComponentType;

Loading…
Cancel
Save