From 10cd746f52d0ce8189fdce85ee65871a28fc84a3 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, 6 May 2026 15:38:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BE=93=E5=85=A5=E6=80=A7CVE=E6=BC=8F=E6=B4=9E=20?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=BD=BF=E7=94=A8=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=88=B0=E6=9C=AC=E5=9C=B0=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tool/gen/index.ts | 8 ------- src/api/tool/gen/types.ts | 6 ----- src/views/tool/gen/genInfoForm.vue | 38 ------------------------------ src/views/tool/gen/index.vue | 9 ++----- 4 files changed, 2 insertions(+), 59 deletions(-) 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/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue index 95065a09..477aac26 100644 --- a/src/views/tool/gen/genInfoForm.vue +++ b/src/views/tool/gen/genInfoForm.vue @@ -82,44 +82,6 @@ - - - - zip压缩包 - 自定义路径 - - - - - - - - - - - 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) => { -- Gitee From 6fd38aef43825580c7da5c34c907ecd7de181446 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: 2026年5月11日 18:50:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/settings.ts | 1 - 1 file changed, 1 deletion(-) 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, -- Gitee From eb05c5197fa396057a4a223c0ee921a22ed79cee 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: 2026年5月22日 10:22:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E4=B8=8E=E5=AD=97=E5=85=B8=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/TagsView/ScrollPane.vue | 7 +++++-- src/views/system/dict/index.vue | 17 +++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) 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/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 }} - +