Use new Router & Layout

packages/app/src/App.jsx

@@ -43,10 +43,10 @@ Promise.tasked = function (promises) {
 }
 
 import React from "react"
-import { EviteRuntime, BindPropsProvider } from "evite"
+import { EviteRuntime } from "evite"
 import { Helmet } from "react-helmet"
 import * as antd from "antd"
-import { ActionSheet, Toast } from "antd-mobile"
+import { Toast } from "antd-mobile"
 import { StatusBar, Style } from "@capacitor/status-bar"
 import { Translation } from "react-i18next"
 
@@ -57,8 +57,7 @@ import { NotFound, RenderError, Crash, Settings, Navigation, Login } from "compo
 import { Icons } from "components/Icons"
 
 import Layout from "./layout"
-
+import Router from "./router"
-import * as Render from "cores/render"
 
 import "theme/index.less"
 
@@ -415,25 +414,26 @@ class App extends React.Component {
 	}
 
 	render() {
-		return (
+		return <React.Fragment>
-			<React.Fragment>
+			<Helmet>
-				<Helmet>
+				<title>{config.app.siteName}</title>
-					<title>{config.app.siteName}</title>
+			</Helmet>
-				</Helmet>
+			<antd.ConfigProvider>
-				<antd.ConfigProvider>
+				<Layout
-					<Layout user={this.state.user} >
+					user={this.state.user}
-						<BindPropsProvider
+					staticRenders={App.staticRenders}
-							user={this.state.user}
+					bindProps={{
-							session={this.state.session}
+						staticRenders: App.staticRenders,
-							sessionController={this.sessionController}
+						user: this.state.user,
-							userController={this.userController}
+						session: this.state.session,
-						>
+						sessionController: this.sessionController,
-							<Render.RouteRender staticRenders={App.staticRenders} />
+						userController: this.userController,
-						</BindPropsProvider>
+					}}
-					</Layout>
+				>
-				</antd.ConfigProvider>
+					<Router />
-			</React.Fragment>
+				</Layout>
-		)
+			</antd.ConfigProvider>
+		</React.Fragment>
 	}
 }