From c708c550566a85055599d5acadb660991201eb0b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 30 Aug 2019 16:34:11 +0300 Subject: [PATCH 1/9] [SSE] Bug 37388 --- apps/common/main/lib/component/Tab.js | 9 ++++++ apps/common/main/lib/component/TabBar.js | 32 +++++++++++++++---- .../main/resources/less/statusbar.less | 8 +++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 29e93b32c..89f6f28e3 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -82,6 +82,10 @@ define([ this.$el.addClass('active'); }, + isSelected: function() { + return this.$el.hasClass('selected'); + }, + deactivate: function(){ this.$el.removeClass('active'); }, @@ -110,6 +114,11 @@ define([ this.$el.removeClass(cls); }, + toggleClass: function(cls) { + if (cls.length) + this.$el.toggleClass(cls); + }, + hasClass: function(cls) { return this.$el.hasClass(cls); }, diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 0c6868add..b4d3f7803 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -69,12 +69,20 @@ define([ }; StateManager.prototype.attach = function (tab) { - tab.changeState = $.proxy(function () { - this.trigger('tab:change', tab); - this.bar.$el.find('ul > li.active').removeClass('active'); - tab.activate(); + tab.changeState = $.proxy(function (select) { + if (select) { + tab.toggleClass('selected'); + } else { + if (!tab.isSelected()) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + tab.addClass('selected'); + } + this.trigger('tab:change', tab); + this.bar.$el.find('ul > li.active').removeClass('active'); + tab.activate(); - this.bar.trigger('tab:changed', this.bar, this.bar.tabs.indexOf(tab), tab); + this.bar.trigger('tab:changed', this.bar, this.bar.tabs.indexOf(tab), tab); + } }, this); var dragHelper = new (function() { @@ -283,10 +291,22 @@ define([ }); tab.$el.on({ - click: $.proxy(function () { + click: $.proxy(function (event) { if (!tab.disabled && !tab.$el.hasClass('active')) { if (tab.control == 'manual') { this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); + } else if (event.ctrlKey || event.metaKey) { + tab.changeState(true); + } else if (event.shiftKey) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + var $active = this.bar.$el.find('ul > li.active'), + indexAct = $active.index(), + indexCur = tab.sheetindex; + var startIndex = (indexCur > indexAct) ? indexAct : indexCur, + endIndex = (indexCur > indexAct) ? indexCur : indexAct; + for(var i = startIndex; i <= endIndex; i++) { + this.bar.tabs[i].changeState(true); + } } else { tab.changeState(); } diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index da2c0b79d..58dfef726 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -194,6 +194,14 @@ } } + &.selected { + > a { + border-bottom-color: @body-bg; + background-color: @body-bg; + box-shadow: 0px 2px 0 @gray-deep inset; + } + } + &.coauth-locked { > a { outline: none; From 0cc3ddfca64fa9d9be224b4f1306d2fb57fbb540 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 2 Sep 2019 13:52:16 +0300 Subject: [PATCH 2/9] [SSE] Bug 37388 --- apps/common/main/lib/component/Tab.js | 2 +- apps/common/main/lib/component/TabBar.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 89f6f28e3..b3b5644ef 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -51,7 +51,7 @@ define([ this.active = false; this.label = 'Tab'; this.cls = ''; - this.template = _.template(['
  • ', + this.template = _.template(['
  • ', '<%- label %>', '
    • '].join('')); diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index b4d3f7803..8e5ff01a3 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -292,10 +292,8 @@ define([ tab.$el.on({ click: $.proxy(function (event) { - if (!tab.disabled && !tab.$el.hasClass('active')) { - if (tab.control == 'manual') { - this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); - } else if (event.ctrlKey || event.metaKey) { + if (!tab.disabled) { + if (event.ctrlKey || event.metaKey) { tab.changeState(true); } else if (event.shiftKey) { this.bar.$el.find('ul > li.selected').removeClass('selected'); @@ -304,11 +302,15 @@ define([ indexCur = tab.sheetindex; var startIndex = (indexCur > indexAct) ? indexAct : indexCur, endIndex = (indexCur > indexAct) ? indexCur : indexAct; - for(var i = startIndex; i <= endIndex; i++) { + for (var i = startIndex; i <= endIndex; i++) { this.bar.tabs[i].changeState(true); } - } else { - tab.changeState(); + } else if (!tab.$el.hasClass('active')) { + if (tab.control == 'manual') { + this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); + } else { + tab.changeState(); + } } } !tab.disabled && Common.NotificationCenter.trigger('edit:complete', this.bar); From db5e747c3671bafbabf7c7d75fc55ca812bbbbe2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 3 Sep 2019 14:09:22 +0300 Subject: [PATCH 3/9] [SSE] Bug 37388 --- apps/common/main/lib/component/TabBar.js | 27 +++++- .../main/app/controller/Statusbar.js | 83 +++++++++++++++---- .../main/app/view/Statusbar.js | 2 +- 3 files changed, 95 insertions(+), 17 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 8e5ff01a3..62dd31ee7 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -72,10 +72,18 @@ define([ tab.changeState = $.proxy(function (select) { if (select) { tab.toggleClass('selected'); + var selectTab = _.find(this.bar.selectTabs, function (item) {return item.sheetindex === tab.sheetindex;}); + if (selectTab) { + this.bar.selectTabs = _.without(this.bar.selectTabs, selectTab); + } else { + this.bar.selectTabs.push(tab); + } } else { if (!tab.isSelected()) { this.bar.$el.find('ul > li.selected').removeClass('selected'); tab.addClass('selected'); + this.bar.selectTabs.length = 0; + this.bar.selectTabs.push(tab); } this.trigger('tab:change', tab); this.bar.$el.find('ul > li.active').removeClass('active'); @@ -297,9 +305,10 @@ define([ tab.changeState(true); } else if (event.shiftKey) { this.bar.$el.find('ul > li.selected').removeClass('selected'); + this.bar.selectTabs.length = 0; var $active = this.bar.$el.find('ul > li.active'), indexAct = $active.index(), - indexCur = tab.sheetindex; + indexCur = this.bar.tabs.indexOf(tab); var startIndex = (indexCur > indexAct) ? indexAct : indexCur, endIndex = (indexCur > indexAct) ? indexCur : indexAct; for (var i = startIndex; i <= endIndex; i++) { @@ -319,7 +328,11 @@ define([ this.trigger('tab:dblclick', this, this.tabs.indexOf(tab), tab); }, this.bar), contextmenu: $.proxy(function () { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); + if (this.selectTabs.length > 1) { + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); + } else { + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); + } }, this.bar), mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { @@ -344,6 +357,7 @@ define([ tabs: [], template: _.template('
      '), + selectTabs: [], initialize : function (options) { _.extend(this.config, options); @@ -419,6 +433,10 @@ define([ me.$bar.append(tab.render().$el); me.tabs.push(tab); me.manager.attach(tab); + if (tab.isActive()) { + me.selectTabs.length = 0; + me.selectTabs.push(tab); + } } } else { for (i = tabs.length; i-- > 0 ; ) { @@ -432,6 +450,11 @@ define([ me.tabs.splice(index, 0, tab); } + if (tab.isActive()) { + me.selectTabs.length = 0; + me.selectTabs.push(tab); + } + me.manager.attach(tab); } } diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index b88aee8a8..ca3aeec10 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -247,20 +247,54 @@ define([ onTabMenu: function(obj, item, e) { var me = this; - switch (item.value){ - case 'ins': - setTimeout(function(){ - me.api.asc_insertWorksheet(me.createSheetName()); - }, 1); - break; - case 'del': this.deleteWorksheet(); break; - case 'ren': this.renameWorksheet(); break; - case 'copy': this.moveWorksheet(false); break; - case 'move': this.moveWorksheet(true); break; - case 'hide': - setTimeout(function(){ - me.hideWorksheet(true);}, 1); - break; + var selectTabs = this.statusbar.tabbar.selectTabs; + if (selectTabs.length > 1) { + switch (item.value) { + case 'ins': + setTimeout(function () { + //me.api.asc_insertWorksheets(); + }, 1); + break; + case 'del': + this.deleteWorksheets(); + break; + case 'copy': + this.moveWorksheets(false); + break; + case 'move': + this.moveWorksheets(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheets(selectTabs); + }, 1,); + break; + } + } else { + switch (item.value) { + case 'ins': + setTimeout(function () { + me.api.asc_insertWorksheet(me.createSheetName()); + }, 1); + break; + case 'del': + this.deleteWorksheet(); + break; + case 'ren': + this.renameWorksheet(); + break; + case 'copy': + this.moveWorksheet(false); + break; + case 'move': + this.moveWorksheet(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheet(true); + }, 1); + break; + } } }, @@ -297,6 +331,10 @@ define([ return name; }, + deleteWorksheets: function() { + + }, + deleteWorksheet: function() { var me = this; @@ -317,6 +355,19 @@ 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) { if ( hide ) { this.statusbar.tabbar.tabs.length == 1 ? @@ -376,6 +427,10 @@ define([ } }, + moveWorksheets: function() { + + }, + moveWorksheet: function(cut, silent, index, destPos) { var me = this; var wc = me.api.asc_getWorksheetsCount(), items = [], i = -1; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 247da69e5..d4117fb93 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -409,7 +409,7 @@ define([ // Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()], false); // hide popover }, - onTabMenu: function (o, index, tab) { + onTabMenu: function (o, index, tab, select) { if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable) && !this.mode.isDisconnected ) { From b7364f56315da73633e64f93baf89be5116e5829 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 6 Sep 2019 13:07:47 +0300 Subject: [PATCH 4/9] [SSE] Bug 37388 (Add Ungroup Sheets, Select All Sheets) --- apps/common/main/lib/component/TabBar.js | 31 +++++++++++++++--- .../main/app/controller/Statusbar.js | 32 ------------------- .../main/app/view/Statusbar.js | 23 +++++++++++-- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 62dd31ee7..e572730e1 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -315,6 +315,10 @@ define([ this.bar.tabs[i].changeState(true); } } else if (!tab.$el.hasClass('active')) { + if (this.bar.tabs.length === this.bar.selectTabs.length) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + this.bar.selectTabs.length = 0; + } if (tab.control == 'manual') { this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); } else { @@ -328,11 +332,7 @@ define([ this.trigger('tab:dblclick', this, this.tabs.indexOf(tab), tab); }, this.bar), contextmenu: $.proxy(function () { - if (this.selectTabs.length > 1) { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); - } else { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); - } + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); }, this.bar), mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { @@ -507,6 +507,27 @@ define([ this.checkInvisible(); }, + setSelectAll: function(isSelect) { + var me = this; + me.selectTabs.length = 0; + if (isSelect) { + me.tabs.forEach(function(tab){ + if (!tab.isSelected()) { + tab.addClass('selected'); + } + me.selectTabs.push(tab); + }); + } else { + me.tabs.forEach(function(tab){ + if (tab.isActive()) { + me.selectTabs.push(tab); + } else if (tab.isSelected()) { + tab.removeClass('selected'); + } + }); + } + }, + getActive: function(iselem) { return iselem ? this.$bar.find('> li.active') : this.$bar.find('> li.active').index(); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index ca3aeec10..96420bede 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -248,29 +248,6 @@ define([ onTabMenu: function(obj, item, e) { var me = this; var selectTabs = this.statusbar.tabbar.selectTabs; - if (selectTabs.length > 1) { - switch (item.value) { - case 'ins': - setTimeout(function () { - //me.api.asc_insertWorksheets(); - }, 1); - break; - case 'del': - this.deleteWorksheets(); - break; - case 'copy': - this.moveWorksheets(false); - break; - case 'move': - this.moveWorksheets(true); - break; - case 'hide': - setTimeout(function () { - me.hideWorksheets(selectTabs); - }, 1,); - break; - } - } else { switch (item.value) { case 'ins': setTimeout(function () { @@ -295,7 +272,6 @@ define([ }, 1); break; } - } }, createSheetName: function() { @@ -331,10 +307,6 @@ define([ return name; }, - deleteWorksheets: function() { - - }, - deleteWorksheet: function() { var me = this; @@ -427,10 +399,6 @@ define([ } }, - moveWorksheets: function() { - - }, - moveWorksheet: function(cut, silent, index, destPos) { var me = this; var wc = me.api.asc_getWorksheetsCount(), items = [], i = -1; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index d4117fb93..fd1f65930 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -241,7 +241,10 @@ define([ { caption: this.itemTabColor, menu: menuColorItems - } + }, + { caption: '--' }, + {caption: this.selectAllSheets, value: 'selectall'}, + {caption: this.ungroupSheets, value: 'noselect'} ] }).on('render:after', function(btn) { var colorVal = $('
      '); @@ -432,6 +435,15 @@ define([ this.tabMenu.items[6].setDisabled(isdoclocked); this.tabMenu.items[7].setDisabled(issheetlocked); + if (select.length === 1) { + this.tabMenu.items[10].hide(); + } else { + this.tabMenu.items[10].show(); + } + + this.tabMenu.items[9].setDisabled(issheetlocked); + this.tabMenu.items[10].setDisabled(issheetlocked); + this.api.asc_closeCellEditor(); this.api.asc_enableKeyEvents(false); @@ -473,6 +485,11 @@ define([ onTabMenuClick: function (o, item) { if (item && this.api) { this.enableKeyEvents = (item.value === 'ins' || item.value === 'hide'); + if (item.value === 'selectall') { + this.tabbar.setSelectAll(true); + } else if (item.value === 'noselect') { + this.tabbar.setSelectAll(false); + } } }, @@ -544,7 +561,9 @@ define([ textMin : 'MIN', textMax : 'MAX', filteredRecordsText : '{0} of {1} records filtered', - filteredText : 'Filter mode' + filteredText : 'Filter mode', + selectAllSheets : 'Select All Sheets', + ungroupSheets : 'Ungroup Sheets' }, SSE.Views.Statusbar || {})); SSE.Views.Statusbar.RenameDialog = Common.UI.Window.extend(_.extend({ From e744a710e322d22226df721845dabe89e0b2c1e5 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 26 Sep 2019 11:35:29 +0300 Subject: [PATCH 5/9] [SSE] Bug 37388 (delete, hide select tabs) --- .../main/app/controller/Statusbar.js | 75 ++++++++----------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 96420bede..3c6b35802 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -247,31 +247,35 @@ define([ onTabMenu: function(obj, item, e) { var me = this; - var selectTabs = this.statusbar.tabbar.selectTabs; - switch (item.value) { - case 'ins': - setTimeout(function () { - me.api.asc_insertWorksheet(me.createSheetName()); - }, 1); - break; - case 'del': - this.deleteWorksheet(); - break; - case 'ren': - this.renameWorksheet(); - break; - case 'copy': - this.moveWorksheet(false); - break; - case 'move': - this.moveWorksheet(true); - break; - case 'hide': - setTimeout(function () { - me.hideWorksheet(true); - }, 1); - break; - } + var selectTabs = this.statusbar.tabbar.selectTabs, + arrIndex = []; + selectTabs.forEach(function (item) { + arrIndex.push(item.sheetindex); + }); + switch (item.value) { + case 'ins': + setTimeout(function () { + me.api.asc_insertWorksheet(me.createSheetName()); + }, 1); + break; + case 'del': + this.deleteWorksheet(arrIndex); + break; + case 'ren': + this.renameWorksheet(); + break; + case 'copy': + this.moveWorksheet(false); + break; + case 'move': + this.moveWorksheet(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheet(true, arrIndex); + }, 1); + break; + } }, createSheetName: function() { @@ -307,17 +311,17 @@ define([ return name; }, - deleteWorksheet: function() { + deleteWorksheet: function(selectTabs) { 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}); } else { Common.UI.warning({ msg: this.warnDeleteSheet, buttons: ['ok','cancel'], callback: function(btn) { - if (btn == 'ok' && !me.api.asc_deleteWorksheet()) { + if (btn == 'ok' && !me.api.asc_deleteWorksheet(selectTabs)) { _.delay(function(){ Common.UI.error({msg: me.errorRemoveSheet}); },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) { 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}) : this.api['asc_hideWorksheet'](index); } else { From 8f4537a22a7277f4d9736a2b81412b0ee9d1c80d Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 26 Sep 2019 14:24:33 +0300 Subject: [PATCH 6/9] [SSE] Bug 37388 (set worksheet color) --- .../main/app/controller/Statusbar.js | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 3c6b35802..2774ad85b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -495,18 +495,26 @@ define([ }, setWorksheetColor: function (color) { + var me = this; if (this.api) { - var sindex = this.api.asc_getActiveWorksheetIndex(); - var tab = _.findWhere(this.statusbar.tabbar.tabs, {sheetindex: sindex}); - if (tab) { + var selectTabs = this.statusbar.tabbar.selectTabs, + arrIndex = []; + selectTabs.forEach(function (item) { + arrIndex.push(item.sheetindex); + }); + if (arrIndex) { if ('transparent' === color) { - this.api.asc_setWorksheetTabColor(sindex, null); - tab.$el.find('a').css('box-shadow', ''); + this.api.asc_setWorksheetTabColor(null, arrIndex); + selectTabs.forEach(function (tab) { + tab.$el.find('a').css('box-shadow', ''); + }); } else { var asc_clr = Common.Utils.ThemeColor.getRgbColor(color); if (asc_clr) { - this.api.asc_setWorksheetTabColor(sindex, asc_clr); - this.setTabLineColor(tab, asc_clr); + this.api.asc_setWorksheetTabColor(asc_clr, arrIndex); + selectTabs.forEach(function (tab) { + me.setTabLineColor(tab, asc_clr); + }); } } } From 9df4e5f763eec4e436b69ef7f88f10e946c2402c Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 1 Oct 2019 11:49:43 +0300 Subject: [PATCH 7/9] [SSE] Bug 37388 (move worksheet) --- apps/common/main/lib/component/TabBar.js | 61 ++++++++++++++++++- .../main/app/controller/Statusbar.js | 36 +++++++---- .../main/app/view/Statusbar.js | 18 +++--- .../main/resources/less/statusbar.less | 11 ++++ 4 files changed, 106 insertions(+), 20 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index e572730e1..1a3e3b518 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -294,6 +294,61 @@ define([ document.removeEventListener('dragstart',dragDropText); }); } + }, + + setHookTabs: function (e, bar, tabs) { + var me = this; + function dragComplete() { + if (!_.isUndefined(me.drag)) { + bar.dragging = false; + bar.$el.find('li.mousemove').removeClass('mousemove right'); + var arrSelectIndex = []; + tabs.forEach(function (item) { + arrSelectIndex.push(item.sheetindex); + }); + if (!_.isUndefined(me.drag.place)) { + me.bar.trigger('tab:move', arrSelectIndex, me.drag.place); + me.bar.$bar.scrollLeft(me.scrollLeft); + me.bar.scrollX = undefined; + } else { + me.bar.trigger('tab:move', arrSelectIndex); + me.bar.$bar.scrollLeft(me.scrollLeft); + me.bar.scrollX = undefined; + } + + me.drag = undefined; + } + } + function dragMove (event) { + if (!_.isUndefined(me.drag)) { + me.drag.moveX = event.clientX*Common.Utils.zoom(); + if (me.drag.moveX > me.tabBarRight) { + bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right'); + me.drag.place = bar.tabs.length; + } else { + $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right'); + $(event.target).parent().addClass('mousemove'); + var name = event.target.parentElement.dataset.label, + currentTab = _.findWhere(bar.tabs, {label: name}); + if (!_.isUndefined(currentTab)) { + me.drag.place = currentTab.sheetindex; + } + } + } + } + if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) { + me.bar = bar; + me.drag = {tabs: tabs}; + bar.dragging = true; + this.calculateBounds(); + + $(document).on('mousemove.tabbar', dragMove); + $(document).on('mouseup.tabbar', function (e) { + dragComplete(e); + $(document).off('mouseup.tabbar'); + $(document).off('mousemove.tabbar', dragMove); + }); + } } } }); @@ -337,7 +392,11 @@ define([ mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { if (!tab.isLockTheDrag) { - dragHelper.setHook(e, this.bar, tab); + if (this.bar.selectTabs.length > 1) { + dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs); + } else { + dragHelper.setHook(e, this.bar, tab); + } } } }, this) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 2774ad85b..fe25994f2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -265,10 +265,10 @@ define([ this.renameWorksheet(); break; case 'copy': - this.moveWorksheet(false); + this.moveWorksheet(arrIndex, false); break; case 'move': - this.moveWorksheet(true); + this.moveWorksheet(arrIndex, true); break; case 'hide': setTimeout(function () { @@ -390,26 +390,38 @@ define([ } }, - moveWorksheet: function(cut, silent, index, destPos) { + moveWorksheet: function(selectArr, cut, silent, index, destPos) { var me = this; - var wc = me.api.asc_getWorksheetsCount(), items = [], i = -1; + var wc = me.api.asc_getWorksheetsCount(), items = [], arrIndex = [], i = -1; while (++i < wc) { if (!this.api.asc_isWorksheetHidden(i)) { items.push({ - value : me.api.asc_getWorksheetName(i), - inindex : i + value: me.api.asc_getWorksheetName(i), + inindex: i }); } } + if (!_.isUndefined(selectArr)) { + items.forEach(function (item) { + if (selectArr.indexOf(item.inindex) !== -1) { + arrIndex.push(item.inindex); + } + }); + } if (!_.isUndefined(silent)) { - me.api.asc_showWorksheet(items[index].inindex); + if (_.isUndefined(selectArr)) { + me.api.asc_showWorksheet(items[index].inindex); - Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()]); + Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()]); - if (!_.isUndefined(destPos)) { - me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex); + if (!_.isUndefined(destPos)) { + me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex); + } + } else { + if (!_.isUndefined(destPos)) { + me.api.asc_moveWorksheet(destPos, arrIndex); + } } - return; } @@ -420,7 +432,7 @@ define([ handler : function(btn, i) { if (btn == 'ok') { if (cut) { - me.api.asc_moveWorksheet(i == -255 ? wc : i); + me.api.asc_moveWorksheet(i == -255 ? wc : i, arrIndex); } else { var new_text = me.createCopyName(me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex())); me.api.asc_copyWorksheet(i == -255 ? wc : i, new_text); diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index fd1f65930..d3fcb5db6 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -182,19 +182,23 @@ define([ me.fireEvent('sheet:changename'); } }, this), - 'tab:move' : _.bind(function (tabIndex, index) { + 'tab:move' : _.bind(function (selectTabs, index) { me.tabBarScroll = {scrollLeft: me.tabbar.scrollX}; - - if (_.isUndefined(index) || tabIndex === index) { + if (_.isUndefined(selectTabs) || _.isUndefined(index) || selectTabs === index) { return; } + if (_.isArray(selectTabs)) { + me.fireEvent('sheet:move', [selectTabs, false, true, undefined, index]); + } else { + var tabIndex = selectTabs; - if (tabIndex < index) { - ++index; + if (tabIndex < index) { + ++index; + } + + me.fireEvent('sheet:move', [undefined, false, true, tabIndex, index]); } - me.fireEvent('sheet:move', [false, true, tabIndex, index]); - }, this) }); diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 58dfef726..d11f7533b 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -232,6 +232,17 @@ color: @gray-darker; } } + + &.mousemove { + > a { + background: linear-gradient(to right, @black, @gray-light 1px); + } + &.right { + > a { + background: linear-gradient(to left, @black, @gray-light 1px); + } + } + } } } From 035143f6446afe28d97cdb3309e52a08928bc95b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 8 Oct 2019 11:20:45 +0300 Subject: [PATCH 8/9] [SSE] Bug 37388 (copy worksheet) --- .../main/app/controller/Statusbar.js | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index fe25994f2..784565ac5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -293,7 +293,7 @@ define([ return name; }, - createCopyName: function(orig) { + createCopyName: function(orig, curArrNames) { var wc = this.api.asc_getWorksheetsCount(), names = []; while (wc--) { names.push(this.api.asc_getWorksheetName(wc).toLowerCase()); @@ -308,6 +308,17 @@ define([ if (names.indexOf(name.toLowerCase()) < 0) break; } + if (curArrNames && curArrNames.length > 0) { + var arr = []; + curArrNames.forEach(function (item) { + arr.push(item.toLowerCase()); + }); + while(arr.indexOf(name.toLowerCase()) !== -1) { + index++; + name = first + '(' + index + ')'; + } + } + return name; }, @@ -434,8 +445,11 @@ define([ if (cut) { me.api.asc_moveWorksheet(i == -255 ? wc : i, arrIndex); } else { - var new_text = me.createCopyName(me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex())); - me.api.asc_copyWorksheet(i == -255 ? wc : i, new_text); + var arrNames = []; + arrIndex.forEach(function (item) { + arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames)); + }); + me.api.asc_copyWorksheet(i == -255 ? wc : i, arrNames, arrIndex); } } me.api.asc_enableKeyEvents(true); From 8e1fb526c001a7d26e73079e813161843a399c78 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 9 Oct 2019 10:06:30 +0300 Subject: [PATCH 9/9] [SSE] Bug 37388 (insert worksheet) --- .../main/app/controller/Statusbar.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 784565ac5..3c8523651 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -254,8 +254,12 @@ define([ }); switch (item.value) { case 'ins': + var arrNames = []; + for(var i = 0; i < arrIndex.length; i++) { + arrNames.push(me.createSheetName(arrNames)); + } setTimeout(function () { - me.api.asc_insertWorksheet(me.createSheetName()); + me.api.asc_insertWorksheet(arrNames); }, 1); break; case 'del': @@ -278,7 +282,7 @@ define([ } }, - createSheetName: function() { + createSheetName: function(curArrNames) { var items = [], wc = this.api.asc_getWorksheetsCount(); while (wc--) { items.push(this.api.asc_getWorksheetName(wc).toLowerCase()); @@ -290,6 +294,17 @@ define([ if (items.indexOf(name.toLowerCase()) < 0) break; } + if (curArrNames && curArrNames.length > 0) { + var arr = []; + curArrNames.forEach(function (item) { + arr.push(item.toLowerCase()); + }); + while(arr.indexOf(name.toLowerCase()) !== -1) { + index++; + name = this.strSheet + index; + } + } + return name; },