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

If a job is disabled (by setting its cron expression to some time in the past), job list will have error showing this job.
EricJin-git · Aug 19, 2023 · 88887e2 · 88887e2
1 parent 6f7c8c3
commit 88887e2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/src/locales/lang/en_US.js b/src/locales/lang/en_US.js
@@ -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',

diff --git a/src/locales/lang/ja_JP.js b/src/locales/lang/ja_JP.js
@@ -447,6 +447,7 @@ const jobsTS = {
  },
  addCron: '添加定时任务',
  whatCron: '什么是Cron表达式？',
+ cronNoNext: "N/A",
  cronInfo: {
  one: '* 第一位，表示秒，取值 0-59',
  two: '* 第二位，表示分，取值 0-59',

diff --git a/src/locales/lang/zh_CN.js b/src/locales/lang/zh_CN.js
@@ -502,6 +502,7 @@ const jobsTS = {
  },
  addCron: '添加定时任务',
  whatCron: '什么是Cron表达式？',
+ cronNoNext: "N/A",
  cronInfo: {
  one: '* 第一位，表示秒，取值 0-59',
  two: '* 第二位，表示分，取值 0-59',

diff --git a/src/locales/lang/zh_TW.js b/src/locales/lang/zh_TW.js
@@ -445,6 +445,7 @@ const jobsTS = {
  },
  addCron: '新增排程任務',
  whatCron: '什麼是Cron表達式？',
+ cronNoNext: "N/A",
  cronInfo: {
  one: '* 第一位，表示秒，取值 0-59',
  two: '* 第二位，表示分，取值 0-59',

diff --git a/src/views/Setting/SysJobs.vue b/src/views/Setting/SysJobs.vue
@@ -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">