From d0d451967676707021b9857df529c395b27e90a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 17 Jun 2026 05:05:10 +0000 Subject: [PATCH] =?UTF-8?q?!273=20=E5=8F=91=E5=B8=83=20v5.6.2-v2.6.2=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🦁🦁🦁发布 v5.6.2-v2.6.2 版本 依赖升级 * 🦁🦁🦁发布 v5.6.2-v2.6.2 版本 依赖升级 * !269 fix 修复上传文件图标问题 * fix 修复上传文件图标问题 * update 优化 黑夜模式选中 * !265 修复深色模式按钮悬浮样式异常 * 修复深色模式按钮悬浮样式异常 * fix 修复 类型问题导致的警告与字典样式问题 * fix 修复 删除无用代码 * fix 修复 前端输入性CVE漏洞 禁止使用代码生成到本地路径 --- package.json | 2 +- src/api/tool/gen/index.ts | 8 -- src/api/tool/gen/types.ts | 6 -- src/assets/styles/variables.module.scss | 83 +++++++++++++++++++ src/components/FileUpload/index.vue | 2 +- src/layout/components/TagsView/ScrollPane.vue | 7 +- src/store/modules/settings.ts | 1 - src/views/index.vue | 4 +- src/views/system/dict/index.vue | 17 ++-- src/views/tool/gen/genInfoForm.vue | 38 --------- src/views/tool/gen/index.vue | 9 +- 11 files changed, 103 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 8bbeece2..32766149 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 efe079cf..ffd672d0 100644 --- a/src/api/tool/gen/index.ts +++ b/src/api/tool/gen/index.ts @@ -61,14 +61,6 @@ export const delTable = (tableId: string | number | Array) => { }); }; -// 生成代码（自定义路径） -export const genCode = (tableId: string | number) => { - return request({ - url: '/tool/gen/genCode/' + tableId, - method: 'get' - }); -}; - // 同步数据库 export const synchDb = (tableId: string | number) => { return request({ diff --git a/src/api/tool/gen/types.ts b/src/api/tool/gen/types.ts index 7f7b62fb..a4521961 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 004f1968..144795bf 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 1767b1b0..3cbb4b26 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -34,7 +34,7 @@
  • - {{ getFileName(file.name) }} + {{ getFileName(file.name) }}
    删除 diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue index e24f5ec9..2340fb30 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(); -const scrollWrapper = computed(() => scrollContainerRef.value?.$refs.wrapRef); +const scrollWrapper = computed(() => 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 || -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 06170cc4..bbf6fd8f 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('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 d5033f1d..a2529573 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -33,7 +33,7 @@ * 部署方式 Docker 容器编排 一键部署业务集群
    * 国际化 SpringMessage Spring标准国际化方案

    -

    当前版本: v5.6.1

    +

    当前版本: v5.6.2

    ¥免费开源

    @@ -77,7 +77,7 @@ * 分布式监控 Prometheus、Grafana 全方位性能监控
    * 其余与 Vue 版本一致

    -

    当前版本: v2.6.1

    +

    当前版本: v2.6.2

    ¥免费开源

    diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index a2f7b9da..23fb3da2 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -67,7 +67,7 @@ {{ scope.row.dictType }} - +