diff --git a/package.json b/package.json
index 8bbeece2f9972a7610785b01d4bf1a45742786fe..32766149caf7848ef44955992728de9923430b58 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 "$schema": "https://json.schemastore.org/package",
 "name": "ruoyi-vue-plus",
- "version": "5.6.1-2.6.1",
+ "version": "5.6.2-2.6.2",
 "description": "RuoYi-Vue-Plus多租户管理系统",
 "author": "LionLi",
 "license": "MIT",
diff --git a/src/api/tool/gen/index.ts b/src/api/tool/gen/index.ts
index efe079cf0c2bbb01866b55c37984f75db472c26c..ffd672d09a626122e99233294e682edd123dac2d 100644
--- a/src/api/tool/gen/index.ts
+++ b/src/api/tool/gen/index.ts
@@ -61,14 +61,6 @@ export const delTable = (tableId: string &#124; number &#124; Array<string &#124; number>) => {
 });
 };
 
-// 生成代码(自定义路径)
-export const genCode = (tableId: string &#124; number) => {
- return request({
- url: '/tool/gen/genCode/' + tableId,
- method: 'get'
- });
-};
-
 // 同步数据库
 export const synchDb = (tableId: string &#124; number) => {
 return request({
diff --git a/src/api/tool/gen/types.ts b/src/api/tool/gen/types.ts
index 7f7b62fb2dab125eb16641c09ea3e7597589fe19..a4521961d7735617f35a31e4cf70b9cb867d7cce 100644
--- a/src/api/tool/gen/types.ts
+++ b/src/api/tool/gen/types.ts
@@ -13,8 +13,6 @@ export interface TableVO extends BaseEntity {
 businessName: string;
 functionName: string;
 functionAuthor: string;
- genType: string;
- genPath: string;
 pkColumn?: any;
 columns?: any;
 options?: any;
@@ -81,8 +79,6 @@ export interface DbTableVO {
 businessName?: any;
 functionName?: any;
 functionAuthor?: any;
- genType?: any;
- genPath?: any;
 pkColumn?: any;
 columns: DbColumnVO[];
 options?: any;
@@ -162,8 +158,6 @@ export interface DbTableForm extends BaseEntity {
 businessName: string;
 functionName: string;
 functionAuthor: string;
- genType: string;
- genPath: string;
 pkColumn?: any;
 columns: DbColumnForm[];
 options: string;
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 004f19687b478170d0c3500b0cbcfc2489b6530a..144795bf62c9c31be93de95230f4c5141f3a979d 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -67,6 +67,29 @@ html.dark {
 --el-color-primary-light-9: #262727;
 }
 
+ .el-table {
+ --el-table-current-row-bg-color: var(--el-color-primary-dark-7)
+ }
+
+ .el-dropdown__popper {
+ --el-dropdown-menuItem-hover-fill: var(--el-color-primary-dark-7)
+ }
+
+ .el-button {
+ --el-button-hover-bg-color: var(--el-color-primary-dark-9);
+ --el-button-hover-border-color: var(--el-color-primary-dark-7);
+ }
+
+ .el-button.is-plain {
+ --el-button-hover-bg-color: var(--el-fill-color-light);
+ --el-button-hover-border-color: var(--el-color-primary);
+ }
+
+ .el-button.is-dashed {
+ --el-button-hover-bg-color: var(--el-fill-color-light);
+ --el-button-hover-border-color: var(--el-color-primary);
+ }
+
 .el-button--primary {
 --el-button-bg-color: #2b6bd3;
 --el-button-border-color: #3a7be8;
@@ -81,6 +104,18 @@ html.dark {
 --el-button-bg-color: rgba(43, 107, 211, 0.12);
 --el-button-border-color: rgba(58, 123, 232, 0.5);
 --el-button-text-color: #dbe8ff;
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-bg-color: var(--el-color-primary);
+ --el-button-hover-border-color: var(--el-color-primary);
+ --el-button-active-bg-color: rgba(43, 107, 211, 0.28);
+ --el-button-active-border-color: rgba(43, 107, 211, 0.8);
+ }
+
+ .el-button--primary.is-dashed {
+ --el-button-bg-color: rgba(43, 107, 211, 0.12);
+ --el-button-border-color: rgba(58, 123, 232, 0.5);
+ --el-button-text-color: #dbe8ff;
+ --el-button-hover-text-color: #dbe8ff;
 --el-button-hover-bg-color: rgba(58, 123, 232, 0.2);
 --el-button-hover-border-color: rgba(58, 123, 232, 0.7);
 --el-button-active-bg-color: rgba(43, 107, 211, 0.28);
@@ -101,6 +136,18 @@ html.dark {
 --el-button-bg-color: rgba(31, 138, 90, 0.12);
 --el-button-border-color: rgba(41, 164, 109, 0.5);
 --el-button-text-color: #dbf6e8;
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-bg-color: var(--el-color-success);
+ --el-button-hover-border-color: var(--el-color-success);
+ --el-button-active-bg-color: rgba(31, 138, 90, 0.28);
+ --el-button-active-border-color: rgba(31, 138, 90, 0.8);
+ }
+
+ .el-button--success.is-dashed {
+ --el-button-bg-color: rgba(31, 138, 90, 0.12);
+ --el-button-border-color: rgba(41, 164, 109, 0.5);
+ --el-button-text-color: #dbf6e8;
+ --el-button-hover-text-color: #dbf6e8;
 --el-button-hover-bg-color: rgba(41, 164, 109, 0.2);
 --el-button-hover-border-color: rgba(41, 164, 109, 0.7);
 --el-button-active-bg-color: rgba(31, 138, 90, 0.28);
@@ -121,6 +168,18 @@ html.dark {
 --el-button-bg-color: rgba(184, 121, 34, 0.12);
 --el-button-border-color: rgba(214, 149, 59, 0.5);
 --el-button-text-color: #ffecc8;
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-bg-color: var(--el-color-warning);
+ --el-button-hover-border-color: var(--el-color-warning);
+ --el-button-active-bg-color: rgba(184, 121, 34, 0.28);
+ --el-button-active-border-color: rgba(184, 121, 34, 0.8);
+ }
+
+ .el-button--warning.is-dashed {
+ --el-button-bg-color: rgba(184, 121, 34, 0.12);
+ --el-button-border-color: rgba(214, 149, 59, 0.5);
+ --el-button-text-color: #ffecc8;
+ --el-button-hover-text-color: #ffecc8;
 --el-button-hover-bg-color: rgba(214, 149, 59, 0.2);
 --el-button-hover-border-color: rgba(214, 149, 59, 0.7);
 --el-button-active-bg-color: rgba(184, 121, 34, 0.28);
@@ -141,6 +200,18 @@ html.dark {
 --el-button-bg-color: rgba(178, 74, 74, 0.12);
 --el-button-border-color: rgba(209, 96, 96, 0.5);
 --el-button-text-color: #ffd6d6;
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-bg-color: var(--el-color-danger);
+ --el-button-hover-border-color: var(--el-color-danger);
+ --el-button-active-bg-color: rgba(178, 74, 74, 0.28);
+ --el-button-active-border-color: rgba(178, 74, 74, 0.8);
+ }
+
+ .el-button--danger.is-dashed {
+ --el-button-bg-color: rgba(178, 74, 74, 0.12);
+ --el-button-border-color: rgba(209, 96, 96, 0.5);
+ --el-button-text-color: #ffd6d6;
+ --el-button-hover-text-color: #ffd6d6;
 --el-button-hover-bg-color: rgba(209, 96, 96, 0.2);
 --el-button-hover-border-color: rgba(209, 96, 96, 0.7);
 --el-button-active-bg-color: rgba(178, 74, 74, 0.28);
@@ -161,6 +232,18 @@ html.dark {
 --el-button-bg-color: rgba(75, 85, 99, 0.16);
 --el-button-border-color: rgba(102, 112, 133, 0.55);
 --el-button-text-color: #e5e7eb;
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-bg-color: var(--el-color-info);
+ --el-button-hover-border-color: var(--el-color-info);
+ --el-button-active-bg-color: rgba(75, 85, 99, 0.3);
+ --el-button-active-border-color: rgba(75, 85, 99, 0.85);
+ }
+
+ .el-button--info.is-dashed {
+ --el-button-bg-color: rgba(75, 85, 99, 0.16);
+ --el-button-border-color: rgba(102, 112, 133, 0.55);
+ --el-button-text-color: #e5e7eb;
+ --el-button-hover-text-color: #e5e7eb;
 --el-button-hover-bg-color: rgba(102, 112, 133, 0.22);
 --el-button-hover-border-color: rgba(102, 112, 133, 0.75);
 --el-button-active-bg-color: rgba(75, 85, 99, 0.3);
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 1767b1b0d97d00a0fda1b3eeb5f0069b4dc34f3b..3cbb4b263fefa6f56aad89d1d83658e285871131 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -34,7 +34,7 @@
 <div class="naked_tr"> <li v-for="(file, index) in fileList" :key="file.uid">
 <el-link :href="`${file.url}`" :underline="false">
- <span> {{ getFileName(file.name) }} </span>
+ <el-icon><document /></el-icon> {{ getFileName(file.name) }}
 </el-link>
 <div>
 <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index e24f5ec965c55521a52cf827ff1d77ac07307b78..2340fb3031981eb2b3778be00081b253113c3663 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -11,18 +11,20 @@ import { useTagsViewStore } from '@/store/modules/tagsView';
 const tagAndTagSpacing = ref(4);
 
 const scrollContainerRef = ref<elscrollbarinstance>();
-const scrollWrapper = computed(() => scrollContainerRef.value?.$refs.wrapRef);
+const scrollWrapper = computed<htmldivelement &#124; undefined>(() => scrollContainerRef.value?.wrapRef);
 
 onMounted(() => {
 scrollWrapper.value?.addEventListener('scroll', emitScroll, true);
 });
 onBeforeUnmount(() => {
- scrollWrapper.value?.removeEventListener('scroll', emitScroll);
+ scrollWrapper.value?.removeEventListener('scroll', emitScroll, true);
 });
 
 const handleScroll = (e: WheelEvent) => {
 const eventDelta = (e as any).wheelDelta &#124;&#124; -e.deltaY * 40;
 const $scrollWrapper = scrollWrapper.value;
+ if (!$scrollWrapper) return;
+
 $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4;
 };
 const emits = defineEmits(['scroll']);
@@ -37,6 +39,7 @@ const moveToTarget = (currentTag: RouteLocationNormalized) => {
 const $container = scrollContainerRef.value?.$el;
 const $containerWidth = $container.offsetWidth;
 const $scrollWrapper = scrollWrapper.value;
+ if (!$scrollWrapper) return;
 
 let firstTag = null;
 let lastTag = null;
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 06170cc4aca10a527e695d1ab3fb568662160e4d..bbf6fd8fee416cae4767411a1234f5f5541d6444 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -7,7 +7,6 @@ import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
 export const useSettingsStore = defineStore('setting', () => {
 const storageSetting = useStorage<layoutsetting>('layout-setting', {
- topNav: defaultSettings.topNav,
 tagsView: defaultSettings.tagsView,
 tagsIcon: defaultSettings.tagsIcon,
 fixedHeader: defaultSettings.fixedHeader,
diff --git a/src/views/index.vue b/src/views/index.vue
index d5033f1d6cf9b14560da09cdc4309a0125b0eeb9..a2529573ec8c6d0fb5bb23c5f2bfd87e6981740e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
 * 部署方式 Docker 容器编排 一键部署业务集群<br />
 * 国际化 SpringMessage Spring标准国际化方案<br />
 </p>
- <p><strong>当前版本:</strong> <span>v5.6.1</span></p>
+ <p><strong>当前版本:</strong> <span>v5.6.2</span></p>
 <p>
 <el-tag type="danger">&yen;免费开源</el-tag>
 </p>
@@ -77,7 +77,7 @@
 * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
 * 其余与 Vue 版本一致<br />
 </p>
- <p><strong>当前版本:</strong> <span>v2.6.1</span></p>
+ <p><strong>当前版本:</strong> <span>v2.6.2</span></p>
 <p>
 <el-tag type="danger">&yen;免费开源</el-tag>
 </p>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a2f7b9da1e93590cd7b8ead20ac86930ce2c5b43..23fb3da2376d4d7621e292fa27ca34f9fc28c662 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -67,7 +67,7 @@
 <span @click.stop="handleTypeRowClick(scope.row)">{{ scope.row.dictType }}</span>
 </template>
 </el-table-column>
- <el-table-column label="备注" prop="remark" />
+ <el-table-column label="备注" prop="remark" />
 <el-table-column label="创建时间" prop="createTime">
 <template #default="scope">
 <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
@@ -213,13 +213,15 @@
 <el-input v-model="typeForm.dictName" placeholder="请输入字典名称" />
 </el-form-item>
 <el-form-item prop="dictType">
+ <template #label>
+ <span>
+ <el-tooltip content="数据存储中的Key值,如:sys_user_sex" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ 字典类型
+ </span>
+ </template>
 <el-input v-model="typeForm.dictType" placeholder="请输入字典类型" maxlength="100" />
- <span slot="label">
- <el-tooltip content="数据存储中的Key值,如:sys_user_sex" placement="top">
- 
- </el-tooltip>
- 字典类型
- </span>
 </el-form-item>
 <el-form-item label="备注" prop="remark">
 <el-input v-model="typeForm.remark" type="textarea" placeholder="请输入内容"></el-input>
@@ -671,5 +673,4 @@ onMounted(() => {
 .dict-table-wrap {
 overflow-x: auto;
 }
-
 </style>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 95065a0913966bfacbefb462876883215ff7fc88..477aac266e557e40a3cab221dcb2d3e12c69fe8e 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -82,44 +82,6 @@
 </el-form-item>
 </el-col>
 
- <el-col :span="12">
- <el-form-item prop="genType">
- <template #label>
- 生成代码方式
- <el-tooltip content="默认为zip压缩包下载,也可以自定义生成路径" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-radio v-model="infoForm.genType" value="0">zip压缩包</el-radio>
- <el-radio v-model="infoForm.genType" value="1">自定义路径</el-radio>
- </el-form-item>
- </el-col>
-
- <el-col v-if="infoForm.genType == '1'" :span="24">
- <el-form-item prop="genPath">
- <template #label>
- 自定义路径
- <el-tooltip content="填写磁盘绝对路径,若不填写,则生成到当前Web项目下" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.genPath">
- <template #append>
- <el-dropdown>
- <el-button type="primary">
- 最近路径快速选择
- 
- </el-button>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item @click="infoForm.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </template>
- </el-input>
- </el-form-item>
- </el-col>
 </el-row>
 
 <template v-if="info.tplCategory == 'tree'">
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index e73a3fbf175134a01472c501de10c3b45be4619d..ef69684cc0cb561cc150832233be1cb3bb9a5c5a 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -113,7 +113,7 @@
 </template>
 
 setup name="Gen" lang="ts">
-import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
+import { delTable, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
 import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
 import ImportTable from './importTable.vue';
@@ -181,12 +181,7 @@ const handleGenTable = async (row?: TableVO) => {
 proxy?.$modal.msgError('请选择要生成的数据');
 return;
 }
- if (row?.genType === '1') {
- await genCode(row.tableId);
- proxy?.$modal.msgSuccess('成功生成到自定义路径:' + row.genPath);
- } else {
- proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
- }
+ proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
 };
 /** 同步数据库操作 */
 const handleSynchDb = async (row: TableVO) => {
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://gitee.com/JavaLionLi/plus-ui/pulls/273.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://gitee.com/JavaLionLi/plus-ui/pulls/273.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>