浏览代码

Fix undefined bug when column with is number.

zhixin 10 年之前
父节点
当前提交
8c0418cd2e
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      src/bootstrap-table.js

+ 4 - 3
src/bootstrap-table.js

@@ -493,13 +493,14 @@
                     }
                     }
                 }
                 }
             }
             }
+            if (column.width && typeof column.width === 'string') {
+                column.width = column.width.replace('%', '').replace('px', '');
+            }
 
 
             halign = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
             halign = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
             align = sprintf('text-align: %s; ', column.align);
             align = sprintf('text-align: %s; ', column.align);
             style = sprintf('vertical-align: %s; ', column.valign);
             style = sprintf('vertical-align: %s; ', column.valign);
-            style += sprintf('width: %s%s; ', column.checkbox || column.radio ? 36 :
-                (column.width ? column.width.replace('%', '').replace('px', '') : undefined),
-                unitWidth);
+            style += sprintf('width: %s%s; ', column.checkbox || column.radio ? 36 : column.width, unitWidth);
 
 
             visibleColumns.push(column);
             visibleColumns.push(column);
             that.header.fields.push(column.field);
             that.header.fields.push(column.field);