!246 发布 5.5.1-2.5.1 日常依赖升级bug修复

Merge pull request !246 from 疯狂的狮子Li/dev
!241 发布 5.5.0-2.5.0 喜迎国庆
2026-03-10 11:50:22 +00:00 · 2025-10-28 03:22:49 +00:00 · 2025-09-22 03:18:41 +00:00 · 2025-07-01 01:13:49 +00:00 · 2025-05-29 03:18:30 +00:00
29 changed files with 119 additions and 632 deletions
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -17,8 +17,6 @@
    "MaybeRefOrGetter": true,
    "PropType": true,
    "Ref": true,
-    "Slot": true,
-    "Slots": true,
    "VNode": true,
    "WritableComputedRef": true,
    "acceptHMRUpdate": true,
@@ -37,7 +35,6 @@
    "createInjectionState": true,
    "createPinia": true,
    "createReactiveFn": true,
-    "createRef": true,
    "createReusableTemplate": true,
    "createSharedComposable": true,
    "createTemplatePromise": true,
@@ -280,7 +277,6 @@
    "useThrottleFn": true,
    "useThrottledRefHistory": true,
    "useTimeAgo": true,
-    "useTimeAgoIntl": true,
    "useTimeout": true,
    "useTimeoutFn": true,
    "useTimeoutPoll": true,
@@ -319,6 +315,9 @@
    "watchThrottled": true,
    "watchTriggerable": true,
    "watchWithFilter": true,
-    "whenever": true
+    "whenever": true,
+    "Slot": true,
+    "Slots": true,
+    "createRef": true
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package",
  "name": "ruoyi-vue-plus",
-  "version": "5.5.3-2.5.3",
+  "version": "5.5.1-2.5.1",
  "description": "RuoYi-Vue-Plus多租户管理系统",
  "author": "LionLi",
  "license": "MIT",
@@ -20,72 +20,72 @@
    "url": "https://gitee.com/JavaLionLi/plus-ui.git"
  },
  "dependencies": {
-    "@element-plus/icons-vue": "2.3.2",
-    "@highlightjs/vue-plugin": "2.1.2",
+    "@element-plus/icons-vue": "2.3.1",
+    "@highlightjs/vue-plugin": "2.1.0",
    "@vueup/vue-quill": "1.2.0",
-    "@vueuse/core": "13.9.0",
+    "@vueuse/core": "13.1.0",
    "animate.css": "4.1.1",
    "await-to-js": "3.0.0",
-    "axios": "1.13.1",
+    "axios": "1.8.4",
    "crypto-js": "4.2.0",
    "echarts": "5.6.0",
-    "element-plus": "2.11.7",
+    "element-plus": "2.9.8",
    "file-saver": "2.0.5",
-    "highlight.js": "11.11.1",
+    "highlight.js": "11.9.0",
    "image-conversion": "2.1.1",
    "js-cookie": "3.0.5",
-    "jsencrypt": "3.5.4",
+    "jsencrypt": "3.3.2",
    "nprogress": "0.2.0",
-    "pinia": "3.0.3",
+    "pinia": "3.0.2",
    "screenfull": "6.0.2",
-    "vue": "3.5.22",
-    "vue-cropper": "1.1.4",
-    "vue-i18n": "11.1.12",
-    "vue-json-pretty": "2.6.0",
-    "vue-router": "4.6.3",
+    "vue": "3.5.13",
+    "vue-cropper": "1.1.1",
+    "vue-i18n": "11.1.3",
+    "vue-json-pretty": "2.4.0",
+    "vue-router": "4.5.0",
    "vue-types": "6.0.0",
-    "vxe-table": "4.17.7"
+    "vxe-table": "4.13.7"
  },
  "devDependencies": {
-    "@iconify/json": "^2.2.403",
+    "@iconify/json": "^2.2.276",
    "@types/crypto-js": "4.2.2",
    "@types/file-saver": "2.0.7",
    "@types/js-cookie": "3.0.6",
-    "@types/node": "^22.19.0",
+    "@types/node": "^22.13.4",
    "@types/nprogress": "0.2.3",
-    "@unocss/preset-attributify": "66.5.4",
-    "@unocss/preset-icons": "66.5.4",
-    "@unocss/preset-uno": "66.5.4",
-    "@vitejs/plugin-vue": "5.2.4",
-    "@vue/compiler-sfc": "3.5.22",
+    "@unocss/preset-attributify": "66.5.2",
+    "@unocss/preset-icons": "66.5.2",
+    "@unocss/preset-uno": "66.5.2",
+    "@vitejs/plugin-vue": "5.2.3",
+    "@vue/compiler-sfc": "3.5.13",
    "@vue/eslint-config-prettier": "10.2.0",
-    "@vue/eslint-config-typescript": "14.6.0",
-    "autoprefixer": "10.4.21",
-    "eslint": "9.39.1",
-    "eslint-plugin-prettier": "5.5.4",
-    "eslint-plugin-vue": "9.33.0",
-    "globals": "16.5.0",
-    "prettier": "3.6.2",
-    "sass": "1.93.3",
-    "typescript": "~5.9.3",
-    "unocss": "66.5.4",
-    "unplugin-auto-import": "19.3.0",
-    "unplugin-icons": "22.5.0",
-    "unplugin-vue-components": "28.8.0",
+    "@vue/eslint-config-typescript": "14.4.0",
+    "autoprefixer": "10.4.20",
+    "eslint": "9.21.0",
+    "eslint-plugin-prettier": "5.2.3",
+    "eslint-plugin-vue": "9.32.0",
+    "globals": "16.0.0",
+    "prettier": "3.5.2",
+    "sass": "1.87.0",
+    "typescript": "~5.8.3",
+    "unocss": "66.5.2",
+    "unplugin-auto-import": "19.1.2",
+    "unplugin-icons": "22.1.0",
+    "unplugin-vue-components": "28.5.0",
    "unplugin-vue-setup-extend-plus": "1.0.1",
-    "vite": "6.4.1",
+    "vite": "6.3.2",
    "vite-plugin-compression": "0.5.1",
-    "vite-plugin-svg-icons-ng": "^1.5.2",
-    "vite-plugin-vue-devtools": "8.0.3",
-    "vitest": "3.2.4",
-    "vue-tsc": "^2.2.12"
+    "vite-plugin-svg-icons-ng": "^1.4.0",
+    "vite-plugin-vue-devtools": "7.7.5",
+    "vitest": "3.1.2",
+    "vue-tsc": "^2.2.8"
  },
  "overrides": {
-    "quill": "1.3.7"
+    "quill": "2.0.2"
  },
  "engines": {
-    "node": ">=20.15.0",
-    "npm": ">=8.19.0"
+    "node": ">=18.18.0",
+    "npm": ">=8.9.0"
  },
  "browserslist": [
    "Chrome >= 87",
--- a/src/api/system/social/auth.ts
+++ b/src/api/system/social/auth.ts
@@ -1,7 +1,7 @@
 import request from '@/utils/request';

-// 获取跳转URL
-export function authRouterUrl(source: string, tenantId: string) {
+// 绑定账号
+export function authBinding(source: string, tenantId: string) {
  return request({
    url: '/auth/binding/' + source,
    method: 'get',
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -43,7 +43,7 @@ export interface ButtonList {
 }
 export interface FlowCopyVo {
  userId: string | number;
-  nickName: string;
+  userName: string;
 }

 export interface TaskOperationBo {
@@ -53,8 +53,6 @@ export interface TaskOperationBo {
  userIds?: string[];
  //任务ID（必填）
  taskId: string | number;
-  //消息类型
-  messageType?: string[];
  //意见或备注信息（可选）
  message?: string;
 }
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -282,9 +282,3 @@ h6 {
 .top-right-btn {
  margin-left: auto;
 }
-
-/* horizontal el menu */
-.el-menu--horizontal .el-menu-item .svg-icon + span,
-.el-menu--horizontal .el-sub-menu__title .svg-icon + span {
-  margin-left: 3px;
-}
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <template v-for="(item, index) in options">
-      <template v-if="isValueMatch(item.value)">
+      <template v-if="values.includes(item.value)">
        <span
          v-if="(item.elTagType === 'default' || item.elTagType === '') && (item.elTagClass === '' || item.elTagClass == null)"
          :key="item.value"
@@ -50,7 +50,6 @@ const props = withDefaults(defineProps<Props>(), {

 const values = computed(() => {
  if (props.value === '' || props.value === null || typeof props.value === 'undefined') return [];
-  if (typeof props.value === 'number' || typeof props.value === 'boolean') return [props.value]
  return Array.isArray(props.value) ? props.value.map((item) => '' + item) : String(props.value).split(props.separator);
 });

@@ -59,7 +58,7 @@ const unmatch = computed(() => {
  // 传入值为非数组
  let unmatch = false; // 添加一个标志来判断是否有未匹配项
  values.value.forEach((item) => {
-    if (!props.options.some((v) => v.value == item)) {
+    if (!props.options.some((v) => v.value === item)) {
      unmatch = true; // 如果有未匹配项，将标志设置为true
    }
  });
@@ -86,10 +85,6 @@ const handleArray = (array: Array<string | number>) => {
    return pre + ' ' + cur;
  });
 };
-
-const isValueMatch = (itemValue: any) => {
-  return values.value.some(val => val == itemValue)
-}
 </script>

 <style lang="scss" scoped>
--- a/src/components/Process/processMeddle.vue
+++ b/src/components/Process/processMeddle.vue
@@ -113,8 +113,7 @@ const handleTransferTask = async (data) => {
    const taskOperationBo = reactive<TaskOperationBo>({
      userId: data[0].userId,
      taskId: task.value.id,
-      message: '',
-      messageType: ['1']
+      message: ''
    });
    await proxy?.$modal.confirm('是否确认提交？');
    loading.value = true;
@@ -140,8 +139,7 @@ const addMultiInstanceUser = async (data) => {
    const taskOperationBo = reactive<TaskOperationBo>({
      userIds: data.map((e) => e.userId),
      taskId: task.value.id,
-      message: '',
-      messageType: ['1']
+      message: ''
    });
    await proxy?.$modal.confirm('是否确认提交？');
    loading.value = true;
@@ -165,8 +163,7 @@ const deleteMultiInstanceUser = async (row) => {
  const taskOperationBo = reactive<TaskOperationBo>({
    userIds: [row.userId],
    taskId: task.value.id,
-    message: '',
-    messageType: ['1']
+    message: ''
  });
  await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
    loading.value = false;
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -8,13 +8,13 @@
          <el-checkbox value="3" name="type">短信</el-checkbox>
        </el-checkbox-group>
      </el-form-item>
-      <el-form-item label="附件" v-if="buttonObj.file">
+      <el-form-item label="附件">
        <fileUpload v-model="form.fileId" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf']" :file-size="20" />
      </el-form-item>
      <el-form-item label="抄送" v-if="buttonObj.copy">
        <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
        <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
-          {{ user.nickName }}
+          {{ user.userName }}
        </el-tag>
      </el-form-item>
      <el-form-item v-if="buttonObj.pop && nestNodeList && nestNodeList.length > 0" label="下一步审批人" prop="assigneeMap">
@@ -80,13 +80,7 @@
    <!-- 加签组件 -->
    <UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
    <!-- 弹窗选人 -->
-    <UserSelect
-      ref="porUserRef"
-      :data="form.assigneeMap[nodeCode]"
-      :multiple="true"
-      :userIds="popUserIds"
-      @confirm-call-back="handlePopUser"
-    ></UserSelect>
+    <UserSelect ref="porUserRef" :data="form.assigneeMap[nodeCode]" :multiple="true" :userIds="popUserIds" @confirm-call-back="handlePopUser"></UserSelect>

    <!-- 驳回开始 -->
    <el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
@@ -271,7 +265,7 @@ const openDialog = async (id?: string) => {
  selectCopyUserList.value = task.value.copyList;
  selectCopyUserIds.value = task.value.copyList.map((e) => e.userId).join(',');
  varNodeList.value = task.value.varList;
-  console.log('varNodeList', varNodeList.value);
+  console.log('varNodeList', varNodeList.value)
  buttonDisabled.value = false;
  try {
    const data = {
@@ -316,7 +310,7 @@ const handleCompleteTask = async () => {
    selectCopyUserList.value.forEach((e) => {
      const copyUser = {
        userId: e.userId,
-        nickName: e.nickName
+        userName: e.userName
      };
      flowCopyList.push(copyUser);
    });
@@ -403,8 +397,7 @@ const addMultiInstanceUser = async (data) => {
    const taskOperationBo = reactive<TaskOperationBo>({
      userIds: data.map((e) => e.userId),
      taskId: taskId.value,
-      message: form.value.message,
-      messageType: ['1']
+      message: form.value.message
    });
    await proxy?.$modal.confirm('是否确认提交？');
    loading.value = true;
@@ -428,8 +421,7 @@ const deleteMultiInstanceUser = async (row) => {
  const taskOperationBo = reactive<TaskOperationBo>({
    userIds: [row.userId],
    taskId: taskId.value,
-    message: form.value.message,
-    messageType: ['1']
+    message: form.value.message
  });
  await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
    loading.value = false;
@@ -449,8 +441,7 @@ const handleTransferTask = async (data) => {
    const taskOperationBo = reactive<TaskOperationBo>({
      userId: data[0].userId,
      taskId: taskId.value,
-      message: form.value.message,
-      messageType: ['1']
+      message: form.value.message
    });
    await proxy?.$modal.confirm('是否确认提交？');
    loading.value = true;
@@ -477,8 +468,7 @@ const handleDelegateTask = async (data) => {
    const taskOperationBo = reactive<TaskOperationBo>({
      userId: data[0].userId,
      taskId: taskId.value,
-      message: form.value.message,
-      messageType: ['1']
+      message: form.value.message
    });
    await proxy?.$modal.confirm('是否确认提交？');
    loading.value = true;
--- a/src/enums/NavTypeEnum.ts
+++ b/src/enums/NavTypeEnum.ts
@@ -1,17 +0,0 @@
-/**
- * 导航栏布局枚举
- */
-export enum NavTypeEnum {
-  /**
-   * 左侧导航
-   */
-  LEFT = 'left',
-  /**
-   * 顶部导航
-   */
-  TOP = 'top',
-  /**
-   * 混合导航
-   */
-  MIX = 'mix'
-}
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,14 +1,9 @@
 <template>
-  <div class="navbar" :class="'nav' + navType">
+  <div class="navbar">
    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggle-click="toggleSideBar" />
+    <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />

-    <breadcrumb v-if="navType == NavTypeEnum.LEFT" id="breadcrumb-container" class="breadcrumb-container" />
-    <top-nav v-if="navType == NavTypeEnum.MIX" id="topmenu-container" class="topmenu-container" />
-
-    <template v-if="navType == NavTypeEnum.TOP">
-      <logo v-show="showLogo" :collapse="false"></logo>
-      <top-bar id="topbar-container" class="topbar-container" />
-    </template>
    <div class="right-menu flex align-center">
      <template v-if="appStore.device !== 'mobile'">
        <el-select
@@ -104,9 +99,6 @@ import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
 import router from '@/router';
 import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';
-import Logo from "@/layout/components/Sidebar/Logo.vue";
-import TopBar from './TopBar'

 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -117,9 +109,6 @@ const newNotice = ref(<number>0);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

 const userId = ref(userStore.userId);
-const navType = computed(() => settingsStore.navType);
-const showLogo = computed(() => settingsStore.sidebarLogo);
-
 const companyName = ref(undefined);
 const tenantList = ref<TenantVO[]>([]);
 // 是否切换了租户
@@ -212,12 +201,6 @@ watch(
 </script>

 <style lang="scss" scoped>
-.navbar.navtop {
-  .hamburger-container {
-    display: none !important;
-  }
-}
-
 :deep(.el-select .el-input__wrapper) {
  height: 30px;
 }
@@ -240,22 +223,14 @@ watch(
  position: relative;
  //background: #fff;
  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-  display: flex;
-  align-items: center;
-  // padding: 0 8px;
-  box-sizing: border-box;

  .hamburger-container {
    line-height: 46px;
    height: 100%;
-    //float: left;
+    float: left;
    cursor: pointer;
    transition: background 0.3s;
    -webkit-tap-highlight-color: transparent;
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    margin-right: 8px;

    &:hover {
      background: rgba(0, 0, 0, 0.025);
@@ -263,8 +238,7 @@ watch(
  }

  .breadcrumb-container {
-    //float: left;
-    flex-shrink: 0;
+    float: left;
  }

  .topmenu-container {
@@ -272,28 +246,16 @@ watch(
    left: 50px;
  }

-  .topbar-container {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    align-items: center;
-    overflow: hidden;
-    margin-left: 8px;
-  }
-
-
  .errLog-container {
    display: inline-block;
    vertical-align: top;
  }

  .right-menu {
-    //float: right;
+    float: right;
    height: 100%;
    line-height: 50px;
    display: flex;
-    align-items: center;
-    margin-left: auto;

    &:focus {
      outline: none;
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,40 +1,5 @@
 <template>
  <el-drawer v-model="showSettings" :with-header="false" direction="rtl" size="300px" close-on-click-modal>
-    <h3 class="drawer-title">菜单导航设置</h3>
-    <div class="nav-wrap">
-      <el-tooltip content="左侧菜单" placement="bottom">
-        <div
-          class="item left"
-          @click="handleNavType(NavTypeEnum.LEFT)"
-          :style="{ '--theme': theme }"
-          :class="{ activeItem: navType == NavTypeEnum.LEFT }"
-        >
-          <b></b><b></b>
-        </div>
-      </el-tooltip>
-
-      <el-tooltip content="混合菜单" placement="bottom">
-        <div
-          class="item mix"
-          @click="handleNavType(NavTypeEnum.MIX)"
-          :style="{ '--theme': theme }"
-          :class="{ activeItem: navType == NavTypeEnum.MIX }"
-        >
-          <b></b><b></b>
-        </div>
-      </el-tooltip>
-      <el-tooltip content="顶部菜单" placement="bottom">
-        <div
-          class="item top"
-          @click="handleNavType(NavTypeEnum.TOP)"
-          :style="{ '--theme': theme }"
-          :class="{ activeItem: navType == NavTypeEnum.TOP }"
-        >
-          <b></b><b></b>
-        </div>
-      </el-tooltip>
-    </div>
-
    <h3 class="drawer-title">主题风格设置</h3>

    <div class="setting-drawer-block-checbox">
@@ -80,6 +45,13 @@

    <h3 class="drawer-title">系统布局配置</h3>

+    <div class="drawer-item">
+      <span>开启 TopNav</span>
+      <span class="comp-style">
+        <el-switch v-model="settingsStore.topNav" class="drawer-switch" @change="topNavChange" />
+      </span>
+    </div>
+
    <div class="drawer-item">
      <span>开启 Tags-Views</span>
      <span class="comp-style">
@@ -129,7 +101,6 @@ import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
 import { handleThemeStyle } from '@/utils/theme';
 import { SideThemeEnum } from '@/enums/SideThemeEnum';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import defaultSettings from '@/settings';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -142,7 +113,7 @@ const theme = ref(settingsStore.theme);
 const sideTheme = ref(settingsStore.sideTheme);
 const storeSettings = computed(() => settingsStore);
 const predefineColors = ref(['#409EFF', '#ff4500', '#ff8c00', '#ffd700', '#90ee90', '#00ced1', '#1e90ff', '#c71585']);
-const navType = ref(settingsStore.navType);
+
 // 是否暗黑模式
 const isDark = useDark({
  storageKey: 'useDarkKey',
@@ -159,26 +130,11 @@ watch(isDark, () => {
 });
 const toggleDark = () => useToggle(isDark);

-/** 菜单导航设置 */
-watch(
-  () => navType,
-  (val: string) => {
-    if (val.value === NavTypeEnum.TOP) {
-      appStore.toggleSideBarHide(true);
-      permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any);
-    } else if (val.value === NavTypeEnum.LEFT) {
-      appStore.toggleSideBarHide(false);
-      permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any);
-    } else if (val.value === NavTypeEnum.MIX) {
-      appStore.toggleSideBarHide(false);
-    }
-  },
-  { immediate: true, deep: true }
-);
-
-const handleNavType = (val: NavTypeEnum) => {
-  settingsStore.navType = val;
-  navType.value = val;
+const topNavChange = (val: any) => {
+  if (!val) {
+    appStore.toggleSideBarHide(false);
+    permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any);
+  }
 };

 const dynamicTitleChange = () => {
@@ -202,6 +158,7 @@ const handleTheme = (val: string) => {
 const saveSetting = () => {
  proxy?.$modal.loading('正在保存到本地，请稍候...');
  const settings = useStorage<LayoutSetting>('layout-setting', defaultSettings);
+  settings.value.topNav = storeSettings.value.topNav;
  settings.value.tagsView = storeSettings.value.tagsView;
  settings.value.tagsIcon = storeSettings.value.tagsIcon;
  settings.value.fixedHeader = storeSettings.value.fixedHeader;
@@ -209,7 +166,6 @@ const saveSetting = () => {
  settings.value.dynamicTitle = storeSettings.value.dynamicTitle;
  settings.value.sideTheme = storeSettings.value.sideTheme;
  settings.value.theme = storeSettings.value.theme;
-  settings.value.navType = storeSettings.value.navType;
  setTimeout(() => {
    proxy?.$modal.closeLoading();
  }, 1000);
@@ -287,67 +243,4 @@ defineExpose({
    margin: -3px 8px 0px 0px;
  }
 }
-
-// 导航模式
-.nav-wrap {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin-top: 10px;
-  margin-bottom: 20px;
-
-  .activeItem {
-    border: 2px solid #{'var(--theme)'} !important;
-  }
-
-  .item {
-    position: relative;
-    margin-right: 16px;
-    cursor: pointer;
-    width: 56px;
-    height: 48px;
-    border-radius: 4px;
-    background: #f0f2f5;
-    border: 2px solid transparent;
-  }
-
-  .left {
-    b:first-child {
-      display: block;
-      height: 30%;
-      background: #fff;
-    }
-    b:last-child {
-      width: 30%;
-      background: #1b2a47;
-      position: absolute;
-      height: 100%;
-      top: 0;
-      border-radius: 4px 0 0 4px;
-    }
-  }
-  .mix {
-    b:first-child {
-      border-radius: 4px 4px 0 0;
-      display: block;
-      height: 30%;
-      background: #1b2a47;
-    }
-    b:last-child {
-      width: 30%;
-      background: #1b2a47;
-      position: absolute;
-      height: 70%;
-      border-radius: 0 0 0 4px;
-    }
-  }
-  .top {
-    b:first-child {
-      display: block;
-      height: 30%;
-      background: #1b2a47;
-      border-radius: 4px 4px 0 0;
-    }
-  }
-}
 </style>
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,17 +2,18 @@
  <div
    class="sidebar-logo-container"
    :class="{ collapse: collapse }"
+    :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"
  >
    <transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title">
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
          {{ title }}
        </h1>
      </router-link>
      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title">
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
          {{ title }}
        </h1>
      </router-link>
@@ -25,7 +26,6 @@ import variables from '@/assets/styles/variables.module.scss';
 import logo from '@/assets/logo/logo.png';
 import { useSettingsStore } from '@/store/modules/settings';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-import { NavTypeEnum } from '@/enums/NavTypeEnum';

 defineProps({
  collapse: {
@@ -37,28 +37,6 @@ defineProps({
 const title = import.meta.env.VITE_APP_LOGO_TITLE;
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
-
-// 获取Logo背景色
-const getLogoBackground = computed(() => {
-  if (settingsStore.isDark) {
-    return 'var(--sidebar-bg)'
-  }
-  if (settingsStore.navType == NavTypeEnum.TOP) {
-    return variables.menuLightBackground
-  }
-  return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBackground
-})
-
-// 获取Logo文字颜色
-const getLogoTextColor = computed(() => {
-  if (settingsStore.isDark) {
-    return 'var(--sidebar-text)'
-  }
-  if (settingsStore.navType == NavTypeEnum.TOP) {
-    return variables.logoLightTitleColor
-  }
-  return sideTheme.value === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor
-})
 </script>

 <style lang="scss" scoped>
@@ -73,9 +51,10 @@ const getLogoTextColor = computed(() => {

 .sidebar-logo-container {
  position: relative;
+  width: 100%;
  height: 50px;
  line-height: 50px;
-  background: v-bind(getLogoBackground);
+  background: #2b2f3a;
  text-align: center;
  overflow: hidden;

@@ -88,17 +67,21 @@ const getLogoTextColor = computed(() => {
      height: 32px;
      vertical-align: middle;
      margin-right: 12px;
-      margin-left: 12px;
    }

    & .sidebar-title {
      display: inline-block;
      margin: 0;
-      color: v-bind(getLogoTextColor);
+      color: #fff;
      font-weight: 600;
      line-height: 50px;
      font-size: 14px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+      font-family:
+        Avenir,
+        Helvetica Neue,
+        Arial,
+        Helvetica,
+        sans-serif;
      vertical-align: middle;
    }
  }
--- a/src/layout/components/TopBar/index.vue
+++ b/src/layout/components/TopBar/index.vue
@@ -1,103 +0,0 @@
-<template>
-  <el-menu class="topbar-menu" :ellipsis="false" :default-active="activeMenu" :active-text-color="theme" mode="horizontal">
-    <sidebar-item :key="route.path + index" v-for="(route, index) in topMenus" :item="route" :base-path="route.path" />
-
-    <el-sub-menu index="more" class="el-sub-menu__hide-arrow" v-if="moreRoutes.length > 0">
-      <template #title>
-        <span>更多菜单</span>
-      </template>
-      <sidebar-item :key="route.path + index" v-for="(route, index) in moreRoutes" :item="route" :base-path="route.path" />
-    </el-sub-menu>
-  </el-menu>
-</template>
-
-<script setup>
-import SidebarItem from '../Sidebar/SidebarItem'
-import {useAppStore} from '@/store/modules/app'
-import {useSettingsStore} from '@/store/modules/settings'
-import {usePermissionStore} from '@/store/modules/permission'
-
-const route = useRoute()
-const appStore = useAppStore()
-const settingsStore = useSettingsStore()
-const permissionStore = usePermissionStore()
-
-const sidebarRouters = computed(() => permissionStore.sidebarRouters)
-const theme = computed(() => settingsStore.theme)
-const device = computed(() => appStore.device)
-const activeMenu = computed(() => {
-  const { meta, path } = route
-  if (meta.activeMenu) {
-    return meta.activeMenu
-  }
-  return path
-})
-
-const visibleNumber = ref(5)
-const topMenus = computed(() => {
-  return permissionStore.sidebarRouters.filter((f) => !f.hidden).slice(0, visibleNumber.value)
-})
-const moreRoutes = computed(() => {
-  return permissionStore.sidebarRouters.filter((f) => !f.hidden).slice(visibleNumber.value, sidebarRouters.value.length - visibleNumber.value)
-})
-function setVisibleNumber() {
-  let width = document.body.getBoundingClientRect().width
-  if (width >= 1000) {
-    width -= 500
-  }
-  visibleNumber.value = parseInt(width / 3 / 85)
-}
-
-onMounted(() => {
-  window.addEventListener('resize', setVisibleNumber)
-})
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', setVisibleNumber)
-})
-
-onMounted(() => {
-  setVisibleNumber()
-})
-</script>
-
-<style lang="scss">
-
-/* menu item */
-#app .topbar-menu.el-menu--horizontal .el-sub-menu__title, #app .topbar-menu.el-menu--horizontal .el-menu-item {
-  padding: 0 10px !important;
-}
-
-.topbar-menu.el-menu--horizontal > .el-menu-item {
-  float: left;
-  height: 50px !important;
-  line-height: 50px !important;
-  color: #303133 !important;
-  padding: 0 5px !important;
-  margin: 0 10px !important;
-}
-
-.el-sub-menu.is-active .svg-icon, .el-menu-item.is-active .svg-icon + span, .el-sub-menu.is-active .svg-icon + span, .el-sub-menu.is-active .el-sub-menu__title span {
-  color: v-bind(theme);
-}
-
-/* sub-menu item */
-.topbar-menu.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
-  float: left;
-  line-height: 50px !important;
-  color: #303133 !important;
-  margin: 0 15px -3px!important;
-}
-
-/* topbar more arrow */
-.topbar-menu .el-sub-menu .el-sub-menu__icon-arrow {
-  position: static;
-  margin-left: 8px;
-  margin-top: 0px;
-  display: block !important;
-}
-
-/* menu__title el-menu-item */
-.topbar-menu.el-menu--horizontal .el-sub-menu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
-  height: 60px;
-}
-</style>
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -26,7 +26,6 @@ import SideBar from './components/Sidebar/index.vue';
 import { AppMain, Navbar, Settings, TagsView } from './components';
 import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import { initWebSocket } from '@/utils/websocket';
 import { initSSE } from '@/utils/sse';

@@ -36,13 +35,6 @@ const sidebar = computed(() => useAppStore().sidebar);
 const device = computed(() => useAppStore().device);
 const needTagsView = computed(() => settingsStore.tagsView);
 const fixedHeader = computed(() => settingsStore.fixedHeader);
-const layout = computed(() => settingsStore.navType);
-
-// 根据布局模式判断是否显示侧边栏
-const showSidebar = computed(() => {
-  if (sidebar.value.hide) return false;
-  return layout.value === NavTypeEnum.LEFT || layout.value === NavTypeEnum.MIX;
-});

 const classObj = computed(() => ({
  hideSidebar: !sidebar.value.opened,
--- a/src/main.ts
+++ b/src/main.ts
@@ -28,9 +28,6 @@ import ElementIcons from '@/plugins/svgicon';
 // permission control
 import './permission';

-// 开发者工具保护
-import { initDevToolsProtection } from '@/utils/devtools-protection';
-
 // 国际化
 import i18n from '@/lang/index';

@@ -58,6 +55,3 @@ app.use(plugins);
 directive(app);

 app.mount('#app');
-
-// 初始化开发者工具保护（仅生产环境）
-initDevToolsProtection();
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,5 +1,4 @@
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';

 const setting: DefaultSettings = {
  /**
@@ -19,9 +18,9 @@ const setting: DefaultSettings = {
  showSettings: true,

  /**
-   * 默认布局
+   * 是否显示顶部导航
   */
-  navType: NavTypeEnum.LEFT,
+  topNav: false,

  /**
   * 是否显示 tagsView
@@ -36,7 +35,7 @@ const setting: DefaultSettings = {
  /**
   * 是否固定头部
   */
-  fixedHeader: true,
+  fixedHeader: false,

  /**
   * 是否显示logo
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -3,7 +3,6 @@ import defaultSettings from '@/settings';
 import { useDynamicTitle } from '@/utils/dynamicTitle';
 import { useStorage } from '@vueuse/core';
 import { ref } from 'vue';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';

 export const useSettingsStore = defineStore('setting', () => {
  const storageSetting = useStorage<LayoutSetting>('layout-setting', {
@@ -14,13 +13,13 @@ export const useSettingsStore = defineStore('setting', () => {
    sidebarLogo: defaultSettings.sidebarLogo,
    dynamicTitle: defaultSettings.dynamicTitle,
    sideTheme: defaultSettings.sideTheme,
-    theme: defaultSettings.theme,
-    navType: defaultSettings.navType
+    theme: defaultSettings.theme
  });
  const title = ref<string>(defaultSettings.title);
  const theme = ref<string>(storageSetting.value.theme);
  const sideTheme = ref<string>(storageSetting.value.sideTheme);
  const showSettings = ref<boolean>(defaultSettings.showSettings);
+  const topNav = ref<boolean>(storageSetting.value.topNav);
  const tagsView = ref<boolean>(storageSetting.value.tagsView);
  const tagsIcon = ref<boolean>(storageSetting.value.tagsIcon);
  const fixedHeader = ref<boolean>(storageSetting.value.fixedHeader);
@@ -28,7 +27,6 @@ export const useSettingsStore = defineStore('setting', () => {
  const dynamicTitle = ref<boolean>(storageSetting.value.dynamicTitle);
  const animationEnable = ref<boolean>(defaultSettings.animationEnable);
  const dark = ref<boolean>(defaultSettings.dark);
-  const navType = ref<NavTypeEnum>(storageSetting.value.navType || NavTypeEnum.LEFT);

  const setTitle = (value: string) => {
    title.value = value;
@@ -39,6 +37,7 @@ export const useSettingsStore = defineStore('setting', () => {
    theme,
    sideTheme,
    showSettings,
+    topNav,
    tagsView,
    tagsIcon,
    fixedHeader,
@@ -46,7 +45,6 @@ export const useSettingsStore = defineStore('setting', () => {
    dynamicTitle,
    animationEnable,
    dark,
-    navType,
    setTitle
  };
 });
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,6 +1,5 @@
 import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue';
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import { NavTypeEnum } from '@/enums/NavTypeEnum';

 declare global {
  /** vue Instance */
@@ -91,9 +90,9 @@ declare global {
  }
  declare interface LayoutSetting {
    /**
-     * 默认布局
+     * 是否显示顶部导航
     */
-    navType: NavTypeEnum;
+    topNav: boolean;

    /**
     * 是否显示多标签导航
--- a/src/utils/devtools-protection.ts
+++ b/src/utils/devtools-protection.ts
@@ -1,158 +0,0 @@
-/**
- * 开发者工具保护
- * 检测开发者工具是否打开，如果打开则循环执行 debugger 阻止调试
- */
-
-// 检测开发者工具是否打开
-function detectDevTools(): boolean {
-  try {
-    // 方法1: 检测窗口尺寸差异（最可靠的方法）
-    const widthThreshold = 160; // 开发者工具最小宽度
-    const heightThreshold = 160; // 开发者工具最小高度
-
-    const widthDiff = window.outerWidth - window.innerWidth;
-    const heightDiff = window.outerHeight - window.innerHeight;
-
-    if (widthDiff > widthThreshold || heightDiff > heightThreshold) {
-      return true;
-    }
-
-    // 方法2: 检测 debugger 执行时间（最准确的方法）
-    const start = performance.now();
-    debugger; // 这个 debugger 用于检测，不会被移除
-    const end = performance.now();
-    const timeDiff = end - start;
-
-    // 如果 debugger 被跳过（开发者工具关闭），时间差会很小（通常 < 1ms）
-    // 如果 debugger 暂停（开发者工具打开），时间差会很大（通常 > 100ms）
-    // 降低阈值以提高检测灵敏度
-    if (timeDiff > 10) {
-      return true;
-    }
-
-    // 方法3: 检测控制台对象
-    let devtoolsDetected = false;
-    const element = document.createElement('div');
-    Object.defineProperty(element, 'id', {
-      get: function () {
-        devtoolsDetected = true;
-        return '';
-      }
-    });
-
-    // 使用 console 来触发 getter（仅在开发者工具打开时）
-    try {
-      console.log(element);
-      console.clear();
-    } catch (e) {
-      // 忽略错误
-    }
-
-    if (devtoolsDetected) {
-      return true;
-    }
-
-    // 方法4: 检测控制台是否被重写（开发者工具打开时）
-    const devtoolsRegex = /./;
-    // @ts-expect-error - 动态添加属性
-    devtoolsRegex.toString = function () {
-      // @ts-expect-error - 动态添加属性
-      this.opened = true;
-    };
-    console.log('%c', devtoolsRegex);
-    // @ts-expect-error - 检查动态添加的属性
-    if (devtoolsRegex.opened) {
-      return true;
-    }
-  } catch (e) {
-    // 如果检测过程中出错，默认返回 false
-    return false;
-  }
-
-  return false;
-}
-
-// 开发者工具保护主函数
-export function initDevToolsProtection(): void {
-  // 可以通过环境变量控制是否启用
-  // 生产环境默认启用，开发环境可以通过 VITE_ENABLE_ANTI_DEBUG=true 来启用测试
-  const isProduction = import.meta.env.MODE === 'production';
-  const enableAntiDebug = import.meta.env.VITE_ENABLE_ANTI_DEBUG === 'true' || isProduction;
-
-  if (!enableAntiDebug) {
-    return;
-  }
-
-  let devToolsOpen = false;
-  let debuggerInterval: number | null = null;
-
-  // 立即执行一次检测
-  const initialCheck = detectDevTools();
-  if (initialCheck) {
-    devToolsOpen = true;
-    debuggerInterval = window.setInterval(() => {
-      debugger; // 循环执行 debugger
-    }, 50); // 更频繁的 debugger，每 50ms 一次
-  }
-
-  // 循环检测开发者工具（更频繁的检测）
-  const checkInterval = setInterval(() => {
-    const isOpen = detectDevTools();
-
-    if (isOpen && !devToolsOpen) {
-      // 开发者工具刚打开
-      devToolsOpen = true;
-
-      // 开始循环执行 debugger（更频繁）
-      if (debuggerInterval === null) {
-        debuggerInterval = window.setInterval(() => {
-          debugger; // 循环执行 debugger
-        }, 50); // 每 50ms 执行一次，更激进
-      }
-    } else if (!isOpen && devToolsOpen) {
-      // 开发者工具关闭了
-      devToolsOpen = false;
-
-      // 停止循环 debugger
-      if (debuggerInterval !== null) {
-        clearInterval(debuggerInterval);
-        debuggerInterval = null;
-      }
-    }
-  }, 500); // 每 500ms 检测一次，更频繁
-
-  // 页面卸载时清理
-  window.addEventListener('beforeunload', () => {
-    clearInterval(checkInterval);
-    if (debuggerInterval !== null) {
-      clearInterval(debuggerInterval);
-    }
-  });
-
-  // 额外的检测：监听窗口大小变化
-  let lastWidth = window.innerWidth;
-  let lastHeight = window.innerHeight;
-
-  window.addEventListener('resize', () => {
-    const currentWidth = window.innerWidth;
-    const currentHeight = window.innerHeight;
-
-    // 如果窗口尺寸变化很大，可能是开发者工具打开/关闭
-    if (Math.abs(currentWidth - lastWidth) > 200 || Math.abs(currentHeight - lastHeight) > 200) {
-      // 重新检测
-      const isOpen = detectDevTools();
-      if (isOpen && !devToolsOpen) {
-        devToolsOpen = true;
-        if (debuggerInterval === null) {
-          debuggerInterval = window.setInterval(() => {
-            debugger; // 循环执行 debugger
-          }, 50); // 更频繁的 debugger
-        }
-      }
-    }
-
-    lastWidth = currentWidth;
-    lastHeight = currentHeight;
-  });
-}
-
--- a/src/utils/jsencrypt.ts
+++ b/src/utils/jsencrypt.ts
@@ -1,4 +1,4 @@
-import JSEncrypt from 'jsencrypt';
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min.js';
 // 密钥对生成 http://web.chacuo.net/netrsakeypair

 const publicKey = import.meta.env.VITE_APP_RSA_PUBLIC_KEY;
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -28,11 +28,7 @@ axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
 // 创建 axios 实例
 const service = axios.create({
  baseURL: import.meta.env.VITE_APP_BASE_API,
-  timeout: 50000,
-  transitional: {
-    // 超时错误更明确
-    clarifyTimeoutError: true
-  }
+  timeout: 50000
 });

 // 请求拦截器
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
          * 部署方式 Docker 容器编排 一键部署业务集群<br />
          * 国际化 SpringMessage Spring标准国际化方案<br />
        </p>
-        <p><b>当前版本:</b> <span>v5.5.3</span></p>
+        <p><b>当前版本:</b> <span>v5.5.1</span></p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
@@ -77,7 +77,7 @@
          * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
          * 其余与 Vue 版本一致<br />
        </p>
-        <p><b>当前版本:</b> <span>v2.5.3</span></p>
+        <p><b>当前版本:</b> <span>v2.5.1</span></p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -73,14 +73,14 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright © 2018-2026 疯狂的狮子Li All Rights Reserved.</span>
+      <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span>
    </div>
  </div>
 </template>

 <script setup lang="ts">
 import { getCodeImg, getTenantList } from '@/api/login';
-import { authRouterUrl } from '@/api/system/social/auth';
+import { authBinding } from '@/api/system/social/auth';
 import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
@@ -176,8 +176,6 @@ const getCode = async () => {
  const { data } = res;
  captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
  if (captchaEnabled.value) {
-    // 刷新验证码时清空输入框
-    loginForm.value.code = '';
    codeUrl.value = 'data:image/gif;base64,' + data.img;
    loginForm.value.uuid = data.uuid;
  }
@@ -215,7 +213,7 @@ const initTenantList = async () => {
 * @param type
 */
 const doSocialLogin = (type: string) => {
-  authRouterUrl(type, loginForm.value.tenantId).then((res: any) => {
+  authBinding(type, loginForm.value.tenantId).then((res: any) => {
    if (res.code === HttpStatus.SUCCESS) {
      // 获取授权地址跳转
      window.location.href = res.data;
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -67,7 +67,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
-      <span>Copyright © 2018-2026 疯狂的狮子Li All Rights Reserved.</span>
+      <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span>
    </div>
  </div>
 </template>
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -86,18 +86,12 @@
    </el-card>
    <!-- 添加或修改参数配置对话框 -->
    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="dictFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="dictFormRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="字典名称" prop="dictName">
          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
        </el-form-item>
-        <el-form-item prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" maxlength="100" />
-          <span slot="label">
-            <el-tooltip content="数据存储中的Key值，如：sys_user_sex" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            字典类型
-          </span>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -252,21 +252,6 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col v-if="form.visible !== '0'" :span="12">
-            <el-form-item label="激活路径" prop="form.remark">
-              <template #label>
-                <span>
-                  <el-tooltip content="隐藏菜单填写默认激活路由，比如激活父菜单的路由 /system/user" placement="top">
-                    <el-icon>
-                      <question-filled />
-                    </el-icon>
-                  </el-tooltip>
-                  激活路由
-                </span>
-              </template>
-              <el-input v-model="form.remark" placeholder="请输入激活路径" />
-            </el-form-item>
-          </el-col>
        </el-row>
      </el-form>
      <template #footer>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -46,7 +46,7 @@
            <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:remove']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
+            <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -56,7 +56,7 @@
 </template>

 <script setup lang="ts">
-import { authUnlock, authRouterUrl } from '@/api/system/social/auth';
+import { authUnlock, authBinding } from '@/api/system/social/auth';
 import { propTypes } from '@/utils/propTypes';
 import { useUserStore } from '@/store/modules/user';

@@ -84,7 +84,7 @@ const unlockAuth = (row: any) => {
 };

 const authUrl = (source: string) => {
-  authRouterUrl(source, useUserStore().tenantId).then((res: any) => {
+  authBinding(source, useUserStore().tenantId).then((res: any) => {
    if (res.code === 200) {
      window.location.href = res.data;
    } else {
--- a/vite/plugins/icons.ts
+++ b/vite/plugins/icons.ts
@@ -3,7 +3,6 @@ import Icons from 'unplugin-icons/vite';
 export default () => {
  return Icons({
    // 自动安装图标库
-    autoInstall: true,
-    compiler: "vue3"
+    autoInstall: true
  });
 };
Author	SHA1	Message	Date
疯狂的狮子Li	52ea8895d6	!246 发布 5.5.1-2.5.1 日常依赖升级bug修复 Merge pull request !246 from 疯狂的狮子Li/dev	2025-10-28 03:22:49 +00:00
疯狂的狮子Li	1b46739799	!241 发布 5.5.0-2.5.0 喜迎国庆 Merge pull request !241 from 疯狂的狮子Li/dev	2025-09-22 03:18:41 +00:00
疯狂的狮子Li	b000788785	!222 发布 5.4.1-2.4.1 小步迭代修复问题 Merge pull request !222 from 疯狂的狮子Li/dev	2025-07-01 01:13:49 +00:00
疯狂的狮子Li	2dc094c1db	!212 发布 5.4.0-2.4.0 正式版 Merge pull request !212 from 疯狂的狮子Li/dev	2025-05-29 03:18:30 +00:00