|
@@ -1382,7 +1382,7 @@ class BootstrapTable {
|
|
|
const tr = this.initRow(item, i, data, trFragments)
|
|
const tr = this.initRow(item, i, data, trFragments)
|
|
|
hasTr = hasTr || !!tr
|
|
hasTr = hasTr || !!tr
|
|
|
if (tr && typeof tr === 'string') {
|
|
if (tr && typeof tr === 'string') {
|
|
|
- if (this.virtualScrollDisabled) {
|
|
|
|
|
|
|
+ if (!this.options.virtualScroll) {
|
|
|
trFragments.append(tr)
|
|
trFragments.append(tr)
|
|
|
} else {
|
|
} else {
|
|
|
rows.push(tr)
|
|
rows.push(tr)
|
|
@@ -1396,7 +1396,7 @@ class BootstrapTable {
|
|
|
this.$header.find('th').length,
|
|
this.$header.find('th').length,
|
|
|
this.options.formatNoMatches())}</tr>`)
|
|
this.options.formatNoMatches())}</tr>`)
|
|
|
} else {
|
|
} else {
|
|
|
- if (this.virtualScrollDisabled) {
|
|
|
|
|
|
|
+ if (!this.options.virtualScroll) {
|
|
|
this.$body.html(trFragments)
|
|
this.$body.html(trFragments)
|
|
|
} else {
|
|
} else {
|
|
|
if (this.virtualScroll) {
|
|
if (this.virtualScroll) {
|
|
@@ -1406,6 +1406,7 @@ class BootstrapTable {
|
|
|
rows,
|
|
rows,
|
|
|
scrollEl: this.$tableBody[0],
|
|
scrollEl: this.$tableBody[0],
|
|
|
contentEl: this.$body[0],
|
|
contentEl: this.$body[0],
|
|
|
|
|
+ itemHeight: this.options.virtualScrollItemHeight,
|
|
|
callback: () => {
|
|
callback: () => {
|
|
|
this.fitHeader()
|
|
this.fitHeader()
|
|
|
}
|
|
}
|