修复普通搜索一处语言调用的错误

public/assets/js/bootstrap-table-commonsearch.js

@@ -90,7 +90,7 @@
                     } else {
                         var isArray = vObjCol.searchList.constructor === Array;
                         var searchList = [];
-                        searchList.push(sprintf('<option value="">%s</option>', $.fn.bootstrapTable.locales.formatCommonChoose()));
+                        searchList.push(sprintf('<option value="">%s</option>', that.options.formatCommonChoose()));
                         $.each(vObjCol.searchList, function (key, value) {
                             var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
                             searchList.push(sprintf("<option value='" + (isArray ? value : key) + "' %s>" + value + "</option>", 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";
         },

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('<option value="">%s</option>', $.fn.bootstrapTable.locales.formatCommonChoose()));
+                        searchList.push(sprintf('<option value="">%s</option>', that.options.formatCommonChoose()));
                         $.each(vObjCol.searchList, function (key, value) {
                             var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
                             searchList.push(sprintf("<option value='" + (isArray ? value : key) + "' %s>" + value + "</option>", 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});