Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: prevent disabled job's next trigger date parse error #266

Merged
merged 1 commit into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/locales/lang/en_US.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ const jobsTS = {
},
addCron: 'Add a timed task',
whatCron: 'What is a Cron expression?',
cronNoNext: "N/A",
cronInfo: {
one: '* The first bit, indicating seconds, value range: 0-59',
two: '* The second bit, indicating minutes, value range: 0-59',
Expand Down
1 change: 1 addition & 0 deletions src/locales/lang/ja_JP.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ const jobsTS = {
},
addCron: '添加定时任务',
whatCron: '什么是Cron表达式?',
cronNoNext: "N/A",
cronInfo: {
one: '* 第一位,表示秒,取值 0-59',
two: '* 第二位,表示分,取值 0-59',
Expand Down
1 change: 1 addition & 0 deletions src/locales/lang/zh_CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ const jobsTS = {
},
addCron: '添加定时任务',
whatCron: '什么是Cron表达式?',
cronNoNext: "N/A",
cronInfo: {
one: '* 第一位,表示秒,取值 0-59',
two: '* 第二位,表示分,取值 0-59',
Expand Down
1 change: 1 addition & 0 deletions src/locales/lang/zh_TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ const jobsTS = {
},
addCron: '新增排程任務',
whatCron: '什麼是Cron表達式?',
cronNoNext: "N/A",
cronInfo: {
one: '* 第一位,表示秒,取值 0-59',
two: '* 第二位,表示分,取值 0-59',
Expand Down
2 changes: 1 addition & 1 deletion src/views/Setting/SysJobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ onMounted(() => {
prop="cronNext"
>
<template #default="scope">
{{ new Date(scope.row['cronNext']) }}
{{(scope.row["cronNext"] ? new Date(scope.row["cronNext"]) : $t("jobsTS.cronNoNext"))}}
</template>
</el-table-column>
<el-table-column :label="$t('common.operate')" width="150" align="center">
Expand Down
Loading