@openui5/sap.ui.mdc 1.101.0 → 1.103.0

package/src/sap/ui/mdc/field/ConditionType.js

@@ -36,9 +36,12 @@ sap.ui.define([
 		merge,
 		whitespaceReplacer,
 		SyncPromise
-		) {
+	) {
 	"use strict";
 
+	var sTargetTypeRaw = "sap.ui.mdc.raw";
+	var sTargetTypeRawComposite = "sap.ui.mdc.raw:";
+
 	/**
 	 * Constructor for a Condition type.
 	 *
@@ -48,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -56,7 +59,7 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 *
 	 * @param {object} [oFormatOptions] Formatting options
-	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
+	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting, parsing and validating)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
 	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
 	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
@@ -65,6 +68,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
 	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
 	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
+	 * @param {sap.ui.model.Type[]} [oFormatOptions.compositeTypes] additional Types used for parts of a <code>CompositeType</code>
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. // TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
 	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
@@ -103,7 +107,28 @@ sap.ui.define([
 
 	};
 
-	ConditionType.prototype.formatValue = function(oCondition, sInternalType) {
+	/**
+	 * Formats the given condition to an output value of the given target type.
+	 * This values are formatted using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a description will be determined via given value help or delegate.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject} oCondition
+	 *	The condition to be formatted
+	 * @param {string} sTargetType
+	 *	The target type; see {@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard target types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not formatted and just
+	 *	forwarded to the target. If the value is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {any|Promise}
+	 *	The formatted output value or a <code>Promise</code> resolving with the formatted value
+	 * @throws {sap.ui.model.FormatException}
+	 *	If formatting to the target type is not possible
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionType.prototype.formatValue = function(oCondition, sTargetType) {
 
 		if (oCondition == undefined || oCondition == null || this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -114,8 +139,8 @@ sap.ui.define([
 			throw new FormatException("No valid condition provided");
 		}
 
-		if (!sInternalType) {
-			sInternalType = "string";
+		if (!sTargetType) {
+			sTargetType = "string";
 		}
 
 		var oType = _getValueType.call(this);
@@ -124,7 +149,7 @@ sap.ui.define([
 
 		_attachCurrentValueAtType.call(this, oCondition, oType); // use original condition
 
-		switch (this.getPrimitiveType(sInternalType)) {
+		switch (this.getPrimitiveType(sTargetType)) {
 			case "string":
 			case "any":
 				var sDisplay = _getDisplay.call(this);
@@ -145,7 +170,7 @@ sap.ui.define([
 					var vKey = bIsUnit ? oCondition.values[0][1] : oCondition.values[0];
 
 					return SyncPromise.resolve().then(function() {
-						return _getDescription.call(this, vKey, oCondition, oBindingContext, oConditionModel, sConditionModelName);
+						return _getDescription.call(this, vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName);
 					}.bind(this)).then(function(vDescription) { // if description needs to be requested -> return if it is resolved
 						if (vDescription) {
 							oCondition = merge({}, oCondition); // do not manipulate original object
@@ -180,12 +205,20 @@ sap.ui.define([
 
 				return _returnResult.call(this, oCondition, undefined, iCallCount, true, oType);
 			default:
-				// operators can only be formatted to string. But other controls (like Slider) might just use the value
-				if (oType && oCondition.values.length >= 1) {
-					return oType.formatValue(oCondition.values[0], sInternalType);
+				var iIndex = _getIndexOfRawValue(sTargetType);
+				if (iIndex >= 0) {
+					if (_isCompositeType.call(this, oType)) {
+						//used for compositeTypes if just one value needs to be transfered without any formatting (e.g. for Timezone)
+						return oCondition.values.length >= 1 ? oCondition.values[0][iIndex] : null;
+					}
+				} else if (sTargetType === sTargetTypeRaw) {
+					return oCondition.values.length >= 1 ? oCondition.values[0] : null; // TODO: how to handle operators <> EQ
+				} else if (oType && oCondition.values.length >= 1) {
+					// operators can only be formatted to string. But other controls (like Slider) might just use the value
+					return oType.formatValue(oCondition.values[0], sTargetType);
 				}
 
-				throw new FormatException("Don't know how to format Condition to " + sInternalType);
+				throw new FormatException("Don't know how to format Condition to " + sTargetType);
 		}
 
 	};
@@ -203,12 +236,13 @@ sap.ui.define([
 
 		var bHideOperator = (this.oFormatOptions.hideOperator && oCondition.values.length === 1) || bIsUnit;
 		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+		var aCompositeTypes = _getCompositeTypes.call(this);
 
 		if (!oOperator) {
 			throw new FormatException("No valid condition provided, Operator wrong.");
 		}
 
-		var sResult = oOperator.format(oCondition, oType, sDisplay, bHideOperator);
+		var sResult = oOperator.format(oCondition, oType, sDisplay, bHideOperator, aCompositeTypes);
 		var bConvertWhitespaces = this.oFormatOptions.convertWhitespaces;
 
 		if (bConvertWhitespaces && (_getBaseType.call(this, oType) === BaseType.String || sDisplay !== FieldDisplay.Value)) {
@@ -254,22 +288,47 @@ sap.ui.define([
 
 	}
 
-	ConditionType.prototype.parseValue = function(vValue, sInternalType) {
+	/**
+	 * Parses an external value of the given source type to a condition that holds the value in model
+	 * representation.
+	 * These values are parsed using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a value will be determined via given value help or delegate.
+	 *
+	 * @param {any} vValue
+	 *	The value to be parsed
+	 * @param {string} sSourceType
+	 *	The type of the given value; see
+	 *	{@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard source types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not parsed and just
+	 *	used in the condition. If the value of the condition is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {null|sap.ui.mdc.condition.ConditionObject|Promise<null|sap.ui.mdc.condition.ConditionObject>}
+	 *	The condition or a <code>Promise</code> resolving with the condition.
+	 *  If there is no value <code>null</code> is returned.
+	 * @throws {sap.ui.model.ParseException}
+	 *	If parsing to the model type is not possible; the message of the exception is language
+	 *	dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionType.prototype.parseValue = function(vValue, sSourceType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing
 			return null;
 		}
 
-		if (!sInternalType) {
-			sInternalType = "string";
-		} else if (sInternalType === "any" && typeof vValue === "string") {
-			sInternalType = "string";
+		if (!sSourceType) {
+			sSourceType = "string";
+		} else if (sSourceType === "any" && typeof vValue === "string") {
+			sSourceType = "string";
 		}
 
 		var oNavigateCondition = this.oFormatOptions.navigateCondition;
 		if (oNavigateCondition) {
 			// condition already known from navigation. Just check if it is really the same as the input.
-			var vOutput = this.formatValue(oNavigateCondition, sInternalType);
+			var vOutput = this.formatValue(oNavigateCondition, sSourceType);
 			if (vOutput === vValue) {
 				return merge({}, oNavigateCondition); // use copy
 			}
@@ -291,7 +350,7 @@ sap.ui.define([
 
 		_initCurrentValueAtType.call(this, oType);
 
-		switch (this.getPrimitiveType(sInternalType)) {
+		switch (this.getPrimitiveType(sSourceType)) {
 			case "string":
 				var oOperator;
 				var bCheckForDefault = false;
@@ -335,6 +394,7 @@ sap.ui.define([
 					}
 					var oCondition;
 					var bCompositeType = _isCompositeType.call(this, oType);
+					var aCompositeTypes = _getCompositeTypes.call(this);
 					this._oCalls.active++;
 					this._oCalls.last++;
 					var iCallCount = this._oCalls.last;
@@ -354,7 +414,7 @@ sap.ui.define([
 								// parse using unit part
 								oCondition = Condition.createCondition(oOperator.name, [oType.parseValue(vValue, "string", oType._aCurrentValue)], undefined, undefined, ConditionValidated.NotValidated);
 							} else {
-								oCondition = oOperator.getCondition(vValue, oType, sDisplay, bUseDefaultOperator);
+								oCondition = oOperator.getCondition(vValue, oType, sDisplay, bUseDefaultOperator, aCompositeTypes);
 							}
 						} catch (oException) {
 							var oMyException = oException;
@@ -393,10 +453,22 @@ sap.ui.define([
 						}
 					}
 					if (sDefaultOperator) {
-						return Condition.createCondition(sDefaultOperator, [oType.parseValue(vValue, sInternalType)], undefined, undefined, ConditionValidated.NotValidated);
+						var iIndex = _getIndexOfRawValue(sSourceType);
+						if (iIndex >= 0) {
+							if (_isCompositeType.call(this, oType)) {
+								//used for compositeTypes if just one value needs to be transfered without any parsing (Timezone)
+								var aValue = merge([], oType._aCurrentValue);
+								aValue[iIndex] = vValue;
+								return Condition.createCondition(sDefaultOperator, [aValue], undefined, undefined, ConditionValidated.NotValidated);
+							}
+						} else if (sSourceType === sTargetTypeRaw) {
+							return Condition.createCondition(sDefaultOperator, [vValue], undefined, undefined, ConditionValidated.NotValidated);
+						} else {
+							return Condition.createCondition(sDefaultOperator, [oType.parseValue(vValue, sSourceType)], undefined, undefined, ConditionValidated.NotValidated);
+						}
 					}
 				}
-				throw new ParseException("Don't know how to parse Condition from " + sInternalType);
+				throw new ParseException("Don't know how to parse Condition from " + sSourceType);
 		}
 
 	};
@@ -404,16 +476,21 @@ sap.ui.define([
 	function _finishParseFromString(oCondition, oType) {
 
 		var bIsUnit = _isUnit(oType);
+		var bCompositeType = _isCompositeType.call(this, oType);
 
-		if (oCondition && !bIsUnit) {
-			var sName = oType.getMetadata().getName();
+		if (oCondition && !bIsUnit && bCompositeType) {
+			var oOriginalType = _getOriginalType.call(this) || oType; // use original type for determination if unit as valueType might mapped different (if no original type, valueType is original)
+			var sName = oOriginalType.getMetadata().getName();
+			var oFormatOptions = oOriginalType.getFormatOptions();
+			var oConstraints = oOriginalType.getConstraints();
 			var oDelegate = this.oFormatOptions.delegate;
 			var oPayload = this.oFormatOptions.payload;
-			if (oDelegate && oDelegate.getTypeUtil(oPayload).getBaseType(sName) === BaseType.Unit &&
+			var sBaseType = oDelegate && oDelegate.getTypeUtil(oPayload).getBaseType(sName, oFormatOptions, oConstraints); // don't use _getBaseType to get "real" unit type
+			if ((sBaseType === BaseType.Unit || sBaseType === BaseType.DateTime) &&
 					!oCondition.values[0][1] && oType._aCurrentValue) {
 				// TODO: if no unit provided use last one
 				var sUnit = oType._aCurrentValue[1] ? oType._aCurrentValue[1] : null; // if no unit set null
-				oCondition.values[0][1] = oType._aCurrentValue[1] ? oType._aCurrentValue[1] : null; // if no unit set null
+				oCondition.values[0][1] = sUnit;
 				if (oCondition.operator === "BT") {
 					oCondition.values[1][1] = sUnit;
 				}
@@ -549,7 +626,7 @@ sap.ui.define([
 		}
 
 		return SyncPromise.resolve().then(function() {
-			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oType, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
 		}.bind(this)).then(function(oResult) {
 			return fnGetResult.call(this, oResult, fnSuccess);
 		}.bind(this)).catch(function(oException) {
@@ -609,12 +686,28 @@ sap.ui.define([
 
 	}
 
+	/**
+	 * Validates a given condition. The values of the condition are validated using the given data type.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject} oCondition
+	 *	The condition to be validated
+	 * @returns {void|Promise}
+	 *	<code>undefined</code> or a <code>Promise</code> resolving with an undefined value
+	 * @throws {sap.ui.model.ValidateException}
+	 *	If at least one of the values of the condition is not valid for the given data type; the message of the exception is
+	 *	language dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
 	ConditionType.prototype.validateValue = function(oCondition) {
 
 		var oType = _getValueType.call(this);
 		var oOriginalType = _getOriginalType.call(this);
 		var aOperators = _getOperators.call(this);
 		var bIsUnit = _isUnit(oType);
+		var aCompositeTypes = _getCompositeTypes.call(this);
 
 		if (oCondition === undefined || this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -659,13 +752,13 @@ sap.ui.define([
 		}
 
 		try {
-			oOperator.validate(oCondition.values, oType);
+			oOperator.validate(oCondition.values, oType, aCompositeTypes);
 		} catch (oException) {
 			if (oException instanceof ValidateException && oOriginalType) {
 				// As internal yyyy-MM-dd is used as pattern for dates (times similar) the
 				// ValidateException might contain this as pattern. The user should see the pattern thats shown
 				// So try to validate date with the original type to get ValidateException with right pattern.
-				oOperator.validate(oCondition.values, oOriginalType);
+				oOperator.validate(oCondition.values, oOriginalType, aCompositeTypes);
 			}
 			throw oException;
 		}
@@ -748,13 +841,22 @@ sap.ui.define([
 
 	}
 
+	function _getCompositeTypes() {
+
+		return this.oFormatOptions.compositeTypes;
+
+	}
+
 	function _isUnit(oType) {
 
 		if (_isCompositeType(oType)) {
 			var oFormatOptions = oType.getFormatOptions();
 			var bShowMeasure = !oFormatOptions || !oFormatOptions.hasOwnProperty("showMeasure") || oFormatOptions.showMeasure;
 			var bShowNumber = !oFormatOptions || !oFormatOptions.hasOwnProperty("showNumber") || oFormatOptions.showNumber;
-			if (bShowMeasure && !bShowNumber) {
+			var bShowTimezone = !oFormatOptions || !oFormatOptions.hasOwnProperty("showTimezone") || oFormatOptions.showTimezone; // handle timezone as unit
+			var bShowDate = !oFormatOptions || !oFormatOptions.hasOwnProperty("showDate") || oFormatOptions.showDate;
+			var bShowTime = !oFormatOptions || !oFormatOptions.hasOwnProperty("showTime") || oFormatOptions.showTime;
+			if ((bShowMeasure && !bShowNumber) || (bShowTimezone && !bShowDate && !bShowTime)) {
 				return true;
 			}
 		}
@@ -766,16 +868,16 @@ sap.ui.define([
 	function _attachCurrentValueAtType(oCondition, oType) {
 
 		if (_isCompositeType.call(this, oType) && oCondition && oCondition.values[0]) {
-			oType._aCurrentValue = oCondition.values[0];
+			oType._aCurrentValue = merge([], oCondition.values[0]); // use copy to prevent changes on original arry change aCurrentValue too
 
 			var oAdditionalType = _getAdditionalType.call(this);
 			if (_isCompositeType.call(this, oAdditionalType)) { // store in corresponding unit or measure type too
-				oAdditionalType._aCurrentValue = oCondition.values[0];
+				oAdditionalType._aCurrentValue = merge([], oCondition.values[0]);
 			}
 
 			var oOriginalType = _getOriginalType.call(this);
 			if (_isCompositeType.call(this, oOriginalType)) { // store in original type too (Currently not used in Unit/Currency type, but basically in CompositeType for parsing)
-				oOriginalType._aCurrentValue = oCondition.values[0];
+				oOriginalType._aCurrentValue = merge([], oCondition.values[0]);
 			}
 		}
 
@@ -868,7 +970,7 @@ sap.ui.define([
 
 	}
 
-	function _getItemForValue(vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
+	function _getItemForValue(vValue, vParsedValue, oType, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
@@ -877,6 +979,7 @@ sap.ui.define([
 		var oConfig = {
 				value: vValue,
 				parsedValue: vParsedValue,
+				dataType: oType,
 				inParameters: undefined, // TODO: needed?
 				outParameters: undefined, // TODO: needed?
 				bindingContext: oBindingContext,
@@ -899,31 +1002,32 @@ sap.ui.define([
 
 	}
 
-	function _getDescription(vKey, oCondition, oBindingContext, oConditionModel, sConditionModelName) {
+	function _getDescription(vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
 		var oPayload = this.oFormatOptions.payload;
 		var oControl = this.oFormatOptions.control;
 		if (oDelegate) {
-			return oDelegate.getDescription(oPayload, oFieldHelp, vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName, oCondition.payload, oControl);
+			return oDelegate.getDescription(oPayload, oFieldHelp, vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName, oCondition.payload, oControl, oType);
 		} else if (oFieldHelp) {
 			if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-					var oConfig = {
-						value: vKey,
-						parsedValue: vKey,
-						context: {inParameters: oCondition.inParameters, outParameters: oCondition.outParameters, payload: oCondition.payload},
-						bindingContext: oBindingContext,
-						conditionModel: oConditionModel,
-						conditionModelName: sConditionModelName,
-						checkKey: true,
-						checkDescription: false,
-						caseSensitive: true, // case sensitive as used to get description for known key
-						exception: FormatException,
-						control: oControl
-					};
-					return oFieldHelp.getItemForValue(oConfig);
-				} else {
+				var oConfig = {
+					value: vKey,
+					parsedValue: vKey,
+					dataType: oType,
+					context: {inParameters: oCondition.inParameters, outParameters: oCondition.outParameters, payload: oCondition.payload},
+					bindingContext: oBindingContext,
+					conditionModel: oConditionModel,
+					conditionModelName: sConditionModelName,
+					checkKey: true,
+					checkDescription: false,
+					caseSensitive: true, // case sensitive as used to get description for known key
+					exception: FormatException,
+					control: oControl
+				};
+				return oFieldHelp.getItemForValue(oConfig);
+			} else {
 				return oFieldHelp.getTextForKey(vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName);
 			}
 		}
@@ -956,6 +1060,16 @@ sap.ui.define([
 
 	}
 
+	function _getIndexOfRawValue(sType) {
+
+		var iIndex = -1;
+		if (sType.startsWith(sTargetTypeRawComposite)) {
+			iIndex = parseInt(sType[sTargetTypeRawComposite.length]);
+		}
+		return iIndex;
+
+	}
+
 	return ConditionType;
 
 });

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 *
 	 * @param {object} [oFormatOptions] Formatting options
-	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
+	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting, parsing and validating)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
 	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
 	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
@@ -53,6 +53,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
 	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
 	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
+	 * @param {sap.ui.model.Type[]} [oFormatOptions.compositeTypes] additional Types used for parts of a <code>CompositeType</code>
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
 	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
@@ -127,7 +128,28 @@ sap.ui.define([
 
 	};
 
-	ConditionsType.prototype.formatValue = function(aConditions, sInternalType) {
+	/**
+	 * Formats the given conditions to an output value of the given target type.
+	 * This values are formatted using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a description will be determined via given value help or delegate.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions
+	 *	The conditions to be formatted
+	 * @param {string} sTargetType
+	 *	The target type; see {@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard target types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not formatted and just
+	 *	forwarded to the target. If the value is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {any|Promise}
+	 *	The formatted output value or a <code>Promise</code> resolving with the formatted value
+	 * @throws {sap.ui.model.FormatException}
+	 *	If formatting to the target type is not possible
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionsType.prototype.formatValue = function(aConditions, sTargetType) {
 
 		if (aConditions == undefined || aConditions == null || this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -139,23 +161,23 @@ sap.ui.define([
 
 		var vValue;
 
-		if (!sInternalType || sInternalType === "string" || sInternalType === "any") {
+		if (!sTargetType || sTargetType === "string" || sTargetType === "any") {
 			vValue = ""; // if string requested use string
-		} else if (sInternalType === "float" || sInternalType === "int") {
+		} else if (sTargetType === "float" || sTargetType === "int") {
 			vValue = 0; // if number requested use number
 		}
 
 		var iMaxConditions = _getMaxConditions.call(this);
 
 		var aSyncPromises = [];
-		var fnCreateSyncPromise = function (oCondition, sInternalType) { // as function should not be declared inside a loop
+		var fnCreateSyncPromise = function (oCondition, sTargetType) { // as function should not be declared inside a loop
 			return SyncPromise.resolve().then(function() {
-				return this._oConditionType.formatValue(oCondition, sInternalType);
+				return this._oConditionType.formatValue(oCondition, sTargetType);
 			}.bind(this));
 		};
 
 		for (var i = 0; i < aConditions.length; i++) {
-			aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sInternalType));
+			aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sTargetType));
 
 			if (iMaxConditions > 0 && i >= iMaxConditions - 1) {
 				break;
@@ -182,7 +204,32 @@ sap.ui.define([
 
 	}
 
-	ConditionsType.prototype.parseValue = function(sValue, sInternalType) {
+	/**
+	 * Parses an external value of the given source type to an array of conditions that holds the value in model
+	 * representation.
+	 * These values are parsed using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a value will be determined via given value help or delegate.
+	 *
+	 * @param {any} vValue
+	 *	The value to be parsed
+	 * @param {string} sSourceType
+	 *	The type of the given value; see
+	 *	{@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard source types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not parsed and just
+	 *	used in the condition. If the value of the condition is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {null|sap.ui.mdc.condition.ConditionObject[]|Promise<null|sap.ui.mdc.condition.ConditionObject[]>}
+	 *	The array of conditions or a <code>Promise</code> resolving with the array of conditions.
+	 *  If there is no value <code>null</code> is returned.
+	 * @throws {sap.ui.model.ParseException}
+	 *	If parsing to the model type is not possible; the message of the exception is language
+	 *	dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionsType.prototype.parseValue = function(vValue, sSourceType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -194,7 +241,7 @@ sap.ui.define([
 		}
 
 		var oCondition =  SyncPromise.resolve().then(function() {
-			return this._oConditionType.parseValue(sValue, sInternalType);
+			return this._oConditionType.parseValue(vValue, sSourceType);
 		}.bind(this)).then(function(oCondition) {
 			return _parseConditionToConditions.call(this, oCondition);
 		}.bind(this)).unwrap();
@@ -252,6 +299,21 @@ sap.ui.define([
 
 	}
 
+	/**
+	 * Validates a given array of conditions. The values of the conditions are validated using the given data type.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions
+	 *	The conditions to be validated
+	 * @returns {void|Promise}
+	 *	<code>undefined</code> or a <code>Promise</code> resolving with an undefined value
+	 * @throws {sap.ui.model.ValidateException}
+	 *	If at least one of the values of the conditions is not valid for the given data type; the message of the exception is
+	 *	language dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
 	ConditionsType.prototype.validateValue = function(aConditions) {
 
 		if (aConditions === undefined || aConditions === null || this._bDestroyed) { // if destroyed do nothing
@@ -294,7 +356,10 @@ sap.ui.define([
 			var oFormatOptions = oType.getFormatOptions();
 			var bShowMeasure = !oFormatOptions || !oFormatOptions.hasOwnProperty("showMeasure") || oFormatOptions.showMeasure;
 			var bShowNumber = !oFormatOptions || !oFormatOptions.hasOwnProperty("showNumber") || oFormatOptions.showNumber;
-			if (bShowMeasure && !bShowNumber) {
+			var bShowTimezone = !oFormatOptions || !oFormatOptions.hasOwnProperty("showTimezone") || oFormatOptions.showTimezone; // handle timezone as unit
+			var bShowDate = !oFormatOptions || !oFormatOptions.hasOwnProperty("showDate") || oFormatOptions.showDate;
+			var bShowTime = !oFormatOptions || !oFormatOptions.hasOwnProperty("showTime") || oFormatOptions.showTime;
+			if ((bShowMeasure && !bShowNumber) || (bShowTimezone && !bShowDate && !bShowTime)) {
 				return true;
 			}
 		}

package/src/sap/ui/mdc/field/CustomFieldHelp.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -81,7 +81,6 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	CustomFieldHelp.prototype.fireSelectEvent = function(aConditions) {
 

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe