sbd-npm 1.4.59 → 1.4.61

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.59",
+    "version": "1.4.61",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/status.js

@@ -220,7 +220,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 进程&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".machine_action_modal" data-type="1" href="#" class="btn btn-warning btn-xs">添加任务</a></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=".machine_instruction_modal" data-type="1" href="#" class="btn btn-warning btn-xs">添加任务</a></caption>',
                     "head_cols": [
                         {"name": "进程ID", "table_sort": 1},
                         {"name": "进程名", "table_sort": 1},
@@ -237,8 +237,8 @@ $(function () {
                     Util.set_table_loading("process_div_body");
                     Status.handle_process();
                 });
-                if (!document.getElementById("machine_action_add")) {
-                    Status.init_machine_action_modal();
+                if (!document.getElementById("machine_instruction_add")) {
+                    Status.init_machine_instruction_modal();
                 }
             }
             let is_py_process = $("#is_py_process").prop("checked") ? "1" : "0";
@@ -684,14 +684,14 @@ $(function () {
                 machine_html.push('<option value="">Loading...</option>');
                 machine_html.push('</select>');
                 machine_html.push('</div>');
-                machine_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".machine_action_modal" data-type="2" class="btn btn-warning">添加任务</a>');
+                machine_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".machine_instruction_modal" data-type="2" class="btn btn-warning">添加任务</a>');
                 machine_html.push('<a href="#" data-toggle="modal" data-target=".machine_cookie_modal" class="btn btn-warning">雪球Cookie</a>');
                 machine_html.push('<a href="#" id="machine_refresh" class="btn btn-warning">刷新Machine</a>');
                 machine_html.push('</form>');
                 machine_html.push('<div id="machine_process_div"></div>');
                 $("#machine_div").html(machine_html.join(""));
-                if (!document.getElementById("machine_action_add")) {
-                    Status.init_machine_action_modal();
+                if (!document.getElementById("machine_instruction_add")) {
+                    Status.init_machine_instruction_modal();
                     Status.init_machine_cookie_modal();
                     $("#machine_refresh").click(function() {
                         if (confirm("是否确定要“ 刷新Machine ” ？")) {
@@ -772,8 +772,8 @@ $(function () {
                             let pid = $(this).parent().parent().children('td').eq(0).text();
                             if (confirm("是否确定要终止进程 [" + pid + "] ？")) {
                                 Util.show_loading();
-                                let action_content = "kill_" + pid;
-                                Util.post(location.pathname, {active_div: "machine_action_add", "machine_id": $("#machines").val(), "content": action_content, action_type: 2}, function (j) {
+                                let action_content = "kill_pid_" + pid;
+                                Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": $("#machines").val(), "content": action_content, action_type: 2}, function (j) {
                                     Util.hide_tips();
                                     if (j["code"] === 1) {
                                         Util.show_tips("进程 [" + pid + "] 已加到终止队列中", 4567, "alert-success");
@@ -853,22 +853,22 @@ $(function () {
                 voices.forEach(voice => {
                     data.push(`Name: ${voice.name}, Lang: ${voice.lang}, Default: ${voice.default}`);
                 });
-                alert(data.join("\n"));
+                Util.showAlert(data.join("\n"));
             } else {
-                alert("空列表: []");
+                Util.showAlert("空列表: []");
             }
             Util.is_load = false;
         },
 
-        init_machine_action_modal: function () {
-            Util.init_modal_skeleton("machine_action_modal");
-            $("#machine_action_modal_title").html("添加任务");
+        init_machine_instruction_modal: function () {
+            Util.init_modal_skeleton("machine_instruction_modal");
+            $("#machine_instruction_modal_title").html("添加任务");
             let html = [];
             html.push('<form data-parsley-validate class="form-horizontal form-label-left">');
             html.push('<div class="form-group" id="action_machine_div">');
             html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12">Machine </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<select id="machine_action_machine" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="machine_instruction_machine" class="form-control col-md-7 col-xs-12">');
             html.push('<option value="">Loading...</option>');
             html.push('</select>');
             html.push('</div>');
@@ -876,22 +876,22 @@ $(function () {
             html.push('<div class="form-group">');
             html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12">任务命令 </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<select id="machine_action_content" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="machine_instruction_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">');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">');
-            html.push('<button id="machine_action_add" type="button" class="btn btn-success">添 加</button>');
-            html.push('<span id="machine_action_tips"></span>');
+            html.push('<button id="machine_instruction_add" type="button" class="btn btn-success">添 加</button>');
+            html.push('<span id="machine_instruction_tips"></span>');
             html.push('</div>');
             html.push('</div>');
             html.push('</form>');
-            let camb_obj = $("#machine_action_modal_body");
+            let camb_obj = $("#machine_instruction_modal_body");
             camb_obj.html(html.join(""));
             camb_obj.parent().parent().removeClass("modal-xlg");
-            let cam_obj = $('#machine_action_modal');
+            let cam_obj = $('#machine_instruction_modal');
             cam_obj.on('show.bs.modal', function (e) {
                 Util.show_loading();
                 let action_type = parseInt($(e.relatedTarget).attr("data-type"));
@@ -900,58 +900,58 @@ $(function () {
                 } else {
                     $("#action_machine_div").css("display", "block");
                 }
-                Util.post(location.pathname, {active_div: "machine_action", action_type: action_type}, function (j) {
+                Util.post(location.pathname, {active_div: "machine_instruction", action_type: action_type}, function (j) {
                     if (j["machines"]) {
-                        Status.pack_machine_component("machine_action_machine", j["machines"]);
+                        Status.pack_machine_component("machine_instruction_machine", j["machines"]);
                         let machine = $("#machines").val();
                         if (machine) {
-                            $("#machine_action_machine").find("option[value='" + machine + "']").attr("selected", true);
+                            $("#machine_instruction_machine").find("option[value='" + machine + "']").attr("selected", true);
                         }
                     }
-                    if (j["actions"]) {
-                        let action_html = [];
-                        j["actions"].forEach(function (action) {
-                            action_html.push("<option value='", action, "'>", action, "</option>");
+                    if (j["instructions"]) {
+                        let instruction_html = [];
+                        j["instructions"].forEach(function (instruction) {
+                            instruction_html.push("<option value='", instruction, "'>", instruction, "</option>");
                         });
-                        $("#machine_action_content").html(action_html.join(""));
+                        $("#machine_instruction_content").html(instruction_html.join(""));
                     }
                     Util.hide_tips();
                 });
             });
             cam_obj.on('hidden.bs.modal', function () {
-                $("#machine_action_tips").html("");
+                $("#machine_instruction_tips").html("");
                 Util.hide_tips();
             });
-            $("#machine_action_add").click(function() {
+            $("#machine_instruction_add").click(function() {
                 let action_type = 1, machine_id = "1";
                 if ($("#action_machine_div").css("display") === "block") {
                     action_type = 2;
-                    machine_id = $("#machine_action_machine").val();
+                    machine_id = $("#machine_instruction_machine").val();
                 }
                 if (machine_id) {
-                    let action_content = $("#machine_action_content").val();
+                    let action_content = $("#machine_instruction_content").val();
                     if (action_content) {
                         Util.show_loading();
-                        $("#machine_action_tips").html("");
-                        $("#machine_action_add").attr("disabled", true);
-                        Util.post(location.pathname, {active_div: "machine_action_add", "machine_id": machine_id, "content": action_content, action_type: action_type}, function (j) {
-                            $("#machine_action_add").attr("disabled", false);
+                        $("#machine_instruction_tips").html("");
+                        $("#machine_instruction_add").attr("disabled", true);
+                        Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": machine_id, "content": action_content, action_type: action_type}, function (j) {
+                            $("#machine_instruction_add").attr("disabled", false);
                             if (j["code"] === 1) {
-                                $("#machine_action_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
+                                $("#machine_instruction_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
                             } else if (j["code"] === 2) {
-                                $("#machine_action_tips").html("<b class='text-danger'>Machine 不存在！</b>");
+                                $("#machine_instruction_tips").html("<b class='text-danger'>Machine 不存在！</b>");
                             } else if (j["code"] === 3) {
-                                $("#machine_action_tips").html("<b class='text-danger'>任务内容异常！</b>");
+                                $("#machine_instruction_tips").html("<b class='text-danger'>任务内容异常！</b>");
                             } else {
-                                $("#machine_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
+                                $("#machine_instruction_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
                             }
                             Util.hide_tips();
                         });
                     } else {
-                        $("#machine_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
+                        $("#machine_instruction_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
                     }
                 } else {
-                    $("#machine_action_tips").html("<b class='text-danger'>Machine 异常！</b>");
+                    $("#machine_instruction_tips").html("<b class='text-danger'>Machine 异常！</b>");
                 }
                 return false;
             });
@@ -989,7 +989,7 @@ $(function () {
             let ccm_obj = $('#machine_cookie_modal');
             ccm_obj.on('show.bs.modal', function (e) {
                 Util.show_loading();
-                Util.post(location.pathname, {active_div: "machine_action", action_type: 2}, function (j) {
+                Util.post(location.pathname, {active_div: "machine_instruction", action_type: 2}, function (j) {
                     if (j["machines"]) {
                         Status.pack_machine_component("machine_cookie_machine", j["machines"]);
                         let machine = $("#machines").val();

package/util.js

@@ -4650,6 +4650,122 @@ const Util = {
             ]
         });
         return chart_instance;
+    },
+
+    /**
+     * 显示自定义弹窗
+     * @param {string} message - 要显示的消息内容
+     * @returns {void}
+     */
+    showAlert: function(message) {
+        // 创建模态框容器
+        const modal = document.createElement('div');
+        modal.style.cssText = `
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0, 0, 0, 0.5);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            z-index: 9999;
+        `;
+        // 创建模态框内容
+        const modalContent = document.createElement('div');
+        modalContent.style.cssText = `
+            background-color: white;
+            padding: 20px;
+            border-radius: 5px;
+            max-width: 80%;
+            max-height: 80%;
+            overflow: auto;
+            position: relative;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        `;
+        // 创建消息内容
+        const messageElement = document.createElement('div');
+        messageElement.style.cssText = `
+            margin-bottom: 20px;
+            word-break: break-all;
+            padding: 10px;
+            border: 1px solid #ddd;
+            background-color: #f9f9f9;
+            width: 100%;
+            box-sizing: border-box;
+        `;
+        messageElement.innerHTML = message.replace(/\n/g, '<br>');
+        // 创建按钮容器
+        const buttonContainer = document.createElement('div');
+        buttonContainer.style.cssText = `
+            display: flex;
+            gap: 10px;
+            margin-top: 10px;
+        `;
+        // 创建复制按钮
+        const copyButton = document.createElement('button');
+        copyButton.textContent = '复制';
+        copyButton.style.cssText = `
+            padding: 8px 20px;
+            background-color: #4CAF50;
+            color: white;
+            border: none;
+            border-radius: 3px;
+            cursor: pointer;
+            font-size: 14px;
+        `;
+        copyButton.addEventListener('click', function() {
+            navigator.clipboard.writeText(message).then(
+                function() {
+                    // 复制成功，临时改变按钮文字
+                    const originalText = copyButton.textContent;
+                    copyButton.textContent = '已复制';
+                    copyButton.style.backgroundColor = '#45a049';
+                    setTimeout(function() {
+                        copyButton.textContent = originalText;
+                        copyButton.style.backgroundColor = '#4CAF50';
+                    }, 2000);
+                },
+                function() {
+                    // 复制失败
+                    alert('复制失败，请重试');
+                }
+            );
+        });
+        // 创建关闭按钮
+        const closeButton = document.createElement('button');
+        closeButton.textContent = '关闭';
+        closeButton.style.cssText = `
+            padding: 8px 20px;
+            background-color: #f44336;
+            color: white;
+            border: none;
+            border-radius: 3px;
+            cursor: pointer;
+            font-size: 14px;
+        `;
+        closeButton.addEventListener('click', function() {
+            document.body.removeChild(modal);
+        });
+        // 组装按钮容器
+        buttonContainer.appendChild(copyButton);
+        buttonContainer.appendChild(closeButton);
+        // 组装模态框
+        modalContent.appendChild(messageElement);
+        modalContent.appendChild(buttonContainer);
+        modal.appendChild(modalContent);
+        // 添加到页面
+        document.body.appendChild(modal);
+        // 点击模态框背景也可以关闭
+        modal.addEventListener('click', function(event) {
+            if (event.target === modal) {
+                document.body.removeChild(modal);
+            }
+        });
     }
 
 };