From c78714081ebeb4de22da10a0f24a156da5d5ea45 Mon Sep 17 00:00:00 2001
From: Doflatango <heshitan@sunteng.com>
Date: Thu, 9 Mar 2017 14:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=92=8C=E5=B9=B6=E8=A1=8C=E5=85=81=E8=AE=B8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/job.go                     | 16 +++++++++-------
 web/ui/src/components/JobEdit.vue | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/models/job.go b/models/job.go
index ada9a44..0157f05 100644
--- a/models/job.go
+++ b/models/job.go
@@ -25,13 +25,15 @@ const (
 // 需要执行的 cron cmd 命令
 // 注册到 /cronsun/cmd/groupName/<id>
 type Job struct {
-	ID      string     `json:"id"`
-	Name    string     `json:"name"`
-	Group   string     `json:"group"`
-	Command string     `json:"cmd"`
-	User    string     `json:"user"`
-	Rules   []*JobRule `json:"rules"`
-	Pause   bool       `json:"pause"` // 可手工控制的状态
+	ID        string     `json:"id"`
+	Name      string     `json:"name"`
+	Group     string     `json:"group"`
+	Command   string     `json:"cmd"`
+	User      string     `json:"user"`
+	Rules     []*JobRule `json:"rules"`
+	Pause     bool       `json:"pause"`     // 可手工控制的状态
+	Timeout   int64      `json:"timeout"`   // 任务执行时间超时设置，大于 0 时有效
+	Parallels int        `json:"parallels"` // 设置任务在单个节点上可以同时允许多少个，针对两次任务执行间隔比任务执行时间要长的任务启用
 
 	// 执行任务的结点，用于记录 job log
 	runOn string
diff --git a/web/ui/src/components/JobEdit.vue b/web/ui/src/components/JobEdit.vue
index d16a142..1e4f714 100644
--- a/web/ui/src/components/JobEdit.vue
+++ b/web/ui/src/components/JobEdit.vue
@@ -31,6 +31,19 @@
         <input v-else type="text" v-model="job.user" placeholder="指定执行用户">
       </div>
     </div>
+    <div class="two fields">
+      <div class="field">
+        <label>超时设置（单位“秒”，0 表示不限制）</label>
+        <input type="number" ref="timeout" v-model:value="job.timeout" placeholder="任务执行超时时间">
+      </div>
+      <div class="field">
+        <label>并行数设置（0 表示不限制）</label>
+        <div class="ui icon input">
+          <input type="number" ref="parallels" v-model:value="job.parallels" placeholder="任务执行超时时间">
+          <i ref="parallelstip" class="large help circle link icon" data-position="top right" data-content="设置在单个节点上面同时可执行多少个任务，针对某些任务执行时间很长，但两次任务执行间隔较短时比较有用" data-variation="wide"></i>
+        </div>
+      </div>
+    </div>
     <div class="field">
       <span v-if="!job.rules || job.rules.length == 0"><i class="warning circle icon"></i>当前任务没有定时器，点击下面按钮来添加定时器</span>
     </div>
@@ -66,6 +79,8 @@ export default {
           user: '',
           cmd: '',
           pause: false,
+          parallels: 0,
+          timeout: 0,
           rules: []
         },
         error: ''
@@ -157,6 +172,8 @@ export default {
         vm.job.pause = !vm.job.pause;
       }
     });
+
+    $(this.$refs.parallelstip).popup();
   },
 
   components: {