merge-20160913

d.ts/configs/ts/ConfigsHelper.d.ts

@@ -1,6 +1,7 @@
 /// <reference path="../../includes.d.ts" />
 /// <reference path="configPlugin.d.ts" />
 /// <reference path="../../developer/ts/developerNavigation.d.ts" />
+/// <reference path="../../developer/ts/dataManagerHelper.d.ts" />
 declare module Configs {
     class OperateType {
         static DELETE: string;

d.ts/developer/ts/fileMigrationTask.d.ts

@@ -2,6 +2,7 @@
 /// <reference path="developerPlugin.d.ts" />
 /// <reference path="dataManagerModel.d.ts" />
 /// <reference path="dataManagerHelper.d.ts" />
+/// <reference path="../../configs/ts/ConfigsHelper.d.ts" />
 declare module Developer {
     var KubeTaskController: ng.IModule;
 }

defs.d.ts

@@ -1,6 +1,8 @@
 /// <reference path="d.ts/includes.d.ts"/>
 /// <reference path="d.ts/configs/ts/configPlugin.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerNavigation.d.ts"/>
+/// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
+/// <reference path="d.ts/developer/ts/dataManagerHelper.d.ts"/>
 /// <reference path="d.ts/configs/ts/ConfigsHelper.d.ts"/>
 /// <reference path="d.ts/configs/ts/configsDataService.d.ts"/>
 /// <reference path="d.ts/configs/ts/configsUtils.d.ts"/>
@@ -11,7 +13,27 @@
 /// <reference path="d.ts/kubernetes/ts/utilHelpers.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/readPlacedivision.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesHelpers.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/kubernetesPlugin.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"/>
@@ -24,7 +46,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"/>
@@ -56,24 +77,3 @@
 /// <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/developer/ts/developerHelpers.d.ts"/>
-/// <reference path="d.ts/developer/ts/dataManagerHelper.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/configs/ts/ConfigsHelper.ts

@@ -1,6 +1,7 @@
 /// <reference path="../../includes.ts"/>
 /// <reference path="configPlugin.ts"/>
 /// <reference path="../../developer/ts/developerNavigation.ts"/>
+///  <reference path="../../developer/ts/dataManagerHelper.ts"/>
 module Configs{
 	export class OperateType{
 		public static get DELETE():string {return "delete"}
@@ -57,8 +58,7 @@ module Configs{
 	}
 
 	export function shareInit($scope, $location, $routeParams){
-		$scope.subTabConfig = createConfigBreadcrumbs($scope, $location, $routeParams);
-		$scope.model.updateAllData();		
+		$scope. subTabConfig = Developer.createCurrentSubNavBar($scope, $location, $routeParams);  	
 	}
 
 	export function createNewObejct(array:Array<any>, obj){

plugins/configs/ts/kubeClusterSetting.ts

@@ -2,12 +2,12 @@
 /// <reference path="configPlugin.ts"/>
 /// <reference path="configsHelper.ts"/>
 /// <reference path="configsUtils.ts"/>
+
 module Configs{
 
 	export var KubeController = controller('KubeController', ["$scope", "$templateCache", "$location", "$routeParams", "$http", "$timeout","ConfigsModel",
-		($scope, $templateCache:ng.ITemplateCacheService, $location, $routeParams, $http, $timeout, ConfigsModel) => {		
-
-		$scope.model= ConfigsModel;       
+		($scope, $templateCache:ng.ITemplateCacheService, $location, $routeParams, $http, $timeout, ConfigsModel) => {
+		$scope.model= ConfigsModel;            
 		$scope.tableConfig={
             data: 'model.oracleParam',
             selectedItems: [],

plugins/developer/ts/fileMigrationTask.ts

@@ -2,8 +2,9 @@
 /// <reference path="developerPlugin.ts"/>
 /// <reference path="dataManagerModel.ts"/>
 /// <reference path="dataManagerHelper.ts"/>
+///  <reference path="../../configs/ts/ConfigsHelper.ts"/>
 module Developer {
-	export var KubeTaskController = controller("KubeTaskController", ["$scope", "$location", "$routeParams", "DataModel", "$templateCache", ($scope, $location, $routeParams, DataModel, $templateCache) => {
+	export var KubeTaskController = controller("KubeTaskController", ["$scope", "$http", "$location", "$routeParams", "DataModel", "$templateCache", ($scope, $http, $location, $routeParams, DataModel, $templateCache) => {
 		$scope.model = DataModel;	
         $scope.subTabConfig = Developer.createCurrentSubNavBar($scope, $location, $routeParams); 
 		$scope.model.data = [{_key: 2, name: "南京市-玄武区", labels:{system: 34, batch: 2}, status: 1, process:75},
@@ -59,7 +60,14 @@ module Developer {
 
 
 		$scope.$on("deleteRow", (event, data) =>{
-			console.log("删除任务");
+			if(data.status === 1)
+				console.log("无法删除");
+			else{
+				Configs.oracleInfoOperate($http, "/java/console/api/task", Configs.OperateType.DELETE, data, (data, status) =>{
+					if(status === 200)
+						console.log("删除成功");
+				});
+			}	
 		});		
 	}]);
 }

plugins/kubernetes/html/layoutKubernetes.html

@@ -210,7 +210,7 @@
 <script type="text/ng-template" id="taskEdit.html">
     <div class="ngCellText" ng-init="entity=row.entity" ng-controller="Kubernetes.TaskEdit">
         <button class="btn sj_btn" ng-click="deleteRow(entity)">
-            <span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;删除
+            <span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;删除
         </button>
     </div>
 </script>