Merge branch 'develop' into fix/ajax-error

src/bootstrap-table.js

@@ -422,7 +422,8 @@ class BootstrapTable {
             return order * value
           }
 
-          return Utils.sort(aa, bb, order, this.options.sortStable)
+          return Utils.sort(aa, bb, order, this.options.sortStable,
+            a._position, b._position)
         })
       }
 

src/themes/theme.scss

@@ -125,7 +125,7 @@
           background-color: $hover-bg;
         }
 
-        &.no-records-found {
+        &.no-records-found td {
           text-align: center;
         }
 
@@ -146,12 +146,12 @@
 
         label {
           margin-bottom: 0;
-        }
-      }
 
-      input[type="radio"],
-      input[type="checkbox"] {
-        margin: 0 auto !important;
+          input[type="radio"],
+          input[type="checkbox"] {
+            margin: 0 auto !important;
+          }
+        }
       }
 
       &.table-sm .th-inner {

src/utils/index.js

@@ -271,7 +271,7 @@ export default {
     return data
   },
 
-  sort (a, b, order, sortStable) {
+  sort (a, b, order, sortStable, aPosition, bPosition) {
     if (a === undefined || a === null) {
       a = ''
     }
@@ -280,8 +280,8 @@ export default {
     }
 
     if (sortStable && a === b) {
-      a = a._position
-      b = b._position
+      a = aPosition
+      b = bPosition
     }
 
     // If both values are numeric, do a numeric comparison