Merge pull request wenzhixin#3045 from djhvscf/develop

Fix wenzhixin#3024 and wenzhixin#2894
ly-sniper · Mar 26, 2017 · 4228fa6 · 4228fa6
2 parents a31c01b + 6114a9d
commit 4228fa6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -1687,7 +1687,9 @@
                 column = that.columns[j];
 
             if (that.fromHtml && typeof value_ === 'undefined') {
-                return;
+                if((!column.checkbox) && (!column.radio)) {
+                    return;
+                }
             }
 
             if (!column.visible) {