@sapui5/sap.ui.export 1.98.0 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.98.0",
+	"version": "1.99.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-2022 SAP SE. All rights reserved.</copyright>
-	<version>1.98.0</version>
+	<version>1.99.0</version>
 
 	<documentation>UI5 library: sap.ui.export</documentation>
 

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @constructor The <code>sap.ui.export.ExportBase</code> class allows you to export table data from a UI5 application to a Portable Document Format (*.PDF) file.
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @since 1.96
 	 * @name sap.ui.export.ExportBase

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

@@ -3,33 +3,23 @@
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define([
-	'sap/ui/core/library',
-	'sap/m/library',
 	'./library',
-	'sap/ui/core/Core',
 	'sap/base/Log',
-	'sap/base/util/uid',
-	'sap/ui/core/Item',
+	'sap/ui/core/Core',
+	'sap/ui/core/Fragment',
+	'sap/ui/core/library',
 	'sap/ui/core/syncStyleClass',
 	'sap/ui/model/json/JSONModel',
-	'sap/m/Button',
-	'sap/m/CheckBox',
-	'sap/m/Dialog',
-	'sap/m/Input',
-	'sap/m/Label',
-	'sap/m/Select',
-	'sap/m/Text',
-	'sap/m/VBox',
-	'sap/ui/VersionInfo',
-	'sap/ui/util/openWindow'
-], function(coreLibrary, mLibrary, library, Core, Log, uid, Item, syncStyleClass, JSONModel, Button, CheckBox, Dialog, Input, Label, Select, Text, VBox, VersionInfo, openWindow) {
+	'sap/ui/model/resource/ResourceModel',
+	'sap/ui/util/openWindow',
+	'sap/ui/VersionInfo'
+], function(library, Log, Core, Fragment, coreLibrary, syncStyleClass, JSONModel, ResourceModel, openWindow, VersionInfo) {
 	'use strict';
 
 	// eslint-disable-next-line
 	/* global Blob, MouseEvent, FileReader, URL */
 
 	// Shortcuts
-	var ButtonType = mLibrary.ButtonType;
 	var ValueState = coreLibrary.ValueState;
 	var FileType = library.FileType;
 	var EdmType = library.EdmType;
@@ -54,22 +44,36 @@ sap.ui.define([
 	});
 
 	/* Returns the Export Settings used by the User Settings Dialog */
-	function getExportSettings(oCustomConfig, oResourceBundle, bDevMode) {
+	function getDefaultSettings(oCustomConfig, oResourceBundle, oExportCapabilities) {
 		var sSelectedKey;
+		var aSupportedFormats = Object.keys(oExportCapabilities);
+
 		var oDefaultConfig = {
 			fileName: 'Standard',
-			fileType: [
-				{key: 'xlsx'}
-			],
+			fileType: [],
 			selectedFileType: 'xlsx',
+			selectedPaperSize: 'DIN_A4',
+			selectedOrientation: 'LANDSCAPE',
 			splitCells: false,
 			includeFilterSettings: false,
-			addDateTime: false
+			addDateTime: false,
+			doEnableAccessibility: false,
+			paperSize: [
+				{key: "DIN_A4", text: oResourceBundle.getText("PAPER_SIZE_A4")},
+				{key: "US_LETTER", text: oResourceBundle.getText("PAPER_SIZE_US_LETTER")}
+			],
+			orientation: [
+				{key:"LANDSCAPE", text: oResourceBundle.getText("ORIENTATION_LAND")},
+				{key:"PORTRAIT", text: oResourceBundle.getText("ORIENTATION_PORT")}
+			],
+			fontSize: 10,
+			signature: false,
+			signatureReason: ''
 		};
 
-		if (bDevMode) {
-			oDefaultConfig.fileType.push({key: 'pdf'});
-		}
+		aSupportedFormats.forEach(function(sFormat) {
+			oDefaultConfig.fileType.push({key: sFormat.toLowerCase()});
+		});
 
 		var oExportConfig = Object.assign({}, oDefaultConfig, oCustomConfig || {});
 
@@ -90,11 +94,21 @@ sap.ui.define([
 		return oExportConfig;
 	}
 
+	function processExportSettings(oSettings) {
+		var oFinalSettings = {};
+
+		["fileName", "selectedFileType", "selectedPaperSize", "selectedOrientation", "splitCells", "includeFilterSettings", "addDateTime", "doEnableAccessibility", "fontSize", "signature", "signatureReason"].forEach(function(sProperty) {
+			oFinalSettings[sProperty] = oSettings[sProperty];
+		});
+
+		return oFinalSettings;
+	}
+
 	/**
 	 * Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @since 1.59
 	 * @name sap.ui.export.ExportUtils
@@ -154,138 +168,129 @@ sap.ui.define([
 		 *
 		 * @static
 		 */
-		getExportSettingsViaDialog: function(mCustomConfig, oOpener, fnCallback, bDevMode) {
+		getExportSettingsViaDialog: function(mCustomConfig, oOpener, fnCallback, oExportCapabilities) {
 			return new Promise(function (fnResolve, fnReject) {
 				var oExportSettingsDialog;
 
 				oResourceBundlePromise.then(function (oResourceBundle) {
-
 					var oExportConfigModel = new JSONModel();
-					oExportConfigModel.setData(getExportSettings(mCustomConfig, oResourceBundle, bDevMode));
-
-					var sDialogId = uid();
-
-					oExportSettingsDialog = new Dialog({
-						id: sDialogId,
-						title: oResourceBundle.getText('EXPORT_SETTINGS_TITLE'),
-						horizontalScrolling: false,
-						verticalScrolling: false,
-						content: [
-							//TBD: Maybe use a form here for ACC purposes
-							new VBox({
-								// changing the render type to Bare in order to render the colon by resuing the style classes from Form layout
-								renderType: 'Bare',
-								width: '100%',
-								items: [
-									//TBD: Hide controls (visible=false) when functionality is not yet implemented
-									new Label({
-										text: oResourceBundle.getText('FILE_NAME'),
-										labelFor: sDialogId + '-fileName'
-									}),
-									new Input({
-										id: sDialogId + '-fileName',
-										value: '{/fileName}',
-										liveChange: function (oEvent) {
-											// user input validation for file name
-											var oInput = oEvent.getSource();
-											var sFileName = oEvent.getParameter('value');
-											var oRegEx = /[\\/:|?"*<>]/;
-											var oExportBtn = Core.byId(sDialogId + '-export');
-											var bValidate = oRegEx.test(sFileName);
-											if (bValidate) {
-												oInput.setValueState(ValueState.Error);
-												oInput.setValueStateText(oResourceBundle.getText('FILENAME_ERROR'));
-											} else if (sFileName.length > 100) {
-												oInput.setValueState(ValueState.Warning);
-												oInput.setValueStateText(oResourceBundle.getText('FILENAME_WARNING'));
-											} else {
-												oInput.setValueState(ValueState.None);
-												oInput.setValueStateText(null);
-											}
-											oExportBtn.setEnabled(!bValidate);
-										}
-									}).addStyleClass('sapUiTinyMarginBottom'),
-									new Label({
-										text: oResourceBundle.getText('SELECT_FORMAT'),
-										labelFor: sDialogId + '-fileType',
-										visible: !!bDevMode
-									}),
-									// sap.m.Select control disabled as there is only 1 option for now
-									// control must be enabled when more file types are supported
-									new Select({
-										id: sDialogId + '-fileType',
-										width: '100%',
-										selectedKey: '{/selectedFileType}',
-										items: {
-											path: '/fileType',
-											template: new Item({key: '{key}', text: '{text}'})
-										},
-										visible: !!bDevMode
-									}),
-									new CheckBox({
-										id: sDialogId + '-splitCells',
-										selected: '{/splitCells}',
-										text: oResourceBundle.getText('SPLIT_CELLS')
-									}),
-									new CheckBox({
-										id: sDialogId + '-includeFilterSettings',
-										selected: '{/includeFilterSettings}',
-										text: oResourceBundle.getText('INCLUDE_FILTER_SETTINGS')
-									}),
-									new CheckBox({
-										id: sDialogId + '-addDateTime',
-										selected: '{/addDateTime}',
-										text: oResourceBundle.getText('ADD_DATE_TIME'),
-										visible: false
-									})
-								]
-							// using the style class from Form layout to render colon after the label
-							}).addStyleClass('sapUiExportSettingsLabel')
-						],
-						endButton: new Button({
-							id: sDialogId + '-cancel',
-							text: oResourceBundle.getText('CANCEL_BUTTON'),
-							press: function () {
+
+					oExportConfigModel.setData(getDefaultSettings(mCustomConfig, oResourceBundle, oExportCapabilities));
+
+					Fragment.load({
+						name: 'sap.ui.export.fragments.SettingsDialog',
+						type: 'XML',
+						controller: {
+							isPDF: function(sValue) {
+								return sValue === 'pdf';
+							},
+							isXLSX: function(sValue) {
+								return sValue === 'xlsx';
+							},
+							onCancel: function() {
 								oExportSettingsDialog.close();
-							}
-						}),
-						beginButton: new Button({
-							id: sDialogId + '-export',
-							text: oResourceBundle.getText('EXPORT_BUTTON'),
-							type: ButtonType.Emphasized,
-							press: function () {
+							},
+							onExport: function() {
 								if (oExportSettingsDialog) {
 									oExportSettingsDialog._bSuccess = true;
 									oExportSettingsDialog.close();
-									fnResolve(oExportConfigModel.getData());
+									fnResolve(processExportSettings(oExportConfigModel.getData()));
 								}
+							},
+
+							/**
+							 * User input validation for file name
+							 *
+							 * @param {sap.ui.base.Event} oEvent LiveChange event of the Input control
+							 */
+							onFileNameChange: function(oEvent) {
+								var oInput = oEvent.getSource();
+								var sFileName = oEvent.getParameter('value');
+								var oRegEx = /[\\/:|?"*<>]/;
+								var oExportBtn = Core.byId('exportSettingsDialog-exportButton');
+								var bValidate = oRegEx.test(sFileName);
+								if (bValidate) {
+									oInput.setValueState(ValueState.Error);
+									oInput.setValueStateText(oResourceBundle.getText('FILENAME_ERROR'));
+								} else if (sFileName.length > 100) {
+									oInput.setValueState(ValueState.Warning);
+									oInput.setValueStateText(oResourceBundle.getText('FILENAME_WARNING'));
+								} else {
+									oInput.setValueState(ValueState.None);
+									oInput.setValueStateText(null);
+								}
+								oExportBtn.setEnabled(!bValidate);
+							},
+							onFileTypeChange: function(oEvent) {
+								var oSelectedItem = oEvent.getParameter("selectedItem");
+								if (oSelectedItem && oSelectedItem.getKey() === "pdf") {
+									oExportConfigModel.setProperty("/splitCells", true);
+								} else {
+									Core.byId('exportSettingsDialog-signatureReason').setVisible(false);
+									Core.byId('exportSettingsDialog-signatureReasonLabel').setVisible(false);
+								}
+							},
+							onFontSizeChange: function(oEvent) {
+								// user input validation for font size
+								var oInput = oEvent.getSource();
+								var sFontValue = oEvent.getParameter('value');
+								var oRegEx = /[^\d]/g;
+								var oExportBtn = Core.byId('exportSettingsDialog-exportButton');
+								var bValidate = oRegEx.test(sFontValue);
+								if (bValidate) {
+									oInput.setValueState(ValueState.Error);
+									oInput.setValueStateText(oResourceBundle.getText('NUMBER_ERROR'));
+								} else {
+									oInput.setValueState(ValueState.None);
+									oInput.setValueStateText(null);
+								}
+								oExportBtn.setEnabled(!bValidate);
+							},
+							onAfterClose: function() {
+								if (!oExportSettingsDialog._bSuccess) {
+									// Handle Cancel after close when export button was not pressed
+									// because a close could also be triggered via Esc
+									fnReject(null);
+								}
+								oExportSettingsDialog.destroy();
+								oExportSettingsDialog = null;
 							}
-						}),
-						afterClose: function () {
-							if (!oExportSettingsDialog._bSuccess) {
-								// Handle Cancel after close when export button was not pressed
-								// because a close could also be triggered via Esc
-								fnReject(null);
-							}
-							oExportSettingsDialog.destroy();
-							oExportSettingsDialog = null;
 						}
-					});
-					// using the style class from Form layout to render colon after the label
-					oExportSettingsDialog.addStyleClass('sapUiContentPadding sapUiExportSettings');
-					oExportSettingsDialog.setModel(oExportConfigModel);
-					if (oOpener) {
-						syncStyleClass('sapUiSizeCompact', oOpener, oExportSettingsDialog);
-					}
-					oExportSettingsDialog.open();
+					}).then(function(oDialog) {
+						oExportSettingsDialog = oDialog;
 
-					if (fnCallback) {
-						fnCallback(oExportSettingsDialog);
-					}
+						oExportSettingsDialog.setModel(oExportConfigModel);
+						oExportSettingsDialog.setModel(new ResourceModel({
+							bundle: oResourceBundle
+						}), 'i18n');
+
+						if (oOpener) {
+							syncStyleClass('sapUiSizeCompact', oOpener, oExportSettingsDialog);
+						}
+						oExportSettingsDialog.open();
+
+						if (fnCallback) {
+							fnCallback(oExportSettingsDialog);
+						}
+					});
 				});
 			});
 		},
 
+		/**
+		 * Returns a different representation of the filter
+		 * value in case the value is an instance of Date.
+		 * The resutl of Date.prototype.toString function is
+		 * too long and complex so we use the ISO-String
+		 * instead.
+		 *
+		 * @param {*} vValue Filter value that might get converted
+		 * @returns {*} The formatted value
+		 */
+		_getFormattedFilterValue: function(vValue)  {
+			return vValue instanceof Date ? vValue.toISOString() : vValue;
+		},
+
 		/**
 		 * Combines the filter operator with the value and
 		 * creates a textual representation.
@@ -297,15 +302,15 @@ sap.ui.define([
 		_getReadableFilterValue: function(oFilter) {
 			switch (oFilter.op || oFilter.name) {
 				case '==':
-					return '=' + oFilter.right.value;
+					return '=' + Utils._getFormattedFilterValue(oFilter.right.value);
 				case '>':
 				case '<':
 				case '!=':
 				case '<=':
 				case '>=':
-					return oFilter.op + oFilter.right.value;
+					return oFilter.op + Utils._getFormattedFilterValue(oFilter.right.value);
 				case 'between':
-					return oFilter.args[1].value + '...' + oFilter.args[2].value;
+					return Utils._getFormattedFilterValue(oFilter.args[1].value) + '...' + Utils._getFormattedFilterValue(oFilter.args[2].value);
 				case 'contains':
 					return '*' + oFilter.args[1].value + '*';
 				case 'endswith':
@@ -487,7 +492,25 @@ sap.ui.define([
 						});
 					}
 
+					/* Sort filter settings */
+					oFilterConfig.items.sort(function(firstElement, secondElement) {
+						var sFirstValue = firstElement.key.toLowerCase();
+						var sSecondValue = secondElement.key.toLowerCase();
+
+						if (sFirstValue > sSecondValue) {
+							return 1;
+						}
+
+						if (sFirstValue < sSecondValue) {
+							return -1;
+						}
+
+						return 0;
+					});
+
 					fnResolve(oFilterConfig);
+
+					return oResourceBundle;
 				});
 			});
 		},
@@ -911,7 +934,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.98.0")
+		 * @param {string} [oContext.version] Application version (default: "1.99.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

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @constructor 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.98.0
+	 * @version 1.99.0
 	 *
 	 * @since 1.96
 	 * @name sap.ui.export.PortableDocument
@@ -27,6 +27,14 @@ sap.ui.define([
 
 		constructor: function(mSettings) {
 			ExportBase.call(this, mSettings);
+
+
+			/* Only apply supported properties */
+			['paperSize', 'orientation', 'font', 'fontSize', 'doEnableAccessibility', 'signature', 'signatureReason'].forEach(function(sProperty) {
+				if (typeof mSettings[sProperty] !== 'undefined') {
+					this._mSettings[sProperty] = mSettings[sProperty];
+				}
+			}.bind(this));
 		}
 	});
 
@@ -127,50 +135,73 @@ sap.ui.define([
 	 * Creates the DocumentDescription based on the given export
 	 * settings and assigns a unique Id to it.
 	 *
-	 * @param {Object} oWorkbook Workbook settings of the export configuration
+	 * @param {Object} mSettings Export settings
 	 * @returns {Object} DocumentDescription object that contains all relevant export settings
 	 * @private
 	 */
-	PortableDocument.prototype._createDocumentDescription = function(oWorkbook) {
+	PortableDocument.prototype._createDocumentDescription = function(mSettings) {
+		var oWorkbook = mSettings.workbook;
 		var oDocumentDescription, oMetaInfo;
 
 		oDocumentDescription = {
 			"Title": oWorkbook.context.title,
 			"Format": {
-				"PaperSize": "DIN_A4",
-				"Orientation": "LANDSCAPE",
-				"FontSize": 12
+				"PaperSize": mSettings.paperSize,
+				"Orientation": mSettings.orientation,
+				"FontSize": Number(mSettings.fontSize),
+				"DoEnableAccessibility": mSettings.doEnableAccessibility
 			},
 			"Signature": {
-				"DoSign": true,
-				"Reason": ""
+				"DoSign": mSettings.signature,
+				"Reason": mSettings.signatureReason
 			},
 			"CoverPage": [],
 			"TableColumns": []
 		};
 
-		oMetaInfo = oWorkbook.context.metaInfo;
+		oMetaInfo = oWorkbook.context.metainfo;
 
 		/* Add metaInfo to CoverPage */
 		if (oMetaInfo instanceof Array) {
-			oMetaInfo.forEach(function(oGroup) {
-				var oCoverPageGroup = {
-					"Title": oGroup.name,
-					"Content": []
-				};
-
-				oGroup.items.forEach(function(oItem) {
-					oCoverPageGroup["Content"].push({
-						"Name": oItem.key,
-						"Value": oItem.value
+			if (mSettings.dataSource.version == 2) {
+				oMetaInfo.forEach(function(oGroup) {
+					oGroup.items.forEach(function(oItem) {
+						var oCoverPageGroup = {
+							"Title": oGroup.name,
+							"Name": oItem.key,
+							"Value": oItem.value
+						};
+						oDocumentDescription["CoverPage"].push(oCoverPageGroup);
 					});
 				});
-				oDocumentDescription["CoverPage"].push(oCoverPageGroup);
-			});
+			} else {
+				oMetaInfo.forEach(function(oGroup) {
+					var oCoverPageGroup = {
+						"Title": oGroup.name,
+						"Content": []
+					};
+
+					oGroup.items.forEach(function(oItem) {
+						oCoverPageGroup["Content"].push({
+							"Name": oItem.key,
+							"Value": oItem.value
+						});
+					});
+					oDocumentDescription["CoverPage"].push(oCoverPageGroup);
+				});
+			}
 		}
 
-		/* Add columns */
-		oWorkbook.columns.forEach(function(oColumn){
+		/* Eliminate duplicates and navigation properties before adding columns */
+		oWorkbook.columns.filter(function(oColumn, iIndex, aArray) {
+			var sProperty = Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property;
+
+			return aArray.findIndex(function(oOtherColumn) {
+				var sOtherProperty = Array.isArray(oOtherColumn.property) ? oOtherColumn.property[0] : oOtherColumn.property;
+
+				return sProperty === sOtherProperty;
+			}) === iIndex && !/^to_\w+\/\w+/.test(sProperty);
+		}).forEach(function(oColumn) {
 			oDocumentDescription["TableColumns"].push({
 				"Name": Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property,
 				"Header": oColumn.label
@@ -293,7 +324,7 @@ sap.ui.define([
 		return new Promise(function(fnResolve, fnReject) {
 			var oDocumentDescription;
 
-			oDocumentDescription = that._createDocumentDescription(mSettings.workbook);
+			oDocumentDescription = that._createDocumentDescription(mSettings);
 			that.postDocumentDescription(oDocumentDescription, mSettings.dataSource, fnResolve, fnReject);
 
 		}).then(function(sDocumentDescriptionId) {

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

@@ -83,7 +83,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.98.0")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.99.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 +166,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.98.0',
+		 *         version: '1.99.0',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -278,7 +278,7 @@ sap.ui.define([
 		 * @constructor 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.98.0
+		 * @version 1.99.0
 		 *
 		 * @since 1.50
 		 * @name sap.ui.export.Spreadsheet

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 	 *
 	 * @class Utility class to perform spreadsheet export
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @static
 	 *
 	 * @private

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

@@ -0,0 +1,49 @@
+<Dialog xmlns="sap.m" xmlns:core="sap.ui.core" id="exportSettingsDialog" title="{i18n>EXPORT_SETTINGS_TITLE}" horizontalScrolling="false" verticalScrolling="true" afterClose=".onAfterClose" class="sapUiContentPadding sapUiExportSettings">
+	<content>
+		<VBox renderType="Bare" width="100%">
+			<Label text="{i18n>FILE_NAME}" labelFor="exportSettingsDialog-fileName"/>
+			<Input id="exportSettingsDialog-fileName" value="{/fileName}" liveChange=".onFileNameChange" class="sapUiTinyMarginBottom"/>
+
+			<Label text="{i18n>SELECT_FORMAT}" labelFor="exportSettingsDialog-fileType" visible="{/devMode}"/>
+			<Select id="exportSettingsDialog-fileType" selectedKey="{/selectedFileType}" items="{path: '/fileType'}" change=".onFileTypeChange" width="100%" visible="{/devMode}">
+				<items>
+					<core:Item key="{key}" text="{text}"/>
+				</items>
+			</Select>
+
+			<CheckBox id="exportSettingsDialog-includeFilterSettings" selected="{/includeFilterSettings}" text="{i18n>INCLUDE_FILTER_SETTINGS}"/>
+			<CheckBox id="exportSettingsDialog-splitCells" selected="{/splitCells}" text="{i18n>SPLIT_CELLS}" visible="{path:'/selectedFileType', formatter: '.isXLSX'}"/> <!-- Will be hidden in case of PDF because it needs to be true always -->
+			<CheckBox id="exportSettingsDialog-addDateTime" selected="{/addDateTime}" text="{i18n>ADD_DATE_TIME}" visible="false"/>
+
+			<!-- PDF Specific settings -->
+			<Label text="{i18n>PAPER_SIZE}" labelFor="exportSettingsDialog-papersize" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<Select id="exportSettingsDialog-papersize" selectedKey="{/selectedPaperSize}" items="{path: '/paperSize'}" width="100%" visible="{path:'/selectedFileType', formatter: '.isPDF'}">
+				<items>
+					<core:Item key="{key}" text="{text}"/>
+				</items>
+			</Select>
+
+			<Label text="{i18n>ORIENTATION}" labelFor="exportSettingsDialog-orientation" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<Select id="exportSettingsDialog-orientation" selectedKey="{/selectedOrientation}" items="{path: '/orientation'}" width="100%" visible="{path:'/selectedFileType', formatter: '.isPDF'}">
+				<items>
+					<core:Item key="{key}" text="{text}"/>
+				</items>
+			</Select>
+
+			<Label text="{i18n>FONT_SIZE}" labelFor="exportSettingsDialog-fontSize" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<Input id="exportSettingsDialog-fontSize" value="{/fontSize}" liveChange=".onFontSizeChange" class="sapUiTinyMarginBottom" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+
+			<CheckBox id="exportSettingsDialog-accessibility" enabled="{/accessibilitySupported}" selected="{/doEnableAccessibility}" text="{i18n>ENABLE_ACCESSIBILITY}" tooltip="{i18n>TOOLTIP_PDF_ACCESSIBILITY}" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<CheckBox id="exportSettingsDialog-signature" enabled="{/signatureSupported}" selected="{/signature}" text="{i18n>ENABLE_SIGNATURE}" tooltip="{i18n>TOOLTIP_PDF_SIGNATURE}" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+
+			<Label id="exportSettingsDialog-signatureReasonLabel" text="{i18n>SIGNATURE_REASON}" labelFor="exportSettingsDialog-signatureReason" visible="{/signature}"/>
+			<Input id="exportSettingsDialog-signatureReason" value="{/signatureReason}" class="sapUiTinyMarginBottom" visible="{/signature}"/>
+		</VBox>
+	</content>
+	<beginButton>
+		<Button id="exportSettingsDialog-exportButton" press=".onExport" text="{i18n>EXPORT_BUTTON}" type="Emphasized"/>
+	</beginButton>
+	<endButton>
+		<Button id="exportSettingsDialog-cancelButton" press=".onCancel" text="{i18n>CANCEL_BUTTON}"/>
+	</endButton>
+</Dialog>

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.export
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.98.0"
+		version: "1.99.0"
 	});