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

优化通用搜索和表格searchList

pull/477/MERGE
Karson 2024-11-28 12:11:59 +08:00
parent 1276d44e48
commit 8a50431006
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@
} else { } else {
key = isArray ? value : key; key = isArray ? value : key;
} }
optionList.push(sprintf("<option value='" + key + "' %s>" + value + "</option>", key == vObjCol.defaultValue ? 'selected' : '')); optionList.push(sprintf("<option value='" + Fast.api.escape(key) + "' %s>" + Fast.api.escape(value) + "</option>", key == vObjCol.defaultValue ? 'selected' : ''));
}); });
return optionList; return optionList;
}; };

11
public/assets/js/require-table.js
View File

@ -866,6 +866,15 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
value = Fast.api.escape(customValue); value = Fast.api.escape(customValue);
field = this.customField; field = this.customField;
} }
if (typeof that.searchList === 'object' && typeof that.searchList.then === 'function') {
$.when(that.searchList).done(function (ret) {
if (ret.data && ret.data.searchlist && $.isArray(ret.data.searchlist)) {
that.searchList = ret.data.searchlist;
} else if (ret.constructor === Array || ret.constructor === Object) {
that.searchList = ret;
}
})
}
if (typeof that.searchList === 'object' && typeof that.custom === 'undefined') { if (typeof that.searchList === 'object' && typeof that.custom === 'undefined') {
var i = 0; var i = 0;
var searchValues = Object.values(colorArr); var searchValues = Object.values(colorArr);
@ -879,7 +888,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
//渲染Flag //渲染Flag
var html = []; var html = [];
var arr = value != '' ? value.split(',') : []; var arr = $.isArray(value) ? value : value != '' ? value.split(',') : [];
var color, display, label; var color, display, label;
$.each(arr, function (i, value) { $.each(arr, function (i, value) {
value = value == null || value.length === 0 ? '' : value.toString(); value = value == null || value.length === 0 ? '' : value.toString();