hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/323483/MERGE
Karson 2017-05-21 23:33:23 +08:00
parent 102c2c021c
commit bde9120b36
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/assets/js/bootstrap-table-commonsearch.js
View File

@ -90,7 +90,7 @@
} else { } else {
var isArray = vObjCol.searchList.constructor === Array; var isArray = vObjCol.searchList.constructor === Array;
var searchList = []; 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) { $.each(vObjCol.searchList, function (key, value) {
var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : ''; var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
searchList.push(sprintf("<option value='" + (isArray ? value : key) + "' %s>" + value + "</option>", isSelect)); searchList.push(sprintf("<option value='" + (isArray ? value : key) + "' %s>" + value + "</option>", isSelect));
@ -214,7 +214,7 @@
'column-common-search.bs.table': 'onColumnCommonSearch' 'column-common-search.bs.table': 'onColumnCommonSearch'
}); });
$.extend($.fn.bootstrapTable.locales, { $.extend($.fn.bootstrapTable.locales[$.fn.bootstrapTable.defaults.locale], {
formatCommonSearch: function () { formatCommonSearch: function () {
return "Common search"; return "Common search";
}, },

6
public/assets/js/require-backend.min.js vendored
View File

@ -7290,7 +7290,7 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
} else { } else {
var isArray = vObjCol.searchList.constructor === Array; var isArray = vObjCol.searchList.constructor === Array;
var searchList = []; 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) { $.each(vObjCol.searchList, function (key, value) {
var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : ''; var isSelect = (isArray ? value : key) === vObjCol.defaultValue ? 'selected' : '';
searchList.push(sprintf("<option value='" + (isArray ? value : key) + "' %s>" + value + "</option>", isSelect)); 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) { var isSearchAvailble = function (that) {
console.log('isSearchAvailble');
//只支持服务端搜索 //只支持服务端搜索
if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) { if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) {
return false; 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' 'column-common-search.bs.table': 'onColumnCommonSearch'
}); });
$.extend($.fn.bootstrapTable.locales, { $.extend($.fn.bootstrapTable.locales[$.fn.bootstrapTable.defaults.locale], {
formatCommonSearch: function () { formatCommonSearch: function () {
return "Common search"; return "Common search";
}, },
@ -7493,7 +7492,6 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
return; return;
} }
if (!firstLoad) { if (!firstLoad) {
console.log(122);
var height = parseInt($(".bootstrap-table").height()); var height = parseInt($(".bootstrap-table").height());
height += 10; height += 10;
$("#" + this.options.idTable).bootstrapTable("resetView", {height: height}); $("#" + this.options.idTable).bootstrapTable("resetView", {height: height});