add expire (endTime) for custom mode task

lgh06 · May 12, 2022 · d3cc51e · d3cc51e
1 parent f88525f
commit d3cc51e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/helper/transRes.mjs b/packages/helper/transRes.mjs
@@ -123,6 +123,7 @@ Also, you can close our page, your task will keep running until ":"成功，将
   "Please check the script!": "请检查脚本是否有错误！",
   "Custom script chars cannot > 5000": "自定义脚本字符数不能超过5000",
   "Task alias": "任务别名",
+  "Task expires on": "任务过期日期",
   // below is on script market page
   "Script Market": "脚本市场",
   "No Data": "没有数据",

diff --git a/packages/web/src/pages/task/edit_custom.tsx b/packages/web/src/pages/task/edit_custom.tsx
@@ -175,9 +175,11 @@ Also, you can close our page, your task will keep running until `) + CronTime.to
       router && router.query.id && taskDetail._id ? <>
       <div style={{margin: `.5em auto`}}>
         {t(`Current Task created at:`)} &nbsp; {new Date(parseInt(taskDetail._id.substr(0,8), 16) * 1000).toLocaleString()}
-        &nbsp;&nbsp; {t(`Running status`)}: { t(getTaskExpireStatusAndColor(taskDetail).status) }
+        &nbsp;&nbsp;   {t(`Task expires on`)}: { new Date(taskDetail.endTime).toLocaleString() }
+      </div>
+      <div style={{margin: `.5em auto`}}> 
+        {t(`Running status`)}: { t(getTaskExpireStatusAndColor(taskDetail).status) }
         &nbsp;&nbsp;   {t(`Task alias`)}: { taskDetail.extra.alias }
-
       </div>
       </> : null
     }