@openui5/sap.ui.mdc 1.102.2 → 1.104.0

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.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -17,7 +17,9 @@ sap.ui.define([
 	'sap/ui/mdc/enum/BaseType',
 	'sap/ui/mdc/enum/ConditionValidated',
 	'sap/ui/mdc/Field',
-	'sap/ui/mdc/field/ListFieldHelp',
+	'sap/ui/mdc/ValueHelp',
+	'sap/ui/mdc/valuehelp/Popover',
+	'sap/ui/mdc/valuehelp/content/FixedList',
 	'sap/ui/mdc/field/ListFieldHelpItem',
 	'sap/ui/model/base/ManagedObjectModel',
 	'sap/ui/model/json/JSONModel',
@@ -25,7 +27,6 @@ sap.ui.define([
 	'sap/ui/model/type/String',
 	'sap/ui/core/library',
 	'sap/ui/core/InvisibleText',
-	'sap/ui/core/ListItem',
 	'sap/ui/layout/Grid',
 	'sap/ui/layout/GridData',
 	'sap/m/library',
@@ -48,7 +49,9 @@ sap.ui.define([
 		BaseType,
 		ConditionValidated,
 		Field,
-		ListFieldHelp,
+		ValueHelp,
+		Popover,
+		FixedList,
 		ListFieldHelpItem,
 		ManagedObjectModel,
 		JSONModel,
@@ -56,7 +59,6 @@ sap.ui.define([
 		StringType,
 		coreLibrary,
 		InvisibleText,
-		ListItem,
 		Grid,
 		GridData,
 		mLibrary,
@@ -91,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -371,90 +373,95 @@ sap.ui.define([
 
 		onSelectChange: function(oEvent) {
 			var oField = oEvent.getSource();
-			var oCondition = oField.getBindingContext("$this").getObject();
-			var aConditions = this.getConditions();
-			var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
-			if (iIndex >= 0) {
-				oCondition = aConditions[iIndex]; // to get right instance
-			}
-
-			if (!oEvent.getParameter("valid")) { // if Operator in error state -> don't update values
-				oCondition.invalid = true;
-				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
-				oField._sOldKey = oField.getValue();
-				_checkInvalidInput.call(this, true); // set imediately, not only if row left
-				return;
-			}
-
-			var sKey = oField.getValue();
-			var sOldKey = oField._sOldKey;
-			var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
-			var oOperatorOld = sOldKey && FilterOperatorUtil.getOperator(sOldKey);
+			var oPromise = oEvent.getParameter("promise"); // as with FixedList direct user input is parsed async wait for the promise
 
-			if (oOperator && oOperatorOld) {
-				var bUpdate = false;
+			oPromise.then(function (sKey) {
+				var sOldKey = oField._sOldKey;
+				var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
+				var oOperatorOld = sOldKey && FilterOperatorUtil.getOperator(sOldKey);
+				var oCondition = oField.getBindingContext("$this").getObject();
+				var aConditions = this.getConditions();
+				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+				if (iIndex >= 0) {
+					oCondition = aConditions[iIndex]; // to get right instance
+				}
 
-				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
-					// type changed -> remove entered value (only if changed by user in Select)
-					// As Static text updated on condition change, don't delete it here.
-					if (iIndex >= 0) {
-						oCondition.values.forEach(function(value, index) {
-							if (value !== null) {
-								if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
-										(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
-									// as for Decimal values the type might change we need to format and parse again
-									var oType = _getFieldType.call(this, oOperator.name, index);
-									var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
-									var sValue = oTypeOld.formatValue(oCondition.values[index], "string");
-									var vValue = oType.parseValue(sValue, "string");
-									if (vValue !== oCondition.values[index]) {
-										oCondition.values[index] = oType.parseValue(sValue, "string");
+				if (oOperator && oOperatorOld) {
+					var bUpdate = false;
+
+					if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
+						// type changed -> remove entered value (only if changed by user in Select)
+						// As Static text updated on condition change, don't delete it here.
+						if (iIndex >= 0) {
+							oCondition.values.forEach(function(value, index) {
+								if (value !== null) {
+									if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
+											(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
+										// as for Decimal values the type might change we need to format and parse again
+										var oType = _getFieldType.call(this, oOperator.name, index);
+										var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
+										var sValue = oTypeOld.formatValue(oCondition.values[index], "string");
+										var vValue = oType.parseValue(sValue, "string");
+										if (vValue !== oCondition.values[index]) {
+											oCondition.values[index] = oType.parseValue(sValue, "string");
+											bUpdate = true;
+										}
+									} else {
+										oCondition.values[index] = null;
 										bUpdate = true;
 									}
-								} else {
-									oCondition.values[index] = null;
-									bUpdate = true;
 								}
+							}.bind(this));
+						}
+					}
+
+					if (iIndex >= 0 && oOperator.valueDefaults) {
+						// sets the default values for the operator back to default, if the condition is inital or the value is null
+						oCondition.values.forEach(function(value, index) {
+							if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
+								// set the default value and mark the condition as initial
+								oCondition.values[index] = oOperator.valueDefaults[index];
+								oCondition.isInitial = true;
+								bUpdate = true;
 							}
-						}.bind(this));
+						});
 					}
-				}
 
-				if (iIndex >= 0 && oOperator.valueDefaults) {
-					// sets the default values for the operator back to default, if the condition is inital or the value is null
-					oCondition.values.forEach(function(value, index) {
-						if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
-							// set the default value and mark the condition as initial
-							oCondition.values[index] = oOperator.valueDefaults[index];
-							oCondition.isInitial = true;
-							bUpdate = true;
+					if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
+						// switch from BT to EQ -> remove second value even if filled
+						if (iIndex >= 0) {
+							if (oCondition.values.length > 1 && oCondition.values[1]) {
+								oCondition.values = oCondition.values.slice(0, 1);
+								bUpdate = true;
+							}
 						}
-					});
-				}
-
+					}
 
-				if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
-					// switch from BT to EQ -> remove second value even if filled
-					if (iIndex >= 0) {
-						if (oCondition.values.length > 1 && oCondition.values[1]) {
-							oCondition.values = oCondition.values.slice(0, 1);
-							bUpdate = true;
-						}
+					if (oCondition.invalid) {
+						delete oCondition.invalid;
+						bUpdate = true;
+					}
+					if (bUpdate) {
+						FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
+						this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+						_checkInvalidInput.call(this, false); // set imediately, not only if row left
 					}
 				}
 
-				if (oCondition.invalid) {
-					delete oCondition.invalid;
-					bUpdate = true;
-				}
-				if (bUpdate) {
-					FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
-					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
-					_checkInvalidInput.call(this, false); // set imediately, not only if row left
+				delete oField._sOldKey;
+			}.bind(this)).catch(function (oException) { // if Operator in error state -> don't update values
+				var oCondition = oField.getBindingContext("$this").getObject();
+				var aConditions = this.getConditions();
+				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+				if (iIndex >= 0) {
+					oCondition = aConditions[iIndex]; // to get right instance
 				}
-			}
+				oCondition.invalid = true;
+				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+				oField._sOldKey = oField.getValue();
+				_checkInvalidInput.call(this, true); // set imediately, not only if row left
+			}.bind(this));
 
-			delete oField._sOldKey;
 		},
 
 		onPaste: function(oEvent) {
@@ -880,16 +887,17 @@ sap.ui.define([
 
 		var bHasMultipleGroups = _hasMultipleOperatorGroups.call(this);
 
-		var sFieldHelpId = this.getId() + "--rowSelect-help";
-		var oListFieldHelp = sap.ui.getCore().byId(sFieldHelpId);
+		var sFixedListId = this.getId() + "--rowSelect-help-pop-fl";
+		var oFixedList = sap.ui.getCore().byId(sFixedListId);
 
 		var oTemplate;
 		if (bHasMultipleGroups) {
 			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}"});
 		} else {
-			oTemplate = new ListItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
+			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
 		}
-		oListFieldHelp.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate});
+		oFixedList.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate});
+		oFixedList.setGroupable(bHasMultipleGroups);
 
 		for (var i = 0; i < aOperators.length; i++) {
 			var sOperator = aOperators[i];
@@ -1016,9 +1024,13 @@ sap.ui.define([
 		).addStyleClass("sapMdcDefineconditionPanel");
 
 		oPanel.addDependent(
-			new ListFieldHelp(this.getId() + "--rowSelect-help", {
-				filterList: false,
-				useFirstMatch: true
+			new ValueHelp(this.getId() + "--rowSelect-help", {
+				typeahead: new Popover(this.getId() + "--rowSelect-help-pop", {
+									content: [new FixedList(this.getId() + "--rowSelect-help-pop-fl", {
+													filterList: false,
+													useFirstMatch: true
+												})]
+								})
 			})
 		);
 

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 *
 	 * @since 1.96.0
 	 * @private

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

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'sap/ui/thirdparty/jquery',
 	'sap/ui/Device',
 	'sap/ui/mdc/enum/EditMode',
 	'sap/ui/mdc/enum/FieldDisplay',
@@ -17,6 +16,7 @@ sap.ui.define([
 	'sap/ui/mdc/enum/BaseType',
 	'sap/ui/mdc/field/content/ContentFactory',
 	'sap/ui/mdc/Control',
+	"sap/ui/mdc/util/loadModules",
 	'sap/ui/core/library',
 	'sap/ui/core/LabelEnablement',
 	'sap/ui/core/message/MessageMixin',
@@ -34,7 +34,6 @@ sap.ui.define([
 	'sap/base/util/restricted/_debounce',
 	'sap/ui/events/KeyCodes'
 ], function(
-	jQuery,
 	Device,
 	EditMode,
 	FieldDisplay,
@@ -47,6 +46,7 @@ sap.ui.define([
 	BaseType,
 	ContentFactory,
 	Control,
+	loadModules,
 	coreLibrary,
 	LabelEnablement,
 	MessageMixin,
@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -542,18 +542,27 @@ sap.ui.define([
 
 		mDefaultHelps = {
 			bool: {
-				name: "sap/ui/mdc/field/BoolFieldHelp",
+				modules: ["sap/ui/mdc/ValueHelp", "sap/ui/mdc/valuehelp/Popover", "sap/ui/mdc/valuehelp/content/Bool"],
 				id: "BoolDefaultHelp",
-				getDelegate: "getDefaultFieldHelpBaseDelegate",
-				properties: {},
-				control: undefined
+				getDelegate: "getDefaultValueHelpDelegate",
+				contentProperties: {},
+				dialog: false,
+				control: undefined,
+				updateTitle: function (oValueHelp, sTitle) {
+					// no title needed for boolean help (just dropdown)
+				}
 			},
 			defineConditions: {
-				name: "sap/ui/mdc/field/FieldValueHelp",
+				modules: ["sap/ui/mdc/ValueHelp", "sap/ui/mdc/valuehelp/Dialog", "sap/ui/mdc/valuehelp/content/Conditions"],
 				id: "Field-DefineConditions-Help",
-				getDelegate: "getDefaultFieldValueHelpDelegate",
-				properties: { showConditionPanel: true },
-				control: undefined
+				getDelegate: "getDefaultValueHelpDelegate",
+				contentProperties: {},
+				dialog: true,
+				control: undefined,
+				updateTitle: function (oValueHelp, sTitle) {
+					oValueHelp.getDialog().setTitle(sTitle);
+					oValueHelp.getDialog().getContent()[0].setLabel(sTitle);
+				}
 			}
 		};
 
@@ -632,7 +641,7 @@ sap.ui.define([
 		if (oFieldHelp) {
 			oFieldHelp.detachEvent("dataUpdate", _handleHelpDataUpdate, this);
 			if (this._bConnected) {
-				_handleDisconnect.call(this); // remove event listeners
+				_disconnectFieldhelp.call(this, oFieldHelp); // remove event listeners
 				oFieldHelp.connect(); // disconnect FieldHelp to remove callbacks
 			}
 		}
@@ -1400,7 +1409,6 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.62.0
 	 * @since 1.62.0 Disclaimer: this function is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	FieldBase.prototype.connectLabel = function(oLabel) {
 
@@ -1584,7 +1592,7 @@ sap.ui.define([
 
 		if (this._oCreateContentPromise) {
 			this._oCreateContentPromise.then(function() {
-				fnCreateInternalContent.call(this);
+				_createInternalContentWrapper.call(this); // as already a Promise might be pending
 			}.bind(this));
 		} else {
 			fnCreateInternalContent.call(this);
@@ -1596,7 +1604,7 @@ sap.ui.define([
 	 */
 	FieldBase.prototype._checkCreateInternalContent = function() {
 
-		if (this.getVisible() && this._oContentFactory.getDataType()) {
+		if (!this.bIsDestroyed && this.getVisible() && this._oContentFactory.getDataType()) {
 			_createInternalContentWrapper.call(this);
 		}
 
@@ -1864,45 +1872,45 @@ sap.ui.define([
 
 	function _createDefaultFieldHelp(sType) {
 
-		this.setProperty("_fieldHelpEnabled", true, true);
 		this._sDefaultFieldHelp = mDefaultHelps[sType].id;
 
-		var oFieldHelp = mDefaultHelps[sType].control;
+		var oValueHelp = mDefaultHelps[sType].control;
 
-		if (oFieldHelp && oFieldHelp.bIsDestroyed) {
+		if (oValueHelp && oValueHelp.bIsDestroyed) {
 			// someone destroyed FieldHelp -> initialize
 			mDefaultHelps[sType].control = undefined;
-			oFieldHelp = undefined;
+			oValueHelp = undefined;
 		}
 
-		if (!oFieldHelp) {
+		if (!oValueHelp) {
 			if (mDefaultHelps[sType].promise) {
 				mDefaultHelps[sType].promise.then(_defaultFieldHelpUpdate.bind(this, mDefaultHelps[sType].id));
-			}
-			var FieldHelp = sap.ui.require(mDefaultHelps[sType].name);
-			if (!FieldHelp && !mDefaultHelps[sType].promise) {
-				mDefaultHelps[sType].promise = new Promise(function(fResolve) {
-					mDefaultHelps[sType].resolve = fResolve;
-					sap.ui.require([mDefaultHelps[sType].name], function(fnControl) {
-						_createDefaultFieldHelp.call(this, sType);
-					}.bind(this));
-				}.bind(this)).then(_defaultFieldHelpUpdate.bind(this, mDefaultHelps[sType].id));
-			}
-			if (FieldHelp) {
-				var oDelegate = this.bDelegateInitialized && this.getControlDelegate()[mDefaultHelps[sType].getDelegate]();
-				var oProperties = merge({ delegate: oDelegate }, mDefaultHelps[sType].properties);
-				oFieldHelp = new FieldHelp(mDefaultHelps[sType].id, oProperties);
-				oFieldHelp._bIsDefaultHelp = true;
-				mDefaultHelps[sType].control = oFieldHelp;
-				//				this.addDependent(oFieldHelp); // TODO: where to add to control tree
-				oFieldHelp.connect(this); // to forward dataType
-				if (mDefaultHelps[sType].resolve) {
-					mDefaultHelps[sType].resolve();
-					delete mDefaultHelps[sType].resolve;
-				}
-				if (!mDefaultHelps[sType].promise) {
+			} else {
+				mDefaultHelps[sType].promise = loadModules(mDefaultHelps[sType].modules).catch(function(oError) {
+					throw new Error("loadModules promise rejected in sap.ui.mdc.field.FieldBase:_createDefaultFieldHelp function call - could not load controls " + JSON.stringify(mDefaultHelps[sType].modules));
+				}).then(function(aModules) {
+					var ValueHelp = aModules[0];
+					var Container = aModules[1];
+					var Content = aModules[2];
+					var oDelegate = this.bDelegateInitialized && this.getControlDelegate()[mDefaultHelps[sType].getDelegate]();
+					oValueHelp = new ValueHelp(mDefaultHelps[sType].id, {
+						delegate: oDelegate
+					});
+					var oContainer = new Container(mDefaultHelps[sType].id + "-container", {
+						content: [new Content(mDefaultHelps[sType].id + "-content", mDefaultHelps[sType].contentProperties)]
+					});
+					oValueHelp._bIsDefaultHelp = true;
+					oValueHelp._sDefaultHelpType = sType;
+					mDefaultHelps[sType].control = oValueHelp;
+					if (mDefaultHelps[sType].dialog) {
+						oValueHelp.setDialog(oContainer);
+					} else {
+						oValueHelp.setTypeahead(oContainer);
+					}
+					//				this.addDependent(oValueHelp); // TODO: where to add to control tree
+					oValueHelp.connect(this); // to forward dataType
 					_defaultFieldHelpUpdate.call(this, mDefaultHelps[sType].id);
-				}
+				}.bind(this)).unwrap();
 			}
 		} else {
 			_defaultFieldHelpUpdate.call(this, mDefaultHelps[sType].id);
@@ -2169,6 +2177,7 @@ sap.ui.define([
 
 	}
 
+	// Please note: This method may update aConditions!
 	function _updateConditionsFromChange(oCondition, aConditions, oConditionType, bValid, vValue, oSource, oChange) {
 
 		var iMaxConditions = this.getMaxConditions();
@@ -2189,7 +2198,7 @@ sap.ui.define([
 			if (oCondition) {
 				if (this._oContentFactory.isMeasure() && aConditions.length === 1 && aConditions[0].values[0][0] === undefined) {
 					// remove empty condition
-					aConditions = [];
+					aConditions.length = 0;
 				}
 				if (iMaxConditions !== 1 && FilterOperatorUtil.indexOfCondition(oCondition, aConditions) >= 0) {
 					// condition already exist (only error if tokens, in SearchField it is OK)
@@ -2202,7 +2211,7 @@ sap.ui.define([
 					aConditions.push(oCondition);
 				}
 			} else if (iMaxConditions === 1) {
-				aConditions = [];
+				aConditions.length = 0;
 			}
 
 			if (!deepEqual(aConditions, this.getConditions())) {
@@ -2410,34 +2419,36 @@ sap.ui.define([
 
 	function _fieldHelpChanged(sId, sMutation) {
 
+		var oFieldHelp;
+
 		if (sMutation === "remove") {
-			var oFieldHelp = sap.ui.getCore().byId(sId);
+			oFieldHelp = sap.ui.getCore().byId(sId);
 			if (oFieldHelp) {
-				oFieldHelp.detachEvent("select", _handleFieldHelpSelect, this);
-				oFieldHelp.detachEvent("navigated", _handleFieldHelpNavigated, this);
+				_disconnectFieldhelp.call(this, oFieldHelp);
 				oFieldHelp.detachEvent("dataUpdate", _handleHelpDataUpdate, this);
-				oFieldHelp.detachEvent("disconnect", _handleDisconnect, this);
-				oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this);
-				oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
 			}
-			this.setProperty("_fieldHelpEnabled", false, true);
-			this._bConnected = false;
+			this.resetProperty("_fieldHelpEnabled");
 		} else if (sMutation === "insert") {
+			if (this._sDefaultFieldHelp && sId !== this._sDefaultFieldHelp) { // remove default help
+				_fieldHelpChanged.call(this, this._sDefaultFieldHelp, "remove");
+				delete this._sDefaultFieldHelp; // do not destroy as might used on other Fields too
+			}
 			_checkFieldHelpExist.call(this, sId);
-		}
 
-		// update icon
-		var oControl = this._getContent()[0];
-		if (oControl && oControl.setValueHelpIconSrc) {
-			oControl.setValueHelpIconSrc(this._getFieldHelpIcon());
+			// update icon (on remove not necessary as hidden)
+			var oControl = this._getContent()[0];
+			if (oControl && oControl.setValueHelpIconSrc) {
+				oControl.setValueHelpIconSrc(this._getFieldHelpIcon());
+			}
 		}
+
 		_handleConditionsChange.call(this, this.getConditions()); // to update descriptions
 
 	}
 
 	function _checkFieldHelpExist(sId) {
 
-		if (sId && !this.getProperty("_fieldHelpEnabled")) {
+		if (sId && this.isPropertyInitial("_fieldHelpEnabled")) {
 			var oFieldHelp = sap.ui.getCore().byId(sId);
 			if (oFieldHelp) {
 				oFieldHelp.attachEvent("dataUpdate", _handleHelpDataUpdate, this);
@@ -2574,12 +2585,12 @@ sap.ui.define([
 				}
 
 				// take what ever comes from field help as valid - even if it is an empty key
-				var iIndex = bAdd ? -1 : FilterOperatorUtil.indexOfCondition(oCondition, aConditions);	// Why?
-				if (iIndex === -1) { // check if already exist
+				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions); // check if already exist
+				if (iIndex === -1) { // new -> add
 					aConditions.push(oCondition);
-				} else if (oCondition.values[1] !== aConditions[iIndex].values[1] && aConditions[iIndex].values[1]) {
+				} else if (oCondition.validated === ConditionValidated.Validated && oCondition.values.length > 1 && (aConditions[iIndex].values.length === 1 || oCondition.values[1] !== aConditions[iIndex].values[1])) {
 					// description changed -> use the current description
-					aConditions[iIndex].values[1] = oCondition.values[1];
+					aConditions[iIndex].values = oCondition.values;
 				}
 			}
 		}
@@ -2803,13 +2814,21 @@ sap.ui.define([
 	function _handleDisconnect(oEvent) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
-		oFieldHelp.detachEvent("select", _handleFieldHelpSelect, this);
-		oFieldHelp.detachEvent("navigated", _handleFieldHelpNavigated, this);
-		oFieldHelp.detachEvent("disconnect", _handleDisconnect, this);
-		oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
-		oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
-		oFieldHelp.detachEvent("closed", _handleFieldHelpAfterClose, this);
-		this._bConnected = false;
+		_disconnectFieldhelp.call(this, oFieldHelp);
+
+	}
+
+	function _disconnectFieldhelp(oFieldHelp) {
+
+		if (this._bConnected) {
+			oFieldHelp.detachEvent("select", _handleFieldHelpSelect, this);
+			oFieldHelp.detachEvent("navigated", _handleFieldHelpNavigated, this);
+			oFieldHelp.detachEvent("disconnect", _handleDisconnect, this);
+			oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
+			oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
+			oFieldHelp.detachEvent("closed", _handleFieldHelpAfterClose, this);
+			this._bConnected = false;
+		}
 
 	}
 
@@ -2855,9 +2874,10 @@ sap.ui.define([
 
 			var oContent = this.getControlForSuggestion();
 			_setFocusHandlingForFieldHelp.call(this, oContent);
-			if (oFieldHelp._bIsDefaultHelp && oFieldHelp.setTitle) {
-				oFieldHelp.setTitle(this.getLabel()); // use label as default title for FilterField
-      }
+			if (oFieldHelp._bIsDefaultHelp) {
+				// use label as default title for FilterField
+				mDefaultHelps[oFieldHelp._sDefaultHelpType].updateTitle(oFieldHelp, this.getLabel());
+			}
 		}
 
 	}

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

@@ -227,6 +227,7 @@ sap.ui.define([
 	 * @param {string} [sConditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {object} oConditionPayload Additional context information for this key
 	 * @param {sap.ui.core.Control} [oControl] Instance if the calling control
+	 * @param {sap.ui.model.Type} oType Type of the value
 	 * @returns {string|object|Promise} Description for key or object containing description, key, in and out parameters. If it is not available right away (must be requested), a <code>Promise</code> is returned.
 	 * @throws {sap.ui.model.FormatException} if the description cannot be determined
 	 * @since: 1.78.0
@@ -234,11 +235,12 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	FieldBaseDelegate.getDescription = function(oPayload, oFieldHelp, vKey, oInParameters, oOutParameters, oBindingContext, oConditionModel, sConditionModelName, oConditionPayload, oControl) {
+	FieldBaseDelegate.getDescription = function(oPayload, oFieldHelp, vKey, oInParameters, oOutParameters, oBindingContext, oConditionModel, sConditionModelName, oConditionPayload, oControl, oType) {
 		if (oFieldHelp && oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
 			var oConfig = {
 				value: vKey,
 				parsedValue: vKey,
+				dataType: oType,
 				context: {inParameters: oInParameters, outParameters: oOutParameters, payload: oConditionPayload},
 				bindingContext: oBindingContext,
 				conditionModel: oConditionModel,
@@ -289,6 +291,23 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * This function returns which <code>ValueHelpDelegate</code> is used
+	 * if a default field help (for example, for defining conditions in </code>FilterField</code>)
+	 * is created.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @returns {object} Delegate object with <code>name</code and <code>payload</code>
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase
+	 * @since 1.99.0
+	 */
+	FieldBaseDelegate.getDefaultValueHelpDelegate = function(oPayload) {
+
+		return {name: "sap/ui/mdc/ValueHelpDelegate", payload: {}};
+
+	};
+
 	FieldBaseDelegate.getTypeUtil = function (oPayload) {
 		return TypeUtil;
 	};