From f9f8b56d183821802a4bd369a2fd7b2d5aa57acd Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Thu, 25 Sep 2025 08:15:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9D=99=E9=BB=98?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/timer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/core/timer.py b/app/core/timer.py index c803a56..9e364c3 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -112,7 +112,7 @@ class _MainTimer: """静默模式通过模拟老板键来隐藏模拟器窗口""" if ( - len(Config.if_ignore_silence) > 0 + len(Config.if_ignore_silence) == 0 and Config.get("Function", "IfSilence") and Config.get("Function", "BossKey") != "" ): From 4ad346ed14a7d452085399526f779f9b79611061 Mon Sep 17 00:00:00 2001 From: Alirea <2981883527@qq.com> Date: Thu, 25 Sep 2025 17:16:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix(notif):=20=E4=BF=AE=E6=94=B9=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=BA=95=E9=83=A8=E9=93=BE=E6=8E=A5=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=AB=99=E4=BB=93=E5=BA=93=E4=B8=BA=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/html/MAA_result.html | 4 ++-- res/html/MAA_statistics.html | 4 ++-- res/html/general_result.html | 4 ++-- res/html/general_statistics.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/res/html/MAA_result.html b/res/html/MAA_result.html index 17a63e1..0bcfa8b 100644 --- a/res/html/MAA_result.html +++ b/res/html/MAA_result.html @@ -150,8 +150,8 @@ AUTO-MAS GitHub
-

文档站仓库:

- AUTO-MAS 文档站 GitHub +

文档站:

+ AUTO-MAS 文档站
diff --git a/res/html/MAA_statistics.html b/res/html/MAA_statistics.html index ce99665..c5ec5cb 100644 --- a/res/html/MAA_statistics.html +++ b/res/html/MAA_statistics.html @@ -223,8 +223,8 @@ AUTO-MAS GitHub
-

文档站仓库:

- AUTO-MAS 文档站 GitHub +

文档站:

+ AUTO-MAS 文档站
diff --git a/res/html/general_result.html b/res/html/general_result.html index b57aa9a..5fa8c2d 100644 --- a/res/html/general_result.html +++ b/res/html/general_result.html @@ -150,8 +150,8 @@ AUTO-MAS GitHub
-

文档站仓库:

- AUTO-MAS 文档站 GitHub +

文档站:

+ AUTO-MAS 文档站
diff --git a/res/html/general_statistics.html b/res/html/general_statistics.html index b47f8d7..2bf8a48 100644 --- a/res/html/general_statistics.html +++ b/res/html/general_statistics.html @@ -190,8 +190,8 @@ AUTO-MAS GitHub
-

文档站仓库:

- AUTO-MAS 文档站 GitHub +

文档站:

+ AUTO-MAS 文档站
From 320d7ab17d21a82dc4d02f12f3a7ef5e0397a644 Mon Sep 17 00:00:00 2001 From: Alirea <2981883527@qq.com> Date: Thu, 25 Sep 2025 17:24:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat(ui):=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=AE=BE=E7=BD=AE=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/History.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/History.vue b/frontend/src/views/History.vue index a389cc2..c554d07 100644 --- a/frontend/src/views/History.vue +++ b/frontend/src/views/History.vue @@ -815,7 +815,6 @@ const getDateStatusColor = (users: Record) => { flex: 1; display: flex; flex-direction: column; - min-width: 0; } .no-selection { @@ -826,6 +825,7 @@ const getDateStatusColor = (users: Record) => { border: 1px solid var(--ant-color-border); border-radius: 8px; background: var(--ant-color-bg-container); + min-height: 400px; } .detail-content { From dbd1731d7f26c1ee047ea444e452d058b6bd318a Mon Sep 17 00:00:00 2001 From: Alirea <2981883527@qq.com> Date: Thu, 25 Sep 2025 18:12:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat(ui):=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=AF=A6=E7=BB=86=E6=97=A5=E5=BF=97=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E8=A2=AB=E6=92=91=E5=BC=80=E5=88=B0=E8=A7=86?= =?UTF-8?q?=E7=95=8C=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/History.vue | 42 ++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/frontend/src/views/History.vue b/frontend/src/views/History.vue index c554d07..7b556c2 100644 --- a/frontend/src/views/History.vue +++ b/frontend/src/views/History.vue @@ -833,16 +833,18 @@ const getDateStatusColor = (users: Record) => { display: flex; gap: 16px; min-height: 0; + min-width: 0; /* 确保子项 flex:1 时可以收缩 */ + overflow: hidden; /* 避免被长行撑出 */ } /* 记录条目区域 */ .records-area { width: 400px; - flex-shrink: 0; + flex-shrink: 1; /* 新增: 允许一定程度收缩 */ + min-width: 260px; /* 给一个合理下限 */ display: flex; flex-direction: column; gap: 16px; - min-width: 0; } .records-section { @@ -980,7 +982,8 @@ const getDateStatusColor = (users: Record) => { /* 日志区域 */ .log-area { flex: 1; - min-width: 300px; + /* 允许在父级 flex 宽度不足时压缩,避免整体被撑出视口 */ + min-width: 0; /* 修改: 原来是 300px,导致在内容渲染后无法收缩 */ display: flex; flex-direction: column; } @@ -1004,19 +1007,19 @@ const getDateStatusColor = (users: Record) => { flex: 1; max-height: 500px; overflow-y: auto; - background: var(--ant-color-bg-layout); - border: 1px solid var(--ant-color-border); - border-radius: 6px; - padding: 12px; - font-family: 'Consolas', 'Monaco', 'Courier New', monospace; - font-size: 12px; - line-height: 1.4; + /* 新增: 防止超长无空格字符串把容器撑宽 */ + overflow-x: auto; /* 横向单独滚动,而不是撑出布局 */ + word-break: break-all; + overflow-wrap: anywhere; } .log-content pre { margin: 0; white-space: pre-wrap; - word-wrap: break-word; + word-wrap: break-word; /* 兼容性写法 */ + word-break: break-all; /* 处理超长连续字符 */ + overflow-wrap: anywhere; + max-width: 100%; } .no-log { @@ -1055,7 +1058,22 @@ const getDateStatusColor = (users: Record) => { .log-area { width: 100%; - max-height: 400px; + min-width: 0; + } +} + +/* 针对极窄窗口再降级为纵向布局,提前触发布局切换,避免出现水平滚动 */ +@media (max-width: 1000px) { + .history-layout { + flex-direction: column; + } + .records-area { + width: 100%; + min-width: 0; + } + .log-area { + width: 100%; + min-width: 0; } } From 06b3147b53c20f58aed6a803302a01fc440ee761 Mon Sep 17 00:00:00 2001 From: Alirea <2981883527@qq.com> Date: Thu, 25 Sep 2025 19:26:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat(ui):=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=AF=A6=E7=BB=86=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/History.vue | 267 +++++++++------------------------ 1 file changed, 73 insertions(+), 194 deletions(-) diff --git a/frontend/src/views/History.vue b/frontend/src/views/History.vue index 7b556c2..c41e2fe 100644 --- a/frontend/src/views/History.vue +++ b/frontend/src/views/History.vue @@ -26,7 +26,7 @@ - + @@ -277,43 +277,54 @@ -
+
{{ currentDetail.log_content }}
@@ -341,7 +352,7 @@ import { FileOutlined, } from '@ant-design/icons-vue' import { Service } from '@/api/services/Service' -import type { HistorySearchIn, HistoryData } from '@/api' +import { HistorySearchIn, type HistoryData } from '@/api' // 调整:枚举需要值导入 import dayjs from 'dayjs' import NodataImage from '@/assets/NoData.png' @@ -358,62 +369,20 @@ const selectedRecordIndex = ref(-1) const currentDetail = ref(null) const currentJsonFile = ref('') -// 快捷时间选择预设 +// 快捷时间选择预设(改用枚举值) const timePresets = [ - { - key: 'today', - label: '今天', - startDate: () => dayjs().format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按日合并' as HistorySearchIn.mode, - }, - { - key: 'yesterday', - label: '昨天', - startDate: () => dayjs().subtract(1, 'day').format('YYYY-MM-DD'), - endDate: () => dayjs().subtract(1, 'day').format('YYYY-MM-DD'), - mode: '按日合并' as HistorySearchIn.mode, - }, - { - key: 'week', - label: '最近一周', - startDate: () => dayjs().subtract(7, 'day').format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按日合并' as HistorySearchIn.mode, - }, - { - key: 'month', - label: '最近一个月', - startDate: () => dayjs().subtract(1, 'month').format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按周合并' as HistorySearchIn.mode, - }, - { - key: 'twoMonths', - label: '最近两个月', - startDate: () => dayjs().subtract(2, 'month').format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按周合并' as HistorySearchIn.mode, - }, - { - key: 'threeMonths', - label: '最近三个月', - startDate: () => dayjs().subtract(3, 'month').format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按月合并' as HistorySearchIn.mode, - }, - { - key: 'halfYear', - label: '最近半年', - startDate: () => dayjs().subtract(6, 'month').format('YYYY-MM-DD'), - endDate: () => dayjs().format('YYYY-MM-DD'), - mode: '按月合并' as HistorySearchIn.mode, - }, + { key: 'today', label: '今天', startDate: () => dayjs().format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.DAILY }, + { key: 'yesterday', label: '昨天', startDate: () => dayjs().subtract(1, 'day').format('YYYY-MM-DD'), endDate: () => dayjs().subtract(1, 'day').format('YYYY-MM-DD'), mode: HistorySearchIn.mode.DAILY }, + { key: 'week', label: '最近一周', startDate: () => dayjs().subtract(7, 'day').format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.DAILY }, + { key: 'month', label: '最近一个月', startDate: () => dayjs().subtract(1, 'month').format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.WEEKLY }, + { key: 'twoMonths', label: '最近两个月', startDate: () => dayjs().subtract(2, 'month').format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.WEEKLY }, + { key: 'threeMonths', label: '最近三个月', startDate: () => dayjs().subtract(3, 'month').format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.MONTHLY }, + { key: 'halfYear', label: '最近半年', startDate: () => dayjs().subtract(6, 'month').format('YYYY-MM-DD'), endDate: () => dayjs().format('YYYY-MM-DD'), mode: HistorySearchIn.mode.MONTHLY }, ] -// 搜索表单 +// 搜索表单(默认按日合并) const searchForm = reactive({ - mode: '按日合并' as HistorySearchIn.mode, + mode: HistorySearchIn.mode.DAILY as HistorySearchIn.mode, startDate: dayjs().subtract(7, 'day').format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD'), }) @@ -426,37 +395,6 @@ interface HistoryDateGroup { const historyData = ref([]) -// 计算总览数据 -const totalOverview = computed(() => { - let totalRecruit = 0 - let totalDrop = 0 - - historyData.value.forEach(dateGroup => { - Object.values(dateGroup.users).forEach(userData => { - // 统计公招数据 - if (userData.recruit_statistics) { - Object.values(userData.recruit_statistics).forEach((count: any) => { - totalRecruit += count - }) - } - - // 统计掉落数据 - if (userData.drop_statistics) { - Object.values(userData.drop_statistics).forEach((stageDrops: any) => { - Object.values(stageDrops).forEach((count: any) => { - totalDrop += count - }) - }) - } - }) - }) - - return { - totalRecruit, - totalDrop, - } -}) - // 当前显示的统计数据(根据是否选中记录条目来决定显示用户总计还是单条记录的数据) const currentStatistics = computed(() => { if (selectedRecordIndex.value >= 0 && currentDetail.value) { @@ -523,7 +461,7 @@ const handleSearch = async () => { // 重置搜索条件 const handleReset = () => { - searchForm.mode = '按日合并' + searchForm.mode = HistorySearchIn.mode.DAILY searchForm.startDate = dayjs().subtract(7, 'day').format('YYYY-MM-DD') searchForm.endDate = dayjs().format('YYYY-MM-DD') historyData.value = [] @@ -546,12 +484,12 @@ const handleDateChange = () => { currentPreset.value = '' } -// ���择用户处理 +// 选择用户处理(修正乱码注释) const handleSelectUser = async (date: string, username: string, userData: HistoryData) => { selectedUser.value = `${date}-${username}` selectedUserData.value = userData - selectedRecordIndex.value = -1 // 重置记录选择 - currentDetail.value = null // 清空日志内容 + selectedRecordIndex.value = -1 + currentDetail.value = null currentJsonFile.value = '' } @@ -655,15 +593,14 @@ const handleOpenLogDirectory = async () => { } } -// 获取日期状态颜色 -const getDateStatusColor = (users: Record) => { - const hasError = Object.values(users).some( - user => - user.index?.some(item => item.status === '异常') || - (user.error_info && Object.keys(user.error_info).length > 0) - ) - return hasError ? 'error' : 'success' -} +// 日志字体大小(恢复) +const logFontSize = ref(14) +const logFontSizeOptions = [12, 13, 14, 16, 18, 20] + +// Tooltip 容器:避免挂载到 body 造成全局滚动条闪烁与布局抖动 +const tooltipContainer = (triggerNode: HTMLElement) => triggerNode?.parentElement || document.body +// 固定 button 尺寸,避免 hover/tooltip 状态导致宽度高度微调 +const buttonFixedStyle = { width: '28px', height: '28px', padding: 0 } From bbe5286601b29a3f1acb357989da84f3da6f77dc Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Thu, 25 Sep 2025 19:54:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E7=9A=84=E9=85=8D=E7=BD=AE=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E8=B7=B3=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/GeneralScriptEdit.vue | 59 ++++++++++++++++-------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/frontend/src/views/GeneralScriptEdit.vue b/frontend/src/views/GeneralScriptEdit.vue index d92d41b..d7faf59 100644 --- a/frontend/src/views/GeneralScriptEdit.vue +++ b/frontend/src/views/GeneralScriptEdit.vue @@ -647,7 +647,7 @@