sbd-npm 1.3.27 → 1.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.3.27",
+    "version": "1.3.29",
     "description": "Stock Big Data",
     "main": "index.js",
     "scripts": {

package/util.js

@@ -83,7 +83,15 @@ const Util = {
                 window.open(Util.array_rand(url_arr), "_blank");
             }
         });
-        $("#save_page_content").click(Util.save_page_content_image);
+        $("#save_page_content").click(function() {
+            let element;
+            if (document.getElementsByClassName("save_page_div").length > 0) {
+                element = document.getElementsByClassName("save_page_div")[0];
+            } else {
+                element = document.getElementById('page_content');
+            }
+            Util.save_page_content_image(element);
+        });
 
         $('#stock').keyup(function () {
             let st_obj = $("#search-tips");
@@ -186,55 +194,43 @@ const Util = {
     /**
      * 当前页面内容保存为图片
      * [html2canvas](https://html2canvas.hertzen.com)
+     * @param element 要截取的HTML元素(document.getElementById)
      */
-    save_page_content_image: function() {
-        if (!Util.is_load) {
-            // 获取要截取的HTML元素
-            let element;
-            if (arguments.length === 1) {
-                element = document.getElementById(arguments[0]);
-            } else {
-                if (document.getElementsByClassName("save_page_div").length > 0) {
-                    element = document.getElementsByClassName("save_page_div")[0];
-                } else {
-                    element = document.getElementById('page_content');
-                }
-            }
-            if (element) {
-                Util.is_load = true;
-                Util.show_tips("正在生成中", 0, "alert-danger");
-                Util.show_loading();
-                // 创建canvas元素
-                let canvas = document.createElement("canvas");
-                canvas.width = element.offsetWidth;
-                canvas.height = element.offsetHeight;
-                // 将html元素渲染到canvas上
-                html2canvas(element).then((canvas) => {
-                    // 获取Canvas上下文对象
-                    //let ctx = canvas.getContext('2d');
-                    // 添加水印
-                    //ctx.font = '30px Arial';
-                    //ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
-                    //let text = 'Stock Big Data';
-                    //let textSize = ctx.measureText(text);
-                    //let centerX = (canvas.width - textSize.width) / 2;
-                    //let centerY = canvas.height / 2;
-                    //ctx.fillText(text, centerX, centerY);
-
-                    // 创建一个新的图像对象
-                    let img = new Image();
-                    // 设置图像的源为canvas中的内容
-                    img.src = canvas.toDataURL("image/png");
-                    // 创建一个下载链接并模拟点击
-                    let link = document.createElement("a");
-                    link.download = "stock_big_data_" + Util.now() + ".png";
-                    link.href = img.src;
-                    link.click();
-
-                    Util.is_load = false;
-                    Util.hide_tips();
-                });
-            }
+    save_page_content_image: function(element) {
+        if (!Util.is_load && element) {
+            Util.is_load = true;
+            Util.show_tips("正在生成中", 0, "alert-danger");
+            Util.show_loading();
+            // 创建canvas元素
+            let canvas = document.createElement("canvas");
+            canvas.width = element.offsetWidth;
+            canvas.height = element.offsetHeight;
+            // 将html元素渲染到canvas上
+            html2canvas(element).then((canvas) => {
+                // 获取Canvas上下文对象
+                //let ctx = canvas.getContext('2d');
+                // 添加水印
+                //ctx.font = '30px Arial';
+                //ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
+                //let text = 'Stock Big Data';
+                //let textSize = ctx.measureText(text);
+                //let centerX = (canvas.width - textSize.width) / 2;
+                //let centerY = canvas.height / 2;
+                //ctx.fillText(text, centerX, centerY);
+
+                // 创建一个新的图像对象
+                let img = new Image();
+                // 设置图像的源为canvas中的内容
+                img.src = canvas.toDataURL("image/png");
+                // 创建一个下载链接并模拟点击
+                let link = document.createElement("a");
+                link.download = "stock_big_data_" + Util.now() + ".png";
+                link.href = img.src;
+                link.click();
+
+                Util.is_load = false;
+                Util.hide_tips();
+            });
         }
     },
 
@@ -1865,13 +1861,28 @@ const Util = {
      * @returns {number}
      */
     format_to_second: function (format) {
-        if (Util.regexp_date_yyyy_mm_dd(format) || Util.regexp_date_yyyy_mm_dd_hh_mm_ss(format)) {
+        if (Util.regexp_date_yyyymmdd(format)) {
+            let year = format.slice(0, 4);
+            let month = format.slice(4, 6);
+            let day = format.slice(6, 8);
+            let date = new Date(year, month - 1, day);
+            return (date.getTime() / 1000);
+        } else if (Util.regexp_date_yyyy_mm_dd(format) || Util.regexp_date_yyyy_mm_dd_hh_mm_ss(format)) {
             let second = +new Date(format.replace(/-/g, '/'));
             return (second / 1000);
         }
         return 0;
     },
 
+    /**
+     * 正则匹配 20190910 这类时间格式
+     * @param format
+     */
+    regexp_date_yyyymmdd: function (format) {
+        format = format + "";
+        return /^[1-9]\d{3}(0?[1-9]|1[0-2])(0?[1-9]|[1-2]\d|3[0-1])$/.test(format);
+    },
+
     /**
      * 正则匹配 2019-09-10 这类时间格式
      * @param format
@@ -2994,7 +3005,7 @@ const Util = {
         _html.push('<span class="fa fa-calendar-o form-control-feedback left" aria-hidden="true"></span>');
         _html.push('</div>');
         _html.push('</div>');
-        _html.push('<div class="form-group">');
+        _html.push('<div class="form-group" style="margin-left: -15px;">');
         _html.push('<label for="', end_id, '"></label>');
         _html.push('<div class="col-md-6 col-sm-6 col-xs-12 form-group">');
         _html.push('<input type="text" class="form-control has-feedback-left" id="', end_id, '" name="', end_id, '" title="结束时间" placeholder="结束时间" value="', end_date, '">');