1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-17 22:28:45 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Optimize container creation page exit behavior (#9586)

Browse source 
Refs #9424
This commit is contained in:
ssongliu 2025-07-21 17:52:43 +08:00 • committed by GitHub
parent 1c22e1cf99
commit b3b472d711
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/components/log/task/index.vue
View file

@ -10,6 +10,9 @@
<div v-if="open">
<LogFile :config="config" :showTail="showTail"></LogFile>
</div>
<template #footer>
<slot name="task-footer"></slot>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
@ -76,5 +79,5 @@ const handleClose = () => {
bus.emit('refreshApp', true);
};
defineExpose({ openWithResourceID, openWithTaskID });
defineExpose({ openWithResourceID, openWithTaskID, handleClose });
</script>

2
frontend/src/lang/modules/en.ts
View file

@ -134,6 +134,8 @@ const message = {
local: 'local',
serialNumber: 'Serial number',
manageGroup: 'Manage Groups',
backToList: 'Back to List',
keepEdit: 'Continue Editing',
},
loadingText: {
Upgrading: 'System upgrade, please wait...',

2
frontend/src/lang/modules/ja.ts
View file

@ -126,6 +126,8 @@ const message = {
local: 'ローカル',
serialNumber: 'シリアル番号',
manageGroup: 'グループ管理',
backToList: 'リストに戻る',
keepEdit: '編集を続ける',
},
loadingText: {
Upgrading: 'システムのアップグレード、待ってください...',

2
frontend/src/lang/modules/ko.ts
View file

@ -126,6 +126,8 @@ const message = {
local: '로컬',
serialNumber: '일련 번호',
manageGroup: '그룹 관리',
backToList: '목록으로 돌아가기',
keepEdit: '계속 편집',
},
loadingText: {
Upgrading: '시스템 업그레이드 중입니다. 잠시만 기다려 주십시오...',

2
frontend/src/lang/modules/ms.ts
View file

@ -126,6 +126,8 @@ const message = {
local: 'Tempatan',
serialNumber: 'Nombor siri',
manageGroup: 'Urus Kumpulan',
backToList: 'Kembali ke Senarai',
keepEdit: 'Teruskan Mengedit',
},
loadingText: {
Upgrading: 'Peningkatan sistem, sila tunggu...',

2
frontend/src/lang/modules/pt-br.ts
View file

@ -126,6 +126,8 @@ const message = {
local: 'Local',
serialNumber: 'Número de série',
manageGroup: 'Gerenciar Grupos',
backToList: 'Voltar à Lista',
keepEdit: 'Continuar Editando',
},
loadingText: {
Upgrading: 'Atualizando o sistema, por favor, aguarde...',

2
frontend/src/lang/modules/ru.ts
View file

@ -126,6 +126,8 @@ const message = {
local: 'локальный',
serialNumber: 'Серийный номер',
manageGroup: 'Управление группами',
backToList: 'Вернуться к списку',
keepEdit: 'Продолжить редактирование',
},
loadingText: {
Upgrading: 'Обновление системы, пожалуйста, подождите...',

2
frontend/src/lang/modules/tr.ts
View file

@ -134,6 +134,8 @@ const message = {
local: 'yerel',
serialNumber: 'Seri numarası',
manageGroup: 'Grupları Yönet',
backToList: 'Listeye Dön',
keepEdit: 'Düzenlemeye Devam Et',
},
loadingText: {
Upgrading: 'Sistem yükseltiliyor, lütfen bekleyin...',

2
frontend/src/lang/modules/zh-Hant.ts
View file

@ -131,6 +131,8 @@ const message = {
local: '本地',
serialNumber: '序號',
manageGroup: '管理群組',
backToList: '返回列表',
keepEdit: '繼續編輯',
},
loadingText: {
Upgrading: '系統升級中，請稍候...',

2
frontend/src/lang/modules/zh.ts
View file

@ -131,6 +131,8 @@ const message = {
local: '本地',
serialNumber: '序号',
manageGroup: '管理分组',
backToList: '返回列表',
keepEdit: '继续编辑',
},
loadingText: {
Upgrading: '系统升级中，请稍候...',

11
frontend/src/views/container/container/operate/index.vue
View file

@ -424,7 +424,12 @@
</template>
</LayoutContent>
<Confirm ref="confirmRef" @submit="submit" />
<TaskLog ref="taskLogRef" width="70%" @close="goBack" />
<TaskLog ref="taskLogRef" width="70%" :show-close="false">
<template #task-footer>
<el-button @click="goBack">{{ $t('commons.table.backToList') }}</el-button>
<el-button type="primary" @click="closeTask">{{ $t('commons.table.keepEdit') }}</el-button>
</template>
</TaskLog>
<TerminalDialog ref="dialogTerminalRef" />
</div>
</template>
@ -582,7 +587,9 @@ const formRef = ref<FormInstance>();
const goBack = () => {
router.push({ name: 'ContainerItem' });
};
const closeTask = () => {
taskLogRef.value.handleClose();
};
const dialogTerminalRef = ref();
const toTerminal = () => {
dialogTerminalRef.value!.acceptParams({ cwd: '$HOME', command: '/bin/sh' });