diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 4e9672ed..9498d685 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -90,7 +90,7 @@
} else {
var isArray = vObjCol.searchList.constructor === Array;
var searchList = [];
- searchList.push(sprintf('', $.fn.bootstrapTable.locales.formatCommonChoose()));
+ searchList.push(sprintf('', that.options.formatCommonChoose()));
$.each(vObjCol.searchList, function (key, value) {
var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
searchList.push(sprintf("", isSelect));
@@ -214,7 +214,7 @@
'column-common-search.bs.table': 'onColumnCommonSearch'
});
- $.extend($.fn.bootstrapTable.locales, {
+ $.extend($.fn.bootstrapTable.locales[$.fn.bootstrapTable.defaults.locale], {
formatCommonSearch: function () {
return "Common search";
},
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 6ac9066e..0efbbbb2 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -7290,7 +7290,7 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
} else {
var isArray = vObjCol.searchList.constructor === Array;
var searchList = [];
- searchList.push(sprintf('', $.fn.bootstrapTable.locales.formatCommonChoose()));
+ searchList.push(sprintf('', that.options.formatCommonChoose()));
$.each(vObjCol.searchList, function (key, value) {
var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
searchList.push(sprintf("", isSelect));
@@ -7338,7 +7338,6 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
};
var isSearchAvailble = function (that) {
- console.log('isSearchAvailble');
//只支持服务端搜索
if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) {
return false;
@@ -7415,7 +7414,7 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
'column-common-search.bs.table': 'onColumnCommonSearch'
});
- $.extend($.fn.bootstrapTable.locales, {
+ $.extend($.fn.bootstrapTable.locales[$.fn.bootstrapTable.defaults.locale], {
formatCommonSearch: function () {
return "Common search";
},
@@ -7493,7 +7492,6 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
return;
}
if (!firstLoad) {
- console.log(122);
var height = parseInt($(".bootstrap-table").height());
height += 10;
$("#" + this.options.idTable).bootstrapTable("resetView", {height: height});