|
@@ -25,12 +25,13 @@
|
|
|
scroll = $el.bootstrapTable('getScrollPosition');
|
|
scroll = $el.bootstrapTable('getScrollPosition');
|
|
|
$el.bootstrapTable('destroy');
|
|
$el.bootstrapTable('destroy');
|
|
|
}
|
|
}
|
|
|
- options = $.extend(options ? {
|
|
|
|
|
|
|
+ if (options) newOptions = $.extend({}, newOptions, {
|
|
|
sortName: options.sortName,
|
|
sortName: options.sortName,
|
|
|
sortOrder: options.sortOrder,
|
|
sortOrder: options.sortOrder,
|
|
|
pageNumber: options.pageNumber,
|
|
pageNumber: options.pageNumber,
|
|
|
pageSize: options.pageSize
|
|
pageSize: options.pageSize
|
|
|
- } : {}, newOptions);
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ options = newOptions;
|
|
|
$el.bootstrapTable(options);
|
|
$el.bootstrapTable(options);
|
|
|
if (scroll) $el.bootstrapTable('scrollTo', scroll);
|
|
if (scroll) $el.bootstrapTable('scrollTo', scroll);
|
|
|
}, true);
|
|
}, true);
|