sbd-npm 1.4.58 → 1.4.60

package/package.json

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

package/status.js

@@ -740,6 +740,7 @@ $(function () {
                                 {"name": "状态", "table_sort": 1},
                                 {"name": "启动命令"},
                                 {"name": "创建时间", "class": "info", "table_sort": 1},
+                                {"name": "操作"}
                             ]
                         });
                     }
@@ -760,11 +761,33 @@ $(function () {
                             html.push("<td title='", item["cmdline"], "'>", cmdline, "</td>");
                         }
                         html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
+                        html.push("<td><a class='process_kill' href='#'>终止</a></td>");
                         html.push("</tr>");
                     });
                     Util.render_table_html("machine_process_div_body", html);
                     $("#machine_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
                     $("#machines option[value='" + j["machine_id"] + "']").text(j["ip"] + "(" + process_num + ")");
+                    $("#machine_process_div_body .process_kill").each(function() {
+                        $(this).click(function() {
+                            let pid = $(this).parent().parent().children('td').eq(0).text();
+                            if (confirm("是否确定要终止进程 [" + pid + "] ？")) {
+                                Util.show_loading();
+                                let action_content = "kill_pid_" + pid;
+                                Util.post(location.pathname, {active_div: "machine_action_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");
+                                    } else if (j["code"] === 2) {
+                                        Util.show_tips("Machine 不存在！", 4567, "alert-danger");
+                                    } else if (j["code"] === 3) {
+                                        Util.show_tips("进程 [" + pid + "] 异常！", 4567, "alert-danger");
+                                    } else {
+                                        Util.show_tips("进程值不能为空！", 4567, "alert-danger");
+                                    }
+                                });
+                            }
+                        });
+                    });
                 } else if (is_init === 1) {
                     $('#machines').html('<option value="">暂无Machine</option>');
                 }
@@ -830,9 +853,9 @@ $(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;
         },

package/stock_basics.js

@@ -159,7 +159,7 @@ let Stock = {
 
         let location_obj = $("#location");
         if (location_obj.length > 0) {
-            let location_arr = location_obj.text().split(",");
+            let location_arr = location_obj.text().split(/[；;,]/);
             html = [];
             location_arr.forEach(function (location) {
                 html.push(Util.map_url(location, location) + '  ');

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);
+            }
+        });
     }
 
 };