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

[SSE] By bug 59219 (fix min/max/default value, add pages checking)

Browse source
This commit is contained in:
JuliaSvinareva 2022-12-01 21:24:35 +03:00
parent ed909d24b9
commit d1f7e53845
3 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -406,9 +406,16 @@ define([
this.adjPrintParams.asc_setPrintType(printtype); this.adjPrintParams.asc_setPrintType(printtype);
this.adjPrintParams.asc_setPageOptionsMap(this._changedProps); this.adjPrintParams.asc_setPageOptionsMap(this._changedProps);
this.adjPrintParams.asc_setIgnorePrintArea(this.printSettingsDlg.getIgnorePrintArea()); this.adjPrintParams.asc_setIgnorePrintArea(this.printSettingsDlg.getIgnorePrintArea());
this.adjPrintParams.asc_setActiveSheetsArray(SSE.getController('Statusbar').getSelectTabs()); this.adjPrintParams.asc_setActiveSheetsArray(printtype === Asc.c_oAscPrintType.ActiveSheets ? SSE.getController('Statusbar').getSelectTabs() : null);
this.adjPrintParams.asc_setStartPageIndex(this.printSettingsDlg.getPagesFrom() - 1); var pageFrom = this.printSettingsDlg.getPagesFrom(),
this.adjPrintParams.asc_setEndPageIndex(this.printSettingsDlg.getPagesTo() - 1); pageTo = this.printSettingsDlg.getPagesTo();
if (pageFrom > pageTo) {
var t = pageFrom;
pageFrom = pageTo;
pageTo = t;
}
this.adjPrintParams.asc_setStartPageIndex(pageFrom > 0 ? pageFrom - 1 : null);
this.adjPrintParams.asc_setEndPageIndex(pageTo > 0 ? pageTo - 1 : null);
Common.localStorage.setItem("sse-print-settings-range", printtype); Common.localStorage.setItem("sse-print-settings-range", printtype);
if ( this.printSettingsDlg.type=='print' ) { if ( this.printSettingsDlg.type=='print' ) {
@ -444,9 +451,16 @@ define([
this.adjPrintParams.asc_setPrintType(printType); this.adjPrintParams.asc_setPrintType(printType);
this.adjPrintParams.asc_setPageOptionsMap(this._changedProps); this.adjPrintParams.asc_setPageOptionsMap(this._changedProps);
this.adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea()); this.adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea());
this.adjPrintParams.asc_setActiveSheetsArray(SSE.getController('Statusbar').getSelectTabs()); this.adjPrintParams.asc_setActiveSheetsArray(printType === Asc.c_oAscPrintType.ActiveSheets ? SSE.getController('Statusbar').getSelectTabs() : null);
this.adjPrintParams.asc_setStartPageIndex(this.printSettings.getPagesFrom() - 1); var pageFrom = this.printSettings.getPagesFrom(),
this.adjPrintParams.asc_setEndPageIndex(this.printSettings.getPagesTo() - 1); pageTo = this.printSettings.getPagesTo();
if (pageFrom > pageTo) {
var t = pageFrom;
pageFrom = pageTo;
pageTo = t;
}
this.adjPrintParams.asc_setStartPageIndex(pageFrom > 0 ? pageFrom - 1 : null);
this.adjPrintParams.asc_setEndPageIndex(pageTo > 0 ? pageTo - 1 : null);
Common.localStorage.setItem("sse-print-settings-range", printType); Common.localStorage.setItem("sse-print-settings-range", printType);
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
@ -748,7 +762,6 @@ define([
updatePreview: function (needUpdate) { updatePreview: function (needUpdate) {
if (this._isPreviewVisible) { if (this._isPreviewVisible) {
console.log('update preview');
this.printSettings.$previewBox.removeClass('hidden'); this.printSettings.$previewBox.removeClass('hidden');
var adjPrintParams = new Asc.asc_CAdjustPrint(), var adjPrintParams = new Asc.asc_CAdjustPrint(),
@ -756,9 +769,16 @@ define([
adjPrintParams.asc_setPrintType(printType); adjPrintParams.asc_setPrintType(printType);
adjPrintParams.asc_setPageOptionsMap(this._changedProps); adjPrintParams.asc_setPageOptionsMap(this._changedProps);
adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea()); adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea());
adjPrintParams.asc_setActiveSheetsArray(SSE.getController('Statusbar').getSelectTabs()); adjPrintParams.asc_setActiveSheetsArray(printType === Asc.c_oAscPrintType.ActiveSheets ? SSE.getController('Statusbar').getSelectTabs() : null);
adjPrintParams.asc_setStartPageIndex(this.printSettings.getPagesFrom() - 1); var pageFrom = this.printSettings.getPagesFrom(),
adjPrintParams.asc_setEndPageIndex(this.printSettings.getPagesTo() - 1); pageTo = this.printSettings.getPagesTo();
if (pageFrom > pageTo) {
var t = pageFrom;
pageFrom = pageTo;
pageTo = t;
}
adjPrintParams.asc_setStartPageIndex(pageFrom > 0 ? pageFrom - 1 : null);
adjPrintParams.asc_setEndPageIndex(pageTo > 0 ? pageTo - 1 : null);
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(adjPrintParams); opts.asc_setAdvancedOptions(adjPrintParams);

8
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -2399,8 +2399,8 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
step: 1, step: 1,
width: 60, width: 60,
defaultUnit : '', defaultUnit : '',
value: '1', value: '',
maxValue: 1000, maxValue: 1000000,
minValue: 1, minValue: 1,
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
@ -2412,8 +2412,8 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
step: 1, step: 1,
width: 60, width: 60,
defaultUnit : '', defaultUnit : '',
value: '1', value: '',
maxValue: 1000, maxValue: 1000000,
minValue: 1, minValue: 1,
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',

8
apps/spreadsheeteditor/main/app/view/PrintSettings.js
View file

@ -113,8 +113,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
step: 1, step: 1,
width: 60, width: 60,
defaultUnit : '', defaultUnit : '',
value: '1', value: '',
maxValue: 1000, maxValue: 1000000,
minValue: 1, minValue: 1,
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
@ -126,8 +126,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
step: 1, step: 1,
width: 60, width: 60,
defaultUnit : '', defaultUnit : '',
value: '1', value: '',
maxValue: 1000, maxValue: 1000000,
minValue: 1, minValue: 1,
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',