@sapui5/sap.ui.export 1.112.2 → 1.114.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.112.2",
+	"version": "1.114.0",
 	"description": "SAPUI5 Library sap.ui.export",
 	"homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/export/.library

@@ -5,7 +5,7 @@
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
  * (c) Copyright 2009-2023 SAP SE. All rights reserved.</copyright>
-	<version>1.112.2</version>
+	<version>1.114.0</version>
 
 	<documentation>UI5 library: sap.ui.export</documentation>
 

package/src/sap/ui/export/ExportBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class The <code>sap.ui.export.ExportBase</code> class allows you to export table data from a UI5 application to certain formats. This class is an abstract class that requires specific implementations for each file format.
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.ExportBase
@@ -57,6 +57,7 @@ sap.ui.define([
 			/* Pre-process dataSource related settings */
 			if (this._mSettings.workbook) {
 				this._mSettings.workbook.hierarchyLevel = ExportUtils.getHierarchyLevelProperty(mSettings.dataSource);
+				this._mSettings.workbook.drillState = ExportUtils.getHierarchyDrillStateProperty(mSettings.dataSource);
 			}
 		}
 	});

package/src/sap/ui/export/ExportDialog.js

@@ -121,13 +121,14 @@ sap.ui.define([
 	 * @param {number} mParams.columns Amount of columns that will be exported
 	 * @param {boolean} mParams.sizeLimit Indicates whether the size limit warning needs to be shown
 	 * @param {boolean} mParams.cutOff Indicates whether the cut off message needs to be shown
+	 * @param {String} mParams.fileType File type of the exported document
 	 * @returns {Promise} Promise that gets resolved when the user wants to export, regardless of the warning
 	 */
 	function showWarningDialog(mParams) {
 		return new Promise(function(fnResolve, fnReject) {
 
 			oResourceBundlePromise.then(function(oResourceBundle) {
-				var bContinue, oWarningDialog, oWarningText, sWarningText, oNumberFormat, sRowsFormatted;
+				var bContinue, oWarningDialog, oWarningText, sWarningText, oNumberFormat, sRowsFormatted, sCellsFormatted, sCutOffFormatted, sFileTypeText;
 
 				oNumberFormat = NumberFormat.getIntegerInstance({groupingEnabled: true});
 				bContinue = false;
@@ -139,12 +140,15 @@ sap.ui.define([
 					sRowsFormatted = oNumberFormat.format(mParams.rows);
 
 					if (mParams.sizeLimit) {
-						sWarningText = oResourceBundle.getText("SIZE_WARNING_MSG", [sRowsFormatted, mParams.columns]);
+						sCellsFormatted = oNumberFormat.format(mParams.rows * mParams.columns);
+						sWarningText = oResourceBundle.getText("SIZE_WARNING_MSG", [sRowsFormatted, mParams.columns, sCellsFormatted]);
 					}
 
-					if (mParams.cutOff) {
+					if (mParams.rows > mParams.cutOff) {
+						sCutOffFormatted = oNumberFormat.format(mParams.cutOff);
 						sWarningText += sWarningText === '' ? '' : '\n\n'; // Add line breaks if there is already a message
-						sWarningText += oResourceBundle.getText("MSG_WARNING_CUT_OFF", [sRowsFormatted]);
+						sFileTypeText = oResourceBundle.getText(mParams.fileType + "_FILETYPE");
+						sWarningText += oResourceBundle.getText("MSG_WARNING_CUT_OFF", [sRowsFormatted, sCutOffFormatted, sFileTypeText]);
 					}
 				}
 
@@ -152,7 +156,7 @@ sap.ui.define([
 					text: sWarningText
 				});
 				oWarningDialog = new Dialog({
-					title: oResourceBundle.getText('PROGRESS_TITLE'),
+					title: oResourceBundle.getText('WARNING_TITLE'),
 					type: DialogType.Message,
 					state: ValueState.Warning,
 					content: oWarningText,

package/src/sap/ui/export/ExportHandler.js

@@ -15,7 +15,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', 'sap/m/MessageToa
 	 * @class The <code>sap.ui.export.ExportHandler</code> class allows you to export table data from a UI5 application.
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler

package/src/sap/ui/export/ExportUtils.js

@@ -14,8 +14,9 @@ sap.ui.define([
 	'sap/ui/model/resource/ResourceModel',
 	'sap/ui/util/openWindow',
 	'sap/ui/VersionInfo',
-	'sap/ui/core/format/DateFormat'
-], function(library, Log, Core, Fragment, coreLibrary, syncStyleClass, Filter, JSONModel, ResourceModel, openWindow, VersionInfo, DateFormat) {
+	'sap/ui/core/format/DateFormat',
+	"sap/ui/performance/trace/FESRHelper"
+], function(library, Log, Core, Fragment, coreLibrary, syncStyleClass, Filter, JSONModel, ResourceModel, openWindow, VersionInfo, DateFormat, FESRHelper) {
 	'use strict';
 
 	// eslint-disable-next-line
@@ -85,7 +86,8 @@ sap.ui.define([
 			],
 			fontSize: 10,
 			signature: false,
-			signatureReason: ''
+			signatureReason: '',
+			showPageNumber: true
 		};
 
 		aSupportedFormats.forEach(function(sFormat) {
@@ -122,7 +124,7 @@ sap.ui.define([
 	function processExportSettings(oSettings) {
 		var oFinalSettings = {};
 
-		['fileName', 'fileType', 'paperSize', 'orientation', 'splitCells', 'includeFilterSettings', 'addDateTime', 'doEnableAccessibility', 'fitToPage', 'fontSize', 'signature', 'signatureReason', 'pdfArchive', 'destination'].forEach(function(sProperty) {
+		['fileName', 'fileType', 'paperSize', 'orientation', 'splitCells', 'includeFilterSettings', 'addDateTime', 'doEnableAccessibility', 'fitToPage', 'fontSize', 'signature', 'signatureReason', 'pdfArchive', 'destination', 'showPageNumber'].forEach(function(sProperty) {
 			oFinalSettings[sProperty] = oSettings[sProperty];
 		});
 
@@ -133,7 +135,7 @@ sap.ui.define([
 	 * @class Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @since 1.59
 	 * @alias sap.ui.export.ExportUtils
@@ -355,6 +357,10 @@ sap.ui.define([
 					}).then(function(oDialog) {
 						oExportSettingsDialog = oDialog;
 
+						if (oExportCapabilities.PDF && !oExportCapabilities.PDF["HeaderFooter"]) {
+							oExportConfigModel.oData.showPageNumber = false;
+						}
+
 						oExportSettingsDialog.setModel(oExportConfigModel);
 						oExportSettingsDialog.setModel(new ResourceModel({
 							bundle: oResourceBundle
@@ -363,6 +369,10 @@ sap.ui.define([
 						if (oOpener) {
 							syncStyleClass('sapUiSizeCompact', oOpener, oExportSettingsDialog);
 						}
+
+						FESRHelper.setSemanticStepname(oExportSettingsDialog.getBeginButton(), "press", "oi:exp:export");
+						FESRHelper.setSemanticStepname(oExportSettingsDialog.getEndButton(), "press", "oi:exp:cancel");
+
 						oExportSettingsDialog.open();
 
 						if (fnCallback) {
@@ -449,56 +459,76 @@ sap.ui.define([
 		_parseLogical: function(oLogicalFilter) {
 			var aFilters, sProperty;
 
-			/* Breakout behavior for between filter */
-			if (oLogicalFilter.op == '&&'
-				&& oLogicalFilter.left.type === 'Binary'
-				&& oLogicalFilter.right.type === 'Binary'
-				&& oLogicalFilter.left.op === '>='
-				&& oLogicalFilter.right.op === '<='
-				&& oLogicalFilter.left.left.path === oLogicalFilter.right.left.path) {
-
-				return Utils._parseCall({
-					args: [
-						{
-							path: oLogicalFilter.left.left.path,
-							type: 'Reference'
-						},
-						{
-							type: 'Literal',
-							value: oLogicalFilter.left.right.value
-						},
-						{
-							type: 'Literal',
-							value: oLogicalFilter.right.right.value
-						}
-					],
-					name: 'between',
-					type: 'Call'
-				});
-			}
+			try {
+				/*
+				 * BCP 002075129400002076772023
+				 * When too many filters are applied, the
+				 * filter evaluation might fail due to an
+				 * "Maximum call stack size exceeded" error.
+				 * This will be prevented by try-catch and
+				 * still allows to keep existing results.
+				 * Once the error occurs, additional filters
+				 * will be ignored. This only happens for
+				 * Logical filters with OR operator because
+				 * they can lead to an unbalanced filter tree.
+				 * For the unlikely scenario that the failing
+				 * filter is a between filter, this scenario
+				 * is also contained in try-catch.
+				 */
 
-			aFilters = Utils._parseFilter(oLogicalFilter.left).concat(Utils._parseFilter(oLogicalFilter.right));
+				/* Breakout behavior for between filter */
+				if (oLogicalFilter.op == '&&'
+					&& oLogicalFilter.left.type === 'Binary'
+					&& oLogicalFilter.right.type === 'Binary'
+					&& oLogicalFilter.left.op === '>='
+					&& oLogicalFilter.right.op === '<='
+					&& oLogicalFilter.left.left.path === oLogicalFilter.right.left.path) {
+
+					return Utils._parseCall({
+						args: [
+							{
+								path: oLogicalFilter.left.left.path,
+								type: 'Reference'
+							},
+							{
+								type: 'Literal',
+								value: oLogicalFilter.left.right.value
+							},
+							{
+								type: 'Literal',
+								value: oLogicalFilter.right.right.value
+							}
+						],
+						name: 'between',
+						type: 'Call'
+					});
+				}
 
-			/* Group logical OR filter on the same property */
-			if (oLogicalFilter.op === '||' && aFilters.length) {
-				sProperty = aFilters[0].key;
+				aFilters = Utils._parseFilter(oLogicalFilter.left).concat(Utils._parseFilter(oLogicalFilter.right));
 
-				if (aFilters.every(function(item) { return item.key === sProperty; })) {
-					aFilters = [
-						{
-							key: sProperty,
-							value: aFilters.reduce(function(acc, item) {
-								if (Array.isArray(item.value)) {
-									return acc.concat(item.value);
-								}
+				/* Group logical OR filter on the same property */
+				if (oLogicalFilter.op === '||' && aFilters.length) {
+					sProperty = aFilters[0].key;
 
-								acc.push(item.value);
+					if (aFilters.every(function(item) { return item.key === sProperty; })) {
+						aFilters = [
+							{
+								key: sProperty,
+								value: aFilters.reduce(function(acc, item) {
+									if (Array.isArray(item.value)) {
+										return acc.concat(item.value);
+									}
 
-								return acc;
-							}, [])
-						}
-					];
+									acc.push(item.value);
+
+									return acc;
+								}, [])
+							}
+						];
+					}
 				}
+			} catch (oError) {
+				aFilters = [];
 			}
 
 			return aFilters;
@@ -1138,7 +1168,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oContext Context object
 		 * @param {string} [oContext.application] Name of the application (default: "SAP UI5")
-		 * @param {string} [oContext.version] Application version (default: "1.112.2")
+		 * @param {string} [oContext.version] Application version (default: "1.114.0")
 		 * @param {string} [oContext.title] Title that will be written to the file (NOT the filename)
 		 * @param {string} [oContext.modifiedBy] Optional user context that will be written to the file
 		 * @param {string} [oContext.sheetName] Name of the data sheet - Maximum length of 31 characters
@@ -1344,10 +1374,10 @@ sap.ui.define([
 		},
 
 		/**
-		 * Returns the "hierarchy-level-for" annotated property of the bound entity.
+		 * Returns the "hierarchy-level-for" / "DistanceFromRootProperty" annotated property of the bound entity.
 		 *
 		 * @param {sap.ui.model.odata.v2.ODataTreeBinding|sap.ui.model.odata.v4.ODataListBinding} oBinding Binding that is used to evaluate the property name
-		 * @returns {string|undefined} Name of the property which is annotated with "hierarchy-level-for"
+		 * @returns {string|undefined} Name of the property which is annotated with "hierarchy-level-for" or "DistanceFromRootProperty"
 		 *
 		 * @static
 		 * @private
@@ -1365,7 +1395,34 @@ sap.ui.define([
 
 			if (oBinding.isA('sap.ui.model.odata.v4.ODataListBinding')) {
 				var oAggregationInfo = oBinding.getAggregation(/*bVerbose*/true);
-				return oAggregationInfo ? oAggregationInfo.$DistanceFromRootProperty : undefined;
+				return oAggregationInfo && oAggregationInfo.$DistanceFromRootProperty;
+			}
+
+			return undefined;
+		},
+
+		/**
+		 * Returns the "hierarchy-drill-state-for" / "DrillStateProperty" annotated property of the bound entity.
+		 *
+		 * @param {sap.ui.model.odata.v2.ODataTreeBinding|sap.ui.model.odata.v4.ODataListBinding} oBinding Binding that is used to evaluate the property name
+		 * @returns {string|undefined} Name of the property which is annotated with "hierarchy-drill-state-for" or "DrillStateProperty"
+		 *
+		 * @static
+		 * @private
+		 */
+		getHierarchyDrillStateProperty: function(oBinding) {
+			if (!oBinding || typeof oBinding.isA !== 'function') {
+				return undefined;
+			}
+
+			/* Check for ODataTreeBinding#getTreeAnnotation since this is not a public function */
+			if (oBinding.isA('sap.ui.model.odata.v2.ODataTreeBinding') && typeof oBinding.getTreeAnnotation === 'function') {
+				return oBinding.getTreeAnnotation('hierarchy-drill-state-for');
+			}
+
+			if (oBinding.isA('sap.ui.model.odata.v4.ODataListBinding')) {
+				var oAggregationInfo = oBinding.getAggregation(/*bVerbose*/true);
+				return oAggregationInfo && oAggregationInfo.$DrillStateProperty;
 			}
 
 			return undefined;

package/src/sap/ui/export/PortableDocument.js

@@ -8,16 +8,20 @@ sap.ui.define([
 	'sap/ui/core/Core',
 	'sap/ui/export/ExportBase',
 	'sap/ui/export/ExportUtils',
+	'sap/ui/export/library',
 	'sap/ui/model/odata/v4/ODataModel',
-	'./ExportDialog'
-], function(Log, Core, ExportBase, ExportUtils, ODataModel, ExportDialog) {
+	'./ExportDialog',
+	'sap/m/BusyDialog'
+], function(Log, Core, ExportBase, ExportUtils, Library, ODataModel, ExportDialog, BusyDialog) {
 	'use strict';
 
+	var FileType = Library.FileType;
+
 	/**
 	 * @class The <code>sap.ui.export.PortableDocument</code> class allows you to export table data from a UI5 application to a Portable Document Format (*.PDF) file.
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument
@@ -30,7 +34,7 @@ sap.ui.define([
 			ExportBase.call(this, mSettings, mCapabilities);
 
 			/* Only apply supported properties */
-			['paperSize', 'orientation', 'font', 'fontSize', 'doEnableAccessibility', 'fitToPage', 'signature', 'signatureReason', 'pdfArchive'].forEach(function(sProperty) {
+			['paperSize', 'orientation', 'font', 'fontSize', 'doEnableAccessibility', 'fitToPage', 'signature', 'signatureReason', 'pdfArchive', 'showPageNumber'].forEach(function(sProperty) {
 				if (typeof mSettings[sProperty] !== 'undefined') {
 					this._mSettings[sProperty] = mSettings[sProperty];
 				}
@@ -114,7 +118,8 @@ sap.ui.define([
 				version: bV4ODataModel ? 4 : 2,
 				dataUrl: oDataUrl.toString(),
 				serviceUrl: this._resolveServiceUrl(sServiceUrl),
-				headers: bV4ODataModel ?  oModel.getHttpHeaders(true) : oModel.getHeaders()
+				headers: bV4ODataModel ?  oModel.getHttpHeaders(true) : oModel.getHeaders(),
+				count: ExportUtils.getCountFromBinding(oBinding)
 			};
 		}
 
@@ -186,13 +191,21 @@ sap.ui.define([
 			"TableColumns": []
 		};
 
-		if (oWorkbook.hierarchyLevel && oWorkbook.drillState && window.location.href.includes('sap-ui-xx-enable-tree-export')) {
+		if (oWorkbook.hierarchyLevel && oWorkbook.drillState) {
 			oDocumentDescription.Hierarchy = {
 				"DistanceFromRootElement": oWorkbook.hierarchyLevel,
 				"DrillStateElement": oWorkbook.drillState
 			};
 		}
 
+		if (mSettings.showPageNumber) {
+			oDocumentDescription["Footer"] = {
+				"Center": {
+					"Type": "PAGENUM"
+				}
+			};
+		}
+
 		oMetaInfo = oWorkbook.context.metainfo;
 
 		/* Add metaInfo to CoverPage */
@@ -282,6 +295,61 @@ sap.ui.define([
 		}) : this._oModel;
 	};
 
+	/**
+	 * Shows a warning dialog that the exported file might get cut off.
+	 * If the count is less than the ResultSizeMaximum of the PDF capabilities,
+	 * no dialog will be shown and the export will proceed automatically.
+	 *
+	 * @param {object} mSettings Export configuration object
+	 * @returns {Promise} Promise that gets resolved if the requirements
+	 * for the warning are not met or if the user decides to proceed.
+	 * When the user cancels the export, the Promise will reject.
+	 *
+	 * @private
+	 */
+	PortableDocument.prototype._showWarning = function(mSettings) {
+		var mParams, oWarningPromise;
+
+		mParams = {
+			rows: mSettings.dataSource.count,
+			cutOff: this._mCapabilities.ResultSizeMax,
+			fileType: FileType.PDF
+		};
+
+		oWarningPromise = Promise.resolve();
+
+		if (mParams.rows > mParams.cutOff) {
+			oWarningPromise = ExportDialog.showWarningDialog(mParams);
+		}
+
+		return oWarningPromise;
+	};
+
+	/**
+	 * Adds the ResultSizeMaximum from the com.sap.vocabularies.PDF.v1.Features
+	 * annotation as $top to the data URL. If this property is not available on
+	 * the annotation or its value is not a number, it will be ignored.
+	 *
+	 * @param {string} sUrl Data URL that is used to request the PDF document
+	 * @returns {string} The modified data URL that contains $top. The value of $top is
+	 * based on the ResultSizeMaximum of the com.sap.vocabularies.PDF.v1.Features
+	 * annotation.
+	 */
+	PortableDocument.prototype._applyResultSize = function(sUrl) {
+		var iLimit, mDataUrl;
+
+		iLimit = parseInt(this._mCapabilities.ResultSizeMaximum);
+
+		if (!isNaN(iLimit) && iLimit > 0) {
+
+			mDataUrl = new URL(sUrl);
+			mDataUrl.search += '&$top=' + iLimit;
+			sUrl = mDataUrl.toString();
+		}
+
+		return sUrl;
+	};
+
 	/**
 	 * Applies default settings to the export configuration.
 	 *
@@ -377,7 +445,7 @@ sap.ui.define([
 		var oBusyDialog;
 		var oResourceBundle = Core.getLibraryResourceBundle('sap.ui.export');
 
-		oBusyDialog = new sap.m.BusyDialog('PDFExportBusyDialog', {
+		oBusyDialog = new BusyDialog('PDFExportBusyDialog', {
 			title: oResourceBundle.getText('PROGRESS_TITLE'),
 			text: oResourceBundle.getText('PDF_GENERATION_IN_PROGRESS'),
 			showCancelButton: true,
@@ -394,31 +462,27 @@ sap.ui.define([
 		oDocumentDescription = that._createDocumentDescription(mSettings);
 		oBusyDialog.open();
 
-		return that.postDocumentDescription(oDocumentDescription, mSettings.dataSource).then(function(sDocumentDescriptionId) {
-			/*
-			 * Keep reference to oBusyDialog to prevent further processing if the user has canceled the export
-			 * while the DocumentDescription was sent to the backend via POST. There is no dedicated option to
-			 * cancel a request via the binding API.
-			 */
-			return oBusyDialog && that.sendRequest(mSettings.dataSource.dataUrl, sDocumentDescriptionId).then(function(response) {
-				ExportUtils.saveAsFile(response, mSettings.fileName);
-			}).catch(function(oError) {
-
-				/* Handle ignore Promise rejection due to cancelation by the user */
-				if (oError === null) {
-					return;
-				}
+		return this._showWarning(mSettings).then(function() {
+			return that.postDocumentDescription(oDocumentDescription, mSettings.dataSource);
+		}).then(function(sDocumentDescriptionId) {
+			return oBusyDialog && that.sendRequest(mSettings.dataSource.dataUrl, sDocumentDescriptionId);
+		}).then(function(response) {
+			ExportUtils.saveAsFile(response, mSettings.fileName);
+		}).catch(function(oError) {
+			/* Handle ignore Promise rejection due to cancellation by the user */
+			if (!oError) {
+				return;
+			}
 
-				oError.text()
-					.then(function(sError) {
-						ExportDialog.showErrorMessage(sError);
-					})
-					.catch(function() {
-						ExportDialog.showErrorMessage(oResourceBundle.getText('PDF_GENERIC_ERROR'));
-					});
-			}).finally(function() {
-				oBusyDialog && oBusyDialog.close();
-			});
+			oError.text()
+				.then(function(sError) {
+					ExportDialog.showErrorMessage(sError);
+				})
+				.catch(function() {
+					ExportDialog.showErrorMessage(oResourceBundle.getText('PDF_GENERIC_ERROR'));
+				});
+		}).finally(function() {
+			oBusyDialog && oBusyDialog.close();
 		});
 	};
 
@@ -432,6 +496,8 @@ sap.ui.define([
 	 * @private
 	 */
 	PortableDocument.prototype.sendRequest = function(sUrl, sDocumentDescriptionId) {
+		sUrl = this._applyResultSize(sUrl);
+
 		return new Promise(function(fnResolve, fnReject) {
 			var oXHR = this.request = new XMLHttpRequest();
 
@@ -505,4 +571,4 @@ sap.ui.define([
 	};
 
 	return PortableDocument;
-});
+});

package/src/sap/ui/export/Spreadsheet.js

@@ -10,9 +10,10 @@ sap.ui.define([
 		'sap/ui/Device',
 		'sap/ui/export/SpreadsheetExport',
 		'sap/base/Log',
-		'sap/ui/export/ExportUtils'
+		'sap/ui/export/ExportUtils',
+		'sap/ui/export/library'
 	],
-	function(Core, ExportDialog, ExportBase, Device, SpreadsheetExport, Log, ExportUtils) {
+	function(Core, ExportDialog, ExportBase, Device, SpreadsheetExport, Log, ExportUtils, Library) {
 		'use strict';
 
 		// eslint-disable-next-line
@@ -83,7 +84,7 @@ sap.ui.define([
 		 *      <li><code>workbook.context</code> - Context object that will be applied to the generated file. It may contain the following fields:</li>
 		 *      <ul>
 		 *          <li><code>application</code> (string) - The application that creates the XLSX document (default: "SAP UI5")</li>
-		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.112.2")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.114.0")</li>
 		 *          <li><code>title</code> (string) - Title of the XLSX document (NOT the filename)</li>
 		 *          <li><code>modifiedBy</code> (string) - User context for the XLSX document</li>
 		 *          <li><code>sheetName</code> (string) - The label of the data sheet</li>
@@ -166,7 +167,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.112.2',
+		 *         version: '1.114.0',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -278,7 +279,7 @@ sap.ui.define([
 		 * @class The <code>sap.ui.export.Spreadsheet</code> class allows you to export table data from a UI5 application to a spreadsheet file.
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.114.0
 		 *
 		 * @since 1.50
 		 * @alias sap.ui.export.Spreadsheet
@@ -752,15 +753,14 @@ sap.ui.define([
 						rows: nRows,
 						columns: nColumns,
 						sizeLimit: nRows * nColumns > nSizeLimit,
-						cutOff: nRows >= MAX_ROWS
+						cutOff: MAX_ROWS,
+						fileType: Library.FileType.XLSX
 					};
 
 					// Show warning and execute
 					ExportDialog.showWarningDialog(oDialogSettings)
 						.then(startExport)
-						.catch(function() {
-							fnReject('Export cancelled by the user.');
-						});
+						.catch(fnReject);
 				} else {
 					startExport();
 				}

package/src/sap/ui/export/SpreadsheetExport.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 	 * Utility class to perform spreadsheet export.
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @alias sap.ui.export.SpreadsheetExport
 	 * @private

package/src/sap/ui/export/fragments/SettingsDialog.fragment.xml

@@ -48,6 +48,8 @@
 
 			<Label id="exportSettingsDialog-signatureReasonLabel" text="{i18n>SIGNATURE_REASON}" labelFor="exportSettingsDialog-signatureReason" visible="{/signature}"/>
 			<Input id="exportSettingsDialog-signatureReason" value="{/signatureReason}" class="sapUiTinyMarginBottom" visible="{/signature}"/>
+
+			<CheckBox id="exportSettingsDialog-showPageNumber" enabled="{/capabilities/PDF/HeaderFooter}" selected="{/showPageNumber}" text="{i18n>SHOW_PAGENUM}" tooltip="{i18n>TOOLTIP_PDF_PAGENUMBER}" visible="{path:'/fileType', formatter: '.isPDF'}"/>
 		</VBox>
 	</content>
 	<beginButton>