--解决分页问题

defs.d.ts

@@ -17,27 +17,6 @@
 /// <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/navigation/ts/navigationPlugin.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"/>
@@ -50,6 +29,7 @@
 /// <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"/>
@@ -78,6 +58,7 @@
 /// <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/navigation/ts/navigationPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
 /// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/regionalismCodeSearch.d.ts"/>
@@ -86,3 +67,22 @@
 /// <reference path="d.ts/system/ts/systemCodeSearch.d.ts"/>
 /// <reference path="d.ts/system/ts/systemList.d.ts"/>
 /// <reference path="d.ts/system/ts/systemVerification.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"/>

plugins/developer/html/workspaces.html

@@ -35,10 +35,10 @@
                         </button>
                     </div>
                     <ul class="fr sj_table_bottom">
-                        <li class="mr5 ">当前显示1~{{model.data.length}}行，共{{model.data.length}}行。</li>
-                        <li class="mr5 ">每页显示
+                        <li class="mr5 ">当前显示{{(options.currentPageNum-1)*20 + 1}}~{{(options.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行,</li>
+                        <!--<li class="mr5 ">每页显示
                             <select ng-options="value for value in pageSizeChoses" ng-change="selectAction()" ng-model="options.currentTableSize"></select>行
-                        </li>
+                        </li>-->
                         <li class="mr5 ">当前页码</li>
                         <li>
                             <div class="hawtio-pager clearfix">

plugins/developer/ts/workspaces.ts

@@ -326,6 +326,7 @@ module Developer {
     function init($scope,$location,$routeParams){
       //$scope.model.updateModel();
       $scope.keyQuery = ""; 
+      $scope.model.initParamOptions();
       $scope.model.updateParamOption("keyQuery", $scope.keyQuery); 
       if(ConfigsModel.cluster!=null)
         $scope.volumes = ConfigsModel.cluster;