sbd-npm 1.1.91 → 1.1.92

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/util.js +5 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sbd-npm",
3
- "version": "1.1.91",
3
+ "version": "1.1.92",
4
4
  "description": "Stock Big Data",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/util.js CHANGED
@@ -651,6 +651,7 @@ const Util = {
651
651
  if (options["head_cols"]) {
652
652
  let is_table_sort = 0;
653
653
  let is_tooltip = 0;
654
+ let head_length = options["head_cols"].length;
654
655
  let _html = [];
655
656
  if (options["alert"]) {
656
657
  _html.push('<div class="alert alert-info" role="alert">');
@@ -698,6 +699,9 @@ const Util = {
698
699
  td_class.push(col["class"]);
699
700
  }
700
701
  if (col["colspan"]) {
702
+ if (col["colspan"] > 1) {
703
+ head_length += (col["colspan"] - 1);
704
+ }
701
705
  td_attr += ' colspan="' + col["colspan"] + '"';
702
706
  }
703
707
  if (col["table_sort"]) {
@@ -728,7 +732,7 @@ const Util = {
728
732
  });
729
733
  _html.push('</tr></thead>');
730
734
  _html.push('<tbody id="', options["element_id"], '_body"><tr>');
731
- _html.push('<td class="text-center" colspan="', options["head_cols"].length, '">', (options["body_tips"] ? options["body_tips"] : "Loading..."), '</td>');
735
+ _html.push('<td class="text-center" colspan="', head_length, '">', (options["body_tips"] ? options["body_tips"] : "Loading..."), '</td>');
732
736
  _html.push('</tr></tbody>');
733
737
  _html.push('</table>');
734
738
  let tz_obj = $("#" + options["element_id"]);