@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -9,14 +9,15 @@ sap.ui.define([
 	'sap/ui/model/ChangeReason',
 	'sap/base/strings/capitalize',
 	'sap/m/library',
-	"sap/ui/mdc/util/loadModules"
-
+	'sap/ui/mdc/util/loadModules',
+	'sap/ui/thirdparty/jquery'
 	], function(
 			FieldValueHelpTableWrapperBase,
 			ChangeReason,
 			capitalize,
 			mLibrary,
-			loadModules
+			loadModules,
+			jQuery
 	) {
 	"use strict";
 
@@ -34,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -11,7 +11,8 @@ sap.ui.define([
 	"sap/ui/mdc/library",
 	"sap/ui/mdc/enum/PersistenceMode",
 	"sap/ui/mdc/p13n/Engine",
-	'sap/ui/mdc/condition/FilterConverter'
+	'sap/ui/mdc/condition/FilterConverter',
+	"sap/ui/thirdparty/jquery"
 	], function(
 		FieldValueHelpTableWrapperBase,
 		loadModules,
@@ -19,7 +20,8 @@ sap.ui.define([
 		library,
 		PersistenceMode,
 		Engine,
-		FilterConverter
+		FilterConverter,
+		jQuery
 	) {
 	"use strict";
 
@@ -40,7 +42,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -343,7 +345,7 @@ sap.ui.define([
 
 	FieldValueHelpMdcTableWrapper.prototype._handleSelectionChange = function (oEvent) {
 		var bIsTableReady = this._isTableReady();
-		return this._bIsModifyingTableSelection || !bIsTableReady || this._bBusy ? undefined : this._fireSelectionChange.call(this, false);
+		return this._iRunningTableSelectionUpdates || !bIsTableReady || this._bBusy ? undefined : this._fireSelectionChange.call(this, false);
 	};
 
 	FieldValueHelpMdcTableWrapper.prototype._getTableItems = function (bSelectedOnly, bNoVirtual) {

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a table control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpContentWrapperBase
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @experimental As of version 1.88
@@ -90,6 +90,7 @@ sap.ui.define([
 		this._oPromises = {};
 		this._oTableDelegate = {/*onfocusin: this._handleTableEvent, */onsapprevious: this._handleTableEvent, onsapnext: this._handleTableEvent, cellClick: this._handleTableEvent};
 
+		this._iRunningTableSelectionUpdates = 0;
 	};
 
 	FieldValueHelpTableWrapperBase.prototype.exit = function() {
@@ -107,6 +108,8 @@ sap.ui.define([
 		delete this._oTablePromiseResolve;
 		delete this._bTableResolved;
 
+		this._iRunningTableSelectionUpdates = null;
+
 		FieldValueHelpContentWrapperBase.prototype.exit.apply(this, arguments);
 	};
 
@@ -801,7 +804,7 @@ sap.ui.define([
 			var aTableItems = this._getTableItems();
 			var bUpdate = false;
 
-			this._bIsModifyingTableSelection = true;
+			this._iRunningTableSelectionUpdates = this._iRunningTableSelectionUpdates + 1 || 1;
 
 			for (var j = 0; j < aTableItems.length; j++) {
 				var oTableItem = aTableItems[j];
@@ -836,7 +839,7 @@ sap.ui.define([
 			}
 
 			this._oTableModificationPromise = Promise.all(aTableModifications).then(function () {
-				this._bIsModifyingTableSelection = false;
+				this._iRunningTableSelectionUpdates = this._iRunningTableSelectionUpdates - 1;
 			}.bind(this));
 		}
 	};

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

@@ -8,12 +8,14 @@ sap.ui.define([
 	'sap/ui/mdc/field/FieldValueHelpTableWrapperBase',
 	'sap/ui/model/ChangeReason',
 	'sap/base/strings/capitalize',
-	"sap/ui/table/library"
+	"sap/ui/table/library",
+	'sap/ui/thirdparty/jquery'
 	], function(
 			FieldValueHelpTableWrapperBase,
 			ChangeReason,
 			capitalize,
-			library
+			library,
+			jQuery
 	) {
 	"use strict";
 
@@ -31,7 +33,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -227,11 +229,9 @@ sap.ui.define([
 
 		if (!bNoVirtual) {
 			var oBinding = oTable.getBinding();
-			aResult = bSelectedOnly ? aSelectedContexts : oBinding && (oBinding.aContexts || (oBinding.aIndices && oBinding.aIndices.map(function (iIndex) {
-				return oTable.getContextByIndex(iIndex);
-			})) || oBinding.getContexts());
+			aResult = bSelectedOnly ? aSelectedContexts : oBinding && oBinding.getAllCurrentContexts();
 		} else {
-				aResult = oTable.getRows().filter(function (oRow) {
+			aResult = oTable.getRows().filter(function (oRow) {
 				var oRowBindingContext = oRow.getBindingContext();
 				return oRowBindingContext && oRowBindingContext.getObject();	// don't return empty rows
 			});

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>InParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a list of items.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -257,7 +257,15 @@ sap.ui.define([
 
 	ListFieldHelp.prototype.open = function(bSuggestion) {
 
-		return FieldHelpBase.prototype.open.apply(this, arguments);
+		FieldHelpBase.prototype.open.apply(this, arguments);
+
+		var oPopover = this._getPopover();
+		var oControl = this._getControlForSuggestion();
+		if (oPopover && oControl) {
+			// make popver not smaller than Field
+			var sWidth = (oControl.$().outerWidth() / parseFloat(mLibrary.BaseFontSize)) + "rem"; // same logic as in ComboBox
+			oPopover.setContentMinWidth(sWidth);
+		}
 
 	};
 

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>OutParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.mdc.field.InParameter
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -0,0 +1,70 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'sap/m/Token',
+	'sap/ui/mdc/field/TokenDisplayRenderer'
+	], function(
+		Token,
+		TokenDisplayRenderer
+	) {
+	"use strict";
+
+	/**
+	 * Constructor for a new <code>TokenDisplay</code>.
+	 *
+	 * The <code>TokenDisplay</code> control enhances the {@link sap.m.Token Token} control to add ARIA attributes
+	 * and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new control
+	 * @class The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
+	 * @extends sap.m.Token
+	 * @version 1.100.0
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.TokenDisplay
+	 * @since 1.99.0
+	 * @alias sap.ui.mdc.field.TokenDisplay
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	var TokenDisplay = Token.extend("sap.ui.mdc.field.TokenDisplay", /** @lends sap.ui.mdc.field.TokenDisplay */
+	{
+		metadata: {
+			library: "sap.ui.mdc",
+			properties: {
+				_delimiter: {
+					type: "string",
+					defaultValue: "·",
+					visibility: "hidden"
+				}
+			}
+		},
+		renderer: TokenDisplayRenderer
+	});
+
+	TokenDisplay.prototype.init = function() {
+		Token.prototype.init.apply(this, arguments);
+
+		if (!this._oResourceBundle) {
+			this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+		}
+		this.setProperty("_delimiter", this._oResourceBundle.getText("field.SEPARATOR").trim());
+	};
+
+	// make the TokenDisplay instance not selectabled
+	TokenDisplay.prototype.getSelected = function() {
+		return false;
+	};
+
+	TokenDisplay.prototype.focus = function() {
+		return;
+	};
+
+	return TokenDisplay;
+
+});

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

@@ -0,0 +1,24 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define(['sap/ui/core/Renderer', 'sap/m/TokenRenderer'],
+		function(Renderer, TokenRenderer) {
+	"use strict";
+
+	/**
+	 * TokenDisplay renderer.
+	 * @namespace
+	 */
+	var TokenDisplayRenderer = Renderer.extend(TokenRenderer);
+	TokenDisplayRenderer.apiVersion = 2;
+
+	TokenDisplayRenderer._setAttributes = function(oRm, oControl) {
+		TokenRenderer._setAttributes(oRm, oControl);
+		oRm.attr("delimiter", oControl.getProperty("_delimiter"));
+	};
+
+	return TokenDisplayRenderer;
+});

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

@@ -0,0 +1,80 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'sap/m/Tokenizer',
+	'sap/ui/mdc/field/TokenizerDisplayRenderer',
+	'sap/ui/events/KeyCodes',
+	'sap/m/library'
+	], function(
+		Tokenizer,
+		TokenizerDisplayRenderer,
+		KeyCodes,
+		mLibrary
+	) {
+	"use strict";
+
+	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
+
+	/**
+	 * Constructor for a new <code>TokenizerDisplay</code>.
+	 *
+	 * The <code>TokenizerDisplay</code> control enhances the {@link sap.m.Tokenizer Tokenizer} control to support diaply only tokens.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new control
+	 * @class The <code>TokenizerDisplay</code> control is used to render a Tokenizer inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
+	 * @extends sap.m.Tokenizer
+	 * @version 1.100.0
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.TokenizerDisplay
+	 * @since 1.99.0
+	 * @alias sap.ui.mdc.field.TokenizerDisplay
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	var TokenizerDisplay = Tokenizer.extend("sap.ui.mdc.field.TokenizerDisplay", /** @lends sap.ui.mdc.field.TokenizerDisplay */
+	{
+		metadata: {
+			library: "sap.ui.mdc",
+			properties: {
+
+				/**
+				 * Specifies if an empty indicator should be displayed when there is no token.
+				 */
+				 emptyIndicatorMode: { type: "sap.m.EmptyIndicatorMode", group: "Appearance", defaultValue: EmptyIndicatorMode.Off }
+
+			}
+		},
+		renderer: TokenizerDisplayRenderer
+	});
+
+	TokenizerDisplay.prototype.init = function() {
+		Tokenizer.prototype.init.apply(this, arguments);
+
+		this.allowTextSelection(true);
+		this.addStyleClass("sapUiMdcTokenizerDisplay");
+	};
+
+	TokenizerDisplay.prototype.onkeydown = function(oEvent) {
+		Tokenizer.prototype.onkeydown.call(this, oEvent);
+
+		if (!this.getEnabled()) {
+			return;
+		}
+
+		if (oEvent.which === KeyCodes.ENTER) {
+			if (this.getHiddenTokensCount() > 0) {
+				this._handleNMoreIndicatorPress();
+			}
+		}
+
+	};
+
+	return TokenizerDisplay;
+
+});

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

@@ -0,0 +1,69 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define(['sap/ui/core/Renderer', 'sap/m/TokenizerRenderer', 'sap/m/library', 'sap/ui/core/Core'],
+	function(Renderer, TokenizerRenderer, mLibrary, Core) {
+	"use strict";
+
+	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
+
+	// shortcut for library resource bundle
+	var oRb = Core.getLibraryResourceBundle("sap.m");
+
+	/**
+	 * TokenizerDisplay renderer.
+	 * @namespace
+	 */
+	var TokenizerDisplayRenderer = Renderer.extend(TokenizerRenderer);
+	TokenizerDisplayRenderer.apiVersion = 2;
+
+	TokenizerDisplayRenderer._renderIndicator = function(oRm, oControl){
+		TokenizerRenderer._renderIndicator.apply(this, arguments);
+
+		//***** add emptyIndicator */
+		if (oControl.getEmptyIndicatorMode() !== EmptyIndicatorMode.Off && oControl.getTokens().length == 0) {
+			this._renderEmptyIndicator(oRm, oControl);
+		}
+	};
+
+	TokenizerDisplayRenderer._renderTabIndex = function(oRm, oControl) {
+		oRm.attr("tabindex", "-1");
+	};
+
+	TokenizerDisplayRenderer._renderIndicatorTabIndex = function(oRm, oControl) {
+		oRm.attr("tabindex", "0");
+	};
+
+
+	/**
+	 * Renders the empty text indicator.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.ui.mdc.field.TokenizerDisplay} oControl An object representation of the control that should be rendered.
+	 */
+	 TokenizerDisplayRenderer._renderEmptyIndicator = function(oRm, oControl) {
+		oRm.openStart("span");
+			oRm.class("sapMEmptyIndicator");
+			if (oControl.getEmptyIndicatorMode() === EmptyIndicatorMode.Auto) {
+				oRm.class("sapMEmptyIndicatorAuto");
+			}
+			oRm.openEnd();
+			oRm.openStart("span");
+			oRm.attr("aria-hidden", true);
+			oRm.openEnd();
+				oRm.text(oRb.getText("EMPTY_INDICATOR"));
+			oRm.close("span");
+			//Empty space text to be announced by screen readers
+			oRm.openStart("span");
+			oRm.class("sapUiPseudoInvisibleText");
+			oRm.openEnd();
+				oRm.text(oRb.getText("EMPTY_INDICATOR_TEXT"));
+			oRm.close("span");
+		oRm.close("span");
+	};
+
+	return TokenizerDisplayRenderer;
+});

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel

package/src/sap/ui/mdc/field/content/ContentFactory.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 * Creates the suitable controls for the given content type and mode and returns the control instances.
 	 * @param {sap.ui.mdc.field.content.DefaultContent} oContentType The content type object
 	 * @param {sap.ui.mdc.enum.ContentMode} sContentMode A given content mode
-	 * @param {String} sId ID of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {string} sId ID of the {@link sap.ui.mdc.field.FieldBase}
 	 * @returns {sap.ui.core.Control[]} Array containing the created controls
 	 */
 	ContentFactory.prototype.createContent = function(oContentType, sContentMode, sId) {
@@ -111,7 +111,11 @@ sap.ui.define([
 					throw new Error("loadModules promise rejected in sap.ui.mdc.field.content.ContentFactory:createContent function call - could not load controls " + JSON.stringify(aControlNames));
 				})
 				.then(function(aControls) {
-					return oContentType.create(this, sContentMode, this._sOperator, aControls, sId);
+					if (this.getField() && !this.getField()._bIsBeingDestroyed) {
+						return oContentType.create(this, sContentMode, this._sOperator, aControls, sId);
+					} else {
+						return [];
+					}
 				}.bind(this))
 				.unwrap();
 		} catch (oError) {
@@ -132,9 +136,9 @@ sap.ui.define([
 	 * Determines in which {@link sap.ui.mdc.enum.ContentMode} the given content type is displayed.
 	 * @param {sap.ui.mdc.field.content.DefaultContent} oContentType The content type object
 	 * @param {sap.ui.mdc.enum.EditMode} sEditMode The display mode of the {@link sap.ui.mdc.field.FieldBase}
-	 * @param {Integer} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {int} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
 	 * @param {boolean} bMultipleLines Determines if the content type has a multiple line input
-	 * @param {String[]} aOperators Names of the operators if the <code>EditOperator</code> content mode is used
+	 * @param {string[]} aOperators Names of the operators if the <code>EditOperator</code> content mode is used
 	 * @returns {sap.ui.mdc.enum.ContentMode} sContentMode A given content mode
 	 */
 	ContentFactory.prototype.getContentMode = function(oContentType, sEditMode, iMaxConditions, bMultipleLines, aOperators) {
@@ -163,7 +167,7 @@ sap.ui.define([
 	/**
 	 * Determines which content type object to use.
 	 * @param {sap.ui.mdc.enum.BaseType} sBaseType Base type determined by {@link sap.ui.mdc.field.FieldBase}
-	 * @param {Integer} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {int} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
 	 * @param {boolean} bIsTriggerable Checks if the {@link sap.ui.mdc.field.FieldBase} is triggerable or not - needed for link content type
 	 * @returns {sap.ui.mdc.field.content.DefaultContent} oContentType Content type object
 	 */
@@ -242,7 +246,7 @@ sap.ui.define([
 
 	/**
 	 * Defines to which property the field value is bound.
-	 * @param {String} sBoundProperty the name of the property.
+	 * @param {string} sBoundProperty the name of the property.
 	 */
 	ContentFactory.prototype.setBoundProperty = function(sBoundProperty) {
 		this._sBoundProperty = sBoundProperty;

package/src/sap/ui/mdc/field/content/DateContent.js

@@ -229,10 +229,11 @@ sap.ui.define([
 				aOperators = oContentFactory.getField()._getOperators(); // to use default operators if none given
 			}
 			var aOptions = [];
+			var sBaseType = oContentFactory.getField().getBaseType();
 
 			for (var i = 0; i < aOperators.length; i++) {
 				var sOperator = aOperators[i];
-				var sOption = this._getDateRangeOption(sOperator, oContentFactory, OperatorDynamicDateOption);
+				var sOption = this._getDateRangeOption(sOperator, oContentFactory, OperatorDynamicDateOption, sBaseType);
 				if (sOption) {
 					aOptions.push(sOption);
 				}
@@ -241,45 +242,52 @@ sap.ui.define([
 			return aOptions;
 		},
 
-		_getDateRangeOption: function(sOperator, oContentFactory, OperatorDynamicDateOption) {
+		_getDateRangeOption: function(sOperator, oContentFactory, OperatorDynamicDateOption, sBaseType) {
 			var oOperator = FilterOperatorUtil.getOperator(sOperator);
-			var sOption = oOperator.name;
-			if (StandardDynamicDateRangeKeys.indexOf(sOption) === -1 ) {
-				sOption = oOperator.alias || sOption;
-			}
-
-			if (StandardDynamicDateRangeKeys.indexOf(sOption) >= 0 ) {
-				return sOption; // use standard option
-			} else
-				// use OperatorDynamicDateOption
-				if (oOperator) {
-					if (!DynamicDateUtil.getOption(sOption)) {
+			var sOption;
+
+			if (oOperator) {
+				sOption = FilterOperatorUtil.getDynamicDateOptionForOperator(oOperator, StandardDynamicDateRangeKeys, sBaseType);
+				if (!sOption) { // if found, use standard option
+					// use OperatorDynamicDateOption
+					sOption = FilterOperatorUtil.getCustomDynamicDateOptionForOperator(oOperator, sBaseType);
+					if (!DynamicDateUtil.getOption(sOption)) { // create custom option
 						var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
 						var aValueTypes = [];
 
-						for (var j = 0; j < oOperator.valueTypes.length; j++) {
-							if (oOperator.valueTypes[j] && oOperator.valueTypes[j] !== Operator.ValueType.Static) {
+						for (var i = 0; i < oOperator.valueTypes.length; i++) {
+							if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
 								aValueTypes.push("custom"); // provide value as it is to use type to format and parse // TODO: only if custom control?
 							}
 						}
 
-						DynamicDateUtil.addOption(new OperatorDynamicDateOption({key: sOption, operator: oOperator, type: oType, valueTypes: aValueTypes})); // TODO: use name as key?
+						DynamicDateUtil.addOption(new OperatorDynamicDateOption({key: sOption, operator: oOperator, type: oType, baseType: sBaseType, valueTypes: aValueTypes}));
 					}
-					return sOption;
 				}
+			}
+			return sOption;
 		},
 
 		_getDateRangeFormatter: function(oContentFactory) {
 			var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
+			var sBaseType = oContentFactory.getField().getBaseType();
 			var oFormatOptions = oType.getFormatOptions();
+			var oUsedFormatOptions;
 			var oDateRangeFormatOptions = {};
 
 			if (oFormatOptions.style) {
-				oDateRangeFormatOptions.date = {style: oFormatOptions.style};
+				oUsedFormatOptions = {style: oFormatOptions.style};
 			} else if (oFormatOptions.pattern) {
-				oDateRangeFormatOptions.date = {pattern: oFormatOptions.pattern};
+				oUsedFormatOptions = {pattern: oFormatOptions.pattern};
+			}
+
+			if (sBaseType === BaseType.DateTime) {
+				oDateRangeFormatOptions.datetime = oUsedFormatOptions;
 			}
 
+			// use Date FormatOptions anyhow for Operations supporting only dates
+			oDateRangeFormatOptions.date = oUsedFormatOptions;
+
 			return DynamicDateFormat.getInstance(oDateRangeFormatOptions);
 		}
 	});

package/src/sap/ui/mdc/field/content/DateTimeContent.js

@@ -27,14 +27,8 @@ sap.ui.define([
 				"EQ": { name: "sap/m/DateTimePicker", create: this._createDatePickerControl }  // as same API as DatePicker
 			};
 		},
-		getEdit: function() {
-			return DefaultContent.getEdit.apply(this, arguments);
-		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.DateTimeContent - createEditMultiLine not defined!");
-		},
-		createEdit: function(oContentFactory, aControlClasses, sId) {
-			return DefaultContent.createEdit.apply(this, arguments);
 		}
 
 	});