ソースを参照

Apply 'width' column option to row style.

zhixin 11 年 前
コミット
5284cdbbd4
1 ファイル変更5 行追加8 行削除
  1. 5 8
      src/bootstrap-table.js

+ 5 - 8
src/bootstrap-table.js

@@ -312,8 +312,7 @@
         };
         $.each(this.options.columns, function (i, column) {
             var text = '',
-                style = sprintf('text-align: %s; ', column.align) +
-                        sprintf('vertical-align: %s; ', column.valign),
+                style = '',
                 class_ = sprintf(' class="%s"', column['class']),
                 order = that.options.sortOrder || column.order;
 
@@ -321,6 +320,10 @@
                 return;
             }
 
+            style = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
+            style += sprintf('vertical-align: %s; ', column.valign);
+            style += sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
+
             visibleColumns.push(column);
             that.header.fields.push(column.field);
             that.header.styles.push(style);
@@ -331,12 +334,6 @@
             that.header.cellStyles.push(column.cellStyle);
             that.header.clickToSelects.push(column.clickToSelect);
 
-            if (column.halign) {
-                style = sprintf('text-align: %s; ', column.halign) +
-                    sprintf('vertical-align: %s; ', column.valign);
-            }
-            style += sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
-
             html.push('<th',
                 column.checkbox || column.radio ?
                     sprintf(' class="bs-checkbox %s"', column['class'] || '') :