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

[Update] 修改table过滤

pull/3388/head
ibuler 2019-10-25 12:08:49 +08:00
parent f802fb645d
commit d2c65dd783
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,6 +409,46 @@ function makeLabel(data) {
return "<label class='detail-key'><b>" + data[0] + ": </b></label>" + data[1] + "</br>" return "<label class='detail-key'><b>" + data[0] + ": </b></label>" + data[1] + "</br>"
} }
function parseTableFilter(value) {
var cleanValues = [];
var valuesArray = value.split(':');
console.log(valuesArray);
for (var i=0; i<valuesArray.length; i++) {
var v = valuesArray[i].trim();
if (!v) {
continue
}
// 如果是最后一个元素，直接push，不需要再处理了, 因为最后一个肯定不是key
if (i === valuesArray.length -1) {
cleanValues.push(v);
continue
}
v = v.split(' ');
console.log(cleanValues);
// 如果长度是1，直接push上
// 如果长度不是1，根据空格分隔后，最后面的是key
if (v.length === 1) {
cleanValues.push(v[0]);
} else {
var leaveData = v.slice(0, -1).join(' ').trim();
cleanValues.push(leaveData);
cleanValues.push(v.slice(-1)[0]);
}
}
var filter = {};
var key = '';
for (i=0; i<cleanValues.length; i++) {
if (i%2 === 0) {
key = cleanValues[i]
} else {
value = cleanValues[i];
filter[key] = value
}
}
console.log(filter);
return filter;
}
var jumpserver = {}; var jumpserver = {};
jumpserver.checked = false; jumpserver.checked = false;
@ -606,24 +646,26 @@ jumpserver.initServerSideDataTable = function (options) {
delete data.start; delete data.start;
} }
if (data.search !== null) { if (data.search !== null) {
var search_val = data.search.value; var searchValue = data.search.value;
var search_list = search_val.split(" "); var searchFilter = parseTableFilter(searchValue);
var search_attr = {}; // var search_list = search_val.split(" ");
var search_raw = []; // var search_attr = {};
// var search_raw = [];
search_list.map(function (val, index) { //
var kv = val.split(":"); // search_list.map(function (val, index) {
if (kv.length === 2) { // var kv = val.split(":");
var value = kv[1]; // if (kv.length === 2) {
var key = kv[0].trim(); // var value = kv[1];
value = value.replace("+", " ").trim(); // var key = kv[0].trim();
search_attr[key] = value // value = value.replace("+", " ").trim();
} else { // search_attr[key] = value
search_raw.push(kv) // } else {
} // search_raw.push(kv)
}); // }
data.search = search_raw.join(""); // });
$.each(search_attr, function (k, v) { // data.search = search_raw.join("");
console.log(searchFilter);
$.each(searchFilter, function (k, v) {
data[k] = v data[k] = v
}) })
} }