@sapui5/sap.fe.core 1.124.2 → 1.124.4

package/src/sap/fe/core/converters/controls/Common/Table.ts

@@ -405,6 +405,7 @@ export type ColumnExportSettings = Partial<{
 	isCurrency: boolean;
 	property: string[];
 	width: number;
+	autoScale: boolean;
 }>;
 // Properties for Annotation Columns
 export type AnnotationTableColumn = AnnotationTableColumnForOverride & {
@@ -877,44 +878,48 @@ function findColumnByPath(path: string, tableColumns: TableColumn[]): TableColum
 	});
 }
 /**
- * Sets the 'unit' and 'textArrangement' properties in columns when necessary.
+ * Sets the 'unit', 'textArrangement', 'timezone' and 'exportsettings' properties in columns when necessary.
  *
  * @param entityType The entity type displayed in the table
  * @param tableColumns The columns to be updated
  */
 export function updateLinkedProperties(entityType: EntityType, tableColumns: TableColumn[]): void {
 	tableColumns.forEach((oColumn) => {
-		const oTableColumn = oColumn as AnnotationTableColumn;
-		if (oTableColumn.propertyInfos === undefined && oTableColumn.relativePath) {
-			const oProperty = entityType.entityProperties.find((oProp: Property) => oProp.name === oTableColumn.relativePath);
-			if (oProperty) {
-				const oUnit = getAssociatedCurrencyProperty(oProperty) || getAssociatedUnitProperty(oProperty);
-				const oTimezone = getAssociatedTimezoneProperty(oProperty);
-				const sTimezone = oProperty?.annotations?.Common?.Timezone;
-				if (oUnit) {
-					const oUnitColumn = findColumnByPath(oUnit.name, tableColumns);
-					oTableColumn.unit = oUnitColumn?.name;
+		const tableColumn = oColumn as AnnotationTableColumn;
+		if (tableColumn.propertyInfos === undefined && tableColumn.relativePath) {
+			const property = entityType.entityProperties.find((prop: Property) => prop.name === tableColumn.relativePath);
+			if (property) {
+				const unitProperty = getAssociatedCurrencyProperty(property) || getAssociatedUnitProperty(property);
+				const timezoneProperty = getAssociatedTimezoneProperty(property);
+				const timezone = property?.annotations?.Common?.Timezone;
+				if (unitProperty) {
+					const unitColumn = findColumnByPath(unitProperty.name, tableColumns);
+					tableColumn.unit = unitColumn?.name;
 				} else {
-					const sUnit = oProperty?.annotations?.Measures?.ISOCurrency || oProperty?.annotations?.Measures?.Unit;
-					if (sUnit) {
-						oTableColumn.unitText = `${sUnit}`;
+					const unit = property?.annotations?.Measures?.ISOCurrency || property?.annotations?.Measures?.Unit;
+					if (unit) {
+						tableColumn.unitText = `${unit}`;
 					}
 				}
-				if (oTimezone) {
-					const oTimezoneColumn = findColumnByPath(oTimezone.name, tableColumns);
-					oTableColumn.timezone = oTimezoneColumn?.name;
-				} else if (sTimezone) {
-					oTableColumn.timezoneText = sTimezone.toString();
+				if (timezoneProperty) {
+					const oTimezoneColumn = findColumnByPath(timezoneProperty.name, tableColumns);
+					tableColumn.timezone = oTimezoneColumn?.name;
+				} else if (timezone) {
+					tableColumn.timezoneText = timezone.toString();
 				}
-				const displayMode = getDisplayMode(oProperty),
-					textAnnotation = oProperty.annotations.Common?.Text;
+				const displayMode = getDisplayMode(property),
+					textAnnotation = property.annotations.Common?.Text;
 				if (isPathAnnotationExpression(textAnnotation) && displayMode !== "Value") {
-					const oTextColumn = findColumnByPath(textAnnotation.path, tableColumns);
-					if (oTextColumn && oTextColumn.name !== oTableColumn.name) {
-						oTableColumn.textArrangement = {
-							textProperty: oTextColumn.name,
+					const textColumn = findColumnByPath(textAnnotation.path, tableColumns);
+					if (textColumn && textColumn.name !== tableColumn.name) {
+						tableColumn.textArrangement = {
+							textProperty: textColumn.name,
 							mode: displayMode
 						};
+						// If text properties are used but hidden, we must include them to the export as there are used in the paste
+						if (!textColumn.exportSettings) {
+							textColumn.exportSettings = { type: "String" };
+						}
 					}
 				}
 			}
@@ -2012,6 +2017,9 @@ const createColumnExportSettings = function (
 		wrap: relatedPropertiesInfo?.exportSettings.wrap,
 		utc: utc
 	};
+	if (exportSettings.unitProperty || exportSettings.unit) {
+		exportSettings.autoScale = true;
+	}
 	return removeUndefinedFromExportSettings(exportSettings);
 };
 /**