starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-09-26 00:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Optimize backup logic for cronjob (#10145)

Browse Source
This commit is contained in:
ssongliu
2025-08-26 17:07:41 +08:00
committed by GitHub
parent ca84909716
commit 39f334f3a2
20 changed files with 199 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/task-list/index.vue
+1 -1
View File
@@ -17,7 +17,7 @@
<el-option :label="$t('logs.taskRunning')" value="Executing"></el-option>
</el-select>
<TableRefresh @search="search()" />
<TableSetting @search="search()" :rate="5" />
<TableSetting title="task-refresh" @search="search()" :rate="5" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="data" @search="search" :heightDiff="320">
frontend/src/views/ai/gpu/index.vue
+2 -2
View File
@@ -20,7 +20,7 @@
<el-row>
<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16" />
<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<TableSetting @search="refresh()" />
<TableSetting title="gpu-refresh" @search="refresh()" />
</el-col>
</el-row>
</template>
@@ -181,7 +181,7 @@
<el-row>
<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16" />
<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<TableSetting @search="refresh()" />
<TableSetting title="xpu-refresh" @search="refresh()" />
</el-col>
</el-row>
</template>
frontend/src/views/cronjob/cronjob/record/index.vue
+9 -8
View File
@@ -156,14 +156,15 @@
<span class="status-label">{{ $t('commons.table.status') }}</span>
</template>
<Status :status="currentRecord?.status" />
</el-form-item>
</el-row>
<el-row v-if="currentRecord?.status === 'Failed'">
<el-form-item class="w-full">
<template #label>
<span class="status-label">{{ $t('commons.table.message') }}</span>
</template>
{{ currentRecord?.message }}
<el-tooltip :content="currentRecord?.message">
<el-button
class="mt-0.5"
type="danger"
v-if="currentRecord?.status === 'Failed'"
icon="Warning"
link
/>
</el-tooltip>
</el-form-item>
</el-row>
<el-row v-if="currentRecord?.taskID && currentRecord?.taskID != ''">
frontend/src/views/setting/snapshot/index.vue
+24 -26
View File
@@ -36,36 +36,34 @@
fix
/>
<el-table-column prop="version" :label="$t('app.version')" />
<el-table-column :label="$t('setting.backupAccount')" min-width="80" prop="from">
<el-table-column :label="$t('setting.backupAccount')" :min-width="120" prop="from">
<template #default="{ row }">
<div class="flex items-center justify-start gap-0.5">
<div v-for="(item, index) of row.sourceAccounts" :key="index" class="mt-1">
<div v-if="row.expand || (!row.expand && index < 3)">
<span type="info">
<span>
{{ item === 'localhost' ? $t('setting.LOCAL') : item }}
</span>
<el-icon
v-if="item === row.downloadAccount"
size="12"
class="relative top-px left-1"
>
<Star />
</el-icon>
<div v-for="(item, index) of row.sourceAccounts" :key="index">
<div v-if="row.expand || (!row.expand && index < 3)">
<span type="info">
<span>
{{ item === 'localhost' ? $t('setting.LOCAL') : item }}
</span>
</div>
</div>
<div v-if="!row.expand && row.sourceAccounts?.length > 3">
<el-button type="primary" link @click="row.expand = true">
{{ $t('commons.button.expand') }}...
</el-button>
</div>
<div v-if="row.expand && row.sourceAccounts?.length > 3">
<el-button type="primary" link @click="row.expand = false">
{{ $t('commons.button.collapse') }}
</el-button>
<el-icon
v-if="item === row.downloadAccount"
size="12"
class="relative top-px left-1"
>
<Star />
</el-icon>
</span>
</div>
</div>
<div v-if="!row.expand && row.sourceAccounts?.length > 3">
<el-button type="primary" link @click="row.expand = true">
{{ $t('commons.button.expand') }}...
</el-button>
</div>
<div v-if="row.expand && row.sourceAccounts?.length > 3">
<el-button type="primary" link @click="row.expand = false">
{{ $t('commons.button.collapse') }}
</el-button>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('file.size')" prop="size" min-width="60" show-overflow-tooltip>