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

[SSE] Change rules in the toolbar

Browse source
This commit is contained in:
Julia Radzhabova 2021-03-15 17:44:09 +03:00
parent abcb2d78e3
commit 35cab5fe73
5 changed files with 67 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/util/define.js
View file

@ -593,7 +593,8 @@ define(function(){ 'use strict';
textIconSets: 'Icon sets', textIconSets: 'Icon sets',
textFormula: 'Formula', textFormula: 'Formula',
exampleText: 'AaBbCcYyZz', exampleText: 'AaBbCcYyZz',
noFormatText: 'No format set' noFormatText: 'No format set',
textValue: 'Value is'
} }
})(), Common.define.conditionalData || {}); })(), Common.define.conditionalData || {});
}); });

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

@ -396,9 +396,10 @@ define([
if (toolbar.btnCondFormat.rendered) { if (toolbar.btnCondFormat.rendered) {
toolbar.btnCondFormat.menu.on('show:before', _.bind(this.onShowBeforeCondFormat, this)); toolbar.btnCondFormat.menu.on('show:before', _.bind(this.onShowBeforeCondFormat, this));
toolbar.btnCondFormat.menu.on('item:click', _.bind(this.onCondFormatMenu, this)); toolbar.btnCondFormat.menu.on('item:click', _.bind(this.onCondFormatMenu, this));
toolbar.btnCondFormat.menu.items[7].menu.on('item:click', _.bind(this.onCondFormatMenu, this)); for (var i=0; i<7; i++) {
toolbar.btnCondFormat.menu.items[9].menu.on('item:click', _.bind(this.onCondFormatMenu, this)); toolbar.btnCondFormat.menu.items[i].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
toolbar.btnCondFormat.menu.items[21].menu.on('item:click', _.bind(this.onCondFormatMenu, this)); }
toolbar.btnCondFormat.menu.items[15].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
} }
Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); Common.Gateway.on('insertimage', _.bind(this.insertImage, this));

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

@ -91,7 +91,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
var rules = [ var rules = [
{ {
name: this.textValue, name: Common.define.conditionalData.textValue,
type: Asc.c_oAscCFType.cellIs, type: Asc.c_oAscCFType.cellIs,
rules: [ rules: [
{ name: Common.define.conditionalData.textGreater, subtype: Asc.c_oAscCFOperator.greaterThan}, { name: Common.define.conditionalData.textGreater, subtype: Asc.c_oAscCFOperator.greaterThan},
@ -105,7 +105,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
] ]
}, },
{ {
name: this.textRanked, name: Common.define.conditionalData.textTop + '/' + Common.define.conditionalData.textBottom,
type: Asc.c_oAscCFType.top10, type: Asc.c_oAscCFType.top10,
rules: [ rules: [
{ name: Common.define.conditionalData.textTop, subtype: 0}, { name: Common.define.conditionalData.textTop, subtype: 0},
@ -2045,8 +2045,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
textInvalidRange: 'ERROR! Invalid cells range', textInvalidRange: 'ERROR! Invalid cells range',
notcriticalErrorTitle: 'Warning', notcriticalErrorTitle: 'Warning',
textFormat: 'Format', textFormat: 'Format',
textValue: 'Value is',
textRanked: 'Ranked',
textCustom: 'Custom', textCustom: 'Custom',
textBold: 'Bold', textBold: 'Bold',
textItalic: 'Italic', textItalic: 'Italic',

87
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1945,32 +1945,50 @@ define([
this.btnCondFormat.setMenu( new Common.UI.Menu({ this.btnCondFormat.setMenu( new Common.UI.Menu({
items: [ items: [
{ {
caption : Common.define.conditionalData.textGreater, caption : Common.define.conditionalData.textValue,
type : Asc.c_oAscCFType.cellIs, menu : new Common.UI.Menu({
value : Asc.c_oAscCFOperator.greaterThan menuAlign : 'tl-tr',
items: [
{ caption : Common.define.conditionalData.textGreater, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.greaterThan },
{ caption : Common.define.conditionalData.textGreaterEq, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.greaterThanOrEqual },
{ caption : Common.define.conditionalData.textLess, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.lessThan },
{ caption : Common.define.conditionalData.textLessEq, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.lessThanOrEqual },
{ caption : Common.define.conditionalData.textEqual, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.equal },
{ caption : Common.define.conditionalData.textNotEqual, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.notEqual },
{ caption : Common.define.conditionalData.textBetween, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.between },
{ caption : Common.define.conditionalData.textNotBetween, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.notBetween }
]
})
}, },
{ {
caption : Common.define.conditionalData.textLess, caption : Common.define.conditionalData.textTop + '/' + Common.define.conditionalData.textBottom,
type : Asc.c_oAscCFType.cellIs,
value : Asc.c_oAscCFOperator.lessThan
},
{
caption : Common.define.conditionalData.textEqual,
type : Asc.c_oAscCFType.cellIs,
value : Asc.c_oAscCFOperator.equal
},
{caption: '--'},
{
caption : Common.define.conditionalData.textBetween,
type : Asc.c_oAscCFType.cellIs,
value : Asc.c_oAscCFOperator.between
},
{
caption : this.textTop10,
type : Asc.c_oAscCFType.top10, type : Asc.c_oAscCFType.top10,
value : 0 menu : new Common.UI.Menu({
menuAlign : 'tl-tr',
items: [
{ caption: Common.define.conditionalData.textTop + ' 10', type: Asc.c_oAscCFType.top10, value: 0 },
{ caption: Common.define.conditionalData.textBottom + ' 10', type: Asc.c_oAscCFType.top10, value: 1 }
]
})
},
{
caption: Common.define.conditionalData.textAverage,
menu: new Common.UI.Menu({
menuAlign : 'tl-tr',
items: [
{ caption: Common.define.conditionalData.textAbove, type: Asc.c_oAscCFType.aboveAverage, value: 0},
{ caption: Common.define.conditionalData.textBelow, type: Asc.c_oAscCFType.aboveAverage, value: 1},
{ caption: Common.define.conditionalData.textEqAbove, type: Asc.c_oAscCFType.aboveAverage, value: 2},
{ caption: Common.define.conditionalData.textEqBelow, type: Asc.c_oAscCFType.aboveAverage,value: 3},
{ caption: Common.define.conditionalData.text1Above, type: Asc.c_oAscCFType.aboveAverage, value: 4},
{ caption: Common.define.conditionalData.text1Below, type: Asc.c_oAscCFType.aboveAverage, value: 5},
{ caption: Common.define.conditionalData.text2Above, type: Asc.c_oAscCFType.aboveAverage, value: 6},
{ caption: Common.define.conditionalData.text2Below, type: Asc.c_oAscCFType.aboveAverage, value: 7},
{ caption: Common.define.conditionalData.text3Above, type: Asc.c_oAscCFType.aboveAverage, value: 8},
{ caption: Common.define.conditionalData.text3Below, type: Asc.c_oAscCFType.aboveAverage, value: 9}
]
})
}, },
{caption: '--'},
{ {
caption : Common.define.conditionalData.textText, caption : Common.define.conditionalData.textText,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -1983,7 +2001,6 @@ define([
] ]
}) })
}, },
{caption: '--'},
{ {
caption : Common.define.conditionalData.textDate, caption : Common.define.conditionalData.textDate,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -2002,14 +2019,27 @@ define([
] ]
}) })
}, },
{caption: '--'},
{ {
caption : Common.define.conditionalData.textBlank, caption: Common.define.conditionalData.textBlank + '/' + Common.define.conditionalData.textError,
type : Asc.c_oAscCFType.containsBlanks menu : new Common.UI.Menu({
menuAlign : 'tl-tr',
items: [
{ caption: Common.define.conditionalData.textBlanks, type: Asc.c_oAscCFType.containsBlanks },
{ caption: Common.define.conditionalData.textNotBlanks,type: Asc.c_oAscCFType.notContainsBlanks },
{ caption: Common.define.conditionalData.textErrors, type: Asc.c_oAscCFType.containsErrors },
{ caption: Common.define.conditionalData.textNotErrors,type: Asc.c_oAscCFType.notContainsErrors }
]
})
}, },
{ {
caption : Common.define.conditionalData.textDuplicate, caption: Common.define.conditionalData.textDuplicate + '/' + Common.define.conditionalData.textUnique,
type : Asc.c_oAscCFType.duplicateValues menu : new Common.UI.Menu({
menuAlign : 'tl-tr',
items: [
{ caption: Common.define.conditionalData.textDuplicate, type: Asc.c_oAscCFType.duplicateValues },
{ caption: Common.define.conditionalData.textUnique, type: Asc.c_oAscCFType.uniqueValues }
]
})
}, },
{caption: '--'}, {caption: '--'},
this.mnuDataBars = new Common.UI.MenuItem({ this.mnuDataBars = new Common.UI.MenuItem({
@ -2600,7 +2630,6 @@ define([
tipPrintTitles: 'Print titles', tipPrintTitles: 'Print titles',
capBtnColorSchemas: 'Color Scheme', capBtnColorSchemas: 'Color Scheme',
tipCondFormat: 'Conditional formatting', tipCondFormat: 'Conditional formatting',
textTop10: 'Top 10',
textDataBars: 'Data Bars', textDataBars: 'Data Bars',
textColorScales: 'Color Scales', textColorScales: 'Color Scales',
textNewRule: 'New Rule', textNewRule: 'New Rule',

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

@ -98,6 +98,7 @@
"Common.define.conditionalData.textTop": "Top", "Common.define.conditionalData.textTop": "Top",
"Common.define.conditionalData.textUnique": "Unique", "Common.define.conditionalData.textUnique": "Unique",
"Common.define.conditionalData.textYesterday": "Yesterday", "Common.define.conditionalData.textYesterday": "Yesterday",
"Common.define.conditionalData.textValue": "Value is",
"Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.",
"Common.UI.ColorButton.textAutoColor": "Automatic", "Common.UI.ColorButton.textAutoColor": "Automatic",
"Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ColorButton.textNewColor": "Add New Custom Color",
@ -2073,7 +2074,6 @@
"SSE.Views.FormatRulesEditDlg.textPosition": "Position", "SSE.Views.FormatRulesEditDlg.textPosition": "Position",
"SSE.Views.FormatRulesEditDlg.textPositive": "Positive", "SSE.Views.FormatRulesEditDlg.textPositive": "Positive",
"SSE.Views.FormatRulesEditDlg.textPreview": "Preview", "SSE.Views.FormatRulesEditDlg.textPreview": "Preview",
"SSE.Views.FormatRulesEditDlg.textRanked": "Ranked",
"SSE.Views.FormatRulesEditDlg.textRelativeRef": "You cannot use relative references in conditional formatting criteria for color scales, data bars, and icon sets.", "SSE.Views.FormatRulesEditDlg.textRelativeRef": "You cannot use relative references in conditional formatting criteria for color scales, data bars, and icon sets.",
"SSE.Views.FormatRulesEditDlg.textReverse": "Reverse Icons Order", "SSE.Views.FormatRulesEditDlg.textReverse": "Reverse Icons Order",
"SSE.Views.FormatRulesEditDlg.textRight2Left": "Right to left", "SSE.Views.FormatRulesEditDlg.textRight2Left": "Right to left",
@ -2091,7 +2091,6 @@
"SSE.Views.FormatRulesEditDlg.textSuperscript": "Superscript", "SSE.Views.FormatRulesEditDlg.textSuperscript": "Superscript",
"SSE.Views.FormatRulesEditDlg.textTopBorders": "Top Borders", "SSE.Views.FormatRulesEditDlg.textTopBorders": "Top Borders",
"SSE.Views.FormatRulesEditDlg.textUnderline": "Underline", "SSE.Views.FormatRulesEditDlg.textUnderline": "Underline",
"SSE.Views.FormatRulesEditDlg.textValue": "Value is",
"SSE.Views.FormatRulesEditDlg.tipBorders": "Borders", "SSE.Views.FormatRulesEditDlg.tipBorders": "Borders",
"SSE.Views.FormatRulesEditDlg.tipNumFormat": "Number Format", "SSE.Views.FormatRulesEditDlg.tipNumFormat": "Number Format",
"SSE.Views.FormatRulesEditDlg.txtAccounting": "Accounting", "SSE.Views.FormatRulesEditDlg.txtAccounting": "Accounting",
@ -3104,7 +3103,6 @@
"SSE.Views.Toolbar.textThisSheet": "From this worksheet", "SSE.Views.Toolbar.textThisSheet": "From this worksheet",
"SSE.Views.Toolbar.textThisTable": "From this table", "SSE.Views.Toolbar.textThisTable": "From this table",
"SSE.Views.Toolbar.textTop": "Top: ", "SSE.Views.Toolbar.textTop": "Top: ",
"SSE.Views.Toolbar.textTop10": "Top 10",
"SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textTopBorders": "Top Borders",
"SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textUnderline": "Underline",
"SSE.Views.Toolbar.textVertical": "Vertical Text", "SSE.Views.Toolbar.textVertical": "Vertical Text",