diff --git a/backend/app/dto/container.go b/backend/app/dto/container.go index f387b989e..082739d59 100644 --- a/backend/app/dto/container.go +++ b/backend/app/dto/container.go @@ -129,7 +129,7 @@ type ComposeContainer struct { State string `json:"state"` } type ComposeCreate struct { - Name string `json:"name" validate:"required"` + Name string `json:"name"` From string `json:"from" validate:"required,oneof=edit path template"` File string `json:"file"` Path string `json:"path"` diff --git a/backend/app/service/container_compose.go b/backend/app/service/container_compose.go index f3deb4df4..d0a384385 100644 --- a/backend/app/service/container_compose.go +++ b/backend/app/service/container_compose.go @@ -170,7 +170,7 @@ func (u *ContainerService) ComposeOperation(req dto.ComposeOperation) error { global.LOG.Infof("docker-compose %s %s successful", req.Operation, req.Name) if req.Operation == "down" { _ = composeRepo.DeleteRecord(commonRepo.WithByName(req.Name)) - _ = os.RemoveAll(strings.ReplaceAll(req.Path, req.Name+"/docker-compose.yml", "")) + _ = os.RemoveAll(strings.ReplaceAll(req.Path, "/docker-compose.yml", "")) } return nil diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue index aa5cc827b..f4fa50080 100644 --- a/frontend/src/components/upload/index.vue +++ b/frontend/src/components/upload/index.vue @@ -204,7 +204,7 @@ const onSubmit = async () => { MsgError(i18n.global.t('commons.msg.fileNameErr')); return; } - const res = await CheckFile(baseDir.value + '/' + uploaderFiles.value[0]!.raw.name); + const res = await CheckFile(baseDir.value + uploaderFiles.value[0]!.raw.name); if (!res.data) { MsgError(i18n.global.t('commons.msg.fileExist')); return; diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue index d7fa46864..7a542f530 100644 --- a/frontend/src/views/container/compose/create/index.vue +++ b/frontend/src/views/container/compose/create/index.vue @@ -24,7 +24,7 @@ - + diff --git a/frontend/src/views/container/network/create/index.vue b/frontend/src/views/container/network/create/index.vue index d59f34583..6aadf4098 100644 --- a/frontend/src/views/container/network/create/index.vue +++ b/frontend/src/views/container/network/create/index.vue @@ -83,6 +83,15 @@ const form = reactive({ }); const acceptParams = (): void => { + form.name = ''; + form.labelStr = ''; + form.labels = []; + form.optionStr = ''; + form.options = []; + form.driver = ''; + form.subnet = ''; + form.gateway = ''; + form.scope = ''; drawerVisiable.value = true; }; const emit = defineEmits<{ (e: 'search'): void }>(); @@ -92,7 +101,7 @@ const handleClose = () => { }; const rules = reactive({ - name: [Rules.requiredInput, Rules.imageName], + name: [Rules.requiredInput], driver: [Rules.requiredSelect], }); diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue index 5d1c55cfe..3c59293f6 100644 --- a/frontend/src/views/container/repo/index.vue +++ b/frontend/src/views/container/repo/index.vue @@ -39,7 +39,6 @@ :data="data" @search="search" > - { loading.value = false; }); }; - -function selectable(row) { - return !(row.name === 'Docker Hub'); -} - const dialogRef = ref(); const onOpenDialog = async ( title: string, diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index 80d56b3e3..cfb4b706b 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -219,6 +219,7 @@ const submitStop = async () => { await dockerOperate(param) .then(() => { loading.value = false; + stopVisiable.value = false; search(); changeMode(); MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue index 875baab87..74dac596d 100644 --- a/frontend/src/views/cronjob/record/index.vue +++ b/frontend/src/views/cronjob/record/index.vue @@ -134,7 +134,7 @@ {{ dialogData.rowData!.targetDir }}