sbd-npm 1.4.47 → 1.4.49

package/package.json

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

package/stock_basics.js

@@ -287,9 +287,18 @@ let Stock = {
             sort_order: Stock.sort_order,
             start_date: $("#hist_start_date").val(),
             end_date: $("#hist_end_date").val(),
-            hist_type: hist_type
+            hist_type: hist_type,
+            is_init: Stock.data.hasOwnProperty(localStorage[Stock.tab_token]) ? 1 : 0
         };
         Util.post("/stock/" + Stock["code"], payload, function (j) {
+            if (j["init_start_date"]) {
+                let init_start_date = Util.seconds_to_format(j["init_start_date"], "%Y-%m-%d");
+                $("#hist_start_date").val(init_start_date).data('daterangepicker').setStartDate(init_start_date);
+            }
+            if (j["init_end_date"]) {
+                let init_end_date = Util.seconds_to_format(j["init_end_date"], "%Y-%m-%d");
+                $("#hist_end_date").val(init_end_date).data('daterangepicker').setStartDate(init_end_date);
+            }
             Stock.hist_type = "";
             let html = [], hist_low_price = 0, hist_high_price = 0, total_amount = 0, total_volume = 0;
             j["data"].forEach(function (item) {

package/util.js

@@ -420,8 +420,11 @@ const Util = {
             if (location_name === "") {
                 location_name = location.length > 20 ? location.substring(0, 20) : location;
             }
-            //return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
-            return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
+            if (Util.is_has_chinese(location)) {
+                //return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
+                return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
+            }
+            return Util.google_map_url(location, location_name);
         }
         return "--";
     },
@@ -2595,8 +2598,7 @@ const Util = {
      * @returns {boolean}
      */
     is_has_chinese: function (str) {
-        let re = /[^\u4e00-\u9fa5]/;
-        return !re.test(str);
+        return /[\u4e00-\u9fa5]/.test(str);
     },
 
     /**
@@ -3653,7 +3655,11 @@ const Util = {
             }
             start_obj.val(start_date);
         }
-        start_obj.daterangepicker({locale: {format: 'YYYY-MM-DD'}, singleDatePicker: true, singleClasses: "picker_2"});
+        start_obj.daterangepicker({
+            locale: {format: 'YYYY-MM-DD'},
+            singleDatePicker: true,
+            singleClasses: "picker_2"
+        });
         if (end_id.length > 0) {
             let end_obj = $('#' + end_id);
             if (!Util.regexp_date_yyyy_mm_dd(end_obj.val())) {