Skip to content

feat: Enhance log container UI and functionality #11903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HynoR wants to merge 2 commits into from
+196 −73
Closed

feat: Enhance log container UI and functionality #11903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad4a64a
feat: Enhance log container UI and functionality
HynoR Feb 15, 2026
45f1e8f
feat: Add helper text for container update confirmation
HynoR Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 135 additions & 46 deletions frontend/src/components/log/container/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,63 @@
<template>
<div v-if="showControl">
<el-select @change="searchLogs" class="fetchClass" v-model="logSearch.mode">
<template #prefix>{{ $t('container.fetch') }}</template>
<el-option v-for="item in timeOptions" :key="item.label" :value="item.value" :label="item.label" />
</el-select>
<el-select @change="searchLogs" class="tailClass" v-model.number="logSearch.tail">
<template #prefix>{{ $t('container.lines') }}</template>
<el-option :value="0" :label="$t('commons.table.all')" />
<el-option :value="100" :label="100" />
<el-option :value="200" :label="200" />
<el-option :value="500" :label="500" />
<el-option :value="1000" :label="1000" />
</el-select>
<div class="margin-button float-left">
<el-checkbox border @change="searchLogs" v-model="logSearch.isWatch">
{{ $t('commons.button.watch') }}
</el-checkbox>
<div v-if="showControl" class="toolbar-container">
<div class="filter-row">
<div class="select-group">
<el-select @change="searchLogs" class="fetchClass" v-model="logSearch.mode" :disabled="isCopyMode">
<template #prefix>{{ $t('container.fetch') }}</template>
<el-option v-for="item in timeOptions" :key="item.label" :value="item.value" :label="item.label" />
</el-select>
<el-select
@change="searchLogs"
class="tailClass"
v-model.number="logSearch.tail"
:disabled="isCopyMode"
>
<template #prefix>{{ $t('container.lines') }}</template>
<el-option :value="0" :label="$t('commons.table.all')" />
<el-option :value="100" :label="100" />
<el-option :value="200" :label="200" />
<el-option :value="500" :label="500" />
<el-option :value="1000" :label="1000" />
</el-select>
</div>
<div class="checkbox-group">
<el-checkbox border @change="searchLogs" v-model="logSearch.isWatch" :disabled="isCopyMode">
{{ $t('commons.button.watch') }}
</el-checkbox>
<el-checkbox border @change="searchLogs" v-model="logSearch.isShowTimestamp" :disabled="isCopyMode">
{{ $t('commons.table.date') }}
</el-checkbox>
</div>
</div>
<div class="margin-button float-left">
<el-checkbox border @change="searchLogs" v-model="logSearch.isShowTimestamp">
{{ $t('commons.table.date') }}
</el-checkbox>
<div class="button-row">
<el-button @click="toggleCopyMode" :type="isCopyMode ? 'primary' : 'default'">
{{ isCopyMode ? $t('commons.button.close') : $t('commons.button.copy') }}
</el-button>
<el-button @click="onDownload" icon="Download" :disabled="isCopyMode">
{{ $t('commons.button.download') }}
</el-button>
<el-button @click="onClean" icon="Delete" :disabled="isCopyMode">
{{ $t('commons.button.clean') }}
</el-button>
</div>
<el-button class="margin-button" @click="onDownload" icon="Download">
{{ $t('commons.button.download') }}
</el-button>
<el-button class="margin-button" @click="onClean" icon="Delete">
{{ $t('commons.button.clean') }}
</el-button>
</div>
<div class="log-container" :style="styleVars" ref="logContainer">
<div class="log-spacer" :style="{ height: `${totalHeight}px` }"></div>
<div
v-for="(log, index) in visibleLogs"
:key="startIndex + index"
class="log-item"
:style="{ top: `${(startIndex + index) * logHeight}px` }"
>
<hightlight :log="log" type="container" :container="container"></hightlight>
</div>
<template v-if="isCopyMode">
<div v-for="(log, index) in logs" :key="`copy-${index}`" class="log-copy-item">
<span class="whitespace-pre">{{ log }}</span>
</div>
</template>
<template v-else>
<div class="log-spacer" :style="{ height: `${totalHeight}px` }"></div>
<div
v-for="(log, index) in visibleLogs"
:key="startIndex + index"
class="log-item"
:style="{ top: `${(startIndex + index) * logHeight}px` }"
>
<hightlight :log="log" type="container" :container="container"></hightlight>
</div>
</template>
</div>
</template>

Expand Down Expand Up @@ -97,6 +116,8 @@ const styleVars = computed(() => ({
const logVisible = ref(false);
const logContainer = ref<HTMLElement | null>(null);
const logs = ref<string[]>([]);
const isCopyMode = ref(false);
const copyPendingLogs = ref<string[]>([]);
let eventSource: EventSource | null = null;
const logSearch = reactive({
isWatch: props.defaultFollow ? true : true,
Expand Down Expand Up @@ -148,16 +169,42 @@ const stopListening = () => {

const handleClose = async () => {
stopListening();
isCopyMode.value = false;
copyPendingLogs.value = [];
logVisible.value = false;
};

const flushCopyPendingLogs = () => {
if (copyPendingLogs.value.length === 0) {
return;
}
logs.value.push(...copyPendingLogs.value);
copyPendingLogs.value = [];
};

const toggleCopyMode = () => {
if (isCopyMode.value) {
isCopyMode.value = false;
flushCopyPendingLogs();
nextTick(() => {
if (logContainer.value) {
logContainer.value.scrollTop = logContainer.value.scrollHeight;
}
});
return;
}
isCopyMode.value = true;
};

const searchLogs = async () => {
if (Number(logSearch.tail) < 0) {
MsgError(i18n.global.t('container.linesHelper'));
return;
}
stopListening();
isCopyMode.value = false;
logs.value = [];
copyPendingLogs.value = [];
let currentNode = globalStore.currentNode;
if (props.node && props.node !== '') {
currentNode = props.node;
Expand All @@ -169,6 +216,10 @@ const searchLogs = async () => {
eventSource = new EventSource(url);
eventSource.onmessage = (event: MessageEvent) => {
const data = event.data;
if (isCopyMode.value) {
copyPendingLogs.value.push(data);
return;
}
logs.value.push(data);
nextTick(() => {
if (logContainer.value) {
Expand Down Expand Up @@ -290,20 +341,50 @@ onMounted(() => {
</script>

<style scoped lang="scss">
.margin-button {
margin-left: 20px;
.toolbar-container {
display: flex;
flex-direction: column;
gap: 10px;
}

.filter-row {
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
gap: 10px 12px;
}
.fullScreen {
border: none;

.button-row {
display: flex;
align-items: center;
gap: 12px;
flex-wrap: wrap;
}
.tailClass {
width: 20%;
float: left;
margin-left: 20px;

.select-group {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 12px;
}

.checkbox-group {
display: flex;
align-items: center;
gap: 12px;
flex-wrap: wrap;
margin-left: auto;
}

.fetchClass {
width: 30%;
float: left;
width: 320px;
max-width: 100%;
}

.tailClass {
width: 220px;
max-width: 100%;
}

.log-container {
Expand All @@ -323,4 +404,12 @@ onMounted(() => {
box-sizing: border-box;
white-space: nowrap;
}

.log-copy-item {
width: 100%;
padding: 2px;
color: #f5f5f5;
box-sizing: border-box;
white-space: nowrap;
}
</style>
1 change: 0 additions & 1 deletion frontend/src/layout/components/Sidebar/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
:router="true"
:collapse="isCollapse"
:collapse-transition="false"
:unique-opened="true"
@select="handleMenuClick"
class="custom-menu"
>
Expand Down
87 changes: 61 additions & 26 deletions frontend/src/views/container/compose/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,18 @@
</el-table-column>
</el-table>

<el-radio-group class="mt-1 mb-1" v-model="showType">
<el-radio-button value="compose">{{ $t('container.compose') }}</el-radio-button>
<el-radio-button value="log">{{ $t('commons.button.log') }}</el-radio-button>
</el-radio-group>
<div class="mt-1 mb-1 flex items-center justify-between">
<el-radio-group v-model="showType">
<el-radio-button value="compose">{{ $t('container.compose') }}</el-radio-button>
<el-radio-button value="log">{{ $t('commons.button.log') }}</el-radio-button>
<el-radio-button v-if="canEditComposeEnv" value="env">
{{ $t('container.env') }}
</el-radio-button>
</el-radio-group>
<el-button v-if="showType !== 'log'" type="primary" @click="onSubmitEdit">
{{ $t('commons.button.save') }}
</el-button>
</div>
<el-select
class="p-w-300 mt-2 ml-2"
v-model="currentYamlPath"
Expand All @@ -246,25 +254,6 @@
:heightDiff="475"
placeholder="#Define or paste the content of your docker-compose file here"
/>
<span class="envTitle">{{ $t('container.env') }}</span>
<el-input
placeholder="key=value"
type="textarea"
:rows="3"
:disabled="currentCompose.createdBy === 'Apps'"
v-model="env"
/>
<span v-if="currentCompose.createdBy === 'Apps'" class="input-help">
{{ $t('container.composeEnvHelper2') }}
</span>
<div class="mt-2">
<el-checkbox v-model="form.forcePull" :label="$t('container.forcePull')" />
<span class="input-help">{{ $t('container.forcePullHelper') }}</span>
</div>

<el-button type="primary" class="mt-2" @click="onSubmitEdit">
{{ $t('commons.button.save') }}
</el-button>
</div>

<div v-show="showType === 'log'">
Expand All @@ -277,6 +266,20 @@
:defaultFollow="true"
/>
</div>

<div v-show="showType === 'env'">
<span class="envTitle">{{ $t('container.env') }}</span>
<el-input
placeholder="key=value"
type="textarea"
:rows="10"
:disabled="currentCompose.createdBy === 'Apps'"
v-model="env"
/>
<span v-if="currentCompose.createdBy === 'Apps'" class="input-help">
{{ $t('container.composeEnvHelper2') }}
</span>
</div>
</el-card>
<el-card v-else>
<el-form
Expand Down Expand Up @@ -370,7 +373,7 @@
</template>

<script lang="ts" setup>
import { computed, ref } from 'vue';
import { computed, h, ref } from 'vue';
import CodemirrorPro from '@/components/codemirror-pro/index.vue';
import ContainerLog from '@/components/log/container/index.vue';
import TaskLog from '@/components/log/task/index.vue';
Expand Down Expand Up @@ -399,7 +402,7 @@ import { MsgError, MsgSuccess } from '@/utils/message';
import { computeCPU, computeSize2, computeSizeForDocker, newUUID } from '@/utils/util';
import { Rules } from '@/global/form-rules';
import { loadBaseDir } from '@/api/modules/setting';
import { ElForm } from 'element-plus';
import { ElCheckbox, ElForm } from 'element-plus';

const data = ref<any[]>([]);
const loading = ref(false);
Expand Down Expand Up @@ -446,6 +449,7 @@ const rules = reactive({

const isActive = ref(false);
const isExist = ref(false);
const canEditComposeEnv = computed(() => currentCompose.value?.createdBy !== 'Apps');

const tableData = computed(() => {
return composeContainers.value.map((container) => {
Expand Down Expand Up @@ -531,6 +535,9 @@ const loadDetail = async (row: Container.ComposeInfo, withRefresh: boolean) => {
isOnCreate.value = false;
detailLoading.value = true;
currentCompose.value = row;
if (!canEditComposeEnv.value && showType.value === 'env') {
showType.value = 'compose';
}
currentYamlPath.value = row.path.indexOf(',') !== -1 ? row.path.split(',')[0] : row.path;
env.value = row.env || '';
composeContainers.value = row.containers || [];
Expand Down Expand Up @@ -688,6 +695,34 @@ const loadSize = async (row: any) => {
};

const onSubmitEdit = async () => {
const forcePull = ref(false);
try {
await ElMessageBox({
title: i18n.global.t('commons.button.save'),
message: h('div', { class: 'w-full' }, [
h(
ElCheckbox,
{
onChange: (value: string | number | boolean) => {
forcePull.value = Boolean(value);
},
},
{
default: () => i18n.global.t('container.forcePull'),
},
),
h('div', { class: 'input-help mt-1' }, i18n.global.t('container.forcePullHelper')),
h('div', { class: 'mt-2 leading-6' }, i18n.global.t('container.updateHelper4')),
]),
showCancelButton: true,
confirmButtonText: i18n.global.t('commons.button.confirm'),
cancelButtonText: i18n.global.t('commons.button.cancel'),
closeOnClickModal: false,
});
} catch {
return;
}

const taskID = newUUID();
const param = {
taskID: taskID,
Expand All @@ -697,7 +732,7 @@ const onSubmitEdit = async () => {
content: composeContent.value,
createdBy: currentCompose.value.createdBy,
env: env.value || '',
forcePull: form.forcePull,
forcePull: forcePull.value,
};
loading.value = true;
await composeUpdate(param)
Expand Down
Loading