---脚本审核增加保留你能

defs.d.ts

@@ -31,6 +31,12 @@
 /// <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/configs/ts/configsUtils.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/watcher.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/term.d.ts"/>
+/// <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/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -56,8 +62,6 @@
 /// <reference path="d.ts/kubernetes/ts/pipelines.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/pod.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/podEdit.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/watcher.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/term.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/podLogs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/pods.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/replicationController.d.ts"/>
@@ -74,10 +78,6 @@
 /// <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/configs/ts/configsUtils.d.ts"/>
-/// <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/system/ts/systemHelpers.d.ts"/>
 /// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/regionalismCodeSearch.d.ts"/>

gulpfile.js

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

plugins/configs/html/shareLayout.html

@@ -239,7 +239,7 @@
             <button class="btn pull-right sj_btn_blue " ng-click="replace()">
                 替换
             </button>
-            <button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button>
+            <button class="sj_btn_grey mr5 fr" ng-click="cancel()">保留</button>
         </div>
     </div>
 </script>

plugins/configs/ts/shareController.ts

@@ -230,6 +230,14 @@ module Configs{
 		}
 
 		$scope.cancel = () => {
+			//$scope.closeThisDialog();
+			$scope.$emit("replace", {
+				url: "/java/console/api/filePackage/handleSqlFile",
+				item: $scope.ngDialogData.item,
+				content: $scope.content,
+				opt: "delete",
+				type: $scope.ngDialogData.type
+			});
 			$scope.closeThisDialog();			
 		}
 	}]);

plugins/developer/html/workspaces.html

@@ -37,7 +37,7 @@
                     <ul class="fr sj_table_bottom">
                         <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>行
+                            <select ng-options="value for value in pageSizeChoses" ng-cha=nge="selectAction()" ng-model="options.currentTableSize"></select>行
                         </li>-->
                         <li class="mr5 ">当前页码</li>
                         <li>

plugins/developer/ts/workspaces.ts

@@ -14,6 +14,7 @@ module Developer {
   ($scope, KubernetesModel: Kubernetes.KubernetesModelService, DataModel:Developer.DataModelService, ConfigsModel:Configs.ConfigsModelService, KubernetesState,  $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, $element, ngDialog) => {    
     $scope.model=DataModel; 
     $scope.replicasModel = KubernetesModel;
+    console.log("==============================");
     init($scope, $location, $routeParams);   
     $scope.options = DataModel.paramOptions;
     $scope.pageSizeChoses = DataModel.paramOptions.pagerSizeOption;
@@ -103,6 +104,7 @@ module Developer {
         nav.class="";
       });
       item.class="active";
+      $scope.model.updateParamOption("currentPageNum", 1);
       $scope.model.updateParamOption("keyQuery", $scope.keyQuery); 
       $scope.model.updateParamOption("dataBatch", item.alias);        
     }
@@ -327,6 +329,8 @@ module Developer {
 
     function init($scope,$location,$routeParams){
       //$scope.model.updateModel();
+      //console.log($scope.options.currentPageNum);
+      console.log("==============================");
       $scope.keyQuery = ""; 
       $scope.model.initParamOptions();
       $scope.model.updateParamOption("keyQuery", $scope.keyQuery); 

plugins/system/ts/sqlManagement.ts

@@ -13,6 +13,8 @@ module System{
 
 		$scope.status = [{id: 0, label: "有缺失"}, {id: 1, label: "正常"}, {id: 2, label:"待归档"}, {id: 3, label: "待审核"}];	
 
+    SystemModel.updateSqlInfo();	
+
     $scope.cityFilter = $scope.model = SystemModel.sqlInfo; 
 
     $scope.checkboxes = {
@@ -100,8 +102,8 @@ module System{
     $scope.help = () => {
       ngDialog.open({
         template: 'statusHelp.html',        
-        width: 900, 
-        height: 600,         
+        width: 600, 
+        height: 370,         
         closeByDocument: false, 
         className: 'ngdialog-theme-default'
       });  
@@ -213,6 +215,8 @@ module System{
           Kubernetes.removeMask();
           shareUpdate(data);
 			}).error((data,header,config,status) => {	
+          $("#load").remove();
+          Kubernetes.removeMask();				
 			});
     	});
 
@@ -270,6 +274,9 @@ module System{
         if(items.length <= 0)
           return;
 
+        Configs.create_mask();  //创建遮罩层
+        Kubernetes.create_locadEffect("正在更新文件,请稍等！"); //创建数据加载效果层
+
         $http({
           url: url,
           method: 'POST',            
@@ -303,12 +310,18 @@ module System{
               });
             }
           }
+          
+          $("#load").remove();
+          Kubernetes.removeMask();
           $scope.tableParams.settings({
             dataset: filter
           }); 
           //响应成功
         }).error(function(data,header,config,status){
           //处理响应失败 
+          $("#load").remove();
+          Kubernetes.removeMask(); 
+          Configs.customAlert("提示", "一键审核或归档失败！", '',null, 0, "error");        
         });  
        
       }     

plugins/system/ts/systemList.ts

@@ -11,7 +11,7 @@ module System{
 		shareInit($scope);
 
     $scope.modelServices = SystemModel;
-    //$scope.modelServices.updateExcelInfo();
+    $scope.modelServices.updateExcelInfo();
     $scope.model = SystemModel.systemInfoList;   
 
 		// 表头显示的信息