Merge pull request #342 from Zhangxinguo/master

Fixed #341
apache · May 31, 2017 · 57cf7ad · 57cf7ad
2 parents c2eb1ba + 3d20b6a
commit 57cf7ad
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/...ic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html b/...ic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html
@@ -144,6 +144,14 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="form-group" id="bootstrap-script-div" hidden="hidden">
+                    <label for="script-command-line" class="col-sm-2 control-label"><i>*</i>作业执行脚本</label>
+                    <div class="col-sm-9">
+                        <input type="text" id="script-command-line" name="scriptCommandLine" class="form-control" data-toggle="tooltip" data-placement="bottom" title="SCRIPT类型作业命令行执行脚本" />
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="form-group">
                     <label for="description" class="col-sm-2 control-label">作业描述信息</label>

diff --git a/...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html b/...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html
@@ -144,6 +144,14 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="form-group" id="bootstrap-script-div" hidden="hidden">
+                    <label for="script-command-line" class="col-sm-2 control-label"><i>*</i>作业执行脚本</label>
+                    <div class="col-sm-9">
+                        <input type="text" id="script-command-line" disabled="disabled" name="scriptCommandLine" class="form-control" data-toggle="tooltip" data-placement="bottom" title="SCRIPT类型作业命令行执行脚本" />
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="form-group">
                     <label for="description" class="col-sm-2 control-label">作业描述信息</label>

diff --git a/...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html b/...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html
@@ -144,6 +144,14 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="form-group" id="bootstrap-script-div" hidden="hidden">
+                    <label for="script-command-line" class="col-sm-2 control-label"><i>*</i>作业执行脚本</label>
+                    <div class="col-sm-9">
+                        <input type="text" id="script-command-line" name="scriptCommandLine" class="form-control" data-toggle="tooltip" data-placement="bottom" title="SCRIPT类型作业命令行执行脚本" />
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="form-group">
                     <label for="description" class="col-sm-2 control-label">作业描述信息</label>

diff --git a/...tic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js b/...tic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js
@@ -236,6 +236,7 @@ function getJob() {
         streamingProcess: $("#streaming-process").prop("checked"),
         applicationContext: $("#application-context").val(),
         shardingItemParameters: $("#sharding-item-parameters").val(),
+        scriptCommandLine: $("#script-command-line").val(),
         description: $("#description").val()
     };
 }
diff --git a/...-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js b/...-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js
@@ -206,6 +206,7 @@ function renderJob(job) {
     $("#misfire").prop("checked", job.misfire);
     $("#streaming-process").prop("checked", job.streamingProcess);
     $("#job-type").val(job.jobType);
+    $("#script-command-line").val(job.scriptCommandLine);
     if("SIMPLE" === job.jobType) {
         $("#job-class").attr("value", job.jobClass);
         $("#job-class-model").show();