Merge branch 'main' into pages

locales/en.yaml

@@ -19,6 +19,8 @@ buttons:
   pureBackTop: BackTop
   pureOpenText: Open
   pureCloseText: Close
+  pureWatchMore: Watch More
+  pureMarkAsRead: Mark As Read
 search:
   pureTotal: Total
   pureHistory: History
@@ -239,6 +241,7 @@ login:
   purePassWordSureReg: Please enter confirm password
   purePassWordDifferentReg: The two passwords do not match!
   purePassWordUpdateReg: Password has been updated
+  pureLoginExpired: Login expired, please login again
 tableBar:
   pureList: List
   pureLarge: Large

locales/zh-CN.yaml

@@ -19,6 +19,8 @@ buttons:
   pureBackTop: 回到顶部
   pureOpenText: 开
   pureCloseText: 关
+  pureWatchMore: 查看更多
+  pureMarkAsRead: 标为已读
 search:
   pureTotal: 共
   pureHistory: 搜索历史
@@ -239,6 +241,7 @@ login:
   purePassWordSureReg: 请输入确认密码
   purePassWordDifferentReg: 两次密码不一致!
   purePassWordUpdateReg: 修改密码成功
+  pureLoginExpired: 登录已过期，请重新登录
 tableBar:
   pureList: 列表
   pureLarge: 宽松

mock/asyncRoutes.ts

@@ -326,7 +326,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           systemManagementRouter,
           systemMonitorRouter,

mock/list.ts

@@ -6,7 +6,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list: [
             {

mock/login.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.username === "admin") {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/44761321",
             username: "admin",
@@ -24,7 +25,8 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/52823142",
             username: "common",

mock/map.ts

@@ -33,7 +33,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: mapList()
       };
     }

mock/mine.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           avatar: "https://avatars.githubusercontent.com/u/44761321",
           username: "admin",
@@ -46,7 +47,8 @@ export default defineFakeRoute([
         }
       ];
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数

mock/refreshToken.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.refreshToken) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
@@ -18,7 +19,8 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          success: false,
+          code: 10001,
+          message: "请求参数缺失或格式不正确",
           data: {}
         };
       }

mock/system.ts

@@ -50,7 +50,8 @@ export default defineFakeRoute([
       if (body.phone) list = list.filter(item => item.phone === body.phone);
       if (body.deptId) list = list.filter(item => item.dept.id === body.deptId);
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -66,7 +67,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           { id: 1, name: "超级管理员" },
           { id: 2, name: "普通角色" }
@@ -82,18 +84,21 @@ export default defineFakeRoute([
       if (body.userId) {
         if (body.userId == 1) {
           return {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [1]
           };
         } else if (body.userId == 2) {
           return {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [2]
           };
         }
       } else {
         return {
-          success: false,
+          code: 10001,
+          message: "请求参数缺失或格式不正确",
           data: []
         };
       }
@@ -130,7 +135,8 @@ export default defineFakeRoute([
       );
       if (body.code) list = list.filter(item => item.code === body.code);
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -146,7 +152,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -350,7 +357,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.id == 1) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
             202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
@@ -359,7 +367,8 @@ export default defineFakeRoute([
         };
       } else if (body.id == 2) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
             501, 502, 503
@@ -374,7 +383,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -1255,7 +1265,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           {
             name: "杭州总公司",
@@ -1418,7 +1429,8 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.username.includes(body?.username));
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1462,7 +1474,8 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1508,7 +1521,8 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1566,7 +1580,8 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.module.includes(body?.module));
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1601,7 +1616,8 @@ export default defineFakeRoute([
             "Content-Length": 17019
           },
           responseBody: {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [
               {
                 parentId: 0,

package.json

@@ -54,29 +54,29 @@
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
     "@pureadmin/table": "^3.3.0",
-    "@pureadmin/utils": "^2.6.3",
+    "@pureadmin/utils": "^2.6.4",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.48.1",
+    "@vue-flow/core": "^1.48.2",
-    "@vueuse/core": "^14.1.0",
+    "@vueuse/core": "^14.2.0",
     "@vueuse/motion": "^3.0.3",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.13.2",
+    "axios": "^1.13.4",
     "china-area-data": "^5.0.1",
     "codemirror": "^5.65.20",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
     "dayjs": "^1.11.19",
-    "deep-chat": "^2.3.0",
+    "deep-chat": "^2.4.2",
     "echarts": "^6.0.0",
     "el-table-infinite-scroll": "^3.0.8",
-    "element-plus": "^2.13.0",
+    "element-plus": "^2.13.2",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
-    "jsbarcode": "^3.12.1",
+    "jsbarcode": "^3.12.3",
     "localforage": "^1.10.0",
     "mint-filter": "^4.0.3",
     "mitt": "^3.0.1",
@@ -84,28 +84,28 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "pinia": "^3.0.4",
-    "pinyin-pro": "^3.27.0",
+    "pinyin-pro": "^3.28.0",
     "plus-pro-components": "^0.1.30",
     "qrcode": "^1.5.4",
-    "qs": "^6.14.0",
+    "qs": "^6.14.1",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^12.0.3",
+    "swiper": "^12.1.0",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
     "vditor": "^3.11.2",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.26",
+    "vue": "^3.5.27",
-    "vue-i18n": "^11.2.7",
+    "vue-i18n": "^11.2.8",
     "vue-json-pretty": "^2.6.0",
     "vue-pdf-embed": "^2.1.3",
-    "vue-router": "^4.6.4",
+    "vue-router": "^5.0.2",
     "vue-tippy": "^6.7.1",
     "vue-types": "^6.0.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue-waterfall-plugin-next": "^2.6.9",
-    "vue3-danmaku": "^1.6.6",
+    "vue3-danmaku": "^1.6.7",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
@@ -114,12 +114,12 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.2.0",
+    "@commitlint/cli": "^20.4.1",
-    "@commitlint/config-conventional": "^20.2.0",
+    "@commitlint/config-conventional": "^20.4.1",
-    "@commitlint/types": "^20.2.0",
+    "@commitlint/types": "^20.4.0",
     "@eslint/js": "^9.39.2",
-    "@faker-js/faker": "^10.1.0",
+    "@faker-js/faker": "^10.2.0",
-    "@iconify/json": "^2.2.417",
+    "@iconify/json": "^2.2.435",
     "@iconify/vue": "4.2.0",
     "@intlify/unplugin-vue-i18n": "^11.0.3",
     "@tailwindcss/vite": "^4.1.18",
@@ -127,44 +127,44 @@
     "@types/dagre": "^0.7.53",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.19.27",
+    "@types/node": "^20.19.31",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.6",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.9",
-    "@vitejs/plugin-vue": "^6.0.3",
+    "@vitejs/plugin-vue": "^6.0.4",
-    "@vitejs/plugin-vue-jsx": "^5.1.2",
+    "@vitejs/plugin-vue-jsx": "^5.1.4",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^1.3.3",
+    "code-inspector-plugin": "^1.4.1",
     "cssnano": "^7.1.2",
     "dagre": "^0.8.5",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-vue": "^10.6.2",
+    "eslint-plugin-vue": "^10.7.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "postcss": "^8.5.6",
-    "postcss-html": "^1.8.0",
+    "postcss-html": "^1.8.1",
     "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
     "rimraf": "^6.1.2",
     "rollup-plugin-visualizer": "^6.0.5",
-    "sass": "^1.97.1",
+    "sass": "^1.97.3",
-    "stylelint": "^16.26.1",
+    "stylelint": "^17.1.1",
-    "stylelint-config-recess-order": "^7.4.0",
+    "stylelint-config-recess-order": "^7.6.0",
     "stylelint-config-recommended-vue": "^1.6.1",
-    "stylelint-config-standard-scss": "^14.0.0",
+    "stylelint-config-standard-scss": "^17.0.0",
     "stylelint-prettier": "^5.0.3",
     "svgo": "^4.0.0",
     "tailwindcss": "^4.1.18",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.50.0",
+    "typescript-eslint": "^8.54.0",
-    "unplugin-icons": "^22.5.0",
+    "unplugin-icons": "^23.0.1",
-    "vite": "^7.3.0",
+    "vite": "^7.3.1",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.2.2",
@@ -172,7 +172,7 @@
     "vite-plugin-router-warn": "^2.0.0",
     "vite-svg-loader": "^5.1.0",
     "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^3.2.1"
+    "vue-tsc": "^3.2.4"
   },
   "engines": {
     "node": "^20.19.0 || >=22.13.0",

src/App.vue

@@ -7,16 +7,18 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+import { useRouter } from "vue-router";
+import { useGlobal } from "@pureadmin/utils";
 import { checkVersion } from "version-rocket";
+import { defineComponent, computed } from "vue";
 import { ElConfigProvider } from "element-plus";
-import { ReDialog } from "@/components/ReDialog";
+import { ReDialog, closeAllDialog } from "@/components/ReDialog";
-import { ReDrawer } from "@/components/ReDrawer";
+import { ReDrawer, closeAllDrawer } from "@/components/ReDrawer";
 import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import plusEn from "plus-pro-components/es/locale/lang/en";
 import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
-import { ElNotification } from "element-plus";
+// import { ElNotification } from "element-plus";
 
 export default defineComponent({
   name: "app",
@@ -25,12 +27,23 @@ export default defineComponent({
     ReDialog,
     ReDrawer
   },
-  computed: {
+  setup() {
-    currentLocale() {
+    const router = useRouter();
-      return this.$storage.locale?.locale === "zh"
+    const { $storage } = useGlobal<GlobalPropertiesApi>();
+    const currentLocale = computed(() => {
+      return $storage.locale?.locale === "zh"
         ? { ...zhCn, ...plusZhCn }
         : { ...en, ...plusEn };
-    }
+    });
+
+    router.beforeEach(() => {
+      closeAllDialog();
+      closeAllDrawer();
+    });
+
+    return {
+      currentLocale
+    };
   },
   beforeCreate() {
     const { version, name: title } = __APP_INFO__.pkg;
@@ -54,23 +67,23 @@ export default defineComponent({
         }
       );
     }
-  },
-  mounted() {
-    ElNotification({
-      title: "高级服务",
-      duration: 0,
-      customClass: "fullpage-notification",
-      // @ts-expect-error
-      style: { width: "260px" },
-      position: "bottom-right",
-      dangerouslyUseHTMLString: true,
-      message: `
-        <a target='_blank' class='block text-base text-center border mt-4 rounded hover:text-[red]!' href='https://pure-admin.cn/pages/service/'>
-        新功能更新，点我查看
-        </a>
-      `
-    });
   }
+  // mounted() {
+  //   ElNotification({
+  //     title: "高级服务",
+  //     duration: 0,
+  //     customClass: "fullpage-notification",
+  //     // @ts-expect-error
+  //     style: { width: "260px" },
+  //     position: "bottom-right",
+  //     dangerouslyUseHTMLString: true,
+  //     message: `
+  //       <a target='_blank' class='block text-base text-center border mt-4 rounded hover:text-[red]!' href='https://pure-admin.cn/pages/service'>
+  //       补差价活动即将结束！
+  //       </a>
+  //     `
+  //   });
+  // }
 });
 </script>
 

src/api/list.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/mock.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data: Array<any>;
 };
 
@@ -14,7 +15,7 @@ export const mapJson = (params?: object) => {
 export const formUpload = data => {
   return http.request<Result>(
     "post",
-    "https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b",
+    "https://pureadmin.free.beeceptor.com/images",
     { data },
     {
       headers: {

src/api/routes.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data: Array<any>;
 };
 

src/api/system.ts

@@ -1,12 +1,14 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: Array<any>;
 };
 
 type ResultTable = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/user.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 export type UserResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: {
     /** 头像 */
     avatar: string;
@@ -23,7 +24,8 @@ export type UserResult = {
 };
 
 export type RefreshTokenResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: {
     /** `token` */
     accessToken: string;
@@ -50,12 +52,14 @@ export type UserInfo = {
 };
 
 export type UserInfoResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: UserInfo;
 };
 
 type ResultTable = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/components/ReMap/src/Amap.vue

@@ -92,14 +92,16 @@ onBeforeMount(() => {
 
       // 获取模拟车辆信息
       mapJson()
-        .then(({ data }) => {
+        .then(({ code, data }) => {
-          const points: object = data.map(v => {
+          if (code === 0) {
-            return {
+            const points: object = data.map(v => {
-              lnglat: [v.lng, v.lat],
+              return {
-              ...v
+                lnglat: [v.lng, v.lat],
-            };
+                ...v
-          });
+              };
-          if (MarkerCluster) MarkerCluster.setData(points);
+            });
+            if (MarkerCluster) MarkerCluster.setData(points);
+          }
         })
         .catch(err => {
           console.log("err:", err);

src/components/ReSeamlessScroll/src/index.vue

@@ -5,14 +5,10 @@ import {
   ref,
   unref,
   nextTick,
-  computed
+  computed,
+  useTemplateRef
 } from "vue";
-import {
+import { tryOnMounted, tryOnUnmounted, useDebounceFn } from "@vueuse/core";
-  tryOnMounted,
-  tryOnUnmounted,
-  templateRef,
-  useDebounceFn
-} from "@vueuse/core";
 import * as utilsMethods from "./utils";
 const { animationFrame, copyObj } = utilsMethods;
 animationFrame();
@@ -62,17 +58,14 @@ if (props.classOption["key"] === undefined) {
   props.classOption["key"] = 0;
 }
 
-const wrap = templateRef<HTMLElement | null>(
+const wrap = useTemplateRef<HTMLElement | null>(
-  `wrap${props.classOption["key"]}`,
+  `wrap${props.classOption["key"]}`
-  null
 );
-const slotList = templateRef<HTMLElement | null>(
+const slotList = useTemplateRef<HTMLElement | null>(
-  `slotList${props.classOption["key"]}`,
+  `slotList${props.classOption["key"]}`
-  null
 );
-const realBox = templateRef<HTMLElement | null>(
+const realBox = useTemplateRef<HTMLElement | null>(
-  `realBox${props.classOption["key"]}`,
+  `realBox${props.classOption["key"]}`
-  null
 );
 
 const leftSwitchState = computed(() => {

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

@@ -174,7 +174,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -192,7 +192,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -8,6 +8,10 @@ defineProps({
   noticeItem: {
     type: Object as PropType<ListItem>,
     default: () => {}
+  },
+  isLast: {
+    type: Boolean,
+    default: false
   }
 });
 
@@ -49,7 +53,11 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    :class="[
+      'notice-container',
+      'border-0 border-solid border-[#f0f0f0] dark:border-[#303030]',
+      { 'border-b': !isLast }
+    ]"
   >
     <el-avatar
       v-if="noticeItem.avatar"
@@ -119,8 +127,6 @@ function hoverDescription(event, description) {
   justify-content: space-between;
   padding: 12px 0;
 
-  // border-bottom: 1px solid #f0f0f0;
-
   .notice-container-avatar {
     margin-right: 16px;
     background: #fff;

src/layout/components/lay-notice/components/NoticeList.vue

@@ -18,7 +18,12 @@ defineProps({
 
 <template>
   <div v-if="list.length">
-    <NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
+    <NoticeItem
+      v-for="(item, index) in list"
+      :key="index"
+      :noticeItem="item"
+      :isLast="index === list.length - 1"
+    />
   </div>
   <el-empty v-else :description="transformI18n(emptyText)" />
 </template>

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

@@ -3,9 +3,12 @@ import { useI18n } from "vue-i18n";
 import { ref, computed } from "vue";
 import { noticesData } from "./data";
 import NoticeList from "./components/NoticeList.vue";
+
 import BellIcon from "~icons/lucide/bell";
+import ArrowRightIcon from "~icons/ri/arrow-right-s-line";
 
 const { t } = useI18n();
+const dropdownRef = ref();
 const notices = ref(noticesData);
 const activeKey = ref(noticesData[0]?.key);
 
@@ -13,14 +16,40 @@ const getLabel = computed(
   () => item =>
     t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
 );
+
+const currentNoticeHasData = computed(() => {
+  const currentNotice = notices.value.find(
+    item => item.key === activeKey.value
+  );
+  return currentNotice && currentNotice.list.length > 0;
+});
+
+const hasAnyNoticeData = computed(() => {
+  return notices.value.some(
+    item => Array.isArray(item.list) && item.list.length > 0
+  );
+});
+
+const onWatchMore = () => {
+  dropdownRef.value.handleClose();
+};
+
+const onMarkAsRead = () => {
+  const currentNotice = notices.value.find(
+    item => item.key === activeKey.value
+  );
+  if (currentNotice) {
+    currentNotice.list = [];
+  }
+};
 </script>
 
 <template>
-  <el-dropdown trigger="click" placement="bottom-end">
+  <el-dropdown ref="dropdownRef" trigger="click" placement="bottom-end">
     <span
       :class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']"
     >
-      <el-badge is-dot>
+      <el-badge is-dot :hidden="!hasAnyNoticeData">
         <span class="header-notice-icon">
           <IconifyIconOffline :icon="BellIcon" />
         </span>
@@ -42,7 +71,7 @@ const getLabel = computed(
           <span v-else>
             <template v-for="item in notices" :key="item.key">
               <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
-                <el-scrollbar max-height="330px">
+                <el-scrollbar max-height="345px">
                   <div class="noticeList-container">
                     <NoticeList :list="item.list" :emptyText="item.emptyText" />
                   </div>
@@ -51,6 +80,20 @@ const getLabel = computed(
             </template>
           </span>
         </el-tabs>
+        <div
+          v-if="currentNoticeHasData"
+          class="border-t border-t-(--el-border-color-light) text-sm"
+        >
+          <div class="flex-bc m-1">
+            <el-button type="primary" size="small" text @click="onWatchMore">
+              {{ t("buttons.pureWatchMore") }}
+              <IconifyIconOffline :icon="ArrowRightIcon" />
+            </el-button>
+            <el-button type="primary" size="small" text @click="onMarkAsRead">
+              {{ t("buttons.pureMarkAsRead") }}
+            </el-button>
+          </div>
+        </div>
       </el-dropdown-menu>
     </template>
   </el-dropdown>

src/layout/components/lay-sidebar/NavHorizontal.vue

@@ -159,7 +159,7 @@ onMounted(() => {
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -177,7 +177,7 @@ onMounted(() => {
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/layout/components/lay-sidebar/NavMix.vue

@@ -180,7 +180,7 @@ watch(
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -198,7 +198,7 @@ watch(
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/router/utils.ts

@@ -209,18 +209,26 @@ function initRouter() {
       });
     } else {
       return new Promise(resolve => {
-        getAsyncRoutes().then(({ data }) => {
+        getAsyncRoutes().then(({ code, data }) => {
-          handleAsyncRoutes(cloneDeep(data));
+          if (code === 0) {
-          storageLocal().setItem(key, data);
+            handleAsyncRoutes(cloneDeep(data));
-          resolve(router);
+            storageLocal().setItem(key, data);
+            resolve(router);
+          } else {
+            resolve(router);
+          }
         });
       });
     }
   } else {
     return new Promise(resolve => {
-      getAsyncRoutes().then(({ data }) => {
+      getAsyncRoutes().then(({ code, data }) => {
-        handleAsyncRoutes(cloneDeep(data));
+        if (code === 0) {
-        resolve(router);
+          handleAsyncRoutes(cloneDeep(data));
+          resolve(router);
+        } else {
+          resolve(router);
+        }
       });
     });
   }

src/store/modules/user.ts

@@ -80,8 +80,12 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<UserResult>((resolve, reject) => {
         getLogin(data)
           .then(data => {
-            if (data?.success) setToken(data.data);
+            if (data.code === 0) {
-            resolve(data);
+              setToken(data.data);
+              resolve(data);
+            } else {
+              reject(data.message);
+            }
           })
           .catch(error => {
             reject(error);
@@ -103,9 +107,11 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<RefreshTokenResult>((resolve, reject) => {
         refreshTokenApi(data)
           .then(data => {
-            if (data) {
+            if (data.code === 0) {
               setToken(data.data);
               resolve(data);
+            } else {
+              reject(data.message);
             }
           })
           .catch(error => {

src/style/sidebar.scss

@@ -471,6 +471,11 @@
         color: var(--pure-theme-sub-menu-active-text);
       }
 
+      .globalization-icon {
+        color: var(--pure-theme-sub-menu-active-text);
+        outline: none;
+      }
+
       .el-dropdown-link {
         display: flex;
         align-items: center;

src/style/tailwind.css

@@ -42,7 +42,7 @@
 }
 
 @utility navbar-bg-hover {
-  @apply dark:text-white dark:hover:bg-[#242424]!;
+  @apply select-none dark:text-white dark:hover:bg-[#242424]!;
 }
 
 @utility animate-scale-bounce {

src/utils/http/index.ts

@@ -10,6 +10,8 @@ import type {
   PureHttpRequestConfig
 } from "./types.d";
 import { stringify } from "qs";
+import { message } from "@/utils/message";
+import { $t, transformI18n } from "@/plugins/i18n";
 import { getToken, formatToken } from "@/utils/auth";
 import { useUserStoreHook } from "@/store/modules/user";
 
@@ -90,6 +92,13 @@ class PureHttp {
                         PureHttp.requests.forEach(cb => cb(token));
                         PureHttp.requests = [];
                       })
+                      .catch(_err => {
+                        PureHttp.requests = [];
+                        useUserStoreHook().logOut();
+                        message(transformI18n($t("login.pureLoginExpired")), {
+                          type: "warning"
+                        });
+                      })
                       .finally(() => {
                         PureHttp.isRefreshing = false;
                       });

src/views/able/video-frame/index.vue

@@ -171,7 +171,7 @@ onBeforeUnmount(() => {
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-upload-dragger) {
+:deep(.el-upload-dragger) {
   display: flex;
   align-items: center;
   height: 180px;

src/views/account-settings/components/Profile.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { reactive, ref } from "vue";
 import { formUpload } from "@/api/mock";
 import { message } from "@/utils/message";
+import { onMounted, reactive, ref } from "vue";
 import { type UserInfo, getMine } from "@/api/user";
 import type { FormInstance, FormRules } from "element-plus";
 import ReCropperPreview from "@/components/ReCropperPreview";
@@ -73,8 +73,8 @@ const handleSubmitImage = () => {
     files: new File([cropperBlob.value], "avatar")
   });
   formUpload(formData)
-    .then(({ success, data }) => {
+    .then(({ code }) => {
-      if (success) {
+      if (code === 0) {
         message("更新头像成功", { type: "success" });
         handleClose();
       } else {
@@ -98,8 +98,11 @@ const onSubmit = async (formEl: FormInstance) => {
   });
 };
 
-getMine().then(res => {
+onMounted(async () => {
-  Object.assign(userInfos, res.data);
+  const { code, data } = await getMine();
+  if (code === 0) {
+    Object.assign(userInfos, data);
+  }
 });
 </script>
 

src/views/account-settings/components/SecurityLog.vue

@@ -55,11 +55,13 @@ const columns: TableColumnList = [
 
 async function onSearch() {
   loading.value = true;
-  const { data } = await getMineLogs();
+  const { code, data } = await getMineLogs();
-  dataList.value = data.list;
+  if (code === 0) {
-  pagination.total = data.total;
+    dataList.value = data.list;
-  pagination.pageSize = data.pageSize;
+    pagination.total = data.total;
-  pagination.currentPage = data.currentPage;
+    pagination.pageSize = data.pageSize;
+    pagination.currentPage = data.currentPage;
+  }
 
   setTimeout(() => {
     loading.value = false;

src/views/account-settings/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getMine } from "@/api/user";
 import { useRouter } from "vue-router";
-import { ref, onBeforeMount } from "vue";
 import { ReText } from "@/components/ReText";
 import Profile from "./components/Profile.vue";
+import { ref, onMounted, onBeforeMount } from "vue";
 import Preferences from "./components/Preferences.vue";
 import SecurityLog from "./components/SecurityLog.vue";
 import { useGlobal, deviceDetection } from "@pureadmin/utils";
@@ -61,8 +61,11 @@ const panes = [
 ];
 const witchPane = ref("profile");
 
-getMine().then(res => {
+onMounted(async () => {
-  userInfo.value = res.data;
+  const { code, data } = await getMine();
+  if (code === 0) {
+    userInfo.value = data;
+  }
 });
 </script>
 

src/views/chatai/components/Bard.vue

@@ -56,13 +56,13 @@ onMounted(() => {
     :avatars="{
       default: {
         styles: {
-          position: 'left',
+          position: 'start',
           container: { marginLeft: '12px', marginRight: '5px' }
         }
       },
       ai: {
         src: 'https://xiaoxian521.github.io/hyperlink/img/vue-pure-admin/chatai/gemini.png',
-        styles: { position: 'left', avatar: { paddingTop: '6px' } }
+        styles: { position: 'start', avatar: { paddingTop: '6px' } }
       }
     }"
     :speechToText="{
@@ -80,11 +80,11 @@ onMounted(() => {
           },
           svg: { styles: { default: { bottom: '0.35em', left: '0.35em' } } }
         },
-        position: 'inside-right'
+        position: 'inside-end'
       }
     }"
     :submitButtonStyles="{
-      position: 'outside-right',
+      position: 'outside-end',
       submit: {
         container: {
           default: {

src/views/chatai/components/Bing.vue

@@ -89,7 +89,7 @@ onMounted(() => {
       }
     }"
     :submitButtonStyles="{
-      position: 'outside-right',
+      position: 'outside-end',
       submit: {
         container: {
           default: {

src/views/chatai/components/ChatGPT.vue

@@ -46,7 +46,7 @@ onMounted(() => {
       }
     }"
     :avatars="{
-      default: { styles: { position: 'left' } },
+      default: { styles: { position: 'start' } },
       ai: { src: 'https://xiaoxian521.github.io/hyperlink/svg/openai.svg' }
     }"
     :submitButtonStyles="{

src/views/chatai/components/Speech.vue

@@ -22,7 +22,7 @@ onMounted(() => {
     style="border-radius: 8px"
     :speechToText="{
       webSpeech: { language: 'zh-CN' },
-      button: { position: 'outside-left' }
+      button: { position: 'outside-start' }
     }"
     :textInput="{
       placeholder: { text: '发送消息' }

src/views/components/datetime-picker.vue

@@ -68,7 +68,7 @@ const shortcuts1 = [
 
 const value3 = ref("");
 const datePickerRef = ref();
-const placement = ref("auto");
+const placement = ref("auto") as any;
 const checkTag = ref([
   {
     title: "auto", // https://popper.js.org/docs/v2/constructors/#options

src/views/components/split-pane.vue

@@ -71,17 +71,17 @@ const settingTB: ContextProps = reactive({
 
   .dv-a {
     padding-top: 30vh;
-    color: rgba($color: dodgerblue, $alpha: 80%);
+    color: rgb(30 144 255 / 80%);
   }
 
   .dv-b {
     padding-top: 10vh;
-    color: rgba($color: #000, $alpha: 80%);
+    color: rgb(0 0 0 / 80%);
   }
 
   .dv-c {
     padding-top: 18vh;
-    color: rgba($color: #ce272d, $alpha: 80%);
+    color: rgb(206 39 45 / 80%);
   }
 }
 </style>

src/views/components/upload/form.vue

@@ -23,8 +23,8 @@ const submitForm = formEl => {
         date: validateForm.date // 别的字段
       });
       formUpload(formData)
-        .then(({ success }) => {
+        .then(({ code }) => {
-          if (success) {
+          if (code === 0) {
             message("提交成功", { type: "success" });
           } else {
             message("提交失败");

src/views/components/upload/index.vue

@@ -143,7 +143,7 @@ const onDownload = () => {
       class="pure-upload"
       list-type="picture-card"
       accept="image/jpeg,image/png,image/gif"
-      action="https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b"
+      action="https://pureadmin.free.beeceptor.com/images"
       :limit="3"
       :headers="{ Authorization: 'eyJhbGciOiJIUzUxMiJ9.admin' }"
       :on-exceed="onExceed"
@@ -264,13 +264,13 @@ const onDownload = () => {
         表格操作栏中的上传头像功能
       </p>
       <p class="text-[red] text-[12px] flex flex-auto items-center justify-end">
-        免责声明：上传接口使用免费开源的
+        免责声明：上传接口使用
         <el-link
-          href="https://designer.mocky.io/"
+          href="https://beeceptor.com/"
           target="_blank"
           style="font-size: 16px; font-weight: 800"
         >
-          &nbsp;Mocky&nbsp;
+          &nbsp;Beeceptor&nbsp;
         </el-link>
         <span class="font-bold text-[18x]"> 请不要上传重要信息 </span
         >，如果造成任何损失，我们概不负责

src/views/list/card/index.vue

@@ -38,12 +38,14 @@ const dataLoading = ref(true);
 
 const getCardListData = async () => {
   try {
-    const { data } = await getCardList();
+    const { code, data } = await getCardList();
-    productList.value = data.list;
+    if (code === 0) {
-    pagination.value = {
+      productList.value = data.list;
-      ...pagination.value,
+      pagination.value = {
-      total: data.list.length
+        ...pagination.value,
-    };
+        total: data.list.length
+      };
+    }
   } catch (e) {
     console.log(e);
   } finally {

src/views/login/index.vue

@@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => {
           username: ruleForm.username,
           password: ruleForm.password
         })
-        .then(res => {
+        .then(async () => {
-          if (res.success) {
+          // 获取后端路由
-            // 获取后端路由
+          await initRouter();
-            return initRouter().then(() => {
+          disabled.value = true;
-              disabled.value = true;
+          router.push(getTopMenu(true).path).then(() => {
-              router
+            message(t("login.pureLoginSuccess"), { type: "success" });
-                .push(getTopMenu(true).path)
+          });
-                .then(() => {
-                  message(t("login.pureLoginSuccess"), { type: "success" });
-                })
-                .finally(() => (disabled.value = false));
-            });
-          } else {
-            message(t("login.pureLoginFail"), { type: "error" });
-          }
         })
-        .finally(() => (loading.value = false));
+        .catch(_err => {
+          message(t("login.pureLoginFail"), { type: "error" });
+        })
+        .finally(() => {
+          disabled.value = false;
+          loading.value = false;
+        });
     }
   });
 };
@@ -370,7 +368,7 @@ watch(loginDay, value => {
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 

src/views/monitor/logs/login/hook.tsx

@@ -129,11 +129,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getLoginLogsList(toRaw(form));
+    const { code, data } = await getLoginLogsList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/logs/operation/hook.tsx

@@ -134,11 +134,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getOperationLogsList(toRaw(form));
+    const { code, data } = await getOperationLogsList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/logs/system/hook.tsx

@@ -204,11 +204,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getSystemLogsList(toRaw(form));
+    const { code, data } = await getSystemLogsList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/online/hook.tsx

@@ -80,11 +80,13 @@ export function useRole() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getOnlineLogsList(toRaw(form));
+    const { code, data } = await getOnlineLogsList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/permission/page/index.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { message } from "@/utils/message";
 import { initRouter } from "@/router/utils";
 import { storageLocal } from "@pureadmin/utils";
 import { type CSSProperties, ref, computed } from "vue";
@@ -32,12 +33,13 @@ const options = [
 function onChange() {
   useUserStoreHook()
     .loginByUsername({ username: username.value, password: "admin123" })
-    .then(res => {
+    .then(() => {
-      if (res.success) {
+      storageLocal().removeItem("async-routes");
-        storageLocal().removeItem("async-routes");
+      usePermissionStoreHook().clearAllCachePage();
-        usePermissionStoreHook().clearAllCachePage();
+      initRouter();
-        initRouter();
+    })
-      }
+    .catch(err => {
+      message(err, { type: "error" });
     });
 }
 </script>

src/views/system/dept/utils/hook.tsx

@@ -74,17 +74,20 @@ export function useDept() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    const { code, data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
-    let newData = data;
+    if (code === 0) {
-    if (!isAllEmpty(form.name)) {
+      let newData = data;
-      // 前端搜索部门名称
+      if (!isAllEmpty(form.name)) {
-      newData = newData.filter(item => item.name.includes(form.name));
+        // 前端搜索部门名称
+        newData = newData.filter(item => item.name.includes(form.name));
+      }
+      if (!isAllEmpty(form.status)) {
+        // 前端搜索状态
+        newData = newData.filter(item => item.status === form.status);
+      }
+      dataList.value = handleTree(newData); // 处理成树结构
     }
-    if (!isAllEmpty(form.status)) {
+
-      // 前端搜索状态
-      newData = newData.filter(item => item.status === form.status);
-    }
-    dataList.value = handleTree(newData); // 处理成树结构
     setTimeout(() => {
       loading.value = false;
     }, 500);

src/views/system/menu/utils/hook.tsx

@@ -106,15 +106,18 @@ export function useMenu() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    const { code, data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
-    let newData = data;
+    if (code === 0) {
-    if (!isAllEmpty(form.title)) {
+      let newData = data;
-      // 前端搜索菜单名称
+      if (!isAllEmpty(form.title)) {
-      newData = newData.filter(item =>
+        // 前端搜索菜单名称
-        transformI18n(item.title).includes(form.title)
+        newData = newData.filter(item =>
-      );
+          transformI18n(item.title).includes(form.title)
+        );
+      }
+      dataList.value = handleTree(newData); // 处理成树结构
     }
-    dataList.value = handleTree(newData); // 处理成树结构
+
     setTimeout(() => {
       loading.value = false;
     }, 500);

src/views/system/role/utils/hook.tsx

@@ -163,11 +163,13 @@ export function useRole(treeRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getRoleList(toRaw(form));
+    const { code, data } = await getRoleList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;
@@ -229,8 +231,10 @@ export function useRole(treeRef: Ref) {
     if (id) {
       curRow.value = row;
       isShow.value = true;
-      const { data } = await getRoleMenuIds({ id });
+      const { code, data } = await getRoleMenuIds({ id });
-      treeRef.value.setCheckedKeys(data);
+      if (code === 0) {
+        treeRef.value.setCheckedKeys(data);
+      }
     } else {
       curRow.value = null;
       isShow.value = false;
@@ -268,9 +272,11 @@ export function useRole(treeRef: Ref) {
 
   onMounted(async () => {
     onSearch();
-    const { data } = await getRoleMenu();
+    const { code, data } = await getRoleMenu();
-    treeIds.value = getKeyList(data, "id");
+    if (code === 0) {
-    treeData.value = handleTree(data);
+      treeIds.value = getKeyList(data, "id");
+      treeData.value = handleTree(data);
+    }
   });
 
   watch(isExpandAll, val => {

src/views/system/user/utils/hook.tsx

@@ -272,11 +272,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getUserList(toRaw(form));
+    const { code, data } = await getUserList(toRaw(form));
-    dataList.value = data.list;
+    if (code === 0) {
-    pagination.total = data.total;
+      dataList.value = data.list;
-    pagination.pageSize = data.pageSize;
+      pagination.total = data.total;
-    pagination.currentPage = data.currentPage;
+      pagination.pageSize = data.pageSize;
+      pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;
@@ -497,13 +499,16 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
     onSearch();
 
     // 归属部门
-    const { data } = await getDeptList();
+    const { code, data } = await getDeptList();
-    higherDeptOptions.value = handleTree(data);
+    if (code === 0) {
-    treeData.value = handleTree(data);
+      higherDeptOptions.value = handleTree(data);
+      treeData.value = handleTree(data);
+    }
+
     treeLoading.value = false;
 
     // 角色列表
-    roleOptions.value = (await getAllRoleList()).data;
+    roleOptions.value = (await getAllRoleList()).data ?? [];
   });
 
   return {

src/views/table/high/echarts/columns.tsx

@@ -1,7 +1,6 @@
-import { ref, computed } from "vue";
 import { tableDataDrag } from "../data";
 import { message } from "@/utils/message";
-import { templateRef } from "@vueuse/core";
+import { ref, computed, useTemplateRef } from "vue";
 import { clone, useDark, useECharts } from "@pureadmin/utils";
 
 export function useColumns() {
@@ -31,7 +30,7 @@ export function useColumns() {
   const theme = computed(() => (isDark.value ? "dark" : "light"));
 
   dataList.value.forEach((_, i) => {
-    const { setOptions } = useECharts(templateRef(`PieChartRef${i}`), {
+    const { setOptions } = useECharts(useTemplateRef(`PieChartRef${i}`), {
       theme
     });
 

src/views/tabs/index.vue

@@ -4,6 +4,7 @@ import {
   getNodeByUniqueId,
   appendFieldByUniqueId
 } from "@/utils/tree";
+import { useI18n } from "vue-i18n";
 import { useDetail } from "./hooks";
 import { ref, computed } from "vue";
 import { clone } from "@pureadmin/utils";
@@ -15,6 +16,7 @@ defineOptions({
   name: "Tabs"
 });
 
+const { locale } = useI18n();
 const { toDetail, router } = useDetail();
 const menusTree = clone(usePermissionStoreHook().wholeMenus, true);
 
@@ -30,6 +32,12 @@ const multiTags = computed(() => {
   return useMultiTagsStoreHook()?.multiTags;
 });
 
+const treeSelectProps = {
+  label: (data: any) => transformI18n(data.meta.title),
+  children: "children",
+  disabled: "disabled"
+};
+
 function onCloseTags() {
   if (currentValues.value.length === 0) return;
   currentValues.value.forEach(uniqueId => {
@@ -92,6 +100,7 @@ function onCloseTags() {
 
     <el-divider />
     <el-tree-select
+      :key="locale"
       v-model="currentValues"
       class="w-[300px]!"
       node-key="uniqueId"
@@ -100,11 +109,7 @@ function onCloseTags() {
       multiple
       filterable
       default-expand-all
-      :props="{
+      :props="treeSelectProps"
-        label: data => transformI18n(data.meta.title),
-        children: 'children',
-        disabled: 'disabled'
-      }"
       :data="treeData"
     >
       <template #default="{ data }">

src/views/vue-flow/layouting/animationEdge.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, nextTick, ref, toRef, watch } from "vue";
-import { TransitionPresets, executeTransition } from "@vueuse/core";
+import { TransitionPresets, transition } from "@vueuse/core";
 import {
   Position,
   BaseEdge,
@@ -153,7 +153,7 @@ async function runAnimation() {
     currentLength.value = totalLength;
   }
 
-  await executeTransition(edgePoint, from, totalLength, {
+  await transition(edgePoint, from, totalLength, {
     transition: TransitionPresets.easeInOutCubic,
     duration: Math.max(1500, totalLength / 2),
     abort: () => !isAnimating.value

src/views/welcome/index.vue

@@ -185,11 +185,13 @@ const optionsBasis: Array<OptionsType> = [
           }
         }"
       >
-        <el-card shadow="never" class="h-[580px]">
+        <el-card shadow="never">
           <div class="flex justify-between">
             <span class="text-md font-medium">数据统计</span>
           </div>
-          <WelcomeTable class="mt-3" />
+          <el-scrollbar max-height="504" class="mt-3">
+            <WelcomeTable />
+          </el-scrollbar>
         </el-card>
       </re-col>
 
@@ -271,6 +273,10 @@ const optionsBasis: Array<OptionsType> = [
   }
 }
 
+:deep(.el-timeline.is-start) {
+  padding-left: 0;
+}
+
 .main-content {
   margin: 20px 20px 0 !important;
 }