release: update 3.8.0

src/assets/login/avatar.svg

@@ -1 +1 @@
-<svg t="1636193306629" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1847" width="32" height="32"><path d="M410.558481 0.10861C410.558481 211.083075 109.682285 361.860579 109.682285 633.656511c0 174.943176 134.703259 316.787527 300.876196 316.787527s300.876197-141.817198 300.876197-316.787527C711.407525 361.751969 410.558481 210.974465 410.558481 0.10861z" fill="#386BF3" p-id="1848"></path><path d="M613.468671 73.664572c0 211.055922-300.876197 361.914883-300.876196 633.547901 0 174.943176 134.703259 316.787527 300.876196 316.787527s300.876197-141.817198 300.876197-316.787527c-0.054305-271.633018-300.876197-422.491979-300.876197-633.547901z" fill="#C3D2FB" p-id="1849"></path><path d="M312.592475 707.212473c0-183.713414 137.635722-312.171612 226.72288-441.390078 81.701694 106.111739 172.119322 218.740063 172.119323 367.725506a309.755045 309.755045 0 0 1-291.074166 316.516003 323.114046 323.114046 0 0 1-107.768037-242.851431z" fill="#303F5B" p-id="1850"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" class="icon" viewBox="0 0 1024 1024"><path fill="#386BF3" d="M410.558.109c0 210.974-300.876 361.752-300.876 633.548 0 174.943 134.704 316.787 300.876 316.787s300.877-141.817 300.877-316.787C711.408 361.752 410.558 210.974 410.558.109z"/><path fill="#C3D2FB" d="M613.469 73.665c0 211.055-300.877 361.914-300.877 633.547C312.592 882.156 447.296 1024 613.47 1024s300.876-141.817 300.876-316.788C914.29 435.58 613.469 284.72 613.469 73.665z"/><path fill="#303F5B" d="M312.592 707.212c0-183.713 137.636-312.171 226.723-441.39 81.702 106.112 172.12 218.74 172.12 367.726A309.755 309.755 0 0 1 420.36 950.064a323.114 323.114 0 0 1-107.769-242.852z"/></svg>

src/assets/svg/back_top.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M2.88 18.054a35.897 35.897 0 0 1 8.531-16.32.8.8 0 0 1 1.178 0c.166.18.304.332.413.455a35.897 35.897 0 0 1 8.118 15.865c-2.141.451-4.34.747-6.584.874l-2.089 4.178a.5.5 0 0 1-.894 0l-2.089-4.178a44.019 44.019 0 0 1-6.584-.874zm6.698-1.123l1.157.066L12 19.527l1.265-2.53 1.157-.066a42.137 42.137 0 0 0 4.227-.454A33.913 33.913 0 0 0 12 4.09a33.913 33.913 0 0 0-6.649 12.387c1.395.222 2.805.374 4.227.454zM12 15a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-2a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M2.88 18.054a35.897 35.897 0 0 1 8.531-16.32.8.8 0 0 1 1.178 0c.166.18.304.332.413.455a35.897 35.897 0 0 1 8.118 15.865c-2.141.451-4.34.747-6.584.874l-2.089 4.178a.5.5 0 0 1-.894 0l-2.089-4.178a44.019 44.019 0 0 1-6.584-.874zm6.698-1.123 1.157.066L12 19.527l1.265-2.53 1.157-.066a42.137 42.137 0 0 0 4.227-.454A33.913 33.913 0 0 0 12 4.09a33.913 33.913 0 0 0-6.649 12.387c1.395.222 2.805.374 4.227.454zM12 15a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-2a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/></svg>

src/assets/svg/dark.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22 6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22 6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981z"/></svg>

src/assets/svg/day.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85 1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>

src/assets/svg/enter_outlined.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--ant-design" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 1024 1024"><path fill="currentColor" d="M864 170h-60c-4.4 0-8 3.6-8 8v518H310v-73c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 0 0 0 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-75h498c35.3 0 64-28.7 64-64V178c0-4.4-3.6-8-8-8z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--ant-design" viewBox="0 0 1024 1024"><path fill="currentColor" d="M864 170h-60c-4.4 0-8 3.6-8 8v518H310v-73c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 0 0 0 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-75h498c35.3 0 64-28.7 64-64V178c0-4.4-3.6-8-8-8z"/></svg>

src/assets/svg/exit_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" color="#00000073" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3.5 4H1V3h2V1h1v2.5l-.5.5zM13 3V1h-1v2.5l.5.5H15V3h-2zm-1 9.5V15h1v-2h2v-1h-2.5l-.5.5zM1 12v1h2v2h1v-2.5l-.5-.5H1zm11-1.5l-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5v5zM10 7H6v2h4V7z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3.5 4H1V3h2V1h1v2.5l-.5.5zM13 3V1h-1v2.5l.5.5H15V3h-2zm-1 9.5V15h1v-2h2v-1h-2.5l-.5.5zM1 12v1h2v2h1v-2.5l-.5-.5H1zm11-1.5-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5v5zM10 7H6v2h4V7z"/></svg>

src/assets/svg/full_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" color="#00000073" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3 12h10V4H3v8zm2-6h6v4H5V6zM2 6H1V2.5l.5-.5H5v1H2v3zm13-3.5V6h-1V3h-3V2h3.5l.5.5zM14 10h1v3.5l-.5.5H11v-1h3v-3zM2 13h3v1H1.5l-.5-.5V10h1v3z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3 12h10V4H3v8zm2-6h6v4H5V6zM2 6H1V2.5l.5-.5H5v1H2v3zm13-3.5V6h-1V3h-3V2h3.5l.5.5zM14 10h1v3.5l-.5.5H11v-1h3v-3zM2 13h3v1H1.5l-.5-.5V10h1v3z"/></svg>

src/assets/svg/keyboard_esc.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--mdi" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1V7m10 0h4v2h-4v2h2a2 2 0 0 1 2 2v2c0 1.11-.89 2-2 2H9v-2h4v-2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2m8 0h2a2 2 0 0 1 2 2v1h-2V9h-2v6h2v-1h2v1c0 1.11-.89 2-2 2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--mdi" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1V7m10 0h4v2h-4v2h2a2 2 0 0 1 2 2v2c0 1.11-.89 2-2 2H9v-2h4v-2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2m8 0h2a2 2 0 0 1 2 2v1h-2V9h-2v6h2v-1h2v1c0 1.11-.89 2-2 2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2Z"/></svg>

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -10,6 +10,10 @@ import Close from "@iconify-icons/ep/close";
 import CloseBold from "@iconify-icons/ep/close-bold";
 import Bell from "@iconify-icons/ep/bell";
 import Search from "@iconify-icons/ep/search";
+import EpArrowDown from "@iconify-icons/ep/arrow-down";
+import ArrowUp from "@iconify-icons/ep/arrow-up";
+import ArrowRight from "@iconify-icons/ep/arrow-right";
+import ArrowLeft from "@iconify-icons/ep/arrow-left";
 addIcon("check", Check);
 addIcon("home-filled", HomeFilled);
 addIcon("lollipop", Lollipop);
@@ -18,6 +22,10 @@ addIcon("close", Close);
 addIcon("close-bold", CloseBold);
 addIcon("bell", Bell);
 addIcon("search", Search);
+addIcon("ep-arrow-down", EpArrowDown);
+addIcon("ep-arrow-up", ArrowUp);
+addIcon("ep-arrow-right", ArrowRight);
+addIcon("ep-arrow-left", ArrowLeft);
 
 // remixicon
 import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";

src/config/index.ts

@@ -31,7 +31,6 @@ const getConfig = (key?: string): ServerConfigs => {
 export const getServerConfig = async (app: App): Promise<undefined> => {
   app.config.globalProperties.$config = getConfig();
   return axios({
-    baseURL: "",
     method: "get",
     url: `${VITE_PUBLIC_PATH}serverConfig.json`
   })
@@ -44,8 +43,6 @@ export const getServerConfig = async (app: App): Promise<undefined> => {
         // 设置全局配置
         setConfig($config);
       }
-      // 设置全局baseURL
-      app.config.globalProperties.$baseUrl = $config.baseURL;
       return $config;
     })
     .catch(() => {

src/layout/components/notice/index.vue

@@ -2,11 +2,11 @@
 import { ref } from "vue";
 import { noticesData } from "./data";
 import NoticeList from "./noticeList.vue";
-import { templateRef } from "@vueuse/core";
 import { Tabs, TabPane } from "@pureadmin/components";
 
-const dropdownDom = templateRef<ElRef | null>("dropdownDom", null);
-const activeName = ref(noticesData[0].name);
+const dropdownDom = ref();
+const activeKey = ref(noticesData[0].key);
+
 const notices = ref(noticesData);
 
 const noticesNum = ref(0);
@@ -33,7 +33,8 @@ function tabClick() {
         <Tabs
           centered
           class="dropdown-tabs"
-          v-model:activeName="activeName"
+          :tabBarStyle="{ marginLeft: notices?.length > 4 ? '8px' : '0' }"
+          v-model:activeKey="activeKey"
           @tabClick="tabClick"
         >
           <template v-for="item in notices" :key="item.key">

src/layout/components/panel/index.vue

@@ -21,7 +21,7 @@ emitter.on("openPanel", () => {
     <div ref="target" class="right-panel bg-bg_color">
       <div class="right-panel-items">
         <div class="project-configuration">
-          <h3 class="dark:text-white">项目配置</h3>
+          <h4 class="dark:text-white">项目配置</h4>
           <span title="关闭配置">
             <IconifyIconOffline
               class="dark:text-white"

src/layout/components/search/components/SearchFooter.vue

@@ -16,10 +16,11 @@
   </div>
 </template>
 
-<script lang="ts" setup>
-import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
+<script setup lang="ts">
 import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
 </script>
+
 <style lang="scss" scoped>
 .search-footer {
   display: flex;

src/layout/components/search/components/SearchModal.vue

@@ -1,10 +1,10 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import { useRouter } from "vue-router";
 import { cloneDeep } from "lodash-unified";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
+import { deleteChildren } from "@/utils/tree";
 import { useNav } from "@/layout/hooks/useNav";
-import { deleteChildren } from "@pureadmin/utils";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { ref, watch, computed, nextTick, shallowRef } from "vue";
 import { usePermissionStoreHook } from "@/store/modules/permission";

src/layout/components/search/components/SearchResult.vue

@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import { computed } from "vue";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";

src/layout/components/search/index.vue

@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import { SearchModal } from "./components";
 import { useBoolean } from "../../hooks/useBoolean";
 const { bool: show, toggle } = useBoolean();

src/layout/components/setting/index.vue

@@ -13,7 +13,6 @@ import { useRouter } from "vue-router";
 import panel from "../panel/index.vue";
 import { emitter } from "@/utils/mitt";
 import { resetRouter } from "@/router";
-import { templateRef } from "@vueuse/core";
 import { removeToken } from "@/utils/auth";
 import { routerArrays } from "@/layout/types";
 import { useNav } from "@/layout/hooks/useNav";
@@ -38,9 +37,9 @@ const { isDark } = useDark();
 const { isSelect } = useCssModule();
 const { $storage } = useGlobal<GlobalPropertiesApi>();
 
-const mixRef = templateRef<HTMLElement | null>("mixRef", null);
-const verticalRef = templateRef<HTMLElement | null>("verticalRef", null);
-const horizontalRef = templateRef<HTMLElement | null>("horizontalRef", null);
+const mixRef = ref();
+const verticalRef = ref();
+const horizontalRef = ref();
 
 const {
   body,

src/layout/components/sidebar/breadCrumb.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { isEqual } from "lodash-unified";
+import { isEqual } from "@pureadmin/utils";
 import { ref, watch, onMounted, toRaw } from "vue";
 import { getParentPaths, findRouteByPath } from "@/router/utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";

src/layout/components/sidebar/sidebarItem.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import path from "path";
+import { getConfig } from "@/config";
 import { childrenType } from "../../types";
 import { useNav } from "@/layout/hooks/useNav";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
@@ -75,6 +76,10 @@ const getSpanStyle = computed(() => {
   };
 });
 
+const expandCloseIcon = computed(() => {
+  return getConfig()?.MenuArrowIconNoTransition ? "expand-close-icon" : "";
+});
+
 const onlyOneChild: childrenType = ref(null);
 // 存放菜单是否存在showTooltip属性标识
 const hoverMenuMap = new WeakMap();
@@ -211,7 +216,15 @@ function resolvePath(routePath) {
     </el-menu-item>
   </template>
 
-  <el-sub-menu v-else ref="subMenu" :index="resolvePath(props.item.path)">
+  <el-sub-menu
+    v-else
+    ref="subMenu"
+    :index="resolvePath(props.item.path)"
+    v-bind:[expandCloseIcon]="useRenderIcon('ep-arrow-down')"
+    :expand-open-icon="useRenderIcon('ep-arrow-up')"
+    :collapse-close-icon="useRenderIcon('ep-arrow-right')"
+    :collapse-open-icon="useRenderIcon('ep-arrow-left')"
+  >
     <template #title>
       <div v-if="toRaw(props.item.meta.icon)" class="sub-menu-icon">
         <component

src/layout/components/sidebar/vertical.vue

@@ -4,7 +4,6 @@ import { useRoute } from "vue-router";
 import { emitter } from "@/utils/mitt";
 import SidebarItem from "./sidebarItem.vue";
 import leftCollapse from "./leftCollapse.vue";
-import type { StorageConfigs } from "/#/index";
 import { useNav } from "@/layout/hooks/useNav";
 import { storageLocal } from "@pureadmin/utils";
 import { ref, computed, watch, onBeforeMount } from "vue";

src/layout/hooks/useNav.ts

@@ -1,4 +1,5 @@
 import { computed } from "vue";
+import { storeToRefs } from "pinia";
 import { getConfig } from "@/config";
 import { emitter } from "@/utils/mitt";
 import { routeMetaType } from "../types";
@@ -7,6 +8,7 @@ import { useRouter, useRoute } from "vue-router";
 import { router, remainingPaths } from "@/router";
 import { useAppStoreHook } from "@/store/modules/app";
 import { useUserStoreHook } from "@/store/modules/user";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 const errorInfo = "当前路由配置不正确，请检查配置";
 
@@ -14,6 +16,7 @@ export function useNav() {
   const route = useRoute();
   const pureApp = useAppStoreHook();
   const routers = useRouter().options.routes;
+  const { wholeMenus } = storeToRefs(usePermissionStoreHook());
 
   /** 用户名 */
   const username = computed(() => {
@@ -81,6 +84,7 @@ export function useNav() {
   }
 
   function menuSelect(indexPath: string, routers): void {
+    if (wholeMenus.value.length === 0) return;
     if (isRemaining(indexPath)) return;
     let parentPath = "";
     const parentPathIndex = indexPath.lastIndexOf("/");

src/layout/hooks/useTag.ts

@@ -9,10 +9,9 @@ import {
   getCurrentInstance
 } from "vue";
 import { tagsViewsType } from "../types";
-import { isEqual } from "lodash-unified";
-import type { StorageConfigs } from "/#/index";
 import { useEventListener } from "@vueuse/core";
 import { useRoute, useRouter } from "vue-router";
+import { isEqual, isBoolean } from "@pureadmin/utils";
 import { useSettingStoreHook } from "@/store/modules/settings";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { storageLocal, toggleClass, hasClass } from "@pureadmin/utils";
@@ -105,15 +104,14 @@ export function useTags() {
   ]);
 
   function conditionHandle(item, previous, next) {
-    if (
-      Object.keys(route.query).length === 0 &&
-      Object.keys(route.params).length === 0
-    ) {
-      return route.path === item.path ? previous : next;
-    } else if (Object.keys(route.query).length > 0) {
-      return isEqual(route.query, item.query) ? previous : next;
+    if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) {
+      if (Object.keys(route.query).length > 0) {
+        return isEqual(route.query, item.query) ? previous : next;
+      } else {
+        return isEqual(route.params, item.params) ? previous : next;
+      }
     } else {
-      return isEqual(route.params, item.params) ? previous : next;
+      return route.path === item.path ? previous : next;
     }
   }
 

src/router/index.ts

@@ -1,5 +1,5 @@
+// import "@/utils/sso";
 import { getConfig } from "@/config";
-import { toRouteType } from "./types";
 import NProgress from "@/utils/progress";
 import { findIndex } from "lodash-unified";
 import { sessionKey, type DataInfo } from "@/utils/auth";
@@ -21,19 +21,28 @@ import {
   formatTwoStageRoutes,
   formatFlatteningRoutes
 } from "./utils";
-import {
-  buildHierarchyTree,
-  openLink,
-  isUrl,
-  storageSession
-} from "@pureadmin/utils";
+import { buildHierarchyTree } from "@/utils/tree";
+import { isUrl, openLink, storageSession } from "@pureadmin/utils";
 
-import homeRouter from "./modules/home";
-import errorRouter from "./modules/error";
 import remainingRouter from "./modules/remaining";
 
+/** 自动导入全部静态路由，无需再手动引入！匹配 src/router/modules 目录（任何嵌套级别）中具有 .ts 扩展名的所有文件，除了 remaining.ts 文件
+ * 如何匹配所有文件请看：https://github.com/mrmlnc/fast-glob#basic-syntax
+ * 如何排除文件请看：https://cn.vitejs.dev/guide/features.html#negative-patterns
+ */
+const modules: Record<string, any> = import.meta.glob(
+  ["./modules/**/*.ts", "!./modules/**/remaining.ts"],
+  {
+    eager: true
+  }
+);
+
 /** 原始静态路由（未做任何处理） */
-const routes = [homeRouter, errorRouter];
+const routes = [];
+
+Object.keys(modules).forEach(key => {
+  routes.push(modules[key].default);
+});
 
 /** 导出处理后的静态路由（三级及以上的路由全部拍成二级） */
 export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(

src/router/modules/error.ts

@@ -1,6 +1,4 @@
-import type { RouteConfigsTable } from "/#/index";
-
-const errorRouter: RouteConfigsTable = {
+export default {
   path: "/error",
   redirect: "/error/403",
   meta: {
@@ -34,6 +32,4 @@ const errorRouter: RouteConfigsTable = {
       }
     }
   ]
-};
-
-export default errorRouter;
+} as RouteConfigsTable;

src/router/modules/home.ts

@@ -1,7 +1,6 @@
-import type { RouteConfigsTable } from "/#/index";
 const Layout = () => import("@/layout/index.vue");
 
-const homeRouter: RouteConfigsTable = {
+export default {
   path: "/",
   name: "Home",
   component: Layout,
@@ -21,6 +20,4 @@ const homeRouter: RouteConfigsTable = {
       }
     }
   ]
-};
-
-export default homeRouter;
+} as RouteConfigsTable;

src/router/modules/remaining.ts

@@ -1,7 +1,6 @@
-import type { RouteConfigsTable } from "/#/index";
 const Layout = () => import("@/layout/index.vue");
 
-const remainingRouter: Array<RouteConfigsTable> = [
+export default [
   {
     path: "/login",
     name: "Login",
@@ -29,6 +28,4 @@ const remainingRouter: Array<RouteConfigsTable> = [
       }
     ]
   }
-];
-
-export default remainingRouter;
+] as Array<RouteConfigsTable>;

src/router/types.ts

@@ -1,9 +0,0 @@
-import { RouteLocationNormalized } from "vue-router";
-
-export interface toRouteType extends RouteLocationNormalized {
-  meta: {
-    roles: Array<string>;
-    keepAlive?: boolean;
-    dynamicLevel?: string;
-  };
-}

src/router/utils.ts

@@ -14,9 +14,9 @@ import { RouteConfigs } from "@/layout/types";
 import {
   isString,
   storageSession,
-  buildHierarchyTree,
   isIncludeAllChildren
 } from "@pureadmin/utils";
+import { buildHierarchyTree } from "@/utils/tree";
 import { cloneDeep, intersection } from "lodash-unified";
 import { sessionKey, type DataInfo } from "@/utils/auth";
 import { usePermissionStoreHook } from "@/store/modules/permission";
@@ -76,7 +76,7 @@ function isOneOfArray(a: Array<string>, b: Array<string>) {
 /** 从sessionStorage里取出当前登陆用户的角色roles，过滤无权限的菜单 */
 function filterNoPermissionTree(data: RouteComponent[]) {
   const currentRoles =
-    storageSession.getItem<DataInfo<number>>(sessionKey).roles ?? [];
+    storageSession.getItem<DataInfo<number>>(sessionKey)?.roles ?? [];
   const newTree = cloneDeep(data).filter((v: any) =>
     isOneOfArray(v.meta?.roles, currentRoles)
   );

src/store/modules/app.ts

@@ -2,7 +2,6 @@ import { store } from "@/store";
 import { appType } from "./types";
 import { defineStore } from "pinia";
 import { getConfig } from "@/config";
-import type { StorageConfigs } from "/#/index";
 import { deviceDetection, storageLocal } from "@pureadmin/utils";
 
 export const useAppStore = defineStore({

src/store/modules/epTheme.ts

@@ -1,7 +1,6 @@
 import { store } from "@/store";
 import { defineStore } from "pinia";
 import { getConfig } from "@/config";
-import type { StorageConfigs } from "/#/index";
 import { storageLocal } from "@pureadmin/utils";
 
 export const useEpThemeStore = defineStore({

src/store/modules/multiTags.ts

@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { store } from "@/store";
-import { isEqual } from "lodash-unified";
-import type { StorageConfigs } from "/#/index";
+import { isEqual } from "@pureadmin/utils";
 import { routerArrays } from "@/layout/types";
 import { multiType, positionType } from "./types";
 import { isUrl, storageLocal } from "@pureadmin/utils";
@@ -11,11 +10,11 @@ export const useMultiTagsStore = defineStore({
   state: () => ({
     // 存储标签页信息（路由信息）
     multiTags: storageLocal.getItem<StorageConfigs>("responsive-configure")
-      .multiTagsCache
+      ?.multiTagsCache
       ? storageLocal.getItem<StorageConfigs>("responsive-tags")
       : [...routerArrays],
     multiTagsCache: storageLocal.getItem<StorageConfigs>("responsive-configure")
-      .multiTagsCache
+      ?.multiTagsCache
   }),
   getters: {
     getMultiTagsCache() {

src/store/modules/types.ts

@@ -39,6 +39,4 @@ export type setType = {
 export type userType = {
   username?: string;
   roles?: Array<string>;
-  verifyCode?: string;
-  currentPage?: number;
 };

src/store/modules/user.ts

@@ -16,11 +16,7 @@ export const useUserStore = defineStore({
     username:
       storageSession.getItem<DataInfo<number>>(sessionKey)?.username ?? "",
     // 页面级别权限
-    roles: storageSession.getItem<DataInfo<number>>(sessionKey)?.roles ?? [],
-    // 前端生成的验证码（按实际需求替换）
-    verifyCode: "",
-    // 判断登录页面显示哪个组件（0：登录（默认）、1：手机登录、2：二维码登录、3：注册、4：忘记密码）
-    currentPage: 0
+    roles: storageSession.getItem<DataInfo<number>>(sessionKey)?.roles ?? []
   }),
   actions: {
     /** 存储用户名 */
@@ -31,14 +27,6 @@ export const useUserStore = defineStore({
     SET_ROLES(roles: Array<string>) {
       this.roles = roles;
     },
-    /** 存储前端生成的验证码 */
-    SET_VERIFYCODE(verifyCode: string) {
-      this.verifyCode = verifyCode;
-    },
-    /** 存储登录页面显示哪个组件 */
-    SET_CURRENTPAGE(value: number) {
-      this.currentPage = value;
-    },
     /** 登入 */
     async loginByUsername(data) {
       return new Promise<UserResult>((resolve, reject) => {
@@ -59,9 +47,9 @@ export const useUserStore = defineStore({
       this.username = "";
       this.roles = [];
       removeToken();
-      router.push("/login");
       useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
       resetRouter();
+      router.push("/login");
     },
     /** 刷新`token` */
     async handRefreshToken(data) {

src/style/dark.scss

@@ -127,7 +127,7 @@ html.dark {
     color: var(--el-text-color-primary);
   }
 
-  .vxe-button.type--button.size--medium:hover {
+  .vxe-button.type--button:hover {
     background: var(--el-color-primary) !important;
   }
 

src/style/index.scss

@@ -20,7 +20,8 @@
   filter: invert(80%);
 }
 
-/* 重置 vxe-table 中 pager 样式 */
+/* 重置 vxe-table 样式 */
+.vxe-button.type--button.theme--primary:hover,
 .vxe-pager .vxe-pager--num-btn:not(.is--disabled).is--active {
   color: #fff !important;
 }

src/style/reset.scss

@@ -44,16 +44,6 @@ abbr:where([title]) {
   text-decoration: underline dotted;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-size: inherit;
-  font-weight: inherit;
-}
-
 a {
   color: inherit;
   text-decoration: inherit;

src/style/transition.scss

@@ -43,11 +43,10 @@
 
 /**
  * @description 重置el-menu的展开收起动画时长
- * @see {@link https://github.com/element-plus/element-plus/issues/4509#issuecomment-980165001}
  */
 .outer-most .el-collapse-transition-leave-active,
 .outer-most .el-collapse-transition-enter-active {
-  transition: 0.12s all ease-in-out !important;
+  transition: 0.2s all ease-in-out !important;
 }
 
 .horizontal-collapse-transition {

src/utils/auth.ts

@@ -35,7 +35,7 @@ export function getToken(): DataInfo<number> {
 export function setToken(data: DataInfo<Date>) {
   let expires = 0;
   const { accessToken, refreshToken } = data;
-  expires = new Date(data.expires).getTime();
+  expires = new Date(data.expires).getTime(); // 如果后端直接设置时间戳，将此处代码改为expires = data.expires，然后把上面的DataInfo<Date>改成DataInfo<number>即可
   const cookieString = JSON.stringify({ accessToken, expires });
 
   expires > 0
@@ -59,8 +59,10 @@ export function setToken(data: DataInfo<Date>) {
     const { username, roles } = data;
     setSessionKey(username, roles);
   } else {
-    const { username, roles } =
-      storageSession.getItem<DataInfo<number>>(sessionKey);
+    const username =
+      storageSession.getItem<DataInfo<number>>(sessionKey)?.username ?? "";
+    const roles =
+      storageSession.getItem<DataInfo<number>>(sessionKey)?.roles ?? [];
     setSessionKey(username, roles);
   }
 }

src/utils/globalPolyfills.ts

@@ -0,0 +1,7 @@
+// 如果项目出现 `global is not defined` 报错，可能是您引入某个库的问题，比如 aws-sdk-js https://github.com/aws/aws-sdk-js
+// 解决办法就是将该文件引入 src/main.ts 即可 import "@/utils/globalPolyfills";
+if (typeof (window as any).global === "undefined") {
+  (window as any).global = window;
+}
+
+export {};

src/utils/sso.ts

@@ -0,0 +1,59 @@
+import { removeToken, setToken, type DataInfo } from "./auth";
+import { subBefore, getQueryMap } from "@pureadmin/utils";
+
+/**
+ * 简版前端单点登录，根据实际业务自行编写
+ * 划重点：
+ * 判断是否为单点登录，不为则直接返回不再进行任何逻辑处理，下面是单点登录后的逻辑处理
+ * 1.清空本地旧信息；
+ * 2.获取url中的重要参数信息，然后通过 setToken 保存在本地；
+ * 3.删除不需要显示在 url 的参数
+ * 4.使用 window.location.replace 跳转正确页面
+ */
+(function () {
+  // 获取 url 中的参数
+  const params = getQueryMap(location.href) as DataInfo<Date>;
+  const must = ["username", "roles", "accessToken"];
+  const mustLength = must.length;
+  if (Object.keys(params).length !== mustLength) return;
+
+  // url 参数满足 must 里的全部值，才判定为单点登录，避免非单点登录时刷新页面无限循环
+  let sso = [];
+  let start = 0;
+
+  while (start < mustLength) {
+    if (Object.keys(params).includes(must[start]) && sso.length <= mustLength) {
+      sso.push(must[start]);
+    } else {
+      sso = [];
+    }
+    start++;
+  }
+
+  if (sso.length === mustLength) {
+    // 判定为单点登录
+
+    // 清空本地旧信息
+    removeToken();
+
+    // 保存新信息到本地
+    setToken(params);
+
+    // 删除不需要显示在 url 的参数
+    delete params["roles"];
+    delete params["accessToken"];
+
+    const newUrl = `${location.origin}${location.pathname}${subBefore(
+      location.hash,
+      "?"
+    )}?${JSON.stringify(params)
+      .replace(/["{}]/g, "")
+      .replace(/:/g, "=")
+      .replace(/,/g, "&")}`;
+
+    // 替换历史记录项
+    window.location.replace(newUrl);
+  } else {
+    return;
+  }
+})();

src/utils/tree.ts

@@ -0,0 +1,188 @@
+/**
+ * @description 提取菜单树中的每一项uniqueId
+ * @param tree 树
+ * @returns 每一项uniqueId组成的数组
+ */
+export const extractPathList = (tree: any[]): any => {
+  if (!Array.isArray(tree)) {
+    console.warn("tree must be an array");
+    return [];
+  }
+  if (!tree || tree.length === 0) return [];
+  const expandedPaths: Array<number | string> = [];
+  for (const node of tree) {
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      extractPathList(node.children);
+    }
+    expandedPaths.push(node.uniqueId);
+  }
+  return expandedPaths;
+};
+
+/**
+ * @description 如果父级下children的length为1，删除children并自动组建唯一uniqueId
+ * @param tree 树
+ * @param pathList 每一项的id组成的数组
+ * @returns 组件唯一uniqueId后的树
+ */
+export const deleteChildren = (tree: any[], pathList = []): any => {
+  if (!Array.isArray(tree)) {
+    console.warn("menuTree must be an array");
+    return [];
+  }
+  if (!tree || tree.length === 0) return [];
+  for (const [key, node] of tree.entries()) {
+    if (node.children && node.children.length === 1) delete node.children;
+    node.id = key;
+    node.parentId = pathList.length ? pathList[pathList.length - 1] : null;
+    node.pathList = [...pathList, node.id];
+    node.uniqueId =
+      node.pathList.length > 1 ? node.pathList.join("-") : node.pathList[0];
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      deleteChildren(node.children, node.pathList);
+    }
+  }
+  return tree;
+};
+
+/**
+ * @description 创建层级关系
+ * @param tree 树
+ * @param pathList 每一项的id组成的数组
+ * @returns 创建层级关系后的树
+ */
+export const buildHierarchyTree = (tree: any[], pathList = []): any => {
+  if (!Array.isArray(tree)) {
+    console.warn("tree must be an array");
+    return [];
+  }
+  if (!tree || tree.length === 0) return [];
+  for (const [key, node] of tree.entries()) {
+    node.id = key;
+    node.parentId = pathList.length ? pathList[pathList.length - 1] : null;
+    node.pathList = [...pathList, node.id];
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      buildHierarchyTree(node.children, node.pathList);
+    }
+  }
+  return tree;
+};
+
+/**
+ * @description 广度优先遍历，根据唯一uniqueId找当前节点信息
+ * @param tree 树
+ * @param uniqueId 唯一uniqueId
+ * @returns 当前节点信息
+ */
+export const getNodeByUniqueId = (
+  tree: any[],
+  uniqueId: number | string
+): any => {
+  if (!Array.isArray(tree)) {
+    console.warn("menuTree must be an array");
+    return [];
+  }
+  if (!tree || tree.length === 0) return [];
+  const item = tree.find(node => node.uniqueId === uniqueId);
+  if (item) return item;
+  const childrenList = tree
+    .filter(node => node.children)
+    .map(i => i.children)
+    .flat(1) as unknown;
+  return getNodeByUniqueId(childrenList as any[], uniqueId);
+};
+
+/**
+ * @description 向当前唯一uniqueId节点中追加字段
+ * @param tree 树
+ * @param uniqueId 唯一uniqueId
+ * @param fields 需要追加的字段
+ * @returns 追加字段后的树
+ */
+export const appendFieldByUniqueId = (
+  tree: any[],
+  uniqueId: number | string,
+  fields: object
+): any => {
+  if (!Array.isArray(tree)) {
+    console.warn("menuTree must be an array");
+    return [];
+  }
+  if (!tree || tree.length === 0) return [];
+  for (const node of tree) {
+    const hasChildren = node.children && node.children.length > 0;
+    if (
+      node.uniqueId === uniqueId &&
+      Object.prototype.toString.call(fields) === "[object Object]"
+    )
+      Object.assign(node, fields);
+    if (hasChildren) {
+      appendFieldByUniqueId(node.children, uniqueId, fields);
+    }
+  }
+  return tree;
+};
+
+/**
+ * @description 构造树型结构数据
+ * @param data 数据源
+ * @param id id字段 默认id
+ * @param parentId 父节点字段，默认parentId
+ * @param children 子节点字段，默认children
+ * @returns 追加字段后的树
+ */
+export const handleTree = (
+  data: any[],
+  id?: string,
+  parentId?: string,
+  children?: string
+): any => {
+  if (!Array.isArray(data)) {
+    console.warn("data must be an array");
+    return [];
+  }
+  const config = {
+    id: id || "id",
+    parentId: parentId || "parentId",
+    childrenList: children || "children"
+  };
+
+  const childrenListMap: any = {};
+  const nodeIds: any = {};
+  const tree = [];
+
+  for (const d of data) {
+    const parentId = d[config.parentId];
+    if (childrenListMap[parentId] == null) {
+      childrenListMap[parentId] = [];
+    }
+    nodeIds[d[config.id]] = d;
+    childrenListMap[parentId].push(d);
+  }
+
+  for (const d of data) {
+    const parentId = d[config.parentId];
+    if (nodeIds[parentId] == null) {
+      tree.push(d);
+    }
+  }
+
+  for (const t of tree) {
+    adaptToChildrenList(t);
+  }
+
+  function adaptToChildrenList(o: Record<string, any>) {
+    if (childrenListMap[o[config.id]] !== null) {
+      o[config.childrenList] = childrenListMap[o[config.id]];
+    }
+    if (o[config.childrenList]) {
+      for (const c of o[config.childrenList]) {
+        adaptToChildrenList(c);
+      }
+    }
+  }
+  return tree;
+};