fix: 解决容器镜像清理的显示问题

1Panel-dev · Feb 26, 2024 · 80b45b0 · 80b45b0
1 parent f0d5aca
commit 80b45b0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -1243,7 +1243,6 @@ const message = {
         createBackupAccount: 'Add {0}',
         noTypeForCreate: 'No backup type is currently created',
         LOCAL: 'Server disks',
-        currentPath: 'Current path',
         OSS: 'Ali OSS',
         S3: 'Amazon S3',
         MINIO: 'MINIO',

diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
@@ -1166,7 +1166,6 @@ const message = {
         createBackupAccount: '添加 {0}',
         noTypeForCreate: '當前無可創建備份類型',
         LOCAL: '服務器磁盤',
-        currentPath: '當前路徑',
         OSS: '阿裏雲 OSS',
         S3: '亞馬遜 S3 雲存儲',
         MINIO: 'MINIO',

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -1167,7 +1167,6 @@ const message = {
         createBackupAccount: '添加 {0}',
         noTypeForCreate: '当前无可创建备份类型',
         LOCAL: '服务器磁盘',
-        currentPath: '当前路径',
         OSS: '阿里云 OSS',
         S3: '亚马逊 S3 云存储',
         MINIO: 'MINIO',

diff --git a/frontend/src/views/container/image/prune/index.vue b/frontend/src/views/container/image/prune/index.vue
@@ -22,8 +22,11 @@
             </span>
             <div v-if="!withTagAll">
                 <ul v-for="(item, index) in unTagList" :key="index">
-                    <li>
-                        {{ item.tags[0] || '< none >' }}
+                    <li v-if="item.tags">
+                        {{ item.tags[0] }}
+                    </li>
+                    <li v-else>
+                        {{ item.id.replaceAll('sha256:', '').substring(0, 12) }}
                     </li>
                 </ul>
             </div>

diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
@@ -18,7 +18,7 @@
                             </div>
                             <el-divider class="divider" />
                             <div style="margin-left: 20px">
-                                <el-form-item :label="$t('setting.currentPath')">
+                                <el-form-item :label="$t('setting.backupDir')">
                                     {{ localData.varsJson['dir'] }}
                                 </el-form-item>
                                 <el-form-item :label="$t('commons.table.createdAt')">

diff --git a/frontend/src/views/setting/backup-account/local/index.vue b/frontend/src/views/setting/backup-account/local/index.vue
@@ -11,7 +11,7 @@
                             <el-tag>{{ $t('setting.' + dialogData.rowData!.type) }}</el-tag>
                         </el-form-item>
                         <el-form-item
-                            :label="$t('setting.currentPath')"
+                            :label="$t('setting.backupDir')"
                             prop="varsJson['dir']"
                             :rules="Rules.requiredInput"
                         >