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

[SSE] Fix Bug 46974

Browse source
This commit is contained in:
Julia Radzhabova 2020-11-27 00:25:44 +03:00
parent afd6e76a97
commit 89c68bb64e
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/spreadsheeteditor/main/app/controller/DataTab.js
View file

@ -97,6 +97,7 @@ define([
} }
}); });
Common.NotificationCenter.on('data:remduplicates', _.bind(this.onRemoveDuplicates, this)); Common.NotificationCenter.on('data:remduplicates', _.bind(this.onRemoveDuplicates, this));
Common.NotificationCenter.on('data:sortcustom', _.bind(this.onCustomSort, this));
}, },
SetDisabled: function(state) { SetDisabled: function(state) {

5
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -407,6 +407,10 @@ define([
}, },
onSortCells: function(menu, item) { onSortCells: function(menu, item) {
if (item.value=='advanced') {
Common.NotificationCenter.trigger('data:sortcustom', this);
return;
}
if (this.api) { if (this.api) {
var res = this.api.asc_sortCellsRangeExpand(); var res = this.api.asc_sortCellsRangeExpand();
if (res) { if (res) {
@ -1875,6 +1879,7 @@ define([
documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu) && !iscelledit); documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu) && !iscelledit);
documentHolder.pmiSortCells.menu.items[2].setVisible(!internaleditor); documentHolder.pmiSortCells.menu.items[2].setVisible(!internaleditor);
documentHolder.pmiSortCells.menu.items[3].setVisible(!internaleditor); documentHolder.pmiSortCells.menu.items[3].setVisible(!internaleditor);
documentHolder.pmiSortCells.menu.items[4].setVisible(!internaleditor);
documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor); documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor);
documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor); documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor);
documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit); documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit);

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

@ -305,6 +305,9 @@ define([
},{ },{
caption : me.txtSortFontColor, caption : me.txtSortFontColor,
value : Asc.c_oAscSortOptions.ByColorFont value : Asc.c_oAscSortOptions.ByColorFont
},{
caption : me.txtCustomSort,
value : 'advanced'
} }
] ]
}) })
@ -1210,7 +1213,8 @@ define([
textSum: 'Sum', textSum: 'Sum',
textStdDev: 'StdDev', textStdDev: 'StdDev',
textVar: 'Var', textVar: 'Var',
textMore: 'More functions' textMore: 'More functions',
txtCustomSort: 'Custom sort'
}, SSE.Views.DocumentHolder || {})); }, SSE.Views.DocumentHolder || {}));
}); });

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

@ -1602,6 +1602,7 @@
"SSE.Views.DocumentHolder.textMax": "Max", "SSE.Views.DocumentHolder.textMax": "Max",
"SSE.Views.DocumentHolder.textMin": "Min", "SSE.Views.DocumentHolder.textMin": "Min",
"SSE.Views.DocumentHolder.textMore": "More functions", "SSE.Views.DocumentHolder.textMore": "More functions",
"SSE.Views.DocumentHolder.txtCustomSort": "Custom sort",
"SSE.Views.DocumentHolder.textMoreFormats": "More formats", "SSE.Views.DocumentHolder.textMoreFormats": "More formats",
"SSE.Views.DocumentHolder.textNone": "None", "SSE.Views.DocumentHolder.textNone": "None",
"SSE.Views.DocumentHolder.textReplace": "Replace image", "SSE.Views.DocumentHolder.textReplace": "Replace image",