Merge pull request #266 from sam80180/main

fix: prevent disabled job's next trigger date parse error
SonicCloudOrg · Sep 22, 2023 · 23923f4 · 23923f4
2 parents 0abf750 + 88887e2
commit 23923f4
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
@@ -527,6 +527,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
@@ -467,6 +467,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
@@ -521,6 +521,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
@@ -464,6 +464,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">