From 2f94a26fa1628f834bc11a2d3c53ec9be354568a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 29 Mar 2022 19:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/search.js | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/public/home/search.js b/public/home/search.js
index d833b369f..c10e7b3ae 100644
--- a/public/home/search.js
+++ b/public/home/search.js
@@ -102,7 +102,6 @@ function initPageInfo(){
 function searchItem(type,sortType){
     console.log("enter item 2.");
     currentSearchKeyword = document.getElementById("keyword_input").value;
-    sessionStorage.removeItem("searchLabel");
     if(!isEmpty(currentSearchKeyword)){
         initPageInfo();
         currentSearchTableName = itemType[type];
@@ -122,7 +121,6 @@ function search(){
     if(!isEmpty(currentSearchKeyword)){
         currentSearchKeyword = currentSearchKeyword.trim();
     }
-    sessionStorage.removeItem("searchLabel");
     $('#searchForm').addClass("hiddenSearch");
     initPageInfo();
     if(!isEmpty(currentSearchKeyword)){
@@ -212,23 +210,8 @@ function searchLabel(tableName,keyword,sortBy="",ascending="false"){
     sessionStorage.setItem("searchLabel",true);
     sessionStorage.setItem("sortBy",sortBy);
     sessionStorage.setItem("ascending",ascending);
-
     console.log("enter label search.");
-
     window.open("/all/search/");
-    // initDiv(true);
-    // //document.getElementById("search_div").style.display="none";
-    // //document.getElementById("search_label_div").style.display="block";
-    // document.getElementById("search_label_div").innerHTML="<p class=\"searchlabel\">#" + keyword +  "</p>";
-    
-    // currentSearchKeyword = keyword;
-    // initPageInfo();
-    // currentSearchTableName = tableName;
-    // currentSearchSortBy = sortBy;
-    // currentSearchAscending = ascending;
-    // OnlySearchLabel =true;
-    
-    // page(currentPage);
 }
 
 function doSearch(tableName,keyword,page,pageSize=15,onlyReturnNum=true,sortBy="",OnlySearchLabel=false){
@@ -261,9 +244,6 @@ function doSearch(tableName,keyword,page,pageSize=15,onlyReturnNum=true,sortBy="
            console.log("tableName=" + tableName);
            console.log(json);
            displayResult(tableName,page,json,onlyReturnNum,keyword);
-           if(OnlySearchLabel){
-            sessionStorage.removeItem("searchLabel");
-           }
         },
         error:function(response) {
            console.log(response);
@@ -1289,7 +1269,8 @@ var zhCN={
             console.log("tmpSearchLabel=" + tmpSearchLabel);
             if(tmpSearchLabel){
                 console.log("search label....");
-                doSearchLabel(sessionStorage.getItem("tableName"),sessionStorage.getItem("keyword"),sessionStorage.getItem("sortBy"),sessionStorage.getItem("ascending"))
+                sessionStorage.removeItem("searchLabel");
+                doSearchLabel(sessionStorage.getItem("tableName"),sessionStorage.getItem("keyword"),sessionStorage.getItem("sortBy"),sessionStorage.getItem("ascending"));
             }else{
                 console.log("normal search....");
                 search();