sbd-npm 1.4.43 → 1.4.45

package/package.json

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

package/status.js

@@ -739,22 +739,45 @@ $(function () {
                 html.push('</form>');
                 html.push('<div id="word_process_div"></div>');
                 $("#word_div").html(html.join(""));
+                let head_cols = [
+                    {"name": "序号", "table_sort": 1},
+                    {"name": "单词", "table_sort": 1},
+                    {"name": "中文"},
+                    {"name": "时间", "table_sort": 1},
+                ];
+                if ('speechSynthesis' in window) {
+                    head_cols.push({"name": "朗读", "id": "word_recite", "link": "#"});
+                }
+                head_cols.push({"name": "操作"});
                 Util.init_table_skeleton({
                     "element_id": "word_process_div",
                     "caption": '<caption class="' + (is_mobile ? "text-left" : "text-right") + '" id="word_num"></caption>',
-                    "head_cols": [
-                        {"name": "序号", "table_sort": 1},
-                        {"name": "单词", "table_sort": 1},
-                        {"name": "中文"},
-                        {"name": "时间", "table_sort": 1},
-                        {"name": "操作"},
-                    ]
+                    "head_cols": head_cols
+                });
+                $("#word_recite").click(function() {
+                    let voices = window.speechSynthesis.getVoices();
+                    if (voices.length > 0) {
+                        Status.show_speech_voices(voices);
+                    } else {
+                        window.speechSynthesis.onvoiceschanged = () => {
+                            let voices = window.speechSynthesis.getVoices();
+                            Status.show_speech_voices(voices);
+                        };
+                    }
                 });
                 Status.init_word_modal();
             }
             Util.fetch_word_data(is_init, "", "");
         },
 
+        show_speech_voices: function(voices) {
+            let data = [];
+            voices.forEach(voice => {
+                data.push(`Name: ${voice.name}, Lang: ${voice.lang}, Default: ${voice.default}`);
+            });
+            alert(data.join("\n"));
+        },
+
         init_machine_action_modal: function () {
             Util.init_modal_skeleton("machine_action_modal");
             $("#machine_action_modal_title").html("添加任务");
@@ -1052,19 +1075,26 @@ $(function () {
                     }
                     if (match_ip_data) {
                         Util.show_loading();
+                        ip = match_ip_data[0];
                         $("#ip").prop('disabled', true);
                         $("#ip_query").attr("disabled", true);
-                        ip = match_ip_data[0];
-                        $("#ip").val(ip);
                         Util.post("/action", {action: "ip_query", ip: ip}, function (j) {
                             $("#ip").prop('disabled', false);
                             $("#ip_query").attr("disabled", false);
                             if (j["ip"]) {
+                                if (j["domain"]) {
+                                    let domain = $("#ip").val().trim();
+                                    j["domain"] = domain ? domain : j["domain"];
+                                }
                                 $("#ip").val(j["ip"]);
                                 let ip_address = Status.convert_ip_address(j);
                                 if (ip_address.length > 0) {
                                     let map_url = Status.map_url(ip_address, "<i class='glyphicon glyphicon-map-marker'></i>");
-                                    $("#ip_result").html(Util.pack_html_link(Status.ip_url(j["ip"]), "<b class='text-success'>" + ip_address + "</b>") + "&nbsp;&nbsp;" + map_url);
+                                    let ip_result = Util.pack_html_link(Status.ip_url(j["ip"]), "<b class='text-success'>" + ip_address + "</b>") + "&nbsp;&nbsp;" + map_url;
+                                    if (j["domain"]) {
+                                        ip_result += "<br><br>" + Util.pack_html_link(j["domain"], "<b>" + j["domain"] + "</b>");
+                                    }
+                                    $("#ip_result").html(ip_result);
                                 } else {
                                     $("#ip_result").html(Util.pack_html_link(Status.ip_url(ip), "<b class='text-danger'>找不到结果！</b>"));
                                 }
@@ -1084,7 +1114,7 @@ $(function () {
                 Status.phone_query();
             });
             $("#md5_encrypt").click(function () {
-                let md5 = $("#md5").val();
+                let md5 = $("#md5").val().trim();
                 if (md5) {
                     Util.show_loading();
                     $("#md5").prop('disabled', true);
@@ -1100,7 +1130,7 @@ $(function () {
                 }
             });
             $("#base64_action").click(function () {
-                let base64 = $("#base64").val();
+                let base64 = $("#base64").val().trim();
                 if (base64) {
                     if ($(this).text() === "编 码") {
                         $("#base64_result").html("<b class='text-success'>" + Util.base64_encode(base64) + "</b>");
@@ -1115,7 +1145,7 @@ $(function () {
                 $("#base64_action").text($(this).text());
             });
             $("#unicode_convert").click(function () {
-                let unicode_str = $("#unicode").val();
+                let unicode_str = $("#unicode").val().trim();
                 if (unicode_str) {
                     try {
                         let obj = JSON.parse('{"data": "' + unicode_str + '"}');
@@ -1128,7 +1158,7 @@ $(function () {
                 }
             });
             $("#segment_parse").click(function () {
-                let segment_str = $("#segment").val();
+                let segment_str = $("#segment").val().trim();
                 if (segment_str) {
                     try {
                         let segmenter = new Intl.Segmenter("zh-CN", {granularity: "word"});

package/util.js

@@ -1658,6 +1658,7 @@ const Util = {
         Util.post(location.pathname, {active_div: "word", is_init: is_init, specify_day: specify_day, search_key: search_key}, function (j) {
             let html = [], index = 0;
             let is_mobile = Util.is_mobile();
+            let is_speech_synthesis = $("#word_recite").length > 0 ? 1 : 0;
             j["data"].forEach(function (item) {
                 index++;
                 html.push("<tr>");
@@ -1669,6 +1670,9 @@ const Util = {
                     html.push("<td>", item["chinese"], "</td>");
                 }
                 html.push("<td>", Util.seconds_to_format(item["date"]), "</td>");
+                if (is_speech_synthesis === 1) {
+                    html.push("<td class='word_utterance' style='cursor: pointer;'><i class='glyphicon glyphicon-volume-up'></i></td>");
+                }
                 html.push("<td><a href='#' data-toggle='modal' data-target='.word_modal'>修改</a> &nbsp; <a class='word_del' href='#'>删除</a></td>");
                 html.push("</tr>");
             });
@@ -1687,7 +1691,23 @@ const Util = {
                     Util.fetch_word_data(0, appoint_day, "");
                 });
             }
-            $(".word_del").each(function () {
+            if (is_speech_synthesis === 1) {
+                $("#word_process_div_body .word_utterance").each(function () {
+                    $(this).click(function () {
+                        let word = $(this).parent().children('td').eq(1).text();
+                        if (/^[A-Za-z]+$/.test(word)) {
+                            window.speechSynthesis.cancel();    // 清除队列
+                            let utterance = new SpeechSynthesisUtterance(word);
+                            utterance.lang = 'en-US';           // 设置语言为英语（美式英语）
+                            utterance.rate = 1;                 // 语速（0.1 到 10）
+                            utterance.volume = 1;               // 音量（0 到 1）
+                            utterance.pitch = 1;                // 音调（0 到 2）
+                            window.speechSynthesis.speak(utterance);
+                        }
+                    });
+                });
+            }
+            $("#word_process_div_body .word_del").each(function () {
                 $(this).click(function () {
                     let tr_obj = $(this).parent().parent();
                     let word = $(tr_obj).children('td').eq(1).text();
@@ -2947,11 +2967,7 @@ const Util = {
         if (!obj.hasClass("glyphicon-info-sign")) {
             obj.addClass("glyphicon-info-sign");
         }
-        obj.attr("data-original-title", tip);
-        obj.attr("data-toggle", "tooltip");
-        obj.attr("data-placement", "bottom");
-        obj.attr("data-container", "body");
-        obj.tooltip();
+        obj.attr("data-original-title", tip).attr("data-toggle", "tooltip").attr("data-placement", "bottom").attr("data-container", "body").tooltip();
     },
 
     /**
@@ -3286,6 +3302,9 @@ const Util = {
      */
     pack_html_link: function (url, title) {
         if (url) {
+            if (url === "#") {
+                return "<a class='link_cls' href='#'>" + title + "</a>";
+            }
             if (!url.startsWith("http") && !url.startsWith("/")) {
                 url = "http://" + url;
             }