From 1393b193dc51961ee3b57684f018629fc7dee64a Mon Sep 17 00:00:00 2001 From: Fine Date: Tue, 1 Aug 2023 14:40:30 +0800 Subject: [PATCH] fix: update --- src/main.ts | 6 ++++-- src/router/index.ts | 9 +-------- src/router/layer.ts | 5 ++--- vite.config.ts | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main.ts b/src/main.ts index d9bfb839..d051bb83 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,7 +16,6 @@ */ import { createApp } from "vue"; import App from "./App.vue"; -import router from "./router"; import { store } from "./store"; import components from "@/components"; import i18n from "./locales"; @@ -33,6 +32,9 @@ app.use(store); mountApp(); async function mountApp() { + await appStore.getActivateMenus(); await appStore.queryOAPTimeInfo(); - app.use(router).mount("#app"); + + const router = await import("./router"); + app.use(router.default).mount("#app"); } diff --git a/src/router/index.ts b/src/router/index.ts index bf8fe555..f876b1d8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { RouteRecordRaw } from "vue-router"; import { createRouter, createWebHistory } from "vue-router"; import { routesDashboard } from "./dashboard"; import { routesMarketplace } from "./marketplace"; @@ -22,13 +21,7 @@ import { routesAlarm } from "./alarm"; import routesLayers from "./layer"; import { routesSettings } from "./settings"; -const routes: Array = [ - ...routesMarketplace, - ...routesLayers, - ...routesAlarm, - ...routesDashboard, - ...routesSettings, -]; +const routes = [...routesMarketplace, ...routesLayers, ...routesAlarm, ...routesDashboard, ...routesSettings]; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), diff --git a/src/router/layer.ts b/src/router/layer.ts index ec9c98e2..c5b436e8 100644 --- a/src/router/layer.ts +++ b/src/router/layer.ts @@ -18,9 +18,8 @@ import Layout from "@/layout/Index.vue"; import { useAppStoreWithOut } from "@/store/modules/app"; import type { MenuOptions } from "@/types/app"; -async function layerDashboards() { +function layerDashboards() { const appStore = useAppStoreWithOut(); - await appStore.getActivateMenus(); const routes = appStore.allMenus.map((item: MenuOptions) => { const route: any = { path: "", @@ -84,4 +83,4 @@ async function layerDashboards() { return routes; } -export default await layerDashboards(); +export default layerDashboards(); diff --git a/vite.config.ts b/vite.config.ts index a70ea4b6..f5b596eb 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -79,7 +79,7 @@ export default ({ mode }: ConfigEnv): UserConfig => { }, }, build: { - target: "esnext", + target: "es2015", outDir: OUTPUT_DIR, manifest: false, sourcemap: false,