---修复数据管理分页Bug

defs.d.ts

@@ -17,6 +17,26 @@
 /// <reference path="d.ts/configs/ts/shareController.d.ts"/>
 /// <reference path="d.ts/configs/ts/glusterfsSetting.d.ts"/>
 /// <reference path="d.ts/configs/ts/kubeClusterSetting.d.ts"/>
+/// <reference path="d.ts/developer/ts/developerPlugin.d.ts"/>
+/// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
+/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
+/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
+/// <reference path="d.ts/developer/ts/fileMigrationTask.d.ts"/>
+/// <reference path="d.ts/developer/ts/home.d.ts"/>
+/// <reference path="d.ts/developer/ts/jenkinsJob.d.ts"/>
+/// <reference path="d.ts/developer/ts/jenkinsJobs.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/kubernetesModel.d.ts"/>
+/// <reference path="d.ts/developer/ts/jenkinsLog.d.ts"/>
+/// <reference path="d.ts/developer/ts/jenkinsMetrics.d.ts"/>
+/// <reference path="d.ts/developer/ts/navbar.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipeline.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipelineDirective.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipelines.d.ts"/>
+/// <reference path="d.ts/developer/ts/project.d.ts"/>
+/// <reference path="d.ts/developer/ts/projectSelector.d.ts"/>
+/// <reference path="d.ts/developer/ts/projects.d.ts"/>
+/// <reference path="d.ts/developer/ts/workspace.d.ts"/>
+/// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -29,7 +49,6 @@
 /// <reference path="d.ts/kubernetes/ts/deploymentConfig.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/deploymentConfigs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/events.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/kubernetesModel.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/host.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/hosts.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/imageRepositories.d.ts"/>
@@ -58,25 +77,6 @@
 /// <reference path="d.ts/kubernetes/ts/sharedControllers.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/tabs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/templates.d.ts"/>
-/// <reference path="d.ts/developer/ts/developerPlugin.d.ts"/>
-/// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
-/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
-/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
-/// <reference path="d.ts/developer/ts/fileMigrationTask.d.ts"/>
-/// <reference path="d.ts/developer/ts/home.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsJob.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsJobs.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsLog.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsMetrics.d.ts"/>
-/// <reference path="d.ts/developer/ts/navbar.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipeline.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipelineDirective.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipelines.d.ts"/>
-/// <reference path="d.ts/developer/ts/project.d.ts"/>
-/// <reference path="d.ts/developer/ts/projectSelector.d.ts"/>
-/// <reference path="d.ts/developer/ts/projects.d.ts"/>
-/// <reference path="d.ts/developer/ts/workspace.d.ts"/>
-/// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
 /// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
 /// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>

gulpfile.js

@@ -248,8 +248,8 @@ gulp.task('connect', ['watch'], function() {
         targetPath: '/hawtio/git'
     }, {
         proto: "http",
-        port: "8080",
+        port: "8088",
-        hostname: "192.168.0.181",
+        hostname: "192.168.0.110",
         path: '/java/console/api',
         targetPath: "/"
     }];

plugins/developer/ts/dataManagerModel.ts

@@ -34,8 +34,9 @@ module Developer{
 			return result;
 		}
 
-		public getPageSizeNum(){			
+		public getPageSizeNum(){
-		    var num = Math.ceil(this.totalSize/this.currentTableSize);	
+		    var num = Math.ceil(this.totalSize/this.currentTableSize);
+		    console.log(this.totalSize);
 		    if(num < this.currentPageNum)		    	
 			  num =  this.currentPageNum;			
 			return num;
@@ -160,8 +161,7 @@ module Developer{
 				url : "/java/console/api/data.json", 
 				dataType : 'json',
 				data: createParamData(paramOptions),		
-				success : function(data) {
+				success : function(data) {						
-					console.log(data);				
 					result = data.data;
 					paramOptions.totalSize = data.length;	
 					paramOptions.totlePage = data.page.totlePage;								

plugins/developer/ts/workspaces.ts

@@ -113,13 +113,13 @@ module Developer {
 
     $scope.isEmptyOrFirst = () => {
       var idx = $scope.model.getParamOption("currentPageNum");
-      var length =$scope.options.getPageSizeNum();      
+      var length =$scope.model.paramOptions.totlePage;      
       return length <= 0 || idx <= 1;
     }
 
     $scope.isEmptyOrLast = () =>{
       var idx = $scope.model.getParamOption("currentPageNum");
-      var length =$scope.options.getPageSizeNum();
+      var length =$scope.model.paramOptions.totlePage;
       return length < 1 || idx >= length;
     }
 
@@ -133,7 +133,7 @@ module Developer {
 
     $scope.last = () =>{      
       var idx = $scope.model.getParamOption("currentPageNum"); 
-      var length =$scope.options.getPageSizeNum();
+      var length =$scope.model.paramOptions.totlePage;
       if(idx < length){
         Kubernetes.eliminateChechBoxClick();
         $scope.model.updateParamOption("currentPageNum", length);
@@ -142,7 +142,7 @@ module Developer {
 
     $scope.previous = () => {      
       var idx = $scope.model.getParamOption("currentPageNum"); 
-      var length =$scope.options.getPageSizeNum();
+      var length =$scope.model.paramOptions.totlePage;
       if(idx > 1){
         Kubernetes.eliminateChechBoxClick();
         $scope.model.updateParamOption("currentPageNum", idx-1);
@@ -150,7 +150,7 @@ module Developer {
     }
 
     $scope.next = () =>{
-      var length =$scope.options.getPageSizeNum();
+      var length =$scope.model.paramOptions.totlePage;
       var idx = $scope.model.getParamOption("currentPageNum");
       if(idx < length){
         Kubernetes.eliminateChechBoxClick();