sbd-npm 1.3.28 → 1.3.29

package/package.json

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

package/util.js

@@ -1861,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
@@ -2990,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, '">');