sbd-npm 1.4.70 → 1.4.72

package/package.json

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

package/status.js

@@ -108,14 +108,8 @@ $(function () {
                 if (j["ip_date"]) {
                     let id_obj = $("#ip_date");
                     id_obj.val(Util.seconds_to_format(j["ip_date"], "%Y-%m-%d"));
-                    id_obj.daterangepicker({
-                        locale: {format: 'YYYY-MM-DD'},
-                        singleDatePicker: true,
-                        singleClasses: "picker_2"
-                    }, function () {
-                        setTimeout(Status.fetch_data, 123);
-                    });
                     id_obj.parent().attr("title", Util.seconds_to_format(j["ip_date"]));
+                    Util.bind_date_picker_callback("ip_date", Status.fetch_data);
                 }
                 Util.hide_tips();
             });

package/stock_basics.js

@@ -54,7 +54,7 @@ let Stock = {
                 break;
             case "margin":
                 if (!Stock.rzye_chart) {
-                    Util.init_range_date("margin_start_end_date", Stock, "fetch_margin");
+                    Util.init_date_range_picker("margin_start_end_date", Stock, "fetch_margin");
                 }
                 $("#query_margin").click(function () {
                     Stock.fetch_margin();
@@ -66,7 +66,7 @@ let Stock = {
                 break;
             case "hkex_holding":
                 if (!Stock.hkex_holding_chart) {
-                    Util.init_range_date("hkex_start_end_date", Stock, "fetch_hkex_holding");
+                    Util.init_date_range_picker("hkex_start_end_date", Stock, "fetch_hkex_holding");
                 }
                 $("#query_hkex_holding").click(function () {
                     Stock.fetch_hkex_holding();
@@ -99,9 +99,9 @@ let Stock = {
                 break;
             case "hist_trade":  // 个股历史交易记录
                 if (Stock.hist_start_date && Stock.hist_end_date) {
-                    Util.init_range_date("hist_start_end_date", Stock, "fetch_hist_data", Stock.hist_start_date, Stock.hist_end_date);
+                    Util.init_date_range_picker("hist_start_end_date", Stock, "fetch_hist_data", Stock.hist_start_date, Stock.hist_end_date);
                 } else {
-                    Util.init_range_date("hist_start_end_date", Stock, "fetch_hist_data", 60);
+                    Util.init_date_range_picker("hist_start_end_date", Stock, "fetch_hist_data", 60);
                 }
                 if (Stock.hist_type) {
                     $("#hist_type").val(Stock.hist_type);

package/summary_daily.js

@@ -496,20 +496,13 @@ $(function () {
             date_html.push('</li></ul>');
             $('.top_nav .nav_menu nav div.toggle').after(date_html.join(""));
             $("#trade_date").val(Util.seconds_to_format(trade_date, "%Y-%m-%d"));
-            Util.init_date_range_picker("trade_date", DailySummary.fetch_data);
+            Util.bind_date_picker_callback("trade_date", DailySummary.fetch_data);
         }
 
     };
 
-    $("#trade_date").daterangepicker({
-        locale: {format: 'YYYY-MM-DD'},
-        singleDatePicker: true,
-        singleClasses: "picker_2"
-    }, function () {
-        if (!Util.is_load) {
-            setTimeout(DailySummary.fetch_data, 123);
-        }
-    });
+    Util.bind_date_picker_callback("trade_date", DailySummary.fetch_data);
+
     // 成交概况数据
     let Modal = {
 
@@ -686,7 +679,7 @@ $(function () {
     mam_obj.on('shown.bs.modal', function (e) {
         Util.set_table_loading("index_hist_modal_body_body");
         if ($("#index_hist_modal_start_date").length <= 0) {
-            Util.init_range_date("index_hist_modal_start_end_date", DailySummary, "render_index_hist_modal");
+            Util.init_date_range_picker("index_hist_modal_start_end_date", DailySummary, "render_index_hist_modal");
         }
         $("#index_hist_modal_query").click(function () {
             DailySummary.render_index_hist_modal();

package/util.js

@@ -52,6 +52,18 @@ const Util = {
         minSpotColor: "#34495E"
     },
 
+    // 日期范围选择器配置
+    DateRangePickerOptions: {
+        locale: {
+            format: 'YYYY-MM-DD',
+            daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+            monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+            firstDay: 1     // 一周从星期一开始
+        },
+        singleDatePicker: true,
+        singleClasses: "picker_2"
+    },
+
     sbd_init: function () {
         this.show_loading();
 
@@ -1817,7 +1829,7 @@ const Util = {
             let currency = $(e.relatedTarget).attr("data-code");
             Util.set_table_loading(component_id + "_body_body");
             if ($("#currency_modal_start_date").length <= 0) {
-                Util.init_range_date("currency_modal_start_end_date", Util, "render_currency_modal", 60);
+                Util.init_date_range_picker("currency_modal_start_end_date", Util, "render_currency_modal", 60);
             }
             let title_obj = $("#currency_modal_title");
             title_obj.html(currency);
@@ -1909,7 +1921,7 @@ const Util = {
             Util.set_table_loading(component_id + "_body_body");
             let coin = $(e.relatedTarget).attr("data-coin");
             if ($("#" + component_id + "_start_date").length <= 0) {
-                Util.init_range_date(component_id + "_start_end_date", Util, "render_btc_modal", 60);
+                Util.init_date_range_picker(component_id + "_start_end_date", Util, "render_btc_modal", 60);
             }
             let title_obj = $("#" + component_id + "_title");
             title_obj.html(coin);
@@ -3590,7 +3602,15 @@ const Util = {
         }
     },
 
-    init_range_date: function (element_id, Obj, callback_func, start_date = 0, end_date = 0) {
+    /**
+     * 初始日期范围选择器
+     * @param element_id
+     * @param Obj
+     * @param callback_func
+     * @param start_date
+     * @param end_date
+     */
+    init_date_range_picker: function (element_id, Obj, callback_func, start_date = 0, end_date = 0) {
         let separator = element_id.indexOf("_start_end") > -1 ? "_start_end" : "_";
         let element_arr = element_id.split(separator);
         let prefix = element_arr[0];
@@ -3629,6 +3649,12 @@ const Util = {
         Util.init_time_select_range(Obj, select_id, start_id, end_id, callback_func);
     },
 
+    /**
+     * 初始日期范围选择器的时间参数
+     * @param start_id
+     * @param end_id
+     * @param nth_day
+     */
     init_range_picker_date: function (start_id, end_id = "", nth_day = 0) {
         let date = new Date();
         let year = date.getFullYear();
@@ -3646,31 +3672,24 @@ const Util = {
             }
             start_obj.val(start_date);
         }
-        start_obj.daterangepicker({
-            locale: {format: 'YYYY-MM-DD'},
-            singleDatePicker: true,
-            singleClasses: "picker_2"
-        });
+        start_obj.daterangepicker(Util.DateRangePickerOptions);
         if (end_id.length > 0) {
             let end_obj = $('#' + end_id);
             if (!Util.regexp_date_yyyy_mm_dd(end_obj.val())) {
                 let day = date.getDate();
                 end_obj.val(year + "-" + month + "-" + day);
             }
-            end_obj.daterangepicker({
-                locale: {format: 'YYYY-MM-DD'},
-                singleDatePicker: true,
-                singleClasses: "picker_2"
-            });
+            end_obj.daterangepicker(Util.DateRangePickerOptions);
         }
     },
 
-    init_date_range_picker: function (element_id, callback_func) {
-        $("#" + element_id).daterangepicker({
-            locale: {format: 'YYYY-MM-DD'},
-            singleDatePicker: true,
-            singleClasses: "picker_2"
-        }, function () {
+    /**
+     * 初始日期范围选择器，并绑定一个回调函数
+     * @param element_id
+     * @param callback_func
+     */
+    bind_date_picker_callback: function (element_id, callback_func) {
+        $("#" + element_id).daterangepicker(Util.DateRangePickerOptions, function () {
             setTimeout(callback_func, 123);
         });
     },