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

[SSE] fix bug 50024

Browse source
This commit is contained in:
Maxim Kadushkin 2021-04-27 20:21:45 +03:00
parent f5e1031528
commit acaeec776f
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/controller/CellEditor.js
View file

@ -190,11 +190,15 @@ define([
onLayoutResize: function(o, r) { onLayoutResize: function(o, r) {
if (r == 'cell:edit') { if (r == 'cell:edit') {
if (Math.floor(this.editor.$el.height()) > 19) { if (Math.floor(this.editor.$el.height()) > 19) {
if (!this.editor.$btnexpand.hasClass('btn-collapse')) if (!this.editor.$btnexpand.hasClass('btn-collapse')) {
this.editor.$el.addClass('expanded');
this.editor.$btnexpand['addClass']('btn-collapse'); this.editor.$btnexpand['addClass']('btn-collapse');
}
o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height()); o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height());
o && Common.localStorage.setBool('sse-celleditor-expand', true); o && Common.localStorage.setBool('sse-celleditor-expand', true);
} else { } else {
this.editor.$el.removeClass('expanded');
this.editor.$btnexpand['removeClass']('btn-collapse'); this.editor.$btnexpand['removeClass']('btn-collapse');
o && Common.localStorage.setBool('sse-celleditor-expand', false); o && Common.localStorage.setBool('sse-celleditor-expand', false);
} }
@ -232,10 +236,12 @@ define([
if ( Math.floor(this.editor.$el.height()) > 19) { if ( Math.floor(this.editor.$el.height()) > 19) {
this.editor.keep_height = this.editor.$el.height(); this.editor.keep_height = this.editor.$el.height();
this.editor.$el.height(19); this.editor.$el.height(19);
this.editor.$el.removeClass('expanded');
this.editor.$btnexpand['removeClass']('btn-collapse'); this.editor.$btnexpand['removeClass']('btn-collapse');
Common.localStorage.setBool('sse-celleditor-expand', false); Common.localStorage.setBool('sse-celleditor-expand', false);
} else { } else {
this.editor.$el.height(this.editor.keep_height); this.editor.$el.height(this.editor.keep_height);
this.editor.$el.addClass('expanded');
this.editor.$btnexpand['addClass']('btn-collapse'); this.editor.$btnexpand['addClass']('btn-collapse');
Common.localStorage.setBool('sse-celleditor-expand', true); Common.localStorage.setBool('sse-celleditor-expand', true);
} }

22
apps/spreadsheeteditor/main/resources/less/celleditor.less
View file

@ -4,14 +4,14 @@
border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; border-left: solid @scaled-one-px-value-ie @border-toolbar-ie;
border-left: solid @scaled-one-px-value @border-toolbar; border-left: solid @scaled-one-px-value @border-toolbar;
min-height: 20px; min-height: 20px;
background-color: @background-normal-ie; background-color: @background-toolbar-ie;
background-color: @background-normal; background-color: @background-toolbar;
.ce-group-name { .ce-group-name {
float: left; float: left;
height: 20px; height: 20px;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; //border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; //border-bottom: @scaled-one-px-value solid @border-toolbar;
background-color: @background-toolbar-ie; background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
@ -26,6 +26,8 @@
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
transition: none; transition: none;
-webkit-transition: none; -webkit-transition: none;
box-shadow: 0 @scaled-one-px-value-ie 0 0 @border-toolbar-ie;
box-shadow: 0 @scaled-one-px-value 0 0 @border-toolbar;
&[disabled] { &[disabled] {
color: @border-preview-select-ie; color: @border-preview-select-ie;
@ -75,9 +77,19 @@
} }
} }
&:not(.expanded) {
#ce-func-label {
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar;
}
}
.ce-group-expand { .ce-group-expand {
float: right; float: right;
height: 20px; //height: 20px;
height: 100%;
background-color: @background-normal-ie;
background-color: @background-normal;
} }
.ce-group-content { .ce-group-content {