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

[SSE] Fix styles updating

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-16 17:43:49 +03:00
parent 3982797116
commit 0669c65b67
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/component/ComboDataView.js
View file

@ -459,6 +459,13 @@ define([
this.menuPicker.selectByIndex(index); this.menuPicker.selectByIndex(index);
}, },
selectRecord: function(record) {
if (!record)
this.fieldPicker.deselectAll();
this.menuPicker.selectRecord(record);
},
setItemWidth: function(width) { setItemWidth: function(width) {
if (this.itemWidth != width) if (this.itemWidth != width)
this.itemWidth = window.devicePixelRatio > 1 ? width / 2 : width; this.itemWidth = window.devicePixelRatio > 1 ? width / 2 : width;

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1739,6 +1739,7 @@ define([
return; return;
} }
var rec = listStyles.menuPicker.getSelectedRec();
listStyles.menuPicker.store.reset([]); // remove all listStyles.menuPicker.store.reset([]); // remove all
var mainController = this.getApplication().getController('Main'); var mainController = this.getApplication().getController('Main');
@ -1752,8 +1753,9 @@ define([
}); });
if (listStyles.menuPicker.store.length > 0 && listStyles.rendered) { if (listStyles.menuPicker.store.length > 0 && listStyles.rendered) {
listStyles.fillComboView(listStyles.menuPicker.store.at(0), true); rec = rec ? listStyles.menuPicker.store.findWhere({name: rec.get('name')}) : null;
listStyles.selectByIndex(0); listStyles.fillComboView(rec ? rec : listStyles.menuPicker.store.at(0), true);
rec ? listStyles.selectRecord(rec) : listStyles.selectByIndex(0);
} }
window.styles_loaded = true; window.styles_loaded = true;