moliparty/peko-admin-web
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复table组件问题

Browse Source
This commit is contained in:
liaozetao
2023-11-14 17:57:02 +08:00
parent 2c55463d35
commit 3a13518b10
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/assets/plugins/bootstrap-table/js/bootstrap-table.js vendored
View File

@@ -2203,8 +2203,10 @@
fixedScroll = data.fixedScroll;
data = data[this.options.dataField];
} else if (!$.isArray(data)) { // support fixedScroll
fixedScroll = data.fixedScroll;
data = data.data;
if (data) {
fixedScroll = data.fixedScroll;
data = data.data;
}
}
this.initData(data);
@@ -2528,13 +2530,25 @@
};
BootstrapTable.prototype.destroy = function () {
let bootstrapTable = $('div .bootstrap-table');
if (bootstrapTable) {
let $this = this;
let tables = bootstrapTable.filter(i => {
let $container = $(bootstrapTable[i]);
return ($container && $container.html().indexOf('"' +$this.$el[0].id + '"') != -1);
});
if (tables.length > 1) {
this.$container = $(tables[0]);
this.options.toolbar = $('div.fixed-table-toolbar > div.bars.pull-left').html();
}
}
this.$el.insertBefore(this.$container);
$(this.options.toolbar).insertBefore(this.$el);
this.$container.next().remove();
this.$container.remove();
this.$el.html(this.$el_.html())
.css('margin-top', '0')
.attr('class', this.$el_.attr('class') || ''); // reset the class
$(this.options.toolbar).insertBefore(this.$el);
this.$container.next().remove();
this.$container.remove();
this.$el.html(this.$el_.html())
.css('margin-top', '0')
.attr('class', this.$el_.attr('class') || ''); // reset the class
};
BootstrapTable.prototype.showLoading = function () {
@@ -2776,12 +2790,17 @@
data = $this.data('bootstrap.table'),
options = $.extend({}, BootstrapTable.DEFAULTS, $this.data(),
typeof option === 'object' && option);
if (typeof option === 'string') {
if ($.inArray(option, allowedMethods) < 0) {
throw new Error("Unknown method: " + option);
}
if (!data && option === 'destroy') {
new BootstrapTable(this, options).destroy();
return;
}
if (!data) {
return;
}