diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js index 428f707fe08b12626e4daf4fac07dd1cb48a4d62..094906dbf6cde881d43e4d63f9e5f7c9659ac0ff 100644 --- a/public/assets/js/bootstrap-table-commonsearch.js +++ b/public/assets/js/bootstrap-table-commonsearch.js @@ -134,7 +134,7 @@ var createOptionList = function (searchList, vObjCol, that) { var optionList = []; optionList.push(sprintf('', that.options.formatCommonChoose())); - searchList = $.fn.bootstrapTable.utils.combineSearchList(searchList); + searchList = $.fn.bootstrapTable.utils.combineSearchList(searchList, vObjCol, that); $.each(searchList, function (key, value) { optionList.push(sprintf("", key == vObjCol.defaultValue ? 'selected' : '')); }); @@ -286,7 +286,7 @@ _initSearch = BootstrapTable.prototype.initSearch; // 定义通用searchList处理方法 - $.fn.bootstrapTable.utils.combineSearchList = function (list) { + $.fn.bootstrapTable.utils.combineSearchList = function (list, vObjCol, that) { var searchList = {}; if (typeof list !== 'undefined') { @@ -302,7 +302,19 @@ } else { list = ret; } + let optionList = []; + $.each(list, function (key, val) { + if (typeof val !== 'undefined' && val.constructor === Object) { + key = val.id; + val = val[vObjCol.nameKey || 'name']; + } else { + key = isArray ? val : key; + } + optionList.push(sprintf("", key == vObjCol.defaultValue && vObjCol.defaultValue !='' ? 'selected' : '')); + }); + $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).append(optionList.join('')).trigger("change"); }); + list = ''; } // 兼容旧版本searchList返回字符串直接渲染自定义搜索栏 if (typeof list === 'string') { @@ -313,7 +325,7 @@ $.each(list, function (key, val) { if (typeof val !== 'undefined' && val.constructor === Object) { key = val.id; - val = val.name; + val = val[vObjCol.nameKey || 'name']; } else { key = isArray ? val : key; }