From be024fd384efabbd8c3c56147196f6beec1b8fca Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 23 Feb 2022 17:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 105 +++++++++++++++++++++++++++++------------- routers/search.go | 1 + 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index 6fa8cb640..22eded77d 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -121,9 +121,12 @@ function displayPrResult(page,jsonResult,onlyReturnNum,keyword){ var total = jsonResult.Total; $('#pr_total').text(total); if(!onlyReturnNum){ + setActivate("pr_item"); $('#keyword_desc').text(keyword); $('#obj_desc').text("合并请求"); $('#child_total').text(total); + + setIssueOrPrInnerHtml(data); } } @@ -132,6 +135,7 @@ function displayDataSetResult(page,jsonResult,onlyReturnNum,keyword){ var total = jsonResult.Total; $('#dataset_total').text(total); if(!onlyReturnNum){ + setActivate("dataset_item"); $('#keyword_desc').text(keyword); $('#obj_desc').text("数据集"); $('#child_total').text(total); @@ -143,57 +147,45 @@ function displayOrgResult(page,jsonResult,onlyReturnNum,keyword){ var total = jsonResult.Total; $('#org_total').text(total); if(!onlyReturnNum){ + setActivate("org_item"); $('#keyword_desc').text(keyword); $('#obj_desc').text("组织"); $('#child_total').text(total); } } - +var monthDisplay=new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Spt","Oct","Nov","Dec"); function displayUserResult(page,jsonResult,onlyReturnNum,keyword){ var data = jsonResult.Result; var total = jsonResult.Total; $('#user_total').text(total); if(!onlyReturnNum){ + setActivate("user_item"); $('#keyword_desc').text(keyword); $('#obj_desc').text("用户"); $('#child_total').text(total); - } -} - -function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){ - var data = jsonResult.Result; - var total = jsonResult.Total; - $('#issue_total').text(total); - if(!onlyReturnNum){ - setActivate("issue_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text("任务"); - $('#child_total').text(total); var sortHtml = ""; - sortHtml +="最近更新" + sortHtml +="最近更新"; + sortHtml +="名称自然序"; + document.getElementById("sort_type").innerHTML=sortHtml; + var html = ""; var currentTime = new Date().getTime(); for(var i = 0; i < data.length;i++){ var recordMap = data[i]; - html += "
"; + html += "
"; + html += ""; html += "
"; html += "
"; - html += " " + recordMap["name"] + ""; + html += " " + recordMap["name"] + ""; html +="
"; html += "
"; - html += "

" + recordMap["content"] + "

"; - html +="

"; - html +=" "; - html +=" " + recordMap["repoUrl"] +"#" + recordMap["id"] + ""; - html +=" "; - if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="false"){ - html += "关闭"; - }else{ - html += "开启中"; - } - html +=" 最后更新于 " + getTime(recordMap["updated_unix"],currentTime) +""; - + html += "

" + recordMap["description"] + "

"; + html +="

"; + html +=" " + recordMap["email"]; + html +=" 加入于 "; + var userAddDate = new Date(recordMap["created_unix"]*1000); + html += monthDisplay[userAddDate.getMonth()] + " " + userAddDate.getDay() + " " + userAddDate.getFullYear(); html +="

"; html +="
"; html +="
"; @@ -203,6 +195,55 @@ function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){ } } +function setIssueOrPrInnerHtml(data){ + var sortHtml = ""; + sortHtml +="最近更新"; + document.getElementById("sort_type").innerHTML=sortHtml; + + var html = ""; + var currentTime = new Date().getTime(); + for(var i = 0; i < data.length;i++){ + var recordMap = data[i]; + html += "
"; + html += "
"; + html += "
"; + html += " " + recordMap["name"] + ""; + html +="
"; + html += "
"; + html += "

" + recordMap["content"] + "

"; + html +="

"; + html +=" "; + html +=" " + recordMap["repoUrl"] +"#" + recordMap["id"] + ""; + html +=" "; + if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="f"){ + html += "关闭"; + }else{ + html += "开启中"; + } + html +=" 最后更新于 " + getTime(recordMap["updated_unix"],currentTime) +""; + + html +="

"; + html +="
"; + html +="
"; + html +="
"; + } + document.getElementById("child_search_item").innerHTML=html; +} + +function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){ + var data = jsonResult.Result; + var total = jsonResult.Total; + $('#issue_total').text(total); + if(!onlyReturnNum){ + setActivate("issue_item"); + $('#keyword_desc').text(keyword); + $('#obj_desc').text("任务"); + $('#child_total').text(total); + + setIssueOrPrInnerHtml(data); + } +} + function setActivate(name){ $('#repo_item').removeClass("active"); $('#user_item').removeClass("active"); @@ -226,10 +267,10 @@ function displayRepoResult(page,jsonResult,onlyReturnNum,keyword){ $('#child_total').text(total); var sortHtml = ""; - sortHtml +="最近更新" - sortHtml +="关注数" - sortHtml +="点赞数" - sortHtml +="Fork数" + sortHtml +="最近更新"; + sortHtml +="关注数"; + sortHtml +="点赞数"; + sortHtml +="Fork数"; document.getElementById("sort_type").innerHTML=sortHtml; diff --git a/routers/search.go b/routers/search.go index 9189e6730..798e2dff4 100644 --- a/routers/search.go +++ b/routers/search.go @@ -328,6 +328,7 @@ func makeUserOrOrgResult(sRes *elastic.SearchResult, Key string, ctx *context.Co record := make(map[string]interface{}) record["id"] = hit.Id record["name"] = getLabelValue("name", recordSource, hit.Highlight) + record["real_name"] = recordSource["name"] record["full_name"] = getLabelValue("full_name", recordSource, hit.Highlight) if recordSource["description"] != nil { desc := getLabelValue("description", recordSource, hit.Highlight)