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

[SSE] Fix custom icons settings

Browse source
This commit is contained in:
Julia Radzhabova 2021-03-04 01:11:57 +03:00
parent b20e2d7b37
commit ed45c1fe0e
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
View file

@ -1070,16 +1070,16 @@ define([
}); });
// Icons // Icons
var collectionPresets = SSE.getCollection('ConditionalFormatIconsPresets'); this.collectionPresets = SSE.getCollection('ConditionalFormatIconsPresets');
if (collectionPresets.length<1) if (this.collectionPresets.length<1)
SSE.getController('Main').fillCondFormatIconsPresets(this.api.asc_getCFIconsByType()); SSE.getController('Main').fillCondFormatIconsPresets(this.api.asc_getCFIconsByType());
var collectionIcons = SSE.getCollection('ConditionalFormatIcons'); this.collectionIcons = SSE.getCollection('ConditionalFormatIcons');
if (collectionIcons.length<1) if (this.collectionIcons.length<1)
SSE.getController('Main').fillCondFormatIcons(this.api.asc_getFullCFIcons()); SSE.getController('Main').fillCondFormatIcons(this.api.asc_getFullCFIcons());
arr = []; arr = [];
var len = collectionPresets.length; var len = this.collectionPresets.length;
var iconsPresets = this.api.asc_getCFPresets()[Asc.c_oAscCFRuleTypeSettings.icons]; var iconsPresets = this.api.asc_getCFPresets()[Asc.c_oAscCFRuleTypeSettings.icons];
_.each(iconsPresets, function(preset, index){ _.each(iconsPresets, function(preset, index){
if (index>=len) return; if (index>=len) return;
@ -1097,9 +1097,9 @@ define([
arr.push({ arr.push({
value: index, value: index,
data : { data : {
iconSet: collectionPresets.at(index).get('icons'), iconSet: me.collectionPresets.at(index).get('icons'),
values: values, values: values,
icons: collectionIcons icons: me.collectionIcons
} }
}); });
}); });
@ -1132,7 +1132,7 @@ define([
}); });
var icons = []; var icons = [];
collectionIcons.each(function(icon, index){ me.collectionIcons.each(function(icon, index){
icons.push({ icons.push({
value: icon.get('index'), value: icon.get('index'),
imgUrl: icon.get('icon') imgUrl: icon.get('icon')
@ -1557,7 +1557,20 @@ define([
value.asc_setGte(controls.cmbOperator.getValue()); value.asc_setGte(controls.cmbOperator.getValue());
values.push(value); values.push(value);
if (icons) { if (icons) {
this.iconsProps.isReverse ? icons.unshift(controls.pickerIcons.getSelectedRec().get('value')+1) : icons.push(controls.pickerIcons.getSelectedRec().get('value')+1); var icon = controls.pickerIcons.getSelectedRec().get('value')+1;
for (var k=0; k<this.collectionPresets.length; k++) {
var items = this.collectionPresets.at(k).get('icons');
for (var j=0; j<items.length; j++) {
if (icon==items[j]) {
icon = new AscCommonExcel.CConditionalFormatIconSet();
icon.asc_setIconSet(k);
icon.asc_setIconId(j);
this.iconsProps.isReverse ? icons.unshift(icon) : icons.push(icon);
break;
}
}
if (typeof icon=='object') break;
}
} }
} }
iconsProps.asc_setCFVOs(values); iconsProps.asc_setCFVOs(values);
@ -1899,6 +1912,7 @@ define([
}, },
fillIconsControls: function(iconSet, values, icons) { fillIconsControls: function(iconSet, values, icons) {
var me = this;
this.iconsProps.iconsSet = iconSet; this.iconsProps.iconsSet = iconSet;
this.iconsProps.iconsLength = values.length; this.iconsProps.iconsLength = values.length;
this.$window.find('.icons-5').toggleClass('hidden', this.iconsProps.iconsLength<5); this.$window.find('.icons-5').toggleClass('hidden', this.iconsProps.iconsLength<5);
@ -1911,18 +1925,21 @@ define([
controls.value.setValue(values[i].asc_getVal() || ''); controls.value.setValue(values[i].asc_getVal() || '');
controls.cmbOperator.setValue(values[i].asc_getGte()); controls.cmbOperator.setValue(values[i].asc_getGte());
} }
var iconsIndexes = [];
if (icons && icons.length>0) { if (icons && icons.length>0) {
this.cmbIconsPresets.setValue(this.textCustom); this.cmbIconsPresets.setValue(this.textCustom);
_.each(icons, function(item) {
iconsIndexes.push(me.collectionPresets.at(item.asc_getIconSet()).get('icons')[item.asc_getIconId()]);
});
} else { } else {
this.cmbIconsPresets.setValue(iconSet); this.cmbIconsPresets.setValue(iconSet);
var collectionPresets = SSE.getCollection('ConditionalFormatIconsPresets'); iconsIndexes = me.collectionPresets.at(iconSet).get('icons');
icons = collectionPresets.at(iconSet).get('icons');
} }
var isReverse = this.iconsProps.isReverse; var isReverse = this.iconsProps.isReverse;
var len = icons.length; var len = iconsIndexes.length;
for (var i=0; i<icons.length; i++) { for (var i=0; i<iconsIndexes.length; i++) {
var controls = arr[isReverse ? len-i-1 : i]; var controls = arr[isReverse ? len-i-1 : i];
var rec = controls.pickerIcons.store.findWhere({value: icons[i]-1}); var rec = controls.pickerIcons.store.findWhere({value: iconsIndexes[i]-1});
rec && controls.pickerIcons.selectRecord(rec, true); rec && controls.pickerIcons.selectRecord(rec, true);
this.selectIconItem(controls.cmbIcons, rec); this.selectIconItem(controls.cmbIcons, rec);
} }