github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into 1.5.5

pull/3428/head
ibuler 2019-10-25 15:33:02 +08:00
parent 87fd342b68 d22f60364a
commit 458bee9a19
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/static/js/jumpserver.js
View File

@ -448,7 +448,6 @@ function parseTableFilter(value) {
filter[key] = value filter[key] = value
} }
} }
console.log(filter);
return filter; return filter;
} }
@ -651,9 +650,14 @@ jumpserver.initServerSideDataTable = function (options) {
if (data.search !== null) { if (data.search !== null) {
var searchValue = data.search.value; var searchValue = data.search.value;
var searchFilter = parseTableFilter(searchValue); var searchFilter = parseTableFilter(searchValue);
$.each(searchFilter, function (k, v) { if (Object.keys(searchFilter).length === 0) {
data[k] = v data.search = searchValue;
}) } else {
data.search = '';
$.each(searchFilter, function (k, v) {
data[k] = v
})
}
} }
if (data.order !== null && data.order.length === 1) { if (data.order !== null && data.order.length === 1) {
var col = data.order[0].column; var col = data.order[0].column;