--汇总新Bug修复

d.ts/kubernetes/ts/utilHelpers.d.ts

@@ -69,4 +69,5 @@ declare module Kubernetes {
     function checkIsStartSuccess(replicationControllers: Array<any>): any[];
     function checkForMigration(replicationControllers: Array<KubePod>, transferTasks: Array<any>, selectItem: Array<any>): string;
     function eliminateChechBoxClick(): void;
+    function alreadyExitInFolder(selectedItems: Array<any>, selectNode: any): boolean;
 }

gulpfile.js

@@ -249,7 +249,7 @@ gulp.task('connect', ['watch'], function() {
     }, {
         proto: "http",
         port: "8080",
-        hostname: "192.168.191.5",
+        hostname: "192.168.191.9",
         path: '/java/console/api',
         targetPath: "/"
     }];

plugins/developer/ts/workspaces.ts

@@ -140,7 +140,7 @@ module Developer {
       var length =$scope.options.getPageSizeNum();
       var idx = $scope.model.getParamOption("currentPageNum");
       if(idx < length){
-        //Kubernetes.eliminateChechBoxClick();       
+        Kubernetes.eliminateChechBoxClick();       
         $scope.model.updateParamOption("currentPageNum", idx+1);      
       }
     }
@@ -217,7 +217,13 @@ module Developer {
         /*
           向后台发生数据迁移请求,$http:发生http异步请求；第二个参数：请求url;第三个参数：请求操作类型；第四个参数：请求携带的数据；第五个参数：
           一个回调函数，请求响应后的回调函数。
-        */    
+        */  
+        if(Kubernetes.alreadyExitInFolder($scope.tableConfig.selectedItems, $scope.selectNode)){
+          migrationClick.close();
+          Configs.customAlert("提示", "操作失败:" + "数据已在当前目录！", '',null, 0, "error");
+          return;
+        };
+          
         Configs.oracleInfoOperate($http, "/java/console/api/volume", Configs.OperateType.MOVE, 
         {
           "name": migrationClick.selectedItem.name,

plugins/kubernetes/ts/replicationControllers.ts

@@ -189,15 +189,20 @@ module Kubernetes {
    $scope.reStartPrompt = (selected) => {    
       function startSelected(selected:Array<KubePod>, next:KubePod){
          if(next){
-            if(next.$replicas === 0)
-               Kubernetes.resizeController($http, KubernetesApiURL, next, 1, () => {
-                  Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "reStart", next, 200);
-                  startSelected(selected, selected.shift());
-               });
+           console.log(getLabels(next).status);
+            if(next.$replicas === 0){
+              Kubernetes.resizeController($http, KubernetesApiURL, next, 1, () => {
+                Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "reStart", next, 200);
+                startSelected(selected, selected.shift());
+              });
+            }else{
+              if(getLabels(next).status == "1")
+                Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "reStart", next, 200);
+                startSelected(selected, selected.shift());
+            }
          }
       }
-      startSelected(selected, selected.shift());
-     
+      startSelected(selected, selected.shift());     
    };
 
    $scope.extractClick = {

plugins/kubernetes/ts/utilHelpers.ts

@@ -347,9 +347,28 @@ module Kubernetes {
 
 
   export function eliminateChechBoxClick(){
-    console.log($("#tableConfig thead tr td input:checkbox"));
-    if($("#tableConfig thead tr td input:checkbox").is(':checked')){
+    console.log($("#tableConfig > thead > tr input:checkbox").is(':checked'));
+    if($("#tableConfig > thead > tr input:checkbox").is(':checked')){
 
     }
   }
+
+  /*
+    是否已存在当前
+  */
+  export function alreadyExitInFolder(selectedItems: Array<any>, selectNode){    
+    var childNodes = selectNode.childNodes;
+    for(var i in selectedItems) {
+       var itemName = selectedItems[i].regionalismCode + "_" + selectedItems[i].systemCode;
+       for (var j in childNodes) {
+         if(childNodes[j].name == itemName){
+            var childrens = childNodes[j].childNodes;
+            for(var k in childrens)
+              if(childrens[k].name == selectedItems[i].dataVersion)
+                return true;
+         }                           
+       }
+     } 
+     return false;
+  }  
 }