1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 15:06:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve log loss in certain scenarios (#10111)

Browse source
This commit is contained in:
CityFun 2025-08-22 17:15:52 +08:00 • committed by GitHub
parent 4fcf845934
commit c7d603e142
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
frontend/src/components/log/file/index.vue
View file

@ -149,24 +149,42 @@ const totalHeight = computed(() => logHeight * logCount.value);
const containerHeight = ref(500);
const visibleCount = computed(() => Math.ceil(containerHeight.value / logHeight));
const startIndex = ref(0);
const lastScrollTop = ref(0);
const visibleLogs = computed(() => {
return logs.value.slice(startIndex.value, startIndex.value + visibleCount.value);
});
let scrollTimer: ReturnType<typeof setTimeout> | null = null;
const onScroll = () => {
if (logContainer.value) {
const scrollTop = logContainer.value.scrollTop;
if (scrollTop == 0) {
readReq.page = minPage.value - 1;
if (readReq.page < 1) {
return;
}
minPage.value = readReq.page;
getContent(true);
}
startIndex.value = Math.floor(scrollTop / logHeight);
if (!logContainer.value || isLoading.value) return;
const scrollTop = logContainer.value.scrollTop;
const newStartIndex = Math.max(0, Math.floor(scrollTop / logHeight));
if (scrollTimer) {
clearTimeout(scrollTimer);
}
startIndex.value = newStartIndex;
scrollTimer = setTimeout(() => {
if (scrollTop <= logHeight && minPage.value > 1) {
const currentScrollTop = scrollTop;
readReq.page = minPage.value - 1;
if (readReq.page >= 1) {
minPage.value = readReq.page;
lastScrollTop.value = currentScrollTop;
getContent(true);
}
}
if (!tailLog.value && scrollTop + containerHeight.value >= totalHeight.value - logHeight && maxPage.value > 1) {
readReq.page = maxPage.value;
getContent(false);
}
}, 50);
};
const changeLoading = () => {
@ -276,11 +294,19 @@ const getContent = async (pre: boolean) => {
}
nextTick(() => {
if (pre) {
logContainer.value.scrollTop = 2000;
} else {
logContainer.value.scrollTop = totalHeight.value;
containerHeight.value = logContainer.value.getBoundingClientRect().height;
if (logContainer.value) {
if (pre) {
if (!end.value) {
const addedLines = newLogs.length;
const newScrollPosition = lastScrollTop.value + addedLines * logHeight;
logContainer.value.scrollTop = newScrollPosition;
startIndex.value = Math.max(0, Math.floor(newScrollPosition / logHeight));
}
} else {
logContainer.value.scrollTop = totalHeight.value;
containerHeight.value = logContainer.value.getBoundingClientRect().height;
startIndex.value = Math.max(0, logs.value.length - visibleCount.value);
}
}
});
}

7
frontend/src/views/cronjob/cronjob/record/index.vue
View file

@ -170,7 +170,12 @@
:key="currentRecord?.taskID"
@stop-reading="search(false)"
:heightDiff="410"
:config="{ type: 'task', taskID: currentRecord?.taskID, tail: true }"
:config="{
type: 'task',
colorMode: 'task',
taskID: currentRecord?.taskID,
tail: true,
}"
/>
</el-row>
</el-form>

1
frontend/src/views/website/website/config/basic/php/composer/index.vue
View file

@ -101,7 +101,6 @@ const search = () => {
loading.value = true;
getWebsite(req.websiteID)
.then((res) => {
console.log(res.data);
req.dir = res.data.sitePath + '/index';
})
.finally(() => {