sbd-npm 1.4.51 → 1.4.53

package/package.json

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

package/status.js

@@ -363,6 +363,9 @@ $(function () {
                         html.push("<td>", database_variable_num, "</td>");
                         html.push("<td class='text-right'>", item["key"], "</td>");
                     }
+                    if (item["key"] === "innodb_buffer_pool_size") {
+                        item["val"] += " (" + Util.trans_byte_size(item["val"]) + ")";
+                    }
                     html.push("<td class='text-left' style='word-break: break-all'>", item["val"], "</td>");
                     html.push("</tr>");
                 });
@@ -503,7 +506,7 @@ $(function () {
                 $("#task_div").html(ht_html.join(""));
                 $("#task_add").click(function() {
                     let task_content = $("#task_content").val();
-                    task_content = task_content.replace(/[^\w\u4e00-\u9fff]/g, ''); // 去掉除字母、数字、下划线(_)、汉字外的其他字符（䒚 /[^\w\u3400-\u9fff\u{20000}-\u{2EBEF}]/gu）
+                    task_content = task_content.replace(/[^\w\u4e00-\u9fff-]/g, ''); // 去掉除字母、数字、下划线(_)、汉字、横杠(-)外的其他字符（䒚 /[^\w\u3400-\u9fff\u{20000}-\u{2EBEF}]/gu）
                     if (task_content && task_content.length > 0) {
                         $("#task_content").prop('disabled', true);
                         $("#task_add").prop('disabled', true);
@@ -522,7 +525,7 @@ $(function () {
                                 }
                                 $("#task_result").val(task_result);
                                 if ($("#is_refresh_task").prop("checked")) {
-                                    Status.task_timer_id = setTimeout(function () {
+                                    Status.task_timer_id = setTimeout(() => {
                                         Status.fetch_task_data(0);
                                     }, 5678);
                                 }
@@ -594,7 +597,7 @@ $(function () {
                         ta_obj.html('任务处理中...').prop('disabled', true).removeClass("btn-default").addClass("btn-warning");
                         tc_obj.prop('disabled', true);
                         if ($("#is_refresh_task").prop("checked")) {
-                            Status.task_timer_id = setTimeout(function () {
+                            Status.task_timer_id = setTimeout(() => {
                                 Status.fetch_task_data(0);
                             }, 3456);
                         }
@@ -657,7 +660,7 @@ $(function () {
                             Util.show_loading();
                             $("#machine_refresh").attr("disabled", true).html("正在处理中...");
                             Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
-                                setTimeout(function () {
+                                setTimeout(() => {
                                     $('#machine_process_div').html('');
                                     $('#machines').html('<option value="">暂无Machine</option>');
                                     $("#machine_refresh").html("刷新Machine").attr("disabled", false);
@@ -1361,7 +1364,7 @@ $(function () {
         localStorage[Status.tab_token] = request_arguments["tab"];
         if (request_arguments["tab"] === "tool" && request_arguments["phone"]) {
             $("#phone").val(request_arguments["phone"]);
-            setTimeout(function () {
+            setTimeout(() => {
                 Status.phone_query();
                 Enterprise.fetch_enterprise_detail(j["unified_code"]);
             }, 1234);

package/util.js

@@ -127,9 +127,9 @@ const Util = {
         Util.table_sort();
 
         let page_title = Util.get_page_title();
-        if (page_title && page_title.length > 0) {
+        if (page_title.length > 0) {
             let d_title = document.title;
-            if (d_title.indexOf(page_title) === -1) {
+            if (!d_title.includes(page_title)) {
                 document.title = page_title + " - " + d_title;
             }
         }
@@ -481,7 +481,7 @@ const Util = {
                 });
                 if (interval > 0 && Util.is_trade_time()) {
                     interval = parseInt(interval > 4321 ? interval : 4321);
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.refresh_price(element_id, interval);
                     }, interval);
                 }
@@ -2478,9 +2478,8 @@ const Util = {
             return Util.to_float(mega_byte, 2) + " MB";
         } else if (kilo_byte > 0) {
             return Util.to_float(kilo_byte, 2) + " KB";
-        } else {
-            return byte + " B";
         }
+        return byte + " B";
     },
 
     /**
@@ -2633,8 +2632,7 @@ const Util = {
      * @param obj_token
      */
     parse_value_trend: function (obj_token) {
-        let data_arr = [];
-        let unit = "";
+        let data_arr = [], unit = "";
         $("." + obj_token).each(function () {
             let val = $(this).text();
             if (unit === "") {
@@ -2643,9 +2641,7 @@ const Util = {
                     unit = match_arr[0];
                 }
             }
-            let digit = Util.filter_chinese(val);
-            let d = {"obj": $(this), "digit": digit};
-            data_arr.push(d);
+            data_arr.push({"obj": $(this), "digit": Util.filter_chinese(val)});
         });
         let data_arr_len = data_arr.length;
         if (data_arr_len > 0) {
@@ -2905,7 +2901,7 @@ const Util = {
                     loading = loading < 5 ? (loading + 1) : 1;
                     let load_str = ".".repeat(loading);
                     tips_obj.innerHTML = origin_msg + load_str;
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.show_tips(msg, interval, cls, loading);
                     }, 300);
                 }
@@ -2925,9 +2921,9 @@ const Util = {
                 }
                 if (msg.indexOf(".") > -1 && msg.endsWith('.')) {
                     loading = msg.replace(/[^.]/g, '').length;
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.show_tips(msg, interval, cls, loading);
-                    }, 200)
+                    }, 200);
                 }
             }
         }
@@ -3141,7 +3137,7 @@ const Util = {
     countdown_refresh_index_price: function (interval, element_id, index_list, is_us, is_refresh) {
         if (interval > 0) {
             $("#" + element_id + "_tips").html("交易中, " + interval + " 秒后刷新");
-            Util.countdown_timer_id = setTimeout(function () {
+            Util.countdown_timer_id = setTimeout(() => {
                 Util.countdown_refresh_index_price(interval - 1, element_id, index_list, is_us, is_refresh);
             }, 1000);
         } else {
@@ -3153,7 +3149,7 @@ const Util = {
     countdown_func: function (interval, tips_id, callback_func) {
         if (interval > 0) {
             $("#" + tips_id).html("交易中, " + interval + " 秒后刷新");
-            Util.countdown_timer_id = setTimeout(function () {
+            Util.countdown_timer_id = setTimeout(() => {
                 Util.countdown_func(interval - 1, tips_id, callback_func);
             }, 1000);
         } else {
@@ -3167,17 +3163,13 @@ const Util = {
      * @returns {string}
      */
     get_page_title: function () {
-        let page_title = "";
-        if (location.pathname) {
-            let current_url = location.pathname;
-            $('.side-menu li a').each(function () {
-                let url = $(this).attr("href");
-                if (url && url === current_url) {
-                    page_title = $(this).text();
-                }
-            });
+        let current_url = location.pathname;
+        if (current_url) {
+            let arrayObject = document.querySelectorAll('.side-menu li a');
+            let match = Array.from(arrayObject).find(a => a.getAttribute("href") === current_url);
+            return match ? match.textContent : "";
         }
-        return page_title;
+        return "";
     },
 
     /**