From 2f2d38d22adf9fa6ab7406fee25a766cd8f907a2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Mar 2020 15:09:39 +0300 Subject: [PATCH] [SSE] Fix print titles --- .../main/app/controller/Print.js | 22 +++++++++---------- .../main/app/view/PrintTitlesDialog.js | 12 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index ac0876c32..0c2bdca51 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -111,7 +111,7 @@ define([ }, comboSheetsChange: function(panel, combo, record) { - this.fillPageOptions(panel, this._changedProps[record.value] ? this._changedProps[record.value] : this.api.asc_getPageOptions(record.value), record.value); + this.fillPageOptions(panel, this._changedProps[record.value] ? this._changedProps[record.value] : this.api.asc_getPageOptions(record.value, true), record.value); }, fillPageOptions: function(panel, props, sheet) { @@ -159,12 +159,12 @@ define([ panel.chPrintGrid.setValue(props.asc_getGridLines(), true); panel.chPrintRows.setValue(props.asc_getHeadings(), true); - var value = props.asc_getPrintTitlesWidth(); + var value = props.asc_getPrintTitlesHeight(); panel.txtRangeTop.setValue((value) ? value : ''); panel.txtRangeTop.checkValidate(); panel.dataRangeTop = value; - value = props.asc_getPrintTitlesHeight(); + value = props.asc_getPrintTitlesWidth(); panel.txtRangeLeft.setValue((value) ? value : ''); panel.txtRangeLeft.checkValidate(); panel.dataRangeLeft = value; @@ -228,11 +228,11 @@ define([ props.asc_setPageMargins(opt); - var check = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, panel.txtRangeTop.getValue(), false) !== Asc.c_oAscError.ID.DataRangeError; - props.asc_setPrintTitlesWidth(check ? panel.txtRangeTop.getValue() : panel.dataRangeTop); + var check = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, panel.txtRangeTop.getValue(), false) !== Asc.c_oAscError.ID.DataRangeError; + props.asc_setPrintTitlesHeight(check ? panel.txtRangeTop.getValue() : panel.dataRangeTop); - check = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, panel.txtRangeLeft.getValue(), false) !== Asc.c_oAscError.ID.DataRangeError; - props.asc_setPrintTitlesHeight(check ? panel.txtRangeLeft.getValue() : panel.dataRangeLeft); + check = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, panel.txtRangeLeft.getValue(), false) !== Asc.c_oAscError.ID.DataRangeError; + props.asc_setPrintTitlesWidth(check ? panel.txtRangeLeft.getValue() : panel.dataRangeLeft); return props; }, @@ -383,7 +383,7 @@ define([ propertyChange: function(panel, scale, combo, record) { if (scale === 'scale' && record.value === 'customoptions') { var me = this, - props = (me._changedProps.length > 0 && me._changedProps[panel.cmbSheet.getValue()]) ? me._changedProps[panel.cmbSheet.getValue()] : me.api.asc_getPageOptions(panel.cmbSheet.getValue()); + props = (me._changedProps.length > 0 && me._changedProps[panel.cmbSheet.getValue()]) ? me._changedProps[panel.cmbSheet.getValue()] : me.api.asc_getPageOptions(panel.cmbSheet.getValue(), true); var win = new SSE.Views.ScaleDialog({ api: me.api, props: props, @@ -439,7 +439,7 @@ define([ if (_.isEmpty(value)) { return true; } - var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, value, false); + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, value, false); return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; }; panel.txtRangeLeft.validation = function(value) { @@ -447,7 +447,7 @@ define([ if (_.isEmpty(value)) { return true; } - var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, value, false); + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, value, false); return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; }; var data = ((selectdata) ? [{caption: this.textSelectRange, value: 'select'}] : []).concat([ @@ -503,7 +503,7 @@ define([ win.setSettings({ api : me.api, range : (!_.isEmpty(txtRange.getValue()) && (txtRange.checkValidate()==true)) ? txtRange.getValue() : ((type=='top') ? panel.dataRangeTop : panel.dataRangeLeft), - type : Asc.c_oAscSelectionDialogType.Chart + type : Asc.c_oAscSelectionDialogType.PrintTitles }); } } else { diff --git a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js index d779139f3..3bc77a06e 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js @@ -129,7 +129,7 @@ define([ if (_.isEmpty(value)) { return true; } - var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, value, false); + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, value, false); return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; } }); @@ -164,7 +164,7 @@ define([ if (_.isEmpty(value)) { return true; } - var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, value, false); + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, value, false); return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; } }); @@ -198,11 +198,11 @@ define([ }, isRangeValid: function() { - if (this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, this.txtRangeTop.getValue(), false) == Asc.c_oAscError.ID.DataRangeError) { + if (this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, this.txtRangeTop.getValue(), false) == Asc.c_oAscError.ID.DataRangeError) { this.txtRangeTop.cmpEl.find('input').focus(); return false; } - if (this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.None, this.txtRangeLeft.getValue(), false) == Asc.c_oAscError.ID.DataRangeError) { + if (this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.PrintTitles, this.txtRangeLeft.getValue(), false) == Asc.c_oAscError.ID.DataRangeError) { this.txtRangeLeft.cmpEl.find('input').focus(); return false; } @@ -244,7 +244,7 @@ define([ }, getSettings: function() { - return {width: this.txtRangeTop.getValue(), height: this.txtRangeLeft.getValue()}; + return {width: this.txtRangeLeft.getValue(), height: this.txtRangeTop.getValue()}; }, onPresetSelect: function(type, menu, item) { @@ -276,7 +276,7 @@ define([ win.setSettings({ api : me.api, range : (!_.isEmpty(txtRange.getValue()) && (txtRange.checkValidate()==true)) ? txtRange.getValue() : ((type=='top') ? me.dataRangeTop : me.dataRangeLeft), - type : Asc.c_oAscSelectionDialogType.Chart + type : Asc.c_oAscSelectionDialogType.PrintTitles }); } } else {