@pubinfo/core 2.0.5 → 2.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -26,8 +26,8 @@
     "pinia": "^3.0.3",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.5",
-    "@pubinfo/vite": "2.0.5"
+    "@pubinfo/config": "2.0.6",
+    "@pubinfo/vite": "2.0.6"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.16",
@@ -85,8 +85,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.5",
-    "@pubinfo/vite": "2.0.5"
+    "@pubinfo/config": "2.0.6",
+    "@pubinfo/vite": "2.0.6"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/built-in/layout-component/Layout.vue

@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import RiLogoutBoxLine from '~icons/ri/logout-box-line';
+import { useAuth } from '@/features/composables';
 import BackTop from './components/BackTop/index.vue';
 import LayoutContent from './components/Content/index.vue';
 import Copyright from './components/Copyright/index.vue';
 import LayoutHeader from './components/Header/index.vue';
+import NotAllowed from './components/NotAllowed/index.vue';
 import SettingBar from './components/SettingBar/index.vue';
 import LayoutSidebar from './components/Sidebar/index.vue';
-import LayoutTopbar from './components/Topbar/index.vue';
 
+import LayoutTopbar from './components/Topbar/index.vue';
 import { useContext } from './composables/useContext';
 import { useGetSidebarActualWidth } from './composables/useGetComputedStyle';
 import { useHotkey } from './composables/useHotkey';
@@ -18,6 +20,12 @@ defineOptions({
 });
 
 const routeInfo = useRoute();
+const { auth } = useAuth();
+
+const isAuth = computed(() => {
+  return routeInfo.matched.every(item => auth(item.meta.auth ?? ''));
+});
+
 const { settingsStore } = useContext();
 const { mainSidebarActualWidth, subSidebarActualWidth } = useGetSidebarActualWidth();
 useHotkey();
@@ -86,9 +94,13 @@ watch(() => routeInfo.path, () => {
               <RiLogoutBoxLine />
             </div>
 
-            <slot>
+            <slot v-if="isAuth">
               <LayoutContent />
             </slot>
+
+            <slot v-else name="notAllowed">
+              <NotAllowed />
+            </slot>
           </div>
 
           <slot name="footer">

package/src/built-in/layout-component/components/Menu/index.vue

@@ -33,7 +33,7 @@ const isMenuPopup = computed<MenuInjection['isMenuPopup']>(() => {
 });
 
 // 解析传入的 menu 数据，并保存到 items 和 subMenus 对象中
-function initItems(menu: MenuProps['menu'], parentPaths: string[] = []) {
+function initItems(menu: MenuProps['menu'] = [], parentPaths: string[] = []) {
   menu.forEach((item) => {
     const index = item.path ?? JSON.stringify(item);
     if (item.children && item.children.length > 0) {

package/src/{features → built-in/layout-component}/components/NotAllowed/index.vue

@@ -6,40 +6,15 @@ defineOptions({
 });
 
 const route = useRoute();
-const router = useRouter();
 
 const settingsStore = useSettingsStore();
 const tabbarStore = useTabbarStore();
 
-const data = ref({
-  inter: Number.NaN,
-  countdown: 5,
-});
-
-onUnmounted(() => {
-  if (data.value.inter) {
-    window.clearInterval(data.value.inter);
-  }
-});
-
 onMounted(() => {
   if (settingsStore.settings.tabbar.enable) {
     tabbarStore.remove(route.meta.activeMenu || route.fullPath);
   }
-  data.value.inter = window.setInterval(() => {
-    data.value.countdown--;
-    if (data.value.countdown === 0) {
-      if (data.value.inter) {
-        window.clearInterval(data.value.inter);
-      }
-      goBack();
-    }
-  }, 1000);
 });
-
-function goBack() {
-  router.push('/');
-}
 </script>
 
 <template>
@@ -52,23 +27,18 @@ function goBack() {
       <div class="desc mx-0 text-xl text-stone-5 dark:text-[#C9D6EF]">
         抱歉，你无权访问该页面
       </div>
-      <div>
-        <HButton @click="goBack">
-          {{ data.countdown }} 秒后，返回首页
-        </HButton>
-      </div>
     </div>
   </div>
 </template>
 
 <style scoped>
 .noPermissionIcon {
-  background: url("./assets/403.svg") no-repeat;
+  background: url("../../assets/images/403.svg") no-repeat;
   background-size: 100% 100%;
 }
 
 [data-theme="dark"] .noPermissionIcon {
-  background: url("./assets/403_dark.svg") no-repeat;
+  background: url("../../assets/images/403_dark.svg") no-repeat;
   background-size: 100% 100%;
 }
 </style>

package/src/built-in/layout-component/index.ts

@@ -17,6 +17,7 @@ import LayoutTopbar from './components/Topbar/index.vue';
 
 import Logo from './components/Logo/index.vue';
 import Tools from './components/Tools/index.vue';
+import NotAllowed from './components/NotAllowed/index.vue';
 import Fullscreen from './components/Tools/Fullscreen.vue';
 import PageReload from './components/Tools/PageReload.vue';
 import DarkModeToggle from './components/Tools/DarkModeToggle.vue';
@@ -99,6 +100,6 @@ export {
 
   Logo,
   Tools,
-
+  NotAllowed,
   Copyright,
 };

package/src/features/components/PubinfoApp/index.vue

@@ -1,22 +1,9 @@
 <script setup lang="ts">
-import { useAuth } from '@/features/composables';
-import NotAllowed from '../NotAllowed/index.vue';
-
 defineOptions({
   name: 'PubinfoApp',
 });
-
-const route = useRoute();
-const { auth } = useAuth();
-
-const isAuth = computed(() => {
-  return route.matched.every(item => auth(item.meta.auth ?? ''));
-});
 </script>
 
 <template>
-  <RouterView v-slot="{ Component }">
-    <component :is="Component" v-if="isAuth" />
-    <NotAllowed v-else />
-  </RouterView>
+  <RouterView />
 </template>

package/src/features/components/index.ts

@@ -1,4 +1,3 @@
-export { default as NotAllowed } from './NotAllowed/index.vue';
 export { default as PageHeader } from './PageHeader/index.vue';
 export { default as PageMain } from './PageMain/index.vue';
 export { default as PassStrengthValidator } from './PassStrengthValidator/index.vue';

package/src/features/settings/index.ts

@@ -36,6 +36,7 @@ let globalSettings: RequiredDeep<Settings.all> = {
     subMenuCollapse: false,
     enableSubMenuCollapseButton: true,
     enableHotkeys: false,
+    showWithoutPermission: false,
   },
   topbar: {
     mode: 'fixed',

package/src/features/stores/modules/menu.ts

@@ -45,7 +45,7 @@ const useMenuStore = defineStore(
      * //   { path: '/app/about', title: 'About' },
      * // ]
      */
-    function convertToFullPath(menu: any[], path: string = '') {
+    function convertToFullPath(menu: any[] = [], path: string = '') {
       return menu.map((item) => {
         item.path = resolveRoutePath(path, item.path);
         if (item.children) {
@@ -174,7 +174,7 @@ const useMenuStore = defineStore(
      * @param rootPath 根路径
      * @returns 默认展开的路径数组
      */
-    function getDefaultOpenedPaths(menus: Menu.recordRaw[], rootPath = '') {
+    function getDefaultOpenedPaths(menus: Menu.recordRaw[] = [], rootPath = '') {
       const defaultOpenedPaths: string[] = [];
       menus.forEach((item) => {
         if (item.meta?.defaultOpened && item.children) {

package/src/features/stores/modules/route.ts

@@ -33,6 +33,12 @@ const useRouteStore = defineStore(
       system?: boolean
     }>>([]);
 
+    /** 如果权限功能开启 / 不展示无权限菜单，则需要对路由数据进行筛选过滤 */
+    const needFilterRoutes = computed(() => {
+      const { app, menu } = settingsStore.settings;
+      return app.enablePermission && !menu.showWithoutPermission;
+    });
+
     /**
      * 创建面包屑对象
      * @param currentRouter 当前路由对象
@@ -273,8 +279,7 @@ const useRouteStore = defineStore(
      */
     const routes = computed(() => {
       let returnRoutes: Route.recordMainRaw[];
-      // 如果权限功能开启，则需要对路由数据进行筛选过滤
-      if (settingsStore.settings.app.enablePermission) {
+      if (needFilterRoutes.value) {
         returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.user.permissions);
       }
       else {
@@ -351,7 +356,7 @@ const useRouteStore = defineStore(
      * 生成路由
      */
     async function generateRoutes() {
-      const res = await postRbacResourceMineOrAllResourceTree({ needAll: false });
+      const res = await postRbacResourceMineOrAllResourceTree({ needAll: !needFilterRoutes.value });
       if (res.success) {
         remoteRoutesRaw.value = res?.data ?? [];
         const staticRoutes = convertSingleRoutes(filterEnabledRoutes(cloneDeep(asyncRoutes)));

package/src/index.ts

@@ -88,6 +88,7 @@ export {
   LayoutSidebar,
   LayoutTopbar,
   Logo,
+  NotAllowed,
   Tool,
   Tools,
 } from './built-in/layout-component';

package/types/settings.d.ts

@@ -220,6 +220,12 @@ declare namespace Settings {
      */
     enableHotkeys?: boolean
 
+    /**
+     * 是否展示无权限的菜单
+     *
+     * @默认值 `false`
+     */
+    showWithoutPermission?: boolean
   }
 
   /* ================== TOPBAR ================= */

package/dist/HeaderThinMenu-Be1Gkb6k.js

@@ -1,4 +0,0 @@
-import { bH as f } from "./index-rq5fCkC1.js";
-export {
-  f as default
-};

package/dist/index-BJQN47v_.js

@@ -1,4 +0,0 @@
-import { bG as f } from "./index-rq5fCkC1.js";
-export {
-  f as default
-};