Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Bug 37388 (delete, hide select tabs)

Browse source
This commit is contained in:
Julia Svinareva 2019-09-26 11:35:29 +03:00
parent b7364f5631
commit e744a710e3
1 changed files with 33 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/spreadsheeteditor/main/app/controller/Statusbar.js
View file

@ -247,7 +247,11 @@ define([
onTabMenu: function(obj, item, e) { onTabMenu: function(obj, item, e) {
var me = this; var me = this;
var selectTabs = this.statusbar.tabbar.selectTabs; var selectTabs = this.statusbar.tabbar.selectTabs,
arrIndex = [];
selectTabs.forEach(function (item) {
arrIndex.push(item.sheetindex);
});
switch (item.value) { switch (item.value) {
case 'ins': case 'ins':
setTimeout(function () { setTimeout(function () {
@ -255,7 +259,7 @@ define([
}, 1); }, 1);
break; break;
case 'del': case 'del':
this.deleteWorksheet(); this.deleteWorksheet(arrIndex);
break; break;
case 'ren': case 'ren':
this.renameWorksheet(); this.renameWorksheet();
@ -268,7 +272,7 @@ define([
break; break;
case 'hide': case 'hide':
setTimeout(function () { setTimeout(function () {
me.hideWorksheet(true); me.hideWorksheet(true, arrIndex);
}, 1); }, 1);
break; break;
} }
@ -307,17 +311,17 @@ define([
return name; return name;
}, },
deleteWorksheet: function() { deleteWorksheet: function(selectTabs) {
var me = this; var me = this;
if (this.statusbar.tabbar.tabs.length == 1) { if (this.statusbar.tabbar.tabs.length == 1 || selectTabs.length === this.statusbar.tabbar.tabs.length) {
Common.UI.warning({msg: this.errorLastSheet}); Common.UI.warning({msg: this.errorLastSheet});
} else { } else {
Common.UI.warning({ Common.UI.warning({
msg: this.warnDeleteSheet, msg: this.warnDeleteSheet,
buttons: ['ok','cancel'], buttons: ['ok','cancel'],
callback: function(btn) { callback: function(btn) {
if (btn == 'ok' && !me.api.asc_deleteWorksheet()) { if (btn == 'ok' && !me.api.asc_deleteWorksheet(selectTabs)) {
_.delay(function(){ _.delay(function(){
Common.UI.error({msg: me.errorRemoveSheet}); Common.UI.error({msg: me.errorRemoveSheet});
},10); },10);
@ -327,22 +331,9 @@ define([
} }
}, },
hideWorksheets: function(selectTabs) {
var me = this;
if (selectTabs) {
if (selectTabs.length === me.statusbar.tabbar.tabs.length) {
Common.UI.warning({msg: me.errorLastSheet});
} else {
me.statusbar.tabbar.selectTabs.forEach(function (item) {
//me.hideWorksheet(true, item.sheetindex);
});
}
}
},
hideWorksheet: function(hide, index) { hideWorksheet: function(hide, index) {
if ( hide ) { if ( hide ) {
this.statusbar.tabbar.tabs.length == 1 ? (this.statusbar.tabbar.tabs.length == 1 || index.length === this.statusbar.tabbar.tabs.length) ?
Common.UI.warning({msg: this.errorLastSheet}) : Common.UI.warning({msg: this.errorLastSheet}) :
this.api['asc_hideWorksheet'](index); this.api['asc_hideWorksheet'](index);
} else { } else {