Browse Source

Merge pull request #4668 from wenzhixin/improvment/4667

Improved group-by to support number type
文翼 6 years ago
parent
commit
f4f543b3de
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/extensions/group-by-v2/bootstrap-table-group-by.js

+ 5 - 1
src/extensions/group-by-v2/bootstrap-table-group-by.js

@@ -55,7 +55,11 @@ BootstrapTable.prototype.initSort = function (...args) {
   if ((this.options.groupBy) && (this.options.groupByField !== '')) {
   if ((this.options.groupBy) && (this.options.groupByField !== '')) {
 
 
     if ((this.options.sortName !== this.options.groupByField)) {
     if ((this.options.sortName !== this.options.groupByField)) {
-      this.data.sort((a, b) => a[that.options.groupByField].localeCompare(b[that.options.groupByField]))
+      this.data.sort((a, b) => {
+        a = a[that.options.groupByField].toString()
+        b = b[that.options.groupByField].toString()
+        return a.localeCompare(b, undefined, { numeric: true })
+      })
     }
     }
 
 
     const groups = groupBy(that.data, item => [item[that.options.groupByField]])
     const groups = groupBy(that.data, item => [item[that.options.groupByField]])