--汇总新Bug修复

Web_Manager_Develope
wu ming 8 years ago
parent 7183b0bfdd
commit 228f229745

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

File diff suppressed because one or more lines are too long

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

@ -140,7 +140,7 @@ module Developer {
var length =$scope.options.getPageSizeNum(); var length =$scope.options.getPageSizeNum();
var idx = $scope.model.getParamOption("currentPageNum"); var idx = $scope.model.getParamOption("currentPageNum");
if(idx < length){ if(idx < length){
//Kubernetes.eliminateChechBoxClick(); Kubernetes.eliminateChechBoxClick();
$scope.model.updateParamOption("currentPageNum", idx+1); $scope.model.updateParamOption("currentPageNum", idx+1);
} }
} }
@ -218,6 +218,12 @@ module Developer {
,$http:httpurl; ,$http:httpurl;
*/ */
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, Configs.oracleInfoOperate($http, "/java/console/api/volume", Configs.OperateType.MOVE,
{ {
"name": migrationClick.selectedItem.name, "name": migrationClick.selectedItem.name,

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

@ -347,9 +347,28 @@ module Kubernetes {
export function eliminateChechBoxClick(){ export function eliminateChechBoxClick(){
console.log($("#tableConfig thead tr td input:checkbox")); console.log($("#tableConfig > thead > tr input:checkbox").is(':checked'));
if($("#tableConfig thead tr td 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;
}
} }
Loading…
Cancel
Save