@openui5/sap.ui.mdc 1.96.5 → 1.99.0

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

@@ -0,0 +1,311 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides the base implementation for all model implementations
+sap.ui.define([
+	'sap/ui/mdc/field/ConditionsType',
+	'sap/ui/mdc/condition/FilterOperatorUtil',
+	'sap/ui/mdc/condition/Operator',
+	'sap/ui/mdc/condition/Condition',
+	'sap/ui/mdc/enum/ConditionValidated',
+	'sap/ui/mdc/enum/BaseType',
+	"sap/ui/mdc/util/DateUtil",
+	'sap/ui/model/SimpleType',
+	'sap/ui/model/FormatException',
+	'sap/ui/model/ParseException',
+	'sap/ui/model/ValidateException',
+	'sap/m/DynamicDate',
+	'sap/m/library'
+],
+	function(
+		ConditionsType,
+		FilterOperatorUtil,
+		Operator,
+		Condition,
+		ConditionValidated,
+		BaseType,
+		DateUtil,
+		SimpleType,
+		FormatException,
+		ParseException,
+		ValidateException,
+		DynamicDateType,
+		mLibrary
+		) {
+	"use strict";
+
+	/**
+	 * Constructor for a <code>ConditionsType</code> to be used in <code>DynamicDateRange</code> control.
+	 *
+	 * @class
+	 * This class represents a type to map an array of conditions used in a {@link sap.ui.mdc.FilterField FilterField} control to a value of a {@link sap.m.DynamicDateRange DynamicDateRange} control.
+	 *
+	 * @extends sap.ui.mdc.field.ConditionsType
+	 *
+	 * @author SAP SE
+	 * @version 1.99.0
+	 *
+	 * @since 1.96.0
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @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 {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????
+	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
+	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
+	 * @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 {boolean} [oFormatOptions.isUnit] If set, the type is used for the unit part of a field
+	 * @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
+	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
+	 * @param {object} [oFormatOptions.payload] Payload of the delegate
+	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
+	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
+	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
+	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
+	 * @param {object} [oConstraints] Value constraints
+	 * @alias sap.ui.mdc.field.DynamicDateRangeConditionsType
+	 */
+	var DynamicDateRangeConditionsType = ConditionsType.extend("sap.ui.mdc.field.DynamicDateRangeConditionsType", /** @lends sap.ui.mdc.field.DynamicDateRangeConditionsType.prototype */ {
+
+		constructor : function (oFormatOptions, oConstraints) {
+			SimpleType.apply(this, arguments);
+			this.sName = "ConditionsDateRange";
+			this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+			//TODO: specialConditionDataRangeType if used for tokens in MultiValue FilterField
+		}
+
+	});
+
+	DynamicDateRangeConditionsType.prototype.destroy = function() {
+
+		SimpleType.prototype.destroy.apply(this, arguments);
+
+		this._bDestroyed = true;
+
+	};
+
+	DynamicDateRangeConditionsType.prototype.formatValue = function(aConditions, sInternalType) {
+
+		if (aConditions == undefined || aConditions == null || this._bDestroyed) { // if destroyed do nothing
+			return null;
+		}
+
+		if (!Array.isArray(aConditions)) {
+			throw new FormatException("No valid conditions provided");
+		}
+
+		var iMaxConditions = _getMaxConditions.call(this);
+		var vResult;
+
+		if (iMaxConditions !== 1) {
+			throw new FormatException("MaxConditions must be 1");
+		}
+
+		if (aConditions.length === 1) {
+			var oCondition = aConditions[0];
+
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+			if (!oCondition.operator || !oOperator) {
+				throw new FormatException("No valid condition provided, Operator wrong.");
+			}
+
+			var aValues = [];
+			var sOption = oOperator.name;
+			if (!mLibrary.StandardDynamicDateRangeKeys[sOption]) {
+				sOption = oOperator.alias || sOption;
+			}
+
+			for (var i = 0; i < oOperator.valueTypes.length; i++) {
+				if (mLibrary.StandardDynamicDateRangeKeys[sOption] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+					aValues.push(_dateToTimestamp.call(this, oCondition.values[i]));
+				} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
+					aValues.push(oCondition.values[i]);
+				}
+			}
+
+			var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+			vResult = oDynamicDateType.formatValue({operator: sOption, values: aValues}, sInternalType);
+		}
+
+		return vResult;
+
+	};
+
+	function _getDynamicDateType(oOperator) {
+
+		if (!this._oDynamicDateType) {
+			var oDynamicDateFormatOptions = {
+				date: {
+					source: {pattern: "timestamp"}
+				},
+				"int": {}
+			};
+
+			this._oDynamicDateType = new DynamicDateType(oDynamicDateFormatOptions);
+		}
+
+		return this._oDynamicDateType;
+	}
+
+	function _dateToTimestamp(vValue) {
+
+		var oType = _getInternalType.call(this);
+		var sDate = oType.formatValue(vValue, "string");
+		var aDate = sDate.split("-");
+		var iYear = parseInt(aDate[0]);
+		var iMonth = parseInt(aDate[1]) - 1;
+		var iDate = parseInt(aDate[2]);
+		var iTimeStamp = new Date(iYear, iMonth, iDate).getTime();
+
+		return iTimeStamp;
+
+	}
+
+	function _timestampToDate(iTimeStamp) {
+
+		var oType = _getInternalType.call(this);
+		var oDate = new Date(iTimeStamp);
+		var iYear = oDate.getFullYear();
+		var iMonth = oDate.getMonth() + 1;
+		var iDate = oDate.getDate();
+		var sDate = iYear.toString() + "-" + ((iMonth < 10) ? "0" : "") + iMonth.toString() + "-" + ((iDate < 10) ? "0" : "") + iDate.toString();
+		var vDate = oType.parseValue(sDate, "string");
+
+		return vDate;
+
+	}
+
+	function _getInternalType() {
+
+		if (!this._oInternalType) {
+			var oType = _getValueType.call(this);
+			this._oInternalType = DateUtil.createInternalType(oType, "yyyy-MM-dd");
+		}
+
+		return this._oInternalType;
+
+	}
+
+	DynamicDateRangeConditionsType.prototype.parseValue = function(oValue, sInternalType) {
+
+		if (this._bDestroyed) { // if destroyed do nothing
+			return null;
+		}
+
+		if (_getMaxConditions.call(this) !== 1) {
+			throw new ParseException("Only one condition supported for parsing");
+		}
+
+		var aOperators = _getOperators.call(this);
+		var aConditions = [];
+		if (oValue && oValue.operator) {
+			if (oValue.operator === "PARSEERROR") {
+				throw new ParseException(oValue.values[0]);
+			}
+
+			var sOperator = oValue.operator; // sOperator is the Option name
+			var oOperator = FilterOperatorUtil.getOperator(sOperator); // getOperator will search via name and alias
+			sOperator = oOperator.name; // map it back to the real Operator name
+
+			if (oOperator) {
+				var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+				var vResult = oDynamicDateType.parseValue(oValue, sInternalType);
+				var aValues = [];
+
+				for (var i = 0; i < oOperator.valueTypes.length; i++) {
+					if (mLibrary.StandardDynamicDateRangeKeys[oValue.operator] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+						aValues.push(_timestampToDate.call(this, vResult.values[i]));
+					} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
+						aValues.push(vResult.values[i]);
+					}
+				}
+
+				var oCondition = Condition.createCondition(oOperator.name, aValues, undefined, undefined, ConditionValidated.NotValidated);
+				FilterOperatorUtil.updateConditionValues(oCondition);
+				FilterOperatorUtil.checkConditionsEmpty(oCondition, aOperators);
+				aConditions.push(oCondition);
+			}
+		}
+
+		return aConditions;
+
+	};
+
+	DynamicDateRangeConditionsType.prototype.validateValue = function(aConditions) {
+
+		if (aConditions === undefined || aConditions === null || this._bDestroyed) { // if destroyed do nothing
+			return;
+		}
+
+		if (!Array.isArray(aConditions)) {
+			throw new ValidateException("No valid conditions provided");
+		}
+
+		var oType = _getValueType.call(this);
+		var aOperators = _getOperators.call(this);
+
+		for (var i = 0; i < aConditions.length; i++) {
+			var oCondition = aConditions[i];
+			if (typeof oCondition !== "object" || !oCondition.operator || !oCondition.values ||
+					!Array.isArray(oCondition.values)) {
+				throw new ValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"));
+			}
+
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator, aOperators);
+
+			if (!oOperator) {
+				throw new ValidateException("No valid condition provided, Operator wrong.");
+			}
+
+			oOperator.validate(oCondition.values, oType);
+		}
+
+	};
+
+	function _getMaxConditions() {
+
+		var iMaxConditions = 1;
+
+		if (this.oFormatOptions.hasOwnProperty("maxConditions")) {
+			iMaxConditions = this.oFormatOptions.maxConditions;
+		}
+
+		return iMaxConditions;
+
+	}
+
+	function _getValueType() {
+
+		var oType = this.oFormatOptions.valueType;
+		if (!oType) {
+			throw new Error("Type missing");
+		}
+
+		return oType;
+
+	}
+
+	function _getOperators() {
+
+		var aOperators = this.oFormatOptions.operators;
+		if (!aOperators || aOperators.length === 0) {
+			aOperators = FilterOperatorUtil.getOperatorsForType(BaseType.Date); // TODO: check for type
+		}
+
+		return aOperators;
+
+	}
+
+	return DynamicDateRangeConditionsType;
+
+});

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

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -100,6 +100,7 @@ sap.ui.define([
 	var FieldBase = Control.extend("sap.ui.mdc.field.FieldBase", /* @lends sap.ui.mdc.field.FieldBase.prototype */ {
 		metadata: {
 			interfaces: ["sap.ui.core.IFormContent", "sap.ui.core.ISemanticFormContent"],
+			designtime: "sap/ui/mdc/designtime/field/FieldBase.designtime",
 			library: "sap.ui.mdc",
 			properties: {
 				/**
@@ -226,6 +227,8 @@ sap.ui.define([
 				 *
 				 * This property only affects types that support multiple lines.
 				 *
+				 * This property is only used for single-value fields.
+				 *
 				 * <b>Note</b> If the data type used doesn't support multiple lines an error is thrown.
 				 */
 				multipleLines: {
@@ -658,15 +661,21 @@ sap.ui.define([
 		return this;
 	};
 
-	FieldBase.prototype.setProperty = function(sPropertyName, oValue, bSuppressInvalidate) {
+	FieldBase.prototype.setProperty = function(sPropertyName, vValue, bSuppressInvalidate) {
 
 		// most properties are rendered from content controls. Only invalidate whole Field if needed
-		// (multipleLines mostly changed together with editMode -> update once om rendering)
-		if (sPropertyName !== "width" && sPropertyName !== "editMode" && sPropertyName !== "multipleLines" && sPropertyName !== "showEmptyIndicator") {
+		// (multipleLines mostly changed together with editMode -> update once on rendering)
+		if (sPropertyName === "editMode") {
+			// only invalidate if switched between edit and display, not for redonly or disabled
+			var sOld = this.getEditMode();
+			if (sOld !== EditMode.Display && sOld !== EditMode.EditableDisplay && vValue !== EditMode.Display && vValue !== EditMode.EditableDisplay) {
+				bSuppressInvalidate = true;
+			}
+		} else if (sPropertyName !== "width" && sPropertyName !== "multipleLines" && sPropertyName !== "showEmptyIndicator") {
 			bSuppressInvalidate = true;
 		}
 
-		return Control.prototype.setProperty.apply(this, [sPropertyName, oValue, bSuppressInvalidate]);
+		return Control.prototype.setProperty.apply(this, [sPropertyName, vValue, bSuppressInvalidate]);
 
 	};
 
@@ -725,30 +734,34 @@ sap.ui.define([
 
 	FieldBase.prototype.onsapup = function(oEvent) {
 
-		var oFieldHelp = _getFieldHelp.call(this);
-		var oSource = oEvent.srcControl;
+		if (this.getEditMode() === EditMode.Editable) {
+			var oFieldHelp = _getFieldHelp.call(this);
+			var oSource = oEvent.srcControl;
 
-		if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
-			// if only type-ahead but no real value help, only navigate if open TODO: remove function check
-			oEvent.preventDefault();
-			oEvent.stopPropagation();
-			oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
-			oFieldHelp.navigate(-1);
+			if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+				// if only type-ahead but no real value help, only navigate if open TODO: remove function check
+				oEvent.preventDefault();
+				oEvent.stopPropagation();
+				oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
+				oFieldHelp.navigate(-1);
+			}
 		}
 
 	};
 
 	FieldBase.prototype.onsapdown = function(oEvent) {
 
-		var oFieldHelp = _getFieldHelp.call(this);
-		var oSource = oEvent.srcControl;
+		if (this.getEditMode() === EditMode.Editable) {
+			var oFieldHelp = _getFieldHelp.call(this);
+			var oSource = oEvent.srcControl;
 
-		if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
-			// if only type-ahead but no real value help, only navigate if open TODO: remove function check
-			oEvent.preventDefault();
-			oEvent.stopPropagation();
-			oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
-			oFieldHelp.navigate(1);
+			if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+				// if only type-ahead but no real value help, only navigate if open TODO: remove function check
+				oEvent.preventDefault();
+				oEvent.stopPropagation();
+				oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
+				oFieldHelp.navigate(1);
+			}
 		}
 
 	};
@@ -1044,12 +1057,6 @@ sap.ui.define([
 	 */
 	FieldBase.prototype._observeChanges = function(oChanges) {
 
-		var fnUpdateInternalContent = function() {
-			if (this.getAggregation("_content", []).length > 0) {
-					_createInternalContentWrapper.call(this);
-			}
-		};
-
 		if (oChanges.name === "dataType") {
 			// check only if different type (in Field type might be already taken from binding)
 			if (this._oContentFactory.getDataType()) {
@@ -1081,8 +1088,7 @@ sap.ui.define([
 		}
 
 		if (oChanges.name === "maxConditions") {
-			fnUpdateInternalContent.call(this);
-			this._oContentFactory.updateConditionType();
+			this._updateInternalContent();
 		}
 
 		if (oChanges.name === "conditions") {
@@ -1111,7 +1117,7 @@ sap.ui.define([
 		}
 
 		if (oChanges.name === "display") {
-			_destroyInternalContent.call(this); // as bound property can change
+			this._destroyInternalContent(); // as bound property can change
 			this._oContentFactory.updateConditionType();
 		}
 
@@ -1149,6 +1155,14 @@ sap.ui.define([
 		}
 	};
 
+	// to allow Field or FilterField trigger and update if content control
+	FieldBase.prototype._updateInternalContent = function() {
+		if (this.getAggregation("_content", []).length > 0) {
+			_createInternalContentWrapper.call(this);
+			this._oContentFactory.updateConditionType(); // if control is not excanged at least ConditionType needs to be updated
+		}
+	};
+
 	// return the focus DOM elementof the used control
 	FieldBase.prototype.getFocusDomRef = function() {
 
@@ -1210,7 +1224,7 @@ sap.ui.define([
 
 	FieldBase.prototype.getFocusElementForValueHelp = function(bTypahead) {
 		var oSuggestControl = this.getControlForSuggestion();
-		var aIcons = oSuggestControl && oSuggestControl.getMetadata().getAllPrivateAggregations()._endIcon && oSuggestControl.getAggregation("_endIcon");
+		var aIcons = oSuggestControl && oSuggestControl.getMetadata().getAllPrivateAggregations()._endIcon && oSuggestControl.getAggregation("_endIcon", []);
 		var oIcon;
 		for (var i = 0; i < aIcons.length; i++) { // as MultiInput can have a invisible icon before visible icon
 			if (aIcons[i].getVisible()) {
@@ -1432,7 +1446,7 @@ sap.ui.define([
 			// bind to ManagedObjectModel at rendering to prevent unneded updates
 
 			if (this.getAggregation("_content", []).length > 0) {
-				_destroyInternalContent.call(this);
+				this._destroyInternalContent();
 			}
 
 			// as for edit and display different Types are possible switch them with edit mode
@@ -1586,7 +1600,7 @@ sap.ui.define([
 		if (oContent || this._bIsBeingDestroyed ||
 			(sEditMode === EditMode.Display && this.getContentDisplay()) ||
 			(sEditMode !== EditMode.Display && this.getContentEdit())) {
-			_destroyInternalContent.call(this);
+			this._destroyInternalContent();
 			var aContent = this._getContent(); // external set content
 			if (aContent.length === 1) {
 				_setModelOnContent.call(this, aContent[0]); // bind to ManagedObjectModel
@@ -1618,7 +1632,7 @@ sap.ui.define([
 			this._oContentFactory.setHideOperator(_isOnlyOneSingleValue.call(this, aOperators)); // in single value eq Field hide operator
 
 			if (oContentOld) {
-				_destroyInternalContent.call(this);
+				this._destroyInternalContent();
 
 				if (oContentOld.isA("sap.m.DateTimeField")) {
 					// in case of DatePicker remove type with special format options
@@ -1642,6 +1656,7 @@ sap.ui.define([
 					var oControl = aControls[iIndex];
 					oControl.attachEvent("parseError", _handleParseError, this);
 					oControl.attachEvent("validationError", _handleValidationError, this);
+					oControl.attachEvent("validationSuccess", _handleValidationSuccess, this);
 					_modifyKeyboardHandler.call(this, oControl, oContentType.getUseDefaultEnterHandler());
 					_modifyFieldGroupHandler.call(this, oControl, false);
 					_setModelOnContent.call(this, oControl);
@@ -1662,7 +1677,7 @@ sap.ui.define([
 
 	}
 
-	function _destroyInternalContent() {
+	FieldBase.prototype._destroyInternalContent = function () {
 
 		// if the internalContent must be new created the data type must be switched back to original one
 		// so new creation of control is using original data
@@ -1686,7 +1701,7 @@ sap.ui.define([
 			this._oContentFactory.setIsMeasure(false);
 		}
 
-	}
+	};
 
 	function _setModelOnContent(oContent) {
 		oContent.setModel(this._oManagedObjectModel, "$field");
@@ -1870,23 +1885,26 @@ sap.ui.define([
 
 	function _useDefaultFieldHelp(oContentType, aOperators, sEditMode, iMaxConditions) {
 
-		if (oContentType.getUseDefaultFieldHelp() && !this.getFieldHelp() && sEditMode !== EditMode.Display) {
-			if (aOperators.length === 1) {
-				var bIsSingleValue = _isOnlyOneSingleValue.call(this, aOperators); // if operator not exists unse no field help
-				// not if operator is handled by special control (like DatePicker)
-				if (iMaxConditions === 1) {
-					if (!(oContentType.getEditOperator() && oContentType.getEditOperator()[aOperators[0]]) &&
-						(oContentType.getUseDefaultFieldHelp().oneOperatorSingle || !bIsSingleValue)) {
-						// "bool" case (always default field help) or operator needs more than one value (e.g. between)
+		var oUseDefaultFieldHelp = oContentType.getUseDefaultFieldHelp();
+		if (oUseDefaultFieldHelp && !this.getFieldHelp() && sEditMode !== EditMode.Display) {
+			if ((iMaxConditions === 1 && oUseDefaultFieldHelp.single) || (iMaxConditions !== 1 && oUseDefaultFieldHelp.multi)) {
+				if (aOperators.length === 1) {
+					var bIsSingleValue = _isOnlyOneSingleValue.call(this, aOperators); // if operator not exists unse no field help
+					// not if operator is handled by special control (like DatePicker)
+					if (iMaxConditions === 1) {
+						if (!(oContentType.getEditOperator() && oContentType.getEditOperator()[aOperators[0]]) &&
+								(oUseDefaultFieldHelp.oneOperatorSingle || !bIsSingleValue)) {
+							// "bool" case (always default field help) or operator needs more than one value (e.g. between)
+							return true;
+						}
+					} else if (oUseDefaultFieldHelp.oneOperatorMulti || !bIsSingleValue) {
+						// DatePicker case - in multi-value use default help to get DatePicker controls
 						return true;
 					}
-				} else if (oContentType.getUseDefaultFieldHelp().oneOperatorMulti || !bIsSingleValue) {
-					// DatePicker case - in multi-value use default help to get DatePicker controls
+				} else {
+					// multiple operators -> default help needed
 					return true;
 				}
-			} else {
-				// multiple operators -> default help needed
-				return true;
 			}
 		}
 
@@ -1951,6 +1969,12 @@ sap.ui.define([
 
 	}
 
+	function _handleValidationSuccess(oEvent) {
+
+		this._bParseError = false; // if last valif value is entered again no condition is updated
+
+	}
+
 	function _handleContentChange(oEvent) {
 
 		var oChangeEvent = { parameters: merge({}, oEvent.getParameters()), source: oEvent.getSource() };
@@ -2200,8 +2224,6 @@ sap.ui.define([
 			vPreviousValue = aConditions[0] && aConditions[0].values[0];
 		}
 
-		this._bParseError = false; // last parsing result is obsolete if user starts typing
-
 		var oFieldHelp = _getFieldHelp.call(this);
 
 		if (oFieldHelp && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
@@ -2529,6 +2551,7 @@ sap.ui.define([
 			aConditions.splice(0, aConditions.length - iMaxConditions);
 		}
 
+		var bChangeAfterError = false;
 		if (oContent && oContent.setDOMValue) {
 			if (this.getMaxConditionsForHelp() === 1 && aConditions.length > 0) {
 				// the focus is still in the Field. The update of the inner control is done via ManagedObjectModel binding.
@@ -2569,6 +2592,7 @@ sap.ui.define([
 			if (this._bParseError) { // only remove messages set by Field itself, message from outside should stay.
 				this._bParseError = false;
 				this._removeUIMessage();
+				bChangeAfterError = true;
 			}
 		}
 
@@ -2585,6 +2609,8 @@ sap.ui.define([
 
 				_triggerChange.call(this, aConditions, true);
 			}
+		} else if (bChangeAfterError) { // last valif value choosen again
+			_triggerChange.call(this, aConditions, true);
 		}
 
 	}
@@ -2691,6 +2717,7 @@ sap.ui.define([
 			var oContent = this.getControlForSuggestion();
 			this._bIgnoreInputValue = false;
 			oContent.setDOMValue("");
+			this._sFilterValue = "";
 			if (this.getMaxConditions() !== 1 && !this._oContentFactory.getBoundProperty() && oContent.getMetadata().hasProperty("value") && oContent.getProperty("value")) {
 				// clear "value" property of MultiInput as there might be an old value from a invalid input before
 				oContent.setValue();
@@ -2699,6 +2726,11 @@ sap.ui.define([
 
 		_setAriaAttributes.call(this, false);
 
+		// sync conditions with FieldHelp as we cannot e sure that it still is in sync
+		var oFieldHelp = oEvent.getSource();
+		var aConditions = this.getConditions();
+		_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
+
 	}
 
 	function _handleFieldSwitchToValueHelp(oEvent) {
@@ -2757,7 +2789,8 @@ sap.ui.define([
 					delegateName: this.getDelegate() && this.getDelegate().name,
 					payload: this.getPayload(),
 					conditionModel: oConditionModelInfo.model,
-					conditionModelName : oConditionModelInfo.name
+					conditionModelName: oConditionModelInfo.name,
+					defaultOperatorName: this.getDefaultOperator ? this.getDefaultOperator() : null
 			};
 			oFieldHelp.connect(this, oConfig);
 			this._bConnected = true;

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

@@ -15,9 +15,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// initialize the Icon Pool
-	IconPool.insertFontFaceStyle();
-
 	/**
 	 * FieldBase renderer.
 	 * @namespace

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Base type for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -962,7 +962,7 @@ sap.ui.define([
 	 * @type {sap.ui.mdc.field.FieldHelpItem}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.ui.mdc.field.FieldHelpItem
+	 * @typedef {object} sap.ui.mdc.field.FieldHelpItem
 	 * @property {any} key Key of the item
 	 * @property {string} description Description of the item
 	 * @property {object} [inParameters] In parameters of the item. For each field path a value is stored