Merge branch 'main' into pages

src/components/ReFlowChart/src/assets/iconfont/iconfont.js

@@ -23,9 +23,9 @@
   function h() {
     n || ((n = !0), o());
   }
-  (t = function () {
+  ((t = function () {
     var c, t, e, o;
-    ((o = document.createElement("div")).innerHTML = i),
+    (((o = document.createElement("div")).innerHTML = i),
       (i = null),
       (e = o.getElementsByTagName("svg")[0]) &&
         ((e.style.position = "absolute"),
@@ -35,13 +35,13 @@
         (c = e),
         (t = document.body).firstChild
           ? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e))
-          : t.appendChild(c));
+          : t.appendChild(c)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((e = function () {
-            document.removeEventListener("DOMContentLoaded", e, !1), t();
+            (document.removeEventListener("DOMContentLoaded", e, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", e, !1))
       : document.attachEvent &&
@@ -58,5 +58,5 @@
         })(),
         (a.onreadystatechange = function () {
           "complete" == a.readyState && ((a.onreadystatechange = null), h());
-        }));
+        })));
 })(window);

src/components/ReSplitPane/iconfont/iconfont.js

@@ -33,10 +33,10 @@
     }
     l();
   }
-  (t = function () {
+  ((t = function () {
     var e,
       t = document.createElement("div");
-    (t.innerHTML = i),
+    ((t.innerHTML = i),
       (i = null),
       (t = t.getElementsByTagName("svg")[0]) &&
         ((t.style.position = "absolute"),
@@ -44,13 +44,15 @@
         (t.style.height = 0),
         (t.style.overflow = "hidden"),
         (t = t),
-        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
+        (e = document.body).firstChild
+          ? m(t, e.firstChild)
+          : e.appendChild(t)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((n = function () {
-            document.removeEventListener("DOMContentLoaded", n, !1), t();
+            (document.removeEventListener("DOMContentLoaded", n, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", n, !1))
       : document.attachEvent &&
@@ -60,5 +62,5 @@
         a(),
         (o.onreadystatechange = function () {
           "complete" == o.readyState && ((o.onreadystatechange = null), l());
-        }));
+        })));
 })(window);

src/directives/ripple/index.scss

@@ -13,10 +13,10 @@ $ripple-animation-visible-opacity: 0.25 !default;
     z-index: 0;
     width: 100%;
     height: 100%;
+    contain: strict;
     overflow: hidden;
     pointer-events: none;
     border-radius: inherit;
-    contain: strict;
   }
 
   &__animation {

src/layout/components/lay-footer/index.vue

@@ -10,7 +10,7 @@ const TITLE = getConfig("Title");
   >
     Copyright © 2020-2025
     <a
-      class="hover:text-primary"
+      class="hover:text-primary!"
       href="https://github.com/pure-admin"
       target="_blank"
     >

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

@@ -6,8 +6,8 @@ import { useRouter } from "vue-router";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
 import { useNav } from "@/layout/hooks/useNav";
+import { transformI18n } from "@/plugins/i18n";
 import SearchHistory from "./SearchHistory.vue";
-import { transformI18n, $t } from "@/plugins/i18n";
 import type { optionsItem, dragItem } from "../types";
 import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";

src/layout/components/lay-tag/index.vue

@@ -254,7 +254,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(fixedTags.length, valueIndex - 1, true);
+    spliceRoute(fixedTags.length, valueIndex - fixedTags.length);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {

src/router/index.ts

@@ -7,7 +7,13 @@ import { buildHierarchyTree } from "@/utils/tree";
 import remainingRouter from "./modules/remaining";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
+import {
+  isUrl,
+  openLink,
+  cloneDeep,
+  isAllEmpty,
+  storageLocal
+} from "@pureadmin/utils";
 import {
   ascending,
   getTopMenu,
@@ -21,9 +27,9 @@ import {
 } from "./utils";
 import {
   type Router,
-  createRouter,
   type RouteRecordRaw,
-  type RouteComponent
+  type RouteComponent,
+  createRouter
 } from "vue-router";
 import {
   type DataInfo,
@@ -55,6 +61,9 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
   formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
 );
 
+/** 初始的静态路由，用于退出登录时重置路由 */
+const initConstantRoutes: Array<RouteRecordRaw> = cloneDeep(constantRoutes);
+
 /** 用于渲染菜单，保持原始层级 */
 export const constantMenus: Array<RouteComponent> = ascending(
   routes.flat(Infinity)
@@ -87,17 +96,13 @@ export const router: Router = createRouter({
 
 /** 重置路由 */
 export function resetRouter() {
-  router.getRoutes().forEach(route => {
-    const { name, meta } = route;
-    if (name && router.hasRoute(name) && meta?.backstage) {
-      router.removeRoute(name);
-      router.options.routes = formatTwoStageRoutes(
-        formatFlatteningRoutes(
-          buildHierarchyTree(ascending(routes.flat(Infinity)))
-        )
-      );
-    }
-  });
+  router.clearRoutes();
+  for (const route of initConstantRoutes.concat(...(remainingRouter as any))) {
+    router.addRoute(route);
+  }
+  router.options.routes = formatTwoStageRoutes(
+    formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
+  );
   usePermissionStoreHook().clearAllCachePage();
 }
 

src/router/utils.ts

@@ -172,6 +172,8 @@ function handleAsyncRoutes(routeList) {
           const flattenRouters: any = router
             .getRoutes()
             .find(n => n.path === "/");
+          // 保持router.options.routes[0].children与path为"/"的children一致，防止数据不一致导致异常
+          flattenRouters.children = router.options.routes[0].children;
           router.addRoute(flattenRouters);
         }
       }

src/utils/message.ts

@@ -8,6 +8,8 @@ type messageTypes = "info" | "success" | "warning" | "error";
 interface MessageParams {
   /** 消息类型，可选 `info` 、`success` 、`warning` 、`error` ，默认 `info` */
   type?: messageTypes;
+  /** 是否纯色，默认 `false` */
+  plain?: boolean;
   /** 自定义图标，该属性会覆盖 `type` 的图标 */
   icon?: any;
   /** 是否将 `message` 属性作为 `HTML` 片段处理，默认 `false` */
@@ -18,14 +20,14 @@ interface MessageParams {
   duration?: number;
   /** 是否显示关闭按钮，默认值 `false` */
   showClose?: boolean;
-  /** 文字是否居中，默认值 `false` */
-  center?: boolean;
-  /** `Message` 距离窗口顶部的偏移量，默认 `20` */
+  /** `Message` 距离窗口顶部的偏移量，默认 `16` */
   offset?: number;
   /** 设置组件的根元素，默认 `document.body` */
   appendTo?: string | HTMLElement;
   /** 合并内容相同的消息，不支持 `VNode` 类型的消息，默认值 `false` */
   grouping?: boolean;
+  /** 重复次数，类似于 `Badge` 。当和 `grouping` 属性一起使用时作为初始数量使用，默认值 `1` */
+  repeatNum?: number;
   /** 关闭时的回调函数, 参数为被关闭的 `message` 实例 */
   onClose?: Function | null;
 }
@@ -48,28 +50,30 @@ const message = (
     const {
       icon,
       type = "info",
+      plain = false,
       dangerouslyUseHTMLString = false,
       customClass = "antd",
       duration = 2000,
       showClose = false,
-      center = false,
-      offset = 20,
+      offset = 16,
       appendTo = document.body,
       grouping = false,
+      repeatNum = 1,
       onClose
     } = params;
 
     return ElMessage({
       message,
-      type,
       icon,
+      type,
+      plain,
       dangerouslyUseHTMLString,
       duration,
       showClose,
-      center,
       offset,
       appendTo,
       grouping,
+      repeatNum,
       // 全局搜 pure-message 即可知道该类的样式位置
       customClass: customClass === "antd" ? "pure-message" : "",
       onClose: () => (isFunction(onClose) ? onClose() : null)

src/views/able/mqtt-client.vue

@@ -194,7 +194,7 @@ onUnmounted(() => {
         基于
         <el-link
           type="primary"
-          :underline="false"
+          underline="never"
           href="https://github.com/mqttjs/MQTT.js"
           target="_blank"
         >
@@ -203,7 +203,7 @@ onUnmounted(() => {
         和 免费的公共MQTT代理
         <el-link
           type="primary"
-          :underline="false"
+          underline="never"
           href="broker.emqx.io"
           target="_blank"
         >

src/views/account-settings/index.vue

@@ -74,15 +74,17 @@ getMine().then(res => {
       :width="deviceDetection() ? '180px' : '240px'"
     >
       <el-menu :default-active="witchPane" class="pure-account-settings-menu">
-        <el-menu-item
-          class="hover:transition-all! hover:duration-200! hover:text-base! h-[50px]!"
+        <div
+          class="h-[50px]! text-[var(--pure-theme-menu-text)] cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-[var(--pure-theme-menu-title-hover)]!"
           @click="router.go(-1)"
         >
-          <div class="flex items-center">
+          <div
+            class="h-full flex items-center px-[var(--el-menu-base-level-padding)]"
+          >
             <IconifyIconOffline :icon="leftLine" />
             <span class="ml-2">返回</span>
           </div>
-        </el-menu-item>
+        </div>
         <div class="flex items-center ml-8 mt-4 mb-4">
           <el-avatar :size="48" :src="userInfo.avatar" />
           <div class="ml-4 flex flex-col max-w-[130px]">

src/views/guide/index.vue

@@ -4,7 +4,7 @@ import intro from "intro.js";
 import "intro.js/minified/introjs.min.css";
 
 type GuideStep = {
-  element: string | HTMLElement;
+  element: HTMLElement;
   title: string;
   intro: string;
   position: "left" | "right" | "top" | "bottom";
@@ -16,47 +16,43 @@ defineOptions({
 
 const GUIDE_STEPS = [
   {
-    element: document.querySelector(".sidebar-logo-container") as
-      | string
-      | HTMLElement,
+    element: document.querySelector(".sidebar-logo-container"),
     title: "项目名称和Logo",
     intro: "您可以在这里设置项目名称和Logo",
     position: "left"
   },
   {
-    element: document.querySelector("#header-search") as string | HTMLElement,
+    element: document.querySelector("#header-search"),
     title: "搜索菜单",
     intro: "您可以在这里搜索想要查看的菜单",
     position: "left"
   },
   {
-    element: document.querySelector("#header-translation") as
-      | string
-      | HTMLElement,
+    element: document.querySelector("#header-translation"),
     title: "国际化",
     intro: "您可以在这里进行语言切换",
     position: "left"
   },
   {
-    element: document.querySelector("#full-screen") as string | HTMLElement,
+    element: document.querySelector("#full-screen"),
     title: "全屏",
     intro: "您可以在这里进行全屏切换",
     position: "left"
   },
   {
-    element: document.querySelector("#header-notice") as string | HTMLElement,
+    element: document.querySelector("#header-notice"),
     title: "消息通知",
     intro: "您可以在这里查看管理员发送的消息",
     position: "left"
   },
   {
-    element: document.querySelector(".set-icon") as string | HTMLElement,
+    element: document.querySelector(".set-icon"),
     title: "系统配置",
     intro: "您可以在这里查看系统配置",
     position: "left"
   },
   {
-    element: document.querySelector(".tags-view") as string | HTMLElement,
+    element: document.querySelector(".tags-view"),
     title: "多标签页",
     intro: "这里是您访问过的页面的历史",
     position: "bottom"

src/views/login/index.vue

@@ -340,7 +340,7 @@ watch(loginDay, value => {
     >
       Copyright © 2020-2025
       <a
-        class="hover:text-primary"
+        class="hover:text-primary!"
         href="https://github.com/pure-admin"
         target="_blank"
       >