sbd-npm 1.4.11 → 1.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.11",
+    "version": "1.4.13",
     "description": "Stock Big Data",
     "main": "index.js",
     "scripts": {

package/status.js

@@ -172,7 +172,7 @@ $(function () {
                 }
                 Util.init_table_skeleton({
                     "element_id": "process_div",
-                    "caption": prefix_caption + '共 <span class="label label-info" id="process_num"></span> 进程，&nbsp;&nbsp;<input checked type="checkbox" id="is_py_process"> 只显示 Python 进程</caption>',
+                    "caption": prefix_caption + '共 <span class="label label-info" id="process_num"></span> 进程，&nbsp;&nbsp;<input checked type="checkbox" id="is_py_process"> 只显示 Python 进程&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" data-type="1" href="#" class="btn btn-warning btn-xs">添加任务</a></caption>',
                     "head_cols": [
                         {"name": "进程ID", "table_sort": 1},
                         {"name": "进程名", "table_sort": 1},
@@ -189,6 +189,9 @@ $(function () {
                     Util.set_table_loading("process_div_body");
                     Status.handle_process();
                 });
+                if (!document.getElementById("client_action_add")) {
+                    Status.init_worker_modal();
+                }
             }
             let is_py_process = $("#is_py_process").prop("checked") ? "1" : "0";
             Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_py_process: is_py_process}, function (j) {
@@ -530,11 +533,13 @@ $(function () {
                 hw_html.push('<option value="">Loading...</option>');
                 hw_html.push('</select>');
                 hw_html.push('</div>');
-                hw_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" class="btn btn-warning" id="add_client_action">添加任务</a>');
+                hw_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" data-type="2" class="btn btn-warning">添加任务</a>');
                 hw_html.push('</form>');
                 hw_html.push('<div id="worker_process_div"></div>');
                 $("#worker_div").html(hw_html.join(""));
-                Status.init_worker_modal();
+                if (!document.getElementById("client_action_add")) {
+                    Status.init_worker_modal();
+                }
             }
             Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, key: $("#workers").val()}, function (j) {
                 if (j["workers"]) {
@@ -596,7 +601,7 @@ $(function () {
             $("#client_action_modal_title").html("添加任务");
             let html = [];
             html.push('<form data-parsley-validate class="form-horizontal form-label-left">');
-            html.push('<div class="form-group">');
+            html.push('<div class="form-group" id="action_worker_div">');
             html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Worker </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
             html.push('<select id="client_action_worker" class="form-control col-md-7 col-xs-12">');
@@ -607,7 +612,9 @@ $(function () {
             html.push('<div class="form-group">');
             html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">任务命令 </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<input type="text" id="client_action_content" name="client_action_content" placeholder="任务命令" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="client_action_content" class="form-control col-md-7 col-xs-12">');
+            html.push('<option value="">任务命令</option>');
+            html.push('</select>');
             html.push('</div>');
             html.push('</div>');
             html.push('<div class="form-group">');
@@ -623,13 +630,31 @@ $(function () {
             let cam_obj = $('#client_action_modal');
             cam_obj.on('show.bs.modal', function (e) {
                 Util.show_loading();
-                Util.post(location.pathname, {active_div: "client_action"}, function (j) {
+                let action_type = parseInt($(e.relatedTarget).attr("data-type"));
+                if (action_type === 1) {
+                    $("#action_worker_div").css("display", "none");
+                } else {
+                    $("#action_worker_div").css("display", "block");
+                }
+                Util.post(location.pathname, {active_div: "client_action", action_type: action_type}, function (j) {
                     if (j["workers"]) {
-                        let html = [];
+                        let worker_html = [];
                         j["workers"].forEach(function (w) {
-                            html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
+                            worker_html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
                         });
-                        $("#client_action_worker").html(html.join(""));
+                        let caw_obj = $("#client_action_worker");
+                        caw_obj.html(worker_html.join(""));
+                        let worker = $("#workers").val();
+                        if (worker) {
+                            caw_obj.find("option[value='" + worker + "']").attr("selected", true);
+                        }
+                    }
+                    if (j["actions"]) {
+                        let action_html = [];
+                        j["actions"].forEach(function (action) {
+                            action_html.push("<option value='", action, "'>", action, "</option>");
+                        });
+                        $("#client_action_content").html(action_html.join(""));
                     }
                     Util.hide_tips();
                 });
@@ -640,15 +665,21 @@ $(function () {
                 Util.hide_tips();
             });
             $("#client_action_add").click(function() {
-                let worker_key = $("#client_action_worker").val();
+                let action_type = 1, worker_key = "1";
+                if ($("#action_worker_div").css("display") === "block") {
+                    action_type == 2;
+                    worker_key = $("#client_action_worker").val();
+                }
                 if (worker_key) {
                     let action_content = $("#client_action_content").val();
                     if (action_content) {
                         Util.show_loading();
                         $("#client_action_tips").html("");
-                        Util.post(location.pathname, {active_div: "client_action_add", "key": worker_key, "content": action_content}, function (j) {
+                        $("#client_action_add").attr("disabled", true);
+                        Util.post(location.pathname, {active_div: "client_action_add", "key": worker_key, "content": action_content, action_type: action_type}, function (j) {
+                            $("#client_action_add").attr("disabled", false);
                             if (j["code"] && j["code"] === 1) {
-                                $("#client_action_tips").html("<b class='text-success'>添加成功！</b>");
+                                $("#client_action_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
                             } else if (j["code"] && j["code"] === 2) {
                                 $("#client_action_tips").html("<b class='text-danger'>Worker 不存在！</b>");
                             } else if (j["code"] && j["code"] === 3) {
@@ -664,7 +695,7 @@ $(function () {
                 } else {
                     $("#client_action_tips").html("<b class='text-danger'>Worker 异常！</b>");
                 }
-                return False;
+                return false;
             });
         },