@pubinfo/core 2.0.0-beta.14 → 2.0.0-beta.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.16",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.14"
+    "@pubinfo/config": "2.0.0-beta.16"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.13",
@@ -85,7 +85,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.14"
+    "@pubinfo/config": "2.0.0-beta.16"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/layout/components/Tools/index.vue

@@ -39,6 +39,7 @@ const userMenu = computed(() => [
   [
     {
       label: generateI18nTitle('route.home', settingsStore.settings.home.title),
+      icon: 'i-ant-design:home-twotone',
       handle: () => router.push({ name: 'Home' }),
       hide: !settingsStore.settings.home.enable,
     },

package/src/route/index.ts

@@ -7,6 +7,5 @@ export function setupRouterGuard({ router }: { router: Router }) {
   createSettingGuard(router);
 }
 
-export * from './async';
 export * from './guard';
 export * from './routes';

package/src/route/routes.ts

@@ -1,9 +1,75 @@
-// 内置路由
+import type { Route } from '#/vue-router';
 import type { RouteRecordRaw } from 'vue-router';
 import { readProject } from '@/context';
 import { useSettingsStore, useUserStore } from '@/stores';
 import { isUndefined } from 'lodash-es';
 
+let asyncRoutes: Route.recordMainRaw[] = [];
+
+/**
+ * 定义并注册动态路由
+ */
+export function defineAsyncRoutes(routes: Route.recordMainRaw[]) {
+  asyncRoutes = [...asyncRoutes, ...routes];
+  return routes;
+}
+
+/**
+ * 读取注册的动态路由
+ */
+export function getAsyncRoutes() {
+  return asyncRoutes;
+}
+
+const systemRoutes: RouteRecordRaw[] = [
+  {
+    path: '/',
+    component: readProject().layout,
+    meta: {
+      title: () => useSettingsStore().settings.home.title,
+      breadcrumb: false,
+    },
+    children: [
+      {
+        path: 'reload',
+        name: 'Reload',
+        component: () => import('@/pages/system/reload.vue'),
+        meta: {
+          title: '重新加载',
+          breadcrumb: false,
+        },
+      },
+      {
+        path: 'personal/profile',
+        name: 'Profile',
+        component: () => import('@/pages/personal/profile/index.vue'),
+        meta: {
+          title: '个人中心',
+          i18n: 'route.personal.profile',
+          icon: 'i-iconamoon-profile-duotone',
+        },
+      },
+    ],
+  },
+];
+
+/**
+ * 定义并注册系统路由（含Layout）
+ */
+export function defineSystemRoutes(routes: RouteRecordRaw[]) {
+  systemRoutes[0].children = [...(systemRoutes?.[0]?.children ?? []), ...routes];
+}
+
+/**
+ * 读取注册的系统路由
+ */
+export function getSystemRoutes() {
+  return systemRoutes;
+}
+
+/**
+ * 内置静态路由
+ */
 export const constantRoutes: RouteRecordRaw[] = [
   {
     path: '/change-password/:changePassWordToken',
@@ -56,46 +122,3 @@ export const constantRoutes: RouteRecordRaw[] = [
     },
   },
 ];
-
-export const systemRoutes: RouteRecordRaw[] = [
-  {
-    path: '/',
-    component: readProject().layout,
-    meta: {
-      title: () => useSettingsStore().settings.home.title,
-      breadcrumb: false,
-    },
-    children: [
-      {
-        path: '',
-        name: 'Home',
-        component: () => import('@/pages/system/index.vue'),
-        meta: {
-          title: () => useSettingsStore().settings.home.title,
-          i18n: 'route.home',
-          icon: 'i-ant-design:home-twotone',
-          breadcrumb: false,
-        },
-      },
-      {
-        path: 'reload',
-        name: 'Reload',
-        component: () => import('@/pages/system/reload.vue'),
-        meta: {
-          title: '重新加载',
-          breadcrumb: false,
-        },
-      },
-      {
-        path: 'personal/profile',
-        name: 'Profile',
-        component: () => import('@/pages/personal/profile/index.vue'),
-        meta: {
-          title: '个人中心',
-          i18n: 'route.personal.profile',
-          icon: 'i-iconamoon-profile-duotone',
-        },
-      },
-    ],
-  },
-];

package/src/stores/modules/route.ts

@@ -3,8 +3,7 @@ import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 
 import { GetApiRouteList } from '@/api/system/app';
 import { readProject } from '@/context';
-import { getAsyncRoutes } from '@/route';
-import { systemRoutes } from '@/route/routes';
+import { getAsyncRoutes, getSystemRoutes } from '@/route';
 import { resolveRoutePath } from '@/utils';
 import { cloneDeep, defaultTo, get, has, isArray, isString, isUndefined, merge, omit } from 'lodash-es';
 import { defineStore } from 'pinia';
@@ -190,6 +189,7 @@ const useRouteStore = defineStore(
      * @returns {Array<RouteRecordRaw>} 扁平化的系统路由。
      */
     const flatSystemRoutes = computed(() => {
+      const systemRoutes = getSystemRoutes();
       const routes = [...systemRoutes];
       routes.forEach(item => flattenSystemRoutes(item));
       return routes;

package/dist/index-DTQQt_XY.js

@@ -1,10 +0,0 @@
-import { createElementBlock as e, openBlock as o } from "vue";
-import { _ as c } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const t = {}, r = { class: "home" };
-function n(s, _) {
-  return o(), e("div", r, " 主页 ");
-}
-const i = /* @__PURE__ */ c(t, [["render", n]]);
-export {
-  i as default
-};

package/dist/pages/system/index.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, HTMLDivElement>;
-export default _default;

package/dist/route/async.d.ts

@@ -1,9 +0,0 @@
-import { Route } from '../../types/vue-router';
-/**
- * 定义并注册动态路由
- */
-export declare function defineAsyncRoutes(routes: Route.recordMainRaw[]): Route.recordMainRaw[];
-/**
- * 读取注册的动态路由
- */
-export declare function getAsyncRoutes(): Route.recordMainRaw[];

package/src/pages/system/index.vue

@@ -1,5 +0,0 @@
-<template>
-  <div class="home">
-    主页
-  </div>
-</template>

package/src/route/async.ts

@@ -1,18 +0,0 @@
-import type { Route } from '#/vue-router';
-
-let asyncRoutes: Route.recordMainRaw[] = [];
-
-/**
- * 定义并注册动态路由
- */
-export function defineAsyncRoutes(routes: Route.recordMainRaw[]) {
-  asyncRoutes = [...asyncRoutes, ...routes];
-  return routes;
-}
-
-/**
- * 读取注册的动态路由
- */
-export function getAsyncRoutes() {
-  return asyncRoutes;
-}