若依 3.6.8

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.7</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.8</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.7-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.8-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 

docker/copy.sh

@@ -9,7 +9,7 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20250523.sql ./mysql/db
+cp ../sql/ry_20260321.sql ./mysql/db
 cp ../sql/ry_config_20260311.sql ./mysql/db
 
 # copy html

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.7</version>
+    <version>3.6.8</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.7</ruoyi.version>
+        <ruoyi.version>3.6.8</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -4,6 +4,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -228,11 +230,7 @@ public class GenTableServiceImpl implements IGenTableService
     @Override
     public byte[] downloadCode(String tableName)
     {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        generatorCode(tableName, zip);
-        IOUtils.closeQuietly(zip);
-        return outputStream.toByteArray();
+        return downloadCode(new String[] { tableName });
     }
 
     /**
@@ -343,9 +341,14 @@ public class GenTableServiceImpl implements IGenTableService
     {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
+        Map<String, StringBuffer> typeFiles = new HashMap<>();
         for (String tableName : tableNames)
         {
-            generatorCode(tableName, zip);
+            generatorCode(tableName, zip, typeFiles);
+        }
+        for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())
+        {
+            writeToZip(zip, entry.getKey(), entry.getValue().toString());
         }
         IOUtils.closeQuietly(zip);
         return outputStream.toByteArray();
@@ -354,7 +357,7 @@ public class GenTableServiceImpl implements IGenTableService
     /**
      * 查询表信息并生成代码
      */
-    private void generatorCode(String tableName, ZipOutputStream zip)
+    private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)
     {
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableByName(tableName);
@@ -375,22 +378,49 @@ public class GenTableServiceImpl implements IGenTableService
             StringWriter sw = new StringWriter();
             Template tpl = Velocity.getTemplate(template, Constants.UTF8);
             tpl.merge(context, sw);
-            try
+            String fileName = VelocityUtils.getFileName(template, table);
+            // index-bak.ts 模版，追加内容
+            if (fileName.contains("index-bak.ts"))
             {
-                // 添加到zip
-                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
-                IOUtils.write(sw.toString(), zip, Constants.UTF8);
-                IOUtils.closeQuietly(sw);
-                zip.flush();
-                zip.closeEntry();
+                if (!typeFiles.containsKey(fileName))
+                {
+                    typeFiles.put(fileName, new StringBuffer(sw.toString()));
+                }
+                else
+                {
+                    Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));
+                }
             }
-            catch (IOException e)
+            else
             {
-                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+                // 其他文件正常添加
+                writeToZip(zip, fileName, sw.toString());
             }
         }
     }
 
+    /**
+     * 将字符串内容写入ZIP输出流
+     * 
+     * @param zip ZIP输出流
+     * @param fileName ZIP条目名称（即文件名）
+     * @param content 要写入的内容
+     */
+    private void writeToZip(ZipOutputStream zip, String fileName, String content)
+    {
+        try
+        {
+            zip.putNextEntry(new ZipEntry(fileName));
+            IOUtils.write(content, zip, Constants.UTF8);
+            zip.flush();
+            zip.closeEntry();
+        }
+        catch (IOException e)
+        {
+            log.error("写入ZIP文件失败，文件名: " + fileName, e);
+        }
+    }
+
     /**
      * 修改保存参数校验
      * 

ruoyi-modules/ruoyi-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

ruoyi-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "description": "若依管理系统",
   "author": "若依",
   "license": "MIT",

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -74,6 +74,8 @@
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
+      height: 44px !important;
+      line-height: 44px !important;
     }
 
     // menu hover
@@ -105,6 +107,96 @@
         background-color: $base-sub-menu-hover !important;
       }
     }
+
+    // theme-dark 深色主题
+    &.theme-dark {
+      box-shadow: 2px 0 8px rgba(0, 0, 0, 0.4);
+      border-right: none;
+
+      .el-menu-item.is-active {
+        position: relative;
+
+        &::before {
+          content: '';
+          position: absolute;
+          inset: 0;
+          background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
+          border-right: 3px solid var(--current-color, #409eff);
+          pointer-events: none;
+          z-index: 1;
+        }
+      }
+
+      .el-submenu.is-active > .el-submenu__title {
+        color: var(--current-color, #409eff) !important;
+      }
+
+      .el-menu-item:not(.is-active),
+      .submenu-title-noDropdown,
+      .el-submenu__title {
+        position: relative;
+
+        &::before {
+          content: '';
+          position: absolute;
+          inset: 0;
+          background-color: transparent;
+          pointer-events: none;
+          z-index: 1;
+          transition: background-color 0.2s;
+        }
+
+        &:hover::before {
+          background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
+        }
+      }
+    }
+    
+    // theme-light 浅色主题
+    &.theme-light {
+      border-right: 1px solid #e8eaf0;
+      box-shadow: none;
+
+      .el-menu-item,
+      .el-submenu__title {
+        color: rgba(0, 0, 0, 0.65);
+      }
+
+      .el-menu-item.is-active {
+        color: var(--current-color, #409eff) !important;
+        position: relative;
+
+        &::before {
+          content: '';
+          position: absolute;
+          inset: 0;
+          background-color: var(--current-color-light, #ecf5ff);
+          border-right: 3px solid var(--current-color, #409eff);
+          pointer-events: none;
+          z-index: 1;
+        }
+      }
+
+      .el-submenu.is-active > .el-submenu__title {
+        color: var(--current-color, #409eff) !important;
+      }
+
+      .el-menu-item:not(.is-active):hover,
+      .submenu-title-noDropdown:hover,
+      .el-submenu__title:hover {
+        background-color: #f5f7fa !important;
+        color: rgba(0, 0, 0, 0.85) !important;
+      }
+
+      .nest-menu .el-submenu > .el-submenu__title,
+      .el-submenu .el-menu-item {
+        background-color: #fafafa !important;
+
+        &:hover {
+          background-color: #f0f5ff !important;
+        }
+      }
+    }
   }
 
   .hideSidebar {

ruoyi-ui/src/assets/styles/variables.scss

@@ -9,32 +9,17 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
-$base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
+$base-menu-color: #bfcbd9;
+$base-menu-color-active: #ffffff;
+$base-menu-background: #1a1f2e;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#1f2d3d;
-$base-sub-menu-hover:#001528;
-
-// 自定义暗色菜单风格
-/**
-$base-menu-color:hsla(0,0%,100%,.65);
-$base-menu-color-active:#fff;
-$base-menu-background:#001529;
-$base-logo-title-color: #ffffff;
-
-$base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #001529;
-
-$base-sub-menu-background:#000c17;
-$base-sub-menu-hover:#001528;
-*/
+$base-sub-menu-background: #141824;
+$base-sub-menu-hover: rgba(255,255,255,.06);
 
 $base-sidebar-width: 200px;
 

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+    <div :class="['sidebar-theme-wrapper', {'has-logo':showLogo}, settings.sideTheme]" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
         <logo v-if="showLogo" :collapse="isCollapse" />
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu

ruoyi-ui/src/layout/components/TagsView/index.vue

@@ -41,7 +41,10 @@
         <el-dropdown-item command="closeLeft" :disabled="isFirstView()" icon="el-icon-back">关闭左侧</el-dropdown-item>
         <el-dropdown-item command="closeRight" :disabled="isLastView()" icon="el-icon-right">关闭右侧</el-dropdown-item>
         <el-dropdown-item command="closeAll" icon="el-icon-circle-close">全部关闭</el-dropdown-item>
-        <el-dropdown-item command="fullscreen" icon="el-icon-full-screen" divided>全屏显示</el-dropdown-item>
+        <el-dropdown-item command="fullscreen" divided>
+          <template v-if="!isFullscreen"><i class="el-icon-full-screen"></i>全屏显示</template>
+          <template v-else><i class="el-icon-close"></i>退出全屏</template>
+        </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
@@ -77,7 +80,8 @@ export default {
       affixTags: [],
       canScrollLeft: false,
       canScrollRight: false,
-      isFullscreen: false
+      isFullscreen: false,
+      hiddenElements: []
     }
   },
   computed: {
@@ -119,13 +123,19 @@ export default {
     this.initTags()
     this.addTags()
     window.addEventListener('resize', this.updateArrowState)
-    document.addEventListener('fullscreenchange', this.onFullscreenChange)
+    window.addEventListener('keydown', this.handleKeyDown)
   },
   beforeDestroy() {
     window.removeEventListener('resize', this.updateArrowState)
-    document.removeEventListener('fullscreenchange', this.onFullscreenChange)
+    window.removeEventListener('keydown', this.handleKeyDown)
   },
   methods: {
+    handleKeyDown(event) {
+      // 当按下Esc键且处于全屏状态时，退出全屏
+      if (event.key === 'Escape' && this.isFullscreen) {
+        this.toggleFullscreen()
+      }
+    },
     isActive(route) {
       return route.path === this.$route.path
     },
@@ -225,18 +235,40 @@ export default {
       })
     },
     toggleFullscreen() {
-      if (!document.fullscreenElement) {
-        const appMain = document.querySelector('.app-main')
-        if (appMain) {
-          appMain.requestFullscreen()
-        }
+      const mainContainer = document.querySelector('.main-container')
+      const navbar = document.querySelector('.navbar')
+      const sidebar = document.querySelector('.sidebar-container')
+      if (!mainContainer) return
+
+      if (!this.isFullscreen) {
+        mainContainer.classList.add('fullscreen-mode')
+        document.body.style.overflow = 'hidden'
+        const elementsToHide = [
+          { el: navbar, originalDisplay: (navbar && navbar.style.display) || '' }, 
+          { el: sidebar, originalDisplay: (sidebar && sidebar.style.display) || '' }
+        ]
+        elementsToHide.forEach(item => {
+          if (item.el && item.el.style.display !== 'none') {
+            item.originalDisplay = item.el.style.display
+            item.el.style.display = 'none'
+            this.hiddenElements.push(item)
+          }
+        })
+        this.isFullscreen = true
       } else {
-        document.exitFullscreen()
+        mainContainer.classList.remove('fullscreen-mode')
+        document.body.style.overflow = ''
+        this.hiddenElements.forEach(item => {
+          if (item.el) {
+            item.el.style.display = item.originalDisplay
+          }
+        })
+        this.hiddenElements = []
+        const btn = document.querySelector('.tags-action-btn')
+        if (btn) btn.blur()
+        this.isFullscreen = false
       }
     },
-    onFullscreenChange() {
-      this.isFullscreen = !!document.fullscreenElement
-    },
     handleDropdownCommand(command) {
       const tag = this.selectedDropdownTag
       this.selectedTag = tag
@@ -505,4 +537,41 @@ export default {
     }
   }
 }
+
+/* 页签全屏模式样式 */
+.main-container.fullscreen-mode {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+}
+
+.main-container.fullscreen-mode .fixed-header {
+  display: block !important;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  width: 100% !important;
+  z-index: 1000;
+}
+
+.main-container.fullscreen-mode .fixed-header .navbar {
+  display: none !important;
+}
+
+.main-container.fullscreen-mode .app-main {
+  position: fixed;
+  top: 34px;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: 0 !important;
+  padding: 0 !important;
+  height: calc(100vh - 34px) !important;
+  min-height: calc(100vh - 34px) !important;
+  overflow: auto;
+}
 </style>

ruoyi-ui/src/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme, '--current-color-light': theme + '1a', '--current-color-dark-bg': theme + '33'}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">

ruoyi-ui/src/plugins/tab.js

@@ -5,6 +5,10 @@ export default {
   // 刷新当前tab页签
   refreshPage(obj) {
     const { path, query, matched } = router.currentRoute
+    // 防止在重定向过程中重复刷新
+    if (path.startsWith('/redirect/')) {
+      return Promise.resolve()
+    }
     if (obj === undefined) {
       matched.forEach((m) => {
         if (m.components && m.components.default && m.components.default.name) {

ruoyi-ui/src/views/index.vue

@@ -108,6 +108,41 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v3.6.8 - 2026-03-30">
+              <ol>
+                <li>新增锁定屏幕功能</li>
+                <li>首页新增通知公告消息提醒</li>
+                <li>添加持久化标签页开关功能</li>
+                <li>菜单搜索支持文本高亮&数量提示</li>
+                <li>添加菜单路由地址和名称的校验规则</li>
+                <li>字典类型列表新增抽屉效果详细信息</li>
+                <li>升级axios到最新版本0.30.3</li>
+                <li>升级spring-cloud到最新版2025.1.0</li>
+                <li>升级spring-cloud-alibaba到最新版2025.1.0.0</li>
+                <li>升级spring-boot-admin到最新版4.0.2</li>
+                <li>升级dynamic-ds到最新版本4.5.0</li>
+                <li>升级springdoc到最新版本3.0.2</li>
+                <li>升级transmittable-thread-local到最新版本2.14.5</li>
+                <li>升级spring-boot到最新版本4.0.3</li>
+                <li>升级druid到最新版本1.2.28</li>
+                <li>升级pagehelper到最新版2.1.1</li>
+                <li>优化操作日志详细页面</li>
+                <li>部门管理支持批量保存排序</li>
+                <li>菜单管理支持批量保存排序</li>
+                <li>菜单管理列表新增类型显示</li>
+                <li>代码生成模板支持TypeScript版本</li>
+                <li>优化菜单主题风格显示</li>
+                <li>优化点击任务名称查看详细</li>
+                <li>优化字典类型属性提醒说明</li>
+                <li>优化防重提交间隔时间可自定义</li>
+                <li>优化页签功能&支持全屏按钮操作</li>
+                <li>优化RightToolbar搜索栏切换动画</li>
+                <li>修复Excel自定义格式样式污染问题</li>
+                <li>优化isAdmin方法统一到SecurityUtils</li>
+                <li>优化定时任务详情页展示&补充执行时间字段</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v3.6.7 - 2025-12-22">
               <ol>
                 <li>支持防盗链功能</li>
@@ -987,7 +1022,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "3.6.7"
+      version: "3.6.8"
     }
   },
   methods: {

ruoyi-ui/src/views/system/menu/index.vue

@@ -66,10 +66,19 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="220">
         <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
+            <svg-icon :icon-class="scope.row.icon" />
+            <span class="ml5">{{ scope.row.menuName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="menuName" label="类型" :show-overflow-tooltip="true" width="100">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.menuType === 'M' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
+          <el-tag v-else-if="scope.row.menuType === 'M'" type="primary" size="small">目录</el-tag>
+          <el-tag v-else-if="scope.row.menuType === 'C' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
+          <el-tag v-else-if="scope.row.menuType === 'C'" type="success" size="small">菜单</el-tag>
+          <el-tag v-else-if="scope.row.menuType === 'F'" type="warning" size="small">按钮</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200">
@@ -77,16 +86,11 @@
           <el-input-number v-model="scope.row.orderNum" controls-position="right" :min="0" size="mini" style="width: 88px" />
         </template>
       </el-table-column>
-      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true" />
+      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-visual/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-visual/ruoyi-monitor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-visual</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>