From ec887092effe3d4c7b7a909e0e555466ccb709ad Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 27 Jul 2020 18:31:29 +0300 Subject: [PATCH 1/3] [SSE] Fix bug 45952 --- apps/common/main/lib/component/TabBar.js | 2 +- apps/spreadsheeteditor/main/app/controller/Statusbar.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 8a0a84a0f..19ac737ee 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -241,7 +241,7 @@ define([ lockDrag = true; } }); - if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) { + if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1 || this.bar.isEditFormula) { lockDrag = true; } this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag); diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 467c902b8..97a3d5a28 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -208,6 +208,7 @@ define([ statusbar = this.statusbar; statusbar.isEditFormula = disableAdd; + statusbar.tabbar && (statusbar.tabbar.isEditFormula = disableAdd); statusbar.btnZoomUp.setDisabled(disable); statusbar.btnZoomDown.setDisabled(disable); statusbar.labelZoom[disable?'addClass':'removeClass']('disabled'); From 74774555d7ef778ccccad40c7e6592366fd341d7 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 27 Jul 2020 18:32:41 +0300 Subject: [PATCH 2/3] [SSE] Fix bug 43570 --- apps/spreadsheeteditor/main/app/controller/Statusbar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 97a3d5a28..779b1c9d0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -214,6 +214,8 @@ define([ statusbar.labelZoom[disable?'addClass':'removeClass']('disabled'); statusbar.btnAddWorksheet.setDisabled(disable || this.api.asc_isWorkbookLocked() || statusbar.rangeSelectionMode!=Asc.c_oAscSelectionDialogType.None); + statusbar.$el.find('#statusbar_bottom li span').attr('oo_editor_input', !disableAdd); + if (disableAdd && mask.length>0 || !disableAdd && mask.length==0) return; statusbar.$el.find('.statusbar').toggleClass('masked', disableAdd); if(disableAdd) { From a1d7986157974b8e496e766709baebf134835cf3 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 27 Jul 2020 18:36:41 +0300 Subject: [PATCH 3/3] [SSE] Fix change width of first tab in statusbar when moving sheet --- apps/spreadsheeteditor/main/resources/less/statusbar.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 3d03bc64e..650e1cf2c 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -246,10 +246,17 @@ &.mousemove { + &:first-child { + > span { + padding-left: 8px; + } + } + > span { border-left: 2px solid @gray-deep; padding-left: 9px; } + &.right { > span { border-left: 1px solid @gray-dark;