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

[SSE] Add "no icon" to format rule. Fix Bug 51270

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-13 22:08:32 +03:00
parent 60f2c149e3
commit ad2926db43
3 changed files with 67 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template
View file

@ -162,45 +162,45 @@
<tr class="icons-5"> <tr class="icons-5">
<td class="padding-small"> <td class="padding-small">
<div id="format-rules-combo-icon-5" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- <div id="format-rules-combo-icon-5" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!--
--><div id="format-rules-txt-icon-5" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 10px;width: 140px;"></div><!-- --><div id="format-rules-txt-icon-5" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 5px;width: 140px;"></div><!--
--><div id="format-rules-edit-combo-op-5" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-combo-op-5" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-txt-value-5" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-txt-value-5" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-combo-type-5" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div> --><div id="format-rules-edit-combo-type-5" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div>
</td> </td>
</tr> </tr>
<tr class="icons-4"> <tr class="icons-4">
<td class="padding-small"> <td class="padding-small">
<div id="format-rules-combo-icon-4" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- <div id="format-rules-combo-icon-4" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!--
--><div id="format-rules-txt-icon-4" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 10px;width: 140px;"></div><!-- --><div id="format-rules-txt-icon-4" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 5px;width: 140px;"></div><!--
--><div id="format-rules-edit-combo-op-4" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-combo-op-4" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-txt-value-4" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-txt-value-4" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-combo-type-4" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div> --><div id="format-rules-edit-combo-type-4" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div>
</td> </td>
</tr> </tr>
<tr class="icons-3"> <tr class="icons-3">
<td class="padding-small"> <td class="padding-small">
<div id="format-rules-combo-icon-3" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- <div id="format-rules-combo-icon-3" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!--
--><div id="format-rules-txt-icon-3" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 10px;width: 140px;"></div><!-- --><div id="format-rules-txt-icon-3" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 5px;width: 140px;"></div><!--
--><div id="format-rules-edit-combo-op-3" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-combo-op-3" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-txt-value-3" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-txt-value-3" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-combo-type-3" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div> --><div id="format-rules-edit-combo-type-3" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div>
</td> </td>
</tr> </tr>
<tr class="icons-2"> <tr class="icons-2">
<td class="padding-small"> <td class="padding-small">
<div id="format-rules-combo-icon-2" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- <div id="format-rules-combo-icon-2" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!--
--><div id="format-rules-txt-icon-2" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 10px;width: 140px;"></div><!-- --><div id="format-rules-txt-icon-2" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 5px;width: 140px;"></div><!--
--><div id="format-rules-edit-combo-op-2" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-combo-op-2" class="input-group-nr" style="display: inline-block;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-txt-value-2" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-txt-value-2" class="" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-combo-type-2" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div> --><div id="format-rules-edit-combo-type-2" class="input-group-nr" style="display: inline-block;vertical-align: middle;"></div>
</td> </td>
</tr> </tr>
<tr class="icons-1"> <tr class="icons-1">
<td class="padding-small"> <td class="padding-small">
<div id="format-rules-combo-icon-1" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- <div id="format-rules-combo-icon-1" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!--
--><div id="format-rules-txt-icon-1" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 10px;width: 140px;"></div><!-- --><div id="format-rules-txt-icon-1" class="iconset-label" style="display: inline-block;vertical-align: middle;margin-right: 5px;width: 140px;"></div><!--
--><div id="format-rules-edit-combo-op-1" class="input-group-nr hidden" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-combo-op-1" class="input-group-nr hidden" style="display: inline-block;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-txt-value-1" class=" hidden" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 10px;"></div><!-- --><div id="format-rules-edit-txt-value-1" class=" hidden" style="display: inline-block;height: 22px;vertical-align: middle;margin-right: 5px;"></div><!--
--><div id="format-rules-edit-combo-type-1" class="input-group-nr hidden" style="display: inline-block;vertical-align: middle;"></div> --><div id="format-rules-edit-combo-type-1" class="input-group-nr hidden" style="display: inline-block;vertical-align: middle;"></div>
</td> </td>
</tr> </tr>

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

@ -662,7 +662,9 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
type : i, type : i,
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" data-toggle="dropdown">',
'<div class="form-control image" style="width: 55px;background-repeat: no-repeat; background-position: 16px center;"></div>', '<div class="form-control image" style="display: block;width: 70px;">',
'<div style="display: inline-block;overflow: hidden;width: 100%;height: 100%;padding-top: 2px;background-repeat: no-repeat; background-position: 20px center;"></div>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -673,6 +675,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
style: 'min-width: 105px;', style: 'min-width: 105px;',
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
items: [ items: [
{ caption: this.txtNoCellIcon, checkable: true, allowDepress: false, toggleGroup: 'no-cell-icons-' + (i+1) },
{ template: _.template('<div id="format-rules-combo-menu-icon-' + (i+1) + '" style="width: 217px; margin: 0 5px;"></div>') } { template: _.template('<div id="format-rules-combo-menu-icon-' + (i+1) + '" style="width: 217px; margin: 0 5px;"></div>') }
] ]
})).render($('#format-rules-combo-icon-' + (i+1))); })).render($('#format-rules-combo-icon-' + (i+1)));
@ -684,10 +687,12 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
itemTemplate: _.template('<img id="<%= id %>" class="item-icon" src="<%= imgUrl %>" style="width: 16px; height: 16px;">'), itemTemplate: _.template('<img id="<%= id %>" class="item-icon" src="<%= imgUrl %>" style="width: 16px; height: 16px;">'),
type : i type : i
}); });
picker.on('item:click', _.bind(this.onSelectIcon, this, combo)); picker.on('item:click', _.bind(this.onSelectIcon, this, combo, menu.items[0]));
menu.items[0].on('toggle', _.bind(this.onSelectNoIcon, this, combo, picker));
this.iconsControls[i].cmbIcons = combo; this.iconsControls[i].cmbIcons = combo;
this.iconsControls[i].pickerIcons = picker; this.iconsControls[i].pickerIcons = picker;
this.iconsControls[i].itemNoIcons = menu.items[0];
combo = new Common.UI.ComboBox({ combo = new Common.UI.ComboBox({
el : $('#format-rules-edit-combo-op-' + (i+1)), el : $('#format-rules-edit-combo-op-' + (i+1)),
@ -1429,6 +1434,12 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
value.asc_setGte(controls.cmbOperator.getValue()); value.asc_setGte(controls.cmbOperator.getValue());
values.push(value); values.push(value);
if (icons) { if (icons) {
if (controls.itemNoIcons.isChecked()) {
var icon = new Asc.asc_CConditionalFormatIconSet();
icon.asc_setIconSet(Asc.EIconSetType.NoIcons);
icon.asc_setIconId(0);
this.iconsProps.isReverse ? icons.unshift(icon) : icons.push(icon);
} else {
var icon = controls.pickerIcons.getSelectedRec().get('value')+1; var icon = controls.pickerIcons.getSelectedRec().get('value')+1;
for (var k=0; k<this.collectionPresets.length; k++) { for (var k=0; k<this.collectionPresets.length; k++) {
var items = this.collectionPresets.at(k).get('icons'); var items = this.collectionPresets.at(k).get('icons');
@ -1445,6 +1456,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
} }
} }
} }
}
iconsProps.asc_setCFVOs(values); iconsProps.asc_setCFVOs(values);
iconsProps.asc_setIconSets(icons); iconsProps.asc_setIconSets(icons);
props.asc_setColorScaleOrDataBarOrIconSetRule(iconsProps); props.asc_setColorScaleOrDataBarOrIconSetRule(iconsProps);
@ -1860,6 +1872,9 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
if (icons && icons.length>0) { if (icons && icons.length>0) {
this.cmbIconsPresets.setValue(this.textCustom); this.cmbIconsPresets.setValue(this.textCustom);
_.each(icons, function(item) { _.each(icons, function(item) {
if (item.asc_getIconSet()==Asc.EIconSetType.NoIcons) {
iconsIndexes.push(-1);
} else
iconsIndexes.push(me.collectionPresets.at(item.asc_getIconSet()).get('icons')[item.asc_getIconId()]); iconsIndexes.push(me.collectionPresets.at(item.asc_getIconSet()).get('icons')[item.asc_getIconId()]);
}); });
} else { } else {
@ -1870,8 +1885,9 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
var len = iconsIndexes.length; var len = iconsIndexes.length;
for (var i=0; i<iconsIndexes.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: iconsIndexes[i]-1}); var rec = (iconsIndexes[i]==-1) ? null : controls.pickerIcons.store.findWhere({value: iconsIndexes[i]-1});
rec && controls.pickerIcons.selectRecord(rec, true); rec ? controls.pickerIcons.selectRecord(rec, true) : controls.pickerIcons.deselectAll(true);
controls.itemNoIcons.setChecked(!rec, true);
this.selectIconItem(controls.cmbIcons, rec); this.selectIconItem(controls.cmbIcons, rec);
} }
this.fillIconsLabels(); this.fillIconsLabels();
@ -1896,25 +1912,36 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
for (var i=0; i<len/2; i++) { for (var i=0; i<len/2; i++) {
var controls1 = arr[i], var controls1 = arr[i],
controls2 = arr[len-i-1]; controls2 = arr[len-i-1];
var icon1 = controls1.pickerIcons.getSelectedRec().get('value'), var icon1 = controls1.itemNoIcons.isChecked() ? -1 : controls1.pickerIcons.getSelectedRec().get('value'),
icon2 = controls2.pickerIcons.getSelectedRec().get('value'); icon2 = controls2.itemNoIcons.isChecked() ? -1 : controls2.pickerIcons.getSelectedRec().get('value');
var rec = controls1.pickerIcons.store.findWhere({value: icon2}); var rec = controls1.pickerIcons.store.findWhere({value: icon2});
rec && controls1.pickerIcons.selectRecord(rec, true); rec ? controls1.pickerIcons.selectRecord(rec, true) : controls1.pickerIcons.deselectAll(true);
controls1.itemNoIcons.setChecked(!rec, true);
this.selectIconItem(controls1.cmbIcons, rec); this.selectIconItem(controls1.cmbIcons, rec);
rec = controls2.pickerIcons.store.findWhere({value: icon1}); rec = controls2.pickerIcons.store.findWhere({value: icon1});
rec && controls2.pickerIcons.selectRecord(rec, true); rec ? controls2.pickerIcons.selectRecord(rec, true) : controls2.pickerIcons.deselectAll(true);
controls2.itemNoIcons.setChecked(!rec, true);
this.selectIconItem(controls2.cmbIcons, rec); this.selectIconItem(controls2.cmbIcons, rec);
} }
}, },
onSelectIcon: function(combo, picker, view, record) { onSelectIcon: function(combo, noIconItem, picker, view, record) {
this.selectIconItem(combo, record); this.selectIconItem(combo, record);
noIconItem.setChecked(false, true);
this.cmbIconsPresets.setValue(this.textCustom);
},
onSelectNoIcon: function(combo, picker, item, state) {
if (!state) return;
this.selectIconItem(combo);
picker.deselectAll(true);
this.cmbIconsPresets.setValue(this.textCustom); this.cmbIconsPresets.setValue(this.textCustom);
}, },
selectIconItem: function(combo, record) { selectIconItem: function(combo, record) {
var formcontrol = $(combo.el).find('.form-control'); var formcontrol = $(combo.el).find('.form-control > div');
formcontrol.css('background-image', record ? 'url(' + record.get('imgUrl') + ')' : ''); formcontrol.css('background-image', record ? 'url(' + record.get('imgUrl') + ')' : '');
formcontrol.text(record ? '' : this.txtNoCellIcon);
}, },
isRangeValid: function() { isRangeValid: function() {
@ -2191,7 +2218,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
textInvalid: 'Invalid data range.', textInvalid: 'Invalid data range.',
textClear: 'Clear', textClear: 'Clear',
textItem: 'Item', textItem: 'Item',
textPresets: 'Presets' textPresets: 'Presets',
txtNoCellIcon: 'No Icon'
}, SSE.Views.FormatRulesEditDlg || {})); }, SSE.Views.FormatRulesEditDlg || {}));
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2188,6 +2188,7 @@
"SSE.Views.FormatRulesEditDlg.txtTime": "Time", "SSE.Views.FormatRulesEditDlg.txtTime": "Time",
"SSE.Views.FormatRulesEditDlg.txtTitleEdit": "Edit Formatting Rule", "SSE.Views.FormatRulesEditDlg.txtTitleEdit": "Edit Formatting Rule",
"SSE.Views.FormatRulesEditDlg.txtTitleNew": "New Formatting Rule", "SSE.Views.FormatRulesEditDlg.txtTitleNew": "New Formatting Rule",
"SSE.Views.FormatRulesEditDlg.txtNoCellIcon": "No Icon",
"SSE.Views.FormatRulesManagerDlg.guestText": "Guest", "SSE.Views.FormatRulesManagerDlg.guestText": "Guest",
"SSE.Views.FormatRulesManagerDlg.text1Above": "1 std dev above average", "SSE.Views.FormatRulesManagerDlg.text1Above": "1 std dev above average",
"SSE.Views.FormatRulesManagerDlg.text1Below": "1 std dev below average", "SSE.Views.FormatRulesManagerDlg.text1Below": "1 std dev below average",