pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE SSE] for bug 75335

Browse Source
This commit is contained in:
Alexey Koshelev
2025-06-18 22:51:36 +03:00
parent 04e89e27c3
commit c8fad1b22d
4 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/presentationeditor/main/app/controller/Print.js
View File

@ -332,13 +332,14 @@ define([
var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
var printerOption = this.printSettings.cmbPrinter.getSelectedRecord();
var size = rec ? rec.size : this._paperSize;
this.adjPrintParams.asc_setNativeOptions({
usesystemdialog: useSystemDialog,
printer: printerOption ? printerOption.value : null,
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
paperSize: {
w: rec ? rec.size[0] : undefined,
h: rec ? rec.size[1] : undefined,
w: size ? size[0] : undefined,
h: size ? size[1] : undefined,
preset: rec ? rec.caption : undefined
},
copies: this.printSettings.spnCopies.getNumberValue() || 1,
@ -370,6 +371,7 @@ define([
onPaperSizeSelect: function(combo, record) {
if (record) {
this._paperSize = record.size;
this.printSettings.setOriginalPageSize(record.size[0], record.size[1]);
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
}
},

70
apps/presentationeditor/main/app/view/FileMenuPanels.js
View File

@ -2189,6 +2189,7 @@ define([], function () {
];
this._initSettings = true;
this._originalPageSize = undefined;
},
render: function(node) {
@ -2328,16 +2329,21 @@ define([], function () {
dataHint: '2',
dataHintDirection: 'bottom',
dataHintOffset: 'big',
updateFormControl: function (record){
updateFormControl: function (record, customValue){
var formcontrol = $(this.el).find('.form-control');
if (record) {
if (!Common.UI.isRTL()) {
formcontrol[0].innerHTML = record.get('displayValue')[0] + ' (' + record.get('displayValue')[1] + ' ' + record.get('displayValue')[3] + ' x ' +
record.get('displayValue')[2] + ' ' + record.get('displayValue')[3] + ')';
if (record || customValue) {
var displayValue = customValue ? customValue : record.get('displayValue');
if (typeof displayValue === 'string') {
formcontrol[0].innerHTML = displayValue;
} else {
formcontrol[0].innerHTML = '<span dir="ltr">(<span dir="rtl">' + record.get("displayValue")[2] + ' ' + record.get('displayValue')[3] + '</span>' +
'<span> x </span>' + '<span dir="rtl">' + record.get('displayValue')[1] + ' ' + record.get('displayValue')[3] + '</span>)' +
'<span> ' + record.get('displayValue')[0] + '</span></span>';
if (!Common.UI.isRTL()) {
formcontrol[0].innerHTML = displayValue[0] + ' (' + displayValue[1] + ' ' + displayValue[3] + ' x ' +
displayValue[2] + ' ' + displayValue[3] + ')';
} else {
formcontrol[0].innerHTML = '<span dir="ltr">(<span dir="rtl">' + displayValue[2] + ' ' + displayValue[3] + '</span>' +
'<span> x </span>' + '<span dir="rtl">' + displayValue[1] + ' ' + displayValue[3] + '</span>)' +
'<span> ' + displayValue[0] + '</span></span>';
}
}
} else
formcontrol[0].innerHTML = '';
@ -2515,21 +2521,51 @@ define([], function () {
);
}
// If no matching option is found, look for the default size 210x297 (A4)
if (!newSelectedOption) {
newSelectedOption = findOptionBySize(resultList, 210, 297);
if(prevSelectedOption) {
newSelectedOption = {
custom: true,
value: [
this.txtCustom,
parseFloat(Common.Utils.Metric.fnRecalcFromMM(prevSelectedOption.get('size')[0]).toFixed(2)),
parseFloat(Common.Utils.Metric.fnRecalcFromMM(prevSelectedOption.get('size')[1]).toFixed(2)),
Common.Utils.Metric.getCurrentMetricName()
]
}
} else {
const _w = this._originalPageSize ? this._originalPageSize.w : 210,
_h = this._originalPageSize ? this._originalPageSize.h : 297;
// If no matching option is found, look for the default size 210x297 (A4)
if (!newSelectedOption) {
newSelectedOption = findOptionBySize(resultList, _w, _h);
}
if (!newSelectedOption) {
newSelectedOption = {
custom: true,
value: [
this.txtCustom,
parseFloat(Common.Utils.Metric.fnRecalcFromMM(_w).toFixed(2)),
parseFloat(Common.Utils.Metric.fnRecalcFromMM(_h).toFixed(2)),
Common.Utils.Metric.getCurrentMetricName()
]
};
}
if (!newSelectedOption && resultList[0]) {
newSelectedOption = resultList[0];
}
}
}
if (!newSelectedOption && resultList[0]) {
newSelectedOption = resultList[0];
}
this.cmbPaperSize.setData(resultList);
this.updatePaperSizeMetricUnit();
if (!newSelectedOption) {
this.cmbPaperSize.setValue(null);
} else if (newSelectedOption.custom) {
this.cmbPaperSize.setValue(undefined, newSelectedOption.value);
} else {
this.cmbPaperSize.setValue(newSelectedOption.value);
this.cmbPaperSize.trigger('selected', this, this.cmbPaperSize.getSelectedRecord());
}
},
@ -2611,6 +2647,11 @@ define([], function () {
this.fireEvent('openheader', this);
},
setOriginalPageSize: function (w, h) {
this._originalPageSize = {w: w, h: h};
},
txtPrint: 'Print',
txtPrintPdf: 'Print to PDF',
txtPrinter: 'Printer',
@ -2620,6 +2661,7 @@ define([], function () {
txtPrintRange: 'Print range',
txtCurrentPage: 'Current slide',
txtAllPages: 'All slides',
txtCustom: 'Custom',
txtCustomPages: 'Custom print',
txtPage: 'Slide',
txtOf: 'of {0}',

2
apps/spreadsheeteditor/main/app/controller/Print.js
View File

@ -220,6 +220,8 @@ define([
var w = opt.asc_getWidth();
var h = opt.asc_getHeight();
panel.setOriginalPageSize(w, h);
var store = panel.cmbPaperSize.store;
item = null;
for (var i=0; i<store.length; i++) {

23
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -2838,6 +2838,7 @@ define([], function () {
];
this._initSettings = true;
this._originalPageSize = undefined;
this.extendedPrintTitles = Common.localStorage.getBool('sse-print-titles-extended', true);
},
@ -3431,10 +3432,25 @@ define([], function () {
]
}
} else {
const _w = this._originalPageSize ? this._originalPageSize.w : 210,
_h = this._originalPageSize ? this._originalPageSize.h : 297;
// If no matching option is found, look for the default size 210x297 (A4)
if (!newSelectedOption) {
newSelectedOption = findOptionBySize(resultList, 210, 297);
newSelectedOption = findOptionBySize(resultList, _w, _h);
}
if (!newSelectedOption) {
newSelectedOption = {
custom: true,
value: [
this.txtCustom,
parseFloat(Common.Utils.Metric.fnRecalcFromMM(_w).toFixed(2)),
parseFloat(Common.Utils.Metric.fnRecalcFromMM(_h).toFixed(2)),
Common.Utils.Metric.getCurrentMetricName()
]
};
}
if (!newSelectedOption && resultList[0]) {
newSelectedOption = resultList[0];
}
@ -3449,7 +3465,6 @@ define([], function () {
this.cmbPaperSize.setValue(undefined, newSelectedOption.value);
} else {
this.cmbPaperSize.setValue(newSelectedOption.value);
this.cmbPaperSize.trigger('selected', this, this.cmbPaperSize.getSelectedRecord());
}
},
@ -3595,6 +3610,10 @@ define([], function () {
this.txtNumberPage.setValue(index + 1);
},
setOriginalPageSize: function (w, h) {
this._originalPageSize = {w: w, h: h};
},
expandPrintTitles: function () {
this.extendedPrintTitles = !this.extendedPrintTitles;
this.$printTitlesBlock[this.extendedPrintTitles ? 'removeClass' : 'addClass']('no-expand');