diff --git a/agent/app/service/cronjob.go b/agent/app/service/cronjob.go index ee11cf27d..c2616ca99 100644 --- a/agent/app/service/cronjob.go +++ b/agent/app/service/cronjob.go @@ -273,6 +273,7 @@ func (u *CronjobService) Delete(req dto.CronjobBatchDelete) error { if cronjob.ID == 0 { return errors.New("find cronjob in db failed") } + _ = os.RemoveAll(path.Join(global.Dir.DataDir, "task/shell", cronjob.Name)) ids := strings.Split(cronjob.EntryIDs, ",") for _, id := range ids { idItem, _ := strconv.Atoi(id) diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go index 1153ada39..7417f0a22 100644 --- a/agent/app/service/cronjob_helper.go +++ b/agent/app/service/cronjob_helper.go @@ -97,8 +97,7 @@ func (u *CronjobService) handleShell(cronjob model.Cronjob, taskID string) error if len(cronjob.Command) != 0 { command = cronjob.Command } - scriptFile, _ := os.ReadFile(cronjob.Script) - return cmd.ExecShellWithTask(taskItem, 24*time.Hour, "docker", "exec", cronjob.ContainerName, command, "-c", strings.ReplaceAll(string(scriptFile), "\"", "\\\"")) + return cmd.ExecShellWithTask(taskItem, 24*time.Hour, "docker", "exec", cronjob.ContainerName, command, "-c", strings.ReplaceAll(cronjob.Script, "\"", "\\\"")) } if len(cronjob.Executor) == 0 { cronjob.Executor = "bash" diff --git a/core/constant/common.go b/core/constant/common.go index bcd05de1d..f5d395327 100644 --- a/core/constant/common.go +++ b/core/constant/common.go @@ -51,16 +51,17 @@ var WebUrlMap = map[string]struct{}{ "/ai/model": {}, "/ai/gpu": {}, - "/containers": {}, - "/containers/container": {}, - "/containers/image": {}, - "/containers/network": {}, - "/containers/volume": {}, - "/containers/repo": {}, - "/containers/compose": {}, - "/containers/template": {}, - "/containers/setting": {}, - "/containers/dashboard": {}, + "/containers": {}, + "/containers/container": {}, + "containers/container/operate": {}, + "/containers/image": {}, + "/containers/network": {}, + "/containers/volume": {}, + "/containers/repo": {}, + "/containers/compose": {}, + "/containers/template": {}, + "/containers/setting": {}, + "/containers/dashboard": {}, "/cronjobs": {}, diff --git a/frontend/src/components/complex-table/index.vue b/frontend/src/components/complex-table/index.vue index 2978527cc..78716740a 100644 --- a/frontend/src/components/complex-table/index.vue +++ b/frontend/src/components/complex-table/index.vue @@ -30,7 +30,7 @@ :page-sizes="[5, 10, 20, 50, 100]" @size-change="sizeChange" @current-change="currentChange" - :small="mobile" + :small="mobile || paginationConfig.small" :layout="mobile ? 'total, prev, pager, next' : 'total, sizes, prev, pager, next, jumper'" /> diff --git a/frontend/src/components/task-list/index.vue b/frontend/src/components/task-list/index.vue index 5cb0830c9..984a6fae1 100644 --- a/frontend/src/components/task-list/index.vue +++ b/frontend/src/components/task-list/index.vue @@ -62,6 +62,7 @@ const paginationConfig = reactive({ currentPage: 1, pageSize: 10, total: 0, + small: true, }); const taskLogRef = ref(); const req = reactive({ diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue index 32b1d3bc0..84cce2f09 100644 --- a/frontend/src/layout/components/Sidebar/index.vue +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -29,7 +29,12 @@ {{ $t('terminal.local') }} - + {{ item.name }} diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index a9ad44028..b8f1abd1e 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -271,7 +271,10 @@ - + {{ $t('commons.button.edit') }} {{ $t('container.pathSelect') }} @@ -280,8 +283,7 @@ v-model="dialogData.rowData!.script" placeholder="#Define or paste the content of your shell file here" mode="javascript" - :heightDiff="0" - :min-height="200" + :heightDiff="400" />