1
0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-01 19:44:14 +08:00

fix: 容器镜像升级样式调整 (#1531)

This commit is contained in:
ssongliu 2023-07-04 19:24:11 +08:00 committed by GitHub
parent dddd190911
commit a0ceb62372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions

View File

@ -495,6 +495,7 @@ const message = {
'The upgrade operation requires rebuilding the container, and any non-persistent data will be lost. Do you want to continue?', 'The upgrade operation requires rebuilding the container, and any non-persistent data will be lost. Do you want to continue?',
oldImage: 'Current image', oldImage: 'Current image',
targetImage: 'Target image', targetImage: 'Target image',
targetImageHelper: 'Please enter the target image version',
appHelper: appHelper:
'This container is sourced from the application store. Upgrading it may cause the service to be unavailable. Do you want to continue?', 'This container is sourced from the application store. Upgrading it may cause the service to be unavailable. Do you want to continue?',

View File

@ -484,6 +484,7 @@ const message = {
upgradeWarning2: '升級操作需要重建容器任何未持久化的數據將會丟失是否繼續', upgradeWarning2: '升級操作需要重建容器任何未持久化的數據將會丟失是否繼續',
oldImage: '當前鏡像', oldImage: '當前鏡像',
targetImage: '目標鏡像', targetImage: '目標鏡像',
targetImageHelper: '請輸入目標鏡像版本',
appHelper: '該容器來源於應用商店升級可能導致該服務不可用是否繼續', appHelper: '該容器來源於應用商店升級可能導致該服務不可用是否繼續',
server: '服務器', server: '服務器',

View File

@ -484,6 +484,7 @@ const message = {
upgradeWarning2: '升级操作需要重建容器任何未持久化的数据将会丢失是否继续', upgradeWarning2: '升级操作需要重建容器任何未持久化的数据将会丢失是否继续',
oldImage: '当前镜像', oldImage: '当前镜像',
targetImage: '目标镜像', targetImage: '目标镜像',
targetImageHelper: '请输入目标镜像版本',
appHelper: '该容器来源于应用商店升级可能导致该服务不可用是否继续', appHelper: '该容器来源于应用商店升级可能导致该服务不可用是否继续',
server: '服务器', server: '服务器',

View File

@ -15,12 +15,27 @@
/> />
<el-form @submit.prevent ref="formRef" v-loading="loading" :model="form" label-position="top"> <el-form @submit.prevent ref="formRef" v-loading="loading" :model="form" label-position="top">
<el-form-item :label="$t('container.oldImage')" prop="oldImage"> <el-form-item :label="$t('container.oldImage')" prop="oldImage">
<el-tag>{{ form.imageName }}:{{ form.oldTag }}</el-tag> <el-tooltip placement="top-start" :content="form.imageName" v-if="form.imageName.length > 50">
<el-tag>{{ form.imageName.substring(0, 50) }}...:{{ form.oldTag }}</el-tag>
</el-tooltip>
<el-tag v-else>{{ form.imageName }}:{{ form.oldTag }}</el-tag>
</el-form-item> </el-form-item>
<el-form-item :label="$t('container.targetImage')" prop="newTag" :rules="Rules.requiredInput"> <el-form-item prop="newTag" :rules="Rules.requiredInput">
<el-input v-model="form.newTag"> <template #label>
<template #prefix>{{ form.imageName }}:</template> <el-tooltip
</el-input> placement="top-start"
:content="form.imageName"
v-if="form.imageName.length > 40"
>
<span>
{{ $t('container.targetImage') + ' (' + form.imageName.substring(0, 40) + '...)' }}
</span>
</el-tooltip>
<span v-else>
{{ $t('container.targetImage') + ' (' + form.imageName + ')' }}
</span>
</template>
<el-input v-model="form.newTag" :placeholder="$t('container.targetImageHelper')" />
<span class="input-help">{{ $t('container.upgradeHelper') }}</span> <span class="input-help">{{ $t('container.upgradeHelper') }}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -72,7 +87,7 @@ const acceptParams = (props: DialogProps): void => {
form.name = props.container; form.name = props.container;
form.imageName = props.image.indexOf(':') !== -1 ? props.image.split(':')[0] : props.image; form.imageName = props.image.indexOf(':') !== -1 ? props.image.split(':')[0] : props.image;
form.oldTag = props.image.indexOf(':') !== -1 ? props.image.split(':')[1] : 'latest'; form.oldTag = props.image.indexOf(':') !== -1 ? props.image.split(':')[1] : 'latest';
form.newTag = ''; form.newTag = form.oldTag;
form.fromApp = props.fromApp; form.fromApp = props.fromApp;
drawerVisiable.value = true; drawerVisiable.value = true;
}; };