bbb

d.ts/configs/ts/configsDataService.d.ts

@@ -23,7 +23,8 @@ declare module Configs {
     class ConfigsModelService {
         cluster: Array<volume>;
         oracleParam: Array<oracleParam>;
-        updateVolumeData($scope: any, $http: any): void;
+        constructor();
+        updateVolumeData(): any[];
         getFolderByVolumeName(name: string): any[];
     }
 }

plugins/configs/ts/configsDataService.ts

@@ -41,16 +41,21 @@ module Configs{
 		public cluster: Array<volume>=[];
 		public oracleParam: Array<oracleParam>;	
 
-	    public updateVolumeData($scope: ConfigsModelService, $http){
-	    	console.log($scope);
-	    	$http({  
-                method: "POST",  
-                url: "/java/console/api/volume/list"               
-            }).success(function(data, status, headers, config) {  
-                $scope.cluster.push(data);     
-            }).error(function(data, status, headers, config) {  
-                //$scope.voume=data;        
-            });  
+		public constructor(){
+			this.cluster = this.updateVolumeData();
+		}
+	    public updateVolumeData(){
+	    	var result=[];
+	    	$.ajax({ 
+				async: false, 
+				type : "POST", 
+				url : "/java/console/api/volume/list",					
+				success : function(data) { 					
+					result.push(data);
+					console.log(data);									
+				} 
+			});
+	    	return result;
 		}
 
 		public getFolderByVolumeName(name: string){
@@ -64,7 +69,8 @@ module Configs{
 	}
 
     _module.factory('ConfigsModel', ['$rootScope', '$http', '$location', '$resource', ($rootScope, $http, $location, $resource) =>{    	
-    	var $scope = new ConfigsModelService();    	
+    	var $scope = new ConfigsModelService(); 
+    	console.log($scope.cluster);   	
     	return $scope;
     }]);
 }

plugins/developer/html/workspaces.html

@@ -65,10 +65,10 @@
                     <label class="col-sm-3 control-label sj_contro_label" for="selectedItem ">
                         请选择迁移集群
                     </label>
-                    <select ng-model="migrationClick.selectedItem " class="col-sm-3 sj_modal_select" title="name of the new namespace " id="selectedItem " ng-options="x.name for x in configs.cluster " />
+                    <select ng-model="migrationClick.selectedItem " class="col-sm-3 sj_modal_select" title="name of the new namespace " id="selectedItem " ng-options="x.volume for x in volumes " />
                 </div>
                 <div>
-                    <treecontrol class="tree-classic" tree-model="x.folder" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
+                    <treecontrol class="tree-classic" tree-model="dataForTheTree" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
                         {{node.name}}
                     </treecontrol>
                 </div>

plugins/developer/ts/workspaces.ts

@@ -10,21 +10,19 @@
 module Developer {
   export var WorkspacesController = controller("WorkspacesController", ["$scope", "KubernetesModel", "DataModel", "ConfigsModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "$element",
   ($scope, KubernetesModel: Kubernetes.KubernetesModelService, DataModel:Developer.DataModelService, ConfigsModel:Configs.ConfigsModelService, KubernetesState,  $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, $element) => {    
-    init($scope, $location, $routeParams);     
     $scope.model=DataModel;
-    $scope.configs = ConfigsModel;
+    init($scope, $location, $routeParams);      
     $scope.model.initParamOptions();
     $scope.options = DataModel.paramOptions;
     $scope.pageSizeChoses = DataModel.paramOptions.pagerSizeOption;
-    $scope.options.dataType = getDataType($location);
-    
-
-    console.log($scope.volumes);
+    $scope.options.dataType = getDataType($location); 
+    $scope.volumes = ConfigsModel.cluster;
+    console.log(JSON.stringify($scope.volumes[0].folderNode));
 
     $scope.model.updateModel();
 
     $scope.treeOptions = {
-      nodeChildren: "children",
+      nodeChildren: "childNodes",
       dirSelectable: true,
       injectClasses: {
         ul: "a1",
@@ -162,7 +160,7 @@ module Developer {
 
     $scope.migrationClick = {
       items:null,
-      selectedItem: $scope.tableConfig.selectedItems,
+      selectedItem: $scope.volumes[0],
       dialog: new UI.Dialog(),
       onOk: () => {
       },
@@ -170,7 +168,7 @@ module Developer {
           var migrationClick = $scope.migrationClick;
           migrationClick.dialog.open();
           console.log("===================");
-          console.log(selected);
+          console.log(migrationClick.selectedItem);
       },
       close: () => {
         $scope.migrationClick.dialog.close();
@@ -202,8 +200,7 @@ module Developer {
     }
 
     function init($scope,$location,$routeParams){
-      //创建二级菜单
-      ConfigsModel.updateVolumeData($scope.configs, $http);
+      //创建二级菜单      
       $scope.subTabConfig = Developer.createCurrentSubNavBar($scope, $location, $routeParams);
       $scope.navbarItems =[{       
         herf: "",