提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

public/home/search.js

@@ -60,6 +60,7 @@ function searchItem(type,sortType){
         currentPage = 1;
         currentSearchTableName = itemType[type];
         currentSearchSortBy = sortBy[sortType];
+        OnlySearchLabel =false;
         page(currentPage);
         //doSearch(itemType[type],currentSearchKeyword,currentPage,pageSize,false,sortBy[sortType]);
     }
@@ -73,7 +74,11 @@ function search(){
     currentPage = 1;
 
     if(!isEmpty(keyword)){
-        doSearch("repository",keyword,page,pageSize,false,sortBy[11]);
+        currentSearchTableName = "repository";
+        currentSearchSortBy = sortBy[11];
+        OnlySearchLabel =false;
+        page(currentPage);
+        //doSearch("repository",keyword,page,pageSize,false,sortBy[11]);
         doSearch("issue",keyword,page,pageSize,true,"");
         doSearch("user",keyword,page,pageSize,true,"");
         doSearch("org",keyword,page,pageSize,true,"");
@@ -82,6 +87,10 @@ function search(){
     }
 }
 
+function searchLabel(){
+
+}
+
 function doSearch(tableName,keyword,page,pageSize=15,onlyReturnNum=true,sortBy="",OnlySearchLabel=false){
     $.ajax({
         type:"GET",
@@ -124,7 +133,10 @@ function displayResult(tableName,page,jsonResult,onlyReturnNum,keyword){
 	} else if (tableName == "pr") {
 		displayPrResult(page,jsonResult,onlyReturnNum,keyword);
 	}
-    setPage(jsonResult,pageSize);
+    if(!onlyReturnNum){
+        setPage(jsonResult,pageSize,page);
+    }
+   
 }
 
 function displayPrResult(page,jsonResult,onlyReturnNum,keyword){
@@ -502,23 +514,22 @@ var repoAndOrgEN={
 
 function page(current){
     //function doSearch(tableName,keyword,page,pageSize=15,onlyReturnNum=true,sortBy="",OnlySearchLabel=false){
+    currentPage=current;
     doSearch(currentSearchTableName,currentSearchKeyword,current,pageSize,false,currentSearchSortBy,OnlySearchLabel);
-    
-    
   }
   
   function nextPage(){
-     var current = $('#currentPage').text();
-     console.log("current=" + current);
-     page(current,pageSize);
+    currentPage = currentPage+1; 
+    console.log("current=" + currentPage);
+    page(currentPage,pageSize);
   }
   
   function prePage(){
-    var current =$('#currentPage').text();
-    console.log("current=" + current);
+    console.log("current=" + currentPage);
     if(current > 1){
-      console.log("current=" + (current - 2));
-      page(current - 2,pageSize);
+      currentPage = currentPage-1;
+      console.log("current=" + (currentPage));
+      page(currentPage);
     } 
   }
   
@@ -550,39 +561,30 @@ function page(current){
     if (isEmpty(pageData)){
       return;
     }
-    var startIndex = currentPage * pageSize;
-    if(pageData.Total > 0){
-        startIndex = startIndex + 1;
-    }
-    $('#startIndex').text(startIndex);
-    $('#endIndex').text(pageData.current * pageSize + pageData.data.length);
-    $('#totalNum').text(pageData.total);
-    $('#displayPage1').text(pageData.current + 1);
-  
-    console.log("set prePage status, pageData.current=" + pageData.current);
-  
-    if(pageData.current == 0){
-      console.log("set prePage disabled.");
-      $('#prePage').removeAttr("href");
-    }
-    else{
-      $('#prePage').attr("href","javascript:prePage()");
+    $('#page_total').text(pageData.Total);
+    if(currentPage > 1){
+        $('#startPage').removeClass("disabled");
+        $('#lastPage').removeClass("disabled");
+    }else{
+        $('#startPage').addClass("disabled");
+        $('#lastPage').addClass("disabled");
     }
-  
-    if((pageData.current + 1) * pageSize >= pageData.total){
-      console.log("set nextPage disabled.");
-      $('#nextPage').removeAttr("href");
+    var totalPage=Math.ceil(pageData.Total/pageSize)
+    var html ="";
+    for(var i=0;i<5&&(i+currentPage)<totalPage;i++){
+        var  page_i = (currentPage + i);
+        if( i== 0){
+            html += "<a id=\"page_"  + page_i+ "\" class=\"active item\" href=\"page(" + page_i +")\">" + page_i + "</a>";
+        }else{
+            html += "<a id=\"page_"  + page_i+ "\" class=\"item\" href=\"page(" + page_i +")\">" + page_i + "</a>";
+        }
     }
-    else{
-      $('#nextPage').attr("href","javascript:nextPage()");
+    if(currentPage >=totalPage){
+        $('#nextPage').addClass("disabled");
+        $('#endPage').addClass("disabled");
+    }else{
+        $('#nextPage').removeClass("disabled");
+        $('#endPage').removeClass("disabled");
     }
   
-    var pageTotal = pageData.total;
-    var pageNum = parseInt(pageTotal/pageSize);
-    if(pageTotal%pageSize!=0){
-        pageNum += 1;
-    }else {
-        pageNum = pageNum;
-    }
-    $("#totalPageNum").text(pageNum);
   }

public/self/dataset_preview.js

@@ -620,10 +620,10 @@ function showfilelist(){
   
   for (var i=0;i<labeltastresult.length;i++){
     var fname = labeltastresult[i].pic_image_field.substring(labeltastresult[i].pic_image_field.lastIndexOf('/') + 1);
-    console.log(labeltastresult[i])
+    //console.log(labeltastresult[i])
     if(labeltastresult[i].pic_image_field.length > 70){
         var tmpIndex = labeltastresult[i].pic_image_field.indexOf("/",70);
-        console.log(tmpIndex)
+        //console.log(tmpIndex)
         if(tmpIndex != -1){
             fname = labeltastresult[i].pic_image_field.substring(tmpIndex + 1);
             fname = fname.substring(fname.indexOf('/')+1);
@@ -679,7 +679,7 @@ function breadFiles(){
       fname_full_path = tableData[fileindex].pic_image_field.substring(tmp_index + 1);
     }
     var fname_path = fname_full_path.split('/')
-    console.log(fname_path)
+    //console.log(fname_path)
     // var filename_text = tableData[fileindex].pic_image_field.substring(tableData[fileindex].pic_image_field.lastIndexOf('/')+1)
     var html_breadFile = ''
     // var source_name = filename_title+'.zip'

templates/explore/search_new.tmpl

@@ -74,28 +74,29 @@
                 
             </div><!--seach list end-->
             
-            <div class="center page buttons" style="margin: 0px auto 15px">
-                    <div class="ui borderless pagination menu">
-                        <span class="text" id="page_total"></span>
-                        <a class="disabled item navigation" href="" id="startPage"><i class="angle double left icon"></i><span class="navigation_label">&nbsp;首页</span></a>
-                        <a class="disabled item navigation" id="lastPage">
-                            <i class="left arrow icon"></i><span class="navigation_label">&nbsp;</span>
-                        </a>
-                        <span id="pages">
-                                <a class="active item">1</a>
-                                <a class=" item" href="/explore/repos?page=2&amp;sort=active&amp;q=">2</a>
-                                <a class=" item" href="/explore/repos?page=3&amp;sort=active&amp;q=">3</a>
-                                <a class=" item" href="/explore/repos?page=4&amp;sort=active&amp;q=">4</a>
-                                <a class=" item" href="/explore/repos?page=5&amp;sort=active&amp;q=">5</a>
-                                <a class="disabled item">...</a>
-                        </span>
-                               
-                        <a class="item navigation" href="" id="nextPage">
-                            <span class="navigation_label">&nbsp;</span><i class="icon right arrow"></i>
-                        </a>
-                        <a class=" item navigation" href="" id="endPage"><span class="navigation_label">末页&nbsp;</span><i class="angle double right icon"></i></a>
-                    </div>
-            </div>
+            
+            <div class="center page buttons"  style="margin: 0px auto 15px">
+			   <div class="ui borderless mini pagination menu">
+				<span class="item" id="page_total">共 272 条</span>
+				<a id="startPage" class=" item navigation" href="javascript:page(1)"><span class="navigation_label">首页</span></a>
+				<a id="lastPage" class=" item navigation" href="javascript:prePage()">
+					<i class="left arrow icon"></i>
+				</a>
+                <span id="page_ids">
+				<a id="page_1" class="active item" href="">1</a>
+                <a id="page_2" class="item" href="">2</a>
+                <a id="page_n" class="disabled item">...</a>
+				</span>
+				<a id="nextPage" class="item navigation" href="javascript:nextPage()">
+					<i class="icon right arrow"></i>
+				</a>
+				<a id="endPage" class="item navigation" href=""><span class="navigation_label">末页</span></a>
+				<div class="item"> 
+        			前往<div class="ui input"><input id="inputpage" type="text" placeholder="1"></div>页
+    			</div>
+			  </div>
+		    </div>
+
         </div>
 
     </div>

web_src/less/openi.less

@@ -615,4 +615,30 @@ display: block;
 }
 .a_margin{
 	margin: 0px !important;
+}
+
+/*pages*/
+.ui.borderless.pagination {border:none}
+.ui.pagination.menu .item {
+    min-width: 32px;
+    text-align: center;
+    height: 32px;
+    border-radius: .28571429rem;
+    margin: 0 5px;
+    background-color: #F2F2F2;
+}
+.ui.pagination.menu>.item:first-child, .ui.pagination.menu .item:last-child {
+    background-color: #FFF !important;
+}
+.ui.ui.menu .item.disabled{
+    background-color: #F2F2F2;
+}
+.ui.pagination.menu .active.item {
+    background-color: #3291F8;
+    color: #FFF;
+}
+.ui.pagination.menu .item>.input {
+    margin: 0em .5em;
+    width: 3em;
+    height: 32px;
 }