diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go
index 4a58d45be..7604f7a06 100644
--- a/backend/app/service/app_utils.go
+++ b/backend/app/service/app_utils.go
@@ -500,7 +500,7 @@ func handleErr(install model.AppInstall, err error, out string) error {
}
func getAppFromRepo(downloadPath, version string) error {
- downloadUrl := fmt.Sprintf(downloadPath)
+ downloadUrl := downloadPath
appDir := constant.AppResourceDir
global.LOG.Infof("download file from %s", downloadUrl)
diff --git a/frontend/src/components/codemirror-dialog/codemirror.vue b/frontend/src/components/codemirror-dialog/codemirror.vue
index 72ce11588..b08d5a95e 100644
--- a/frontend/src/components/codemirror-dialog/codemirror.vue
+++ b/frontend/src/components/codemirror-dialog/codemirror.vue
@@ -18,6 +18,11 @@
v-model="detailInfo"
:readOnly="true"
/>
+
+
+
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 160137047..3355fdf03 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -813,7 +813,7 @@ export default {
monitor: 'Monitor',
enableMonitor: 'Enable',
- storeDays: 'Expiration time (day)',
+ storeDays: 'Expiration days',
cleanMonitor: 'Clearing monitoring records',
message: 'Message',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index ee1f24dab..a147abe16 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -818,7 +818,7 @@ export default {
monitor: '监控',
enableMonitor: '监控状态',
- storeDays: 'Retention days (days)',
+ storeDays: '保存天数',
cleanMonitor: '清空监控记录',
message: '通知',
diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue
index 9836ec84a..51584c6f9 100644
--- a/frontend/src/views/container/compose/create/index.vue
+++ b/frontend/src/views/container/compose/create/index.vue
@@ -59,8 +59,10 @@
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
index f382eaeb2..1d1cf3d27 100644
--- a/frontend/src/views/container/compose/index.vue
+++ b/frontend/src/views/container/compose/index.vue
@@ -101,7 +101,6 @@ import { Container } from '@/api/interface/container';
import { useDeleteData } from '@/hooks/use-delete-data';
import { LoadFile } from '@/api/modules/files';
import router from '@/routers';
-import { MsgSuccess } from '@/utils/message';
const data = ref();
const selects = ref([]);
@@ -175,7 +174,6 @@ const onDelete = async (row: Container.ComposeInfo) => {
};
await useDeleteData(composeOperator, param, 'commons.msg.delete');
search();
- MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
};
const dialogEditRef = ref();
diff --git a/frontend/src/views/container/image/build/index.vue b/frontend/src/views/container/image/build/index.vue
index 2ea125d60..a212d9452 100644
--- a/frontend/src/views/container/image/build/index.vue
+++ b/frontend/src/views/container/image/build/index.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/frontend/src/views/container/image/delete/index.vue b/frontend/src/views/container/image/delete/index.vue
index 72009b236..ea2c02dcc 100644
--- a/frontend/src/views/container/image/delete/index.vue
+++ b/frontend/src/views/container/image/delete/index.vue
@@ -6,12 +6,17 @@
-
-
-
-
+
-
+
+
+
@@ -35,21 +40,16 @@ import { useDeleteData } from '@/hooks/use-delete-data';
import DrawerHeader from '@/components/drawer-header/index.vue';
const deleteVisiable = ref(false);
-const isByID = ref();
const deleteForm = reactive({
- id: '',
tags: [] as Array,
deleteTags: [] as Array,
});
interface DialogProps {
- id: string;
tags: Array;
}
const acceptParams = (params: DialogProps) => {
- isByID.value = false;
deleteVisiable.value = true;
- deleteForm.id = params.id.replaceAll('sha256:', '').substring(0, 12);
deleteForm.deleteTags = [];
deleteForm.tags = params.tags;
};
@@ -58,20 +58,10 @@ const handleClose = () => {
};
const emit = defineEmits<{ (e: 'search'): void }>();
-const changeDeleteType = () => {
- if (isByID.value) {
- deleteForm.deleteTags = deleteForm.tags;
- }
-};
-
const batchDelete = async () => {
let names: Array = [];
- if (!isByID.value) {
- for (const item of deleteForm.deleteTags) {
- names.push(item);
- }
- } else {
- names.push(deleteForm.id);
+ for (const item of deleteForm.deleteTags) {
+ names.push(item);
}
await useDeleteData(imageRemove, { names: names }, 'commons.msg.delete');
deleteVisiable.value = false;
diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
index 381c2e644..2bcf4cf3e 100644
--- a/frontend/src/views/container/image/index.vue
+++ b/frontend/src/views/container/image/index.vue
@@ -49,11 +49,12 @@
-
-
- {{ dateFormatSimple(row.createdAt) }}
-
-
+
{
const buttons = [
{
- label: 'Tag',
+ label: i18n.global.t('container.tag'),
click: (row: Container.ImageInfo) => {
let params = {
repos: repos.value,
@@ -188,7 +190,11 @@ const buttons = [
},
{
label: i18n.global.t('commons.button.delete'),
- click: (row: Container.ImageInfo) => {
+ click: async (row: Container.ImageInfo) => {
+ if (row.tags.length <= 1) {
+ await useDeleteData(imageRemove, { names: [row.id] }, 'commons.msg.delete');
+ return;
+ }
let params = {
id: row.id,
tags: row.tags,
diff --git a/frontend/src/views/container/image/push/index.vue b/frontend/src/views/container/image/push/index.vue
index fe24ddaaf..c9d6db83f 100644
--- a/frontend/src/views/container/image/push/index.vue
+++ b/frontend/src/views/container/image/push/index.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/frontend/src/views/container/image/save/index.vue b/frontend/src/views/container/image/save/index.vue
index 2e67a2fa8..00bd22cdd 100644
--- a/frontend/src/views/container/image/save/index.vue
+++ b/frontend/src/views/container/image/save/index.vue
@@ -6,7 +6,7 @@
-
+
-
-
- {{ dateFormatSimple(row.createdAt) }}
-
-
+
@@ -80,7 +82,7 @@ import TableSetting from '@/components/table-setting/index.vue';
import OperatorDialog from '@/views/container/repo/operator/index.vue';
import DeleteDialog from '@/views/container/repo/delete/index.vue';
import { reactive, onMounted, ref } from 'vue';
-import { dateFormatSimple } from '@/utils/util';
+import { dateFormat } from '@/utils/util';
import { Container } from '@/api/interface/container';
import { deleteImageRepo, loadDockerStatus, searchImageRepo } from '@/api/modules/container';
import i18n from '@/lang';
diff --git a/frontend/src/views/database/redis/password/index.vue b/frontend/src/views/database/redis/password/index.vue
index 5e8a02992..62bc9c756 100644
--- a/frontend/src/views/database/redis/password/index.vue
+++ b/frontend/src/views/database/redis/password/index.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
index 9590b6024..f6b8bf828 100644
--- a/frontend/src/views/setting/backup-account/index.vue
+++ b/frontend/src/views/setting/backup-account/index.vue
@@ -60,7 +60,7 @@
{{ s3Data.bucket }}
- {{ dateFormatSimple(s3Data.createdAt) }}
+ {{ dateFormat(0, 0, s3Data.createdAt) }}
@@ -96,7 +96,7 @@
{{ ossData.bucket }}
- {{ dateFormatSimple(ossData.createdAt) }}
+ {{ dateFormat(0, 0, ossData.createdAt) }}
@@ -133,7 +133,7 @@
{{ minioData.bucket }}
- {{ dateFormatSimple(minioData.createdAt) }}
+ {{ dateFormat(0, 0, minioData.createdAt) }}
@@ -172,7 +172,7 @@
{{ sftpData.bucket }}
- {{ dateFormatSimple(sftpData.createdAt) }}
+ {{ dateFormat(0, 0, sftpData.createdAt) }}
@@ -188,7 +188,7 @@