Merge branch 'develop' into feature/5168

site/docs/api/events.md

@@ -9,12 +9,16 @@ toc: true
 To use event syntax:
 
 {% highlight html %}
+// Here you can expect to have as last parameter the boostrap-table object
+
 $('#table').bootstrapTable({
   onEventName: function (arg1, arg2, ...) {
     // ...
   }
 })
 
+// Here you can expect to have in the 'e' variable the sender property which is the boostrap-table object
+
 $('#table').on('event-name.bs.table', function (e, arg1, arg2, ...) {
   // ...
 })

src/bootstrap-table.js

@@ -1862,11 +1862,11 @@ class BootstrapTable {
 
   trigger (_name, ...args) {
     const name = `${_name}.bs.table`
-    this.options[BootstrapTable.EVENTS[name]](...args)
-    this.$el.trigger($.Event(name), args)
+    this.options[BootstrapTable.EVENTS[name]](...[...args, this])
+    this.$el.trigger($.Event(name, { sender: this }), args)
 
-    this.options.onAll(name, args)
-    this.$el.trigger($.Event('all.bs.table'), [name, args])
+    this.options.onAll(name, ...[...args, this])
+    this.$el.trigger($.Event('all.bs.table', { sender: this }), [name, args])
   }
 
   resetHeader () {

src/utils/index.js

@@ -66,11 +66,10 @@ export default {
           r.colspanGroup = r.colspan
         }
 
-        for (let k = 0; k < rowspan; k++) {
-          flag[i + k][index] = true
-        }
-        for (let k = 0; k < colspan; k++) {
-          flag[i][index + k] = true
+        for (let j = 0; j < rowspan; j++) {
+          for (let k = 0; k < colspan; k++) {
+            flag[i + j][index + k] = true
+          }
         }
       }
     }