@openui5/sap.ui.mdc 1.99.0 → 1.100.0

package/src/sap/ui/mdc/table/GridTableType.js

@@ -11,7 +11,6 @@ sap.ui.define([
 
 	var InnerTable, InnerColumn, InnerRowAction, InnerRowActionItem, InnerMultiSelectionPlugin, InnerFixedRowMode, InnerAutoRowMode, InnerRowSettings;
 	var RowCountMode = library.RowCountMode;
-	var RowAction = library.RowAction;
 
 	/**
 	 * Constructor for a new <code>GridTableType</code>.
@@ -168,15 +167,6 @@ sap.ui.define([
 		return oColumn;
 	};
 
-	GridTableType.createNavigationRowAction = function(sIdPrefix, aEventInfo) {
-		return new InnerRowAction(sIdPrefix + "--rowAction", {
-			items: new InnerRowActionItem(sIdPrefix + "--rowActionItem", {
-				type: RowAction.Navigation,
-				press: aEventInfo
-			})
-		});
-	};
-
 	GridTableType.createMultiSelectionPlugin = function(oTable, aEventInfo) {
 		return new InnerMultiSelectionPlugin(oTable.getId() + "--multiSelectPlugin", {
 			selectionMode: TableTypeBase.getSelectionMode(oTable),
@@ -208,14 +198,7 @@ sap.ui.define([
 		oTable._oTable.getPlugins()[0].setSelectionMode(sSelectionMode);
 	};
 
-	GridTableType.updateNavigation = function(oTable, fnRowActionPress) {
-		oTable._oTable.setRowActionTemplate(this.createNavigationRowAction(oTable.getId(), [
-			fnRowActionPress, oTable
-		]));
-		oTable._oTable.setRowActionCount(1);
-	};
-
-	GridTableType.clearNavigation = function(oTable) {
+	GridTableType.removeRowActions = function(oTable) {
 		var oInnerRowAction = oTable._oTable.getRowActionTemplate();
 		if (oInnerRowAction) {
 			oInnerRowAction.destroy();
@@ -224,20 +207,85 @@ sap.ui.define([
 		oTable._oTable.setRowActionCount();
 	};
 
-	GridTableType.updateRowAction = function(oTable, bNavigation, fnRowActionPress) {
-		this.clearNavigation(oTable);
-		if (bNavigation) {
-			this.updateNavigation(oTable, fnRowActionPress);
-		}
-	};
-
-	GridTableType.updateRowSettings = function(oTable, oRowSettings) {
+	GridTableType.updateRowSettings = function(oTable, oRowSettings, fnRowActionPress) {
 		var oInnerRowSettings = new InnerRowSettings(undefined, oRowSettings.getAllSettings());
-
+		this.updateRowActions(oTable.getParent(), oRowSettings, fnRowActionPress);
 		oTable.getRowSettingsTemplate().destroy();
 		oTable.setRowSettingsTemplate(oInnerRowSettings);
 	};
 
+	GridTableType.updateRowActions = function (oTable, oRowSettings) {
+		this.removeRowActions(oTable);
+		if (!oRowSettings) {
+			return;
+		}
+		if (!oRowSettings.isBound("rowActions") && (!oRowSettings.getRowActions() || oRowSettings.getRowActions().length == 0)) {
+			return;
+		}
+
+		var oRowActions = oRowSettings.getAllActions();
+		if ("templateInfo" in oRowActions) {
+			var oTemplateInfo = oRowActions.templateInfo;
+			// Set template for inner row actions using temporary metadata
+			oRowActions.items.template = new InnerRowActionItem({
+				type: oTemplateInfo.type,
+				visible: oTemplateInfo.visible,
+				icon: oTemplateInfo.icon,
+				text: oTemplateInfo.text,
+				press: [this._onRowActionPress, oTable]
+			});
+			// Remove temporary metadata from row actions object
+			delete oRowActions.templateInfo;
+		} else {
+			oRowActions.items = oRowActions.items.map(function (oRowActionItem) {
+				var oInnerRowActionItem = new InnerRowActionItem({
+					type: oRowActionItem.isBound("type") ? oRowActionItem.getBindingInfo("type") : oRowActionItem.getType(),
+					visible: oRowActionItem.isBound("visible") ? oRowActionItem.getBindingInfo("visible") : oRowActionItem.getVisible(),
+					icon: oRowActionItem.isBound("icon") ? oRowActionItem.getBindingInfo("icon") : oRowActionItem._getIcon(),
+					text: oRowActionItem.isBound("text") ? oRowActionItem.getBindingInfo("text") : oRowActionItem._getText(),
+					press: [this._onRowActionPress, oTable]
+				});
+				// Add custom data for MDC row action, so original is retrievable from inner row action item
+				oInnerRowActionItem.data("rowAction", oRowActionItem);
+				return oInnerRowActionItem;
+			}, this);
+		}
+
+		var oInnerRowAction = new InnerRowAction(oTable.getId() + "--rowAction", oRowActions);
+		oTable._oTable.setRowActionTemplate(oInnerRowAction);
+		oTable._oTable.setRowActionCount(oRowSettings.getRowActionCount());
+	};
+
+	GridTableType._onRowActionPress = function (oEvent) {
+		var oInnerRowActionItem = oEvent.getParameter("item");
+		var oRowActionsInfo = this.getRowSettings().getAllActions();
+
+		if (this.getRowSettings().isBound("rowActions")) {
+			var sActionModel = oRowActionsInfo.items.model;
+			var oActionContext = oInnerRowActionItem.getBindingContext(sActionModel);
+
+			// Create a one time clone for the MDC RowAction and 'switch' binding context based on press action
+			if (!this._oRowActionItem) {
+				this._oRowActionItem = oRowActionsInfo.items.template.clone();
+			}
+			this._oRowActionItem.setBindingContext(oActionContext, oRowActionsInfo.items.model);
+
+			// Set model for row settings, as it is not propagated
+			this._oRowActionItem.setModel(this.getModel(sActionModel), sActionModel);
+			this.getRowSettings().addDependent(this._oRowActionItem);
+		} else {
+			this._oRowActionItem = oInnerRowActionItem.data("rowAction");
+		}
+		var oRow = oEvent.getParameter("row");
+		this._oRowActionItem.firePress({
+			bindingContext: oRow.getBindingContext()
+		});
+		if (this._oTableRowAction) {
+			this.fireRowPress({
+				bindingContext: oRow.getBindingContext()
+			});
+		}
+	};
 
 	return GridTableType;
 });

package/src/sap/ui/mdc/table/PropertyHelper.js

@@ -45,6 +45,22 @@ sap.ui.define([
 	 *   Defines whether a filter condition for this property is required.
 	 * @property {object} [visualSettings]
 	 *   This object contains all relevant properties for visual adjustments.
+	 * @property {object} [visualSettings.widthCalculation]
+	 *   This object contains all properties and their default values for the column width calculation
+	 * @property {integer} [visualSettings.widthCalculation.minWidth]
+	 *   The minimum content width in rem
+	 * @property {integer} [visualSettings.widthCalculation.maxWidth]
+	 *   The maximum content width in rem
+	 * @property {integer} [visualSettings.widthCalculation.defaultWidth]
+	 *   The default column content width when type check fails
+	 * @property {float} [visualSettings.widthCalculation.gap]
+	 *   The additional content width in rem
+	 * @property {boolean} [visualSettings.widthCalculation.includeLabel]
+	 *   Whether the label should be taken into account
+	 * @property {boolean} [visualSettings.widthCalculation.verticalArrangement]
+	 *   Whether the referenced properties are arranged vertically
+	 * @property {sap.ui.mdc.util.PropertyHelper[]} [visualSettings.widthCalculation.excludeProperties]
+	 *   A list of invisible referenced property names
 	 *
 	 * @private
 	 * @experimental
@@ -57,7 +73,7 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aProperties
 	 *     The properties to process in this helper
-	 * @param {object<string, object>} [mExtensions]
+	 * @param {Object<string, object>} [mExtensions]
 	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
 	 *     The extension of a property is stored in a reserved <code>extension</code> attribute, and its attributes must be specified with
 	 *     <code>mExtensionAttributeMetadata</code>.
@@ -74,7 +90,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @experimental
@@ -289,17 +305,8 @@ sap.ui.define([
 	PropertyHelper.prototype._calcColumnWidth = function (oProperty, mWidthCalculation) {
 		var fWidth = 0;
 		var fLabelWidth = 0;
-		var mPropertyInfoWidthCalculation = oProperty.visualSettings ? oProperty.visualSettings.widthCalculation : {};
-
-		mWidthCalculation = Object.assign({
-			minWidth: 2,
-			maxWidth: 19,
-			defaultWidth: 8,
-			gap: 0,
-			includeLabel: true,
-			excludeProperties: [],
-			verticalArrangement: false
-		}, mPropertyInfoWidthCalculation, mWidthCalculation || {});
+		var mPropertyInfoWidthCalculation = oProperty.visualSettings.widthCalculation;
+		mWidthCalculation = Object.assign({}, mPropertyInfoWidthCalculation, mWidthCalculation || {});
 
 		var iMinWidth = Math.max(1, mWidthCalculation.minWidth);
 		var iMaxWidth = Math.max(iMinWidth, mWidthCalculation.maxWidth);

package/src/sap/ui/mdc/table/ResponsiveTableType.js

@@ -167,25 +167,66 @@ sap.ui.define([
 		oTable._oTable.setMultiSelectMode(oTable.getMultiSelectMode());
 	};
 
-	ResponsiveTableType.updateNavigation = function(oTable) {
-		oTable._oTemplate.setType(RowAction.Navigation);
+	ResponsiveTableType.updateRowSettings = function(oTable, oRowSettings, fnRowActionPress) {
+		// Remove all bindings, as applySettings doesn't do it
+		var oRowTemplate = oTable._oTemplate;
+		oRowTemplate.unbindProperty("navigated");
+		oRowTemplate.unbindProperty("highlight");
+		oRowTemplate.unbindProperty("highlightText");
+
+		this.updateRowActions(oTable, oRowSettings, fnRowActionPress);
+		var oSettings = oRowSettings.getAllSettings();
+		oRowTemplate.applySettings(oSettings);
 	};
 
-	ResponsiveTableType.updateRowAction = function(oTable, bNavigation) {
+	ResponsiveTableType.updateRowActions = function (oTable, oRowSettings) {
+		oTable._oTemplate.unbindProperty("type");
+
 		var sType = oTable.hasListeners("rowPress") ? "Active" : "Inactive";
-		oTable._oTemplate.setType(sType);
-		if (bNavigation) {
-			this.updateNavigation(oTable);
+
+		if (!oRowSettings) {
+			oTable._oTemplate.setType(sType);
+			return;
 		}
-	};
 
-	ResponsiveTableType.updateRowSettings = function(oRowTemplate, oRowSettings) {
-		// Remove all bindings, as applySettings doesn't do it
-		oRowTemplate.unbindProperty("navigated");
-		oRowTemplate.unbindProperty("highlight");
-		oRowTemplate.unbindProperty("highlightText");
+		var oRowActionsInfo = oRowSettings.getAllActions();
+		if ("templateInfo" in oRowActionsInfo) {
+			var oTemplateInfo = oRowActionsInfo.templateInfo;
+
+			if (oTemplateInfo.visible.formatter) {
+				// Wrap the formatter (which should return a boolean) value and determine the type based on the formatted value.
+				var fnFormatter = oTemplateInfo.visible.formatter;
+				oTemplateInfo.visible.formatter = function (sValue) {
+					var bVisible = fnFormatter(sValue);
+					return bVisible ? RowAction.Navigation : sType;
+				};
+			}
+			if (typeof oTemplateInfo.visible === "object") {
+				oTable._oTemplate.bindProperty("type", oTemplateInfo.visible);
+			} else {
+				oTable._oTemplate.setProperty("type", oTemplateInfo.visible);
+			}
+		} else if (oRowActionsInfo && oRowActionsInfo.items){
+			var _oRowActionItem;
+			if (oRowActionsInfo.items.length == 0) {
+				oTable._oTemplate.setType(sType);
+				return;
+			}
+
+			_oRowActionItem = oRowActionsInfo.items.find(function (oRowAction) {
+				return oRowAction.getType() == "Navigation";
+			});
 
-		oRowTemplate.applySettings(oRowSettings.getAllSettings());
+			// ResponsiveTable currently only supports RowActionItem<Navigation>
+			if (!_oRowActionItem && oRowActionsInfo.items.length > 0) {
+				throw new Error("No RowAction of type 'Navigation' found. sap.m.Table only accepts RowAction of type 'Navigation'.");
+			}
+
+			// Associate RowActionItem<Navigation> to template for reference
+			oTable._oTemplate.data("rowAction", _oRowActionItem);
+		}
+
+		oTable._oTemplate.setType(RowAction.Navigation);
 	};
 
 	ResponsiveTableType.disableColumnResizer = function(oTable, oInnerTable) {
@@ -308,5 +349,37 @@ sap.ui.define([
 		}
 	};
 
+	ResponsiveTableType._onRowActionPress = function (oEvent) {
+		var oInnerRow = oEvent.getParameter("listItem");
+		var oContext = oInnerRow.getBindingContext();
+
+		if (oInnerRow.getType() !== "Navigation") {
+			return;
+		}
+
+		var oRowSettings = this.getRowSettings();
+		var oRowActionsInfo = oRowSettings.getAllActions();
+
+		if (this.getRowSettings().isBound("rowActions")) {
+			var sActionModel = oRowActionsInfo.items.model;
+			if (!this._oRowActionItem) {
+				this._oRowActionItem = oRowActionsInfo.items.template.clone();
+			}
+
+			// Set model for row settings, as it is not propagated
+			this._oRowActionItem.setModel(this.getModel(sActionModel), sActionModel);
+			this.getRowSettings().addDependent(this._oRowActionItem);
+		} else {
+			this._oRowActionItem = oInnerRow.data("rowAction");
+		}
+
+		// Binding Context cannot be determined for ResponsiveTable, which is why we always assume to have a RowActionItem<Navigation> no matter what
+		this._oRowActionItem.setType("Navigation");
+
+		this._oRowActionItem.firePress({
+			bindingContext: oContext
+		});
+	};
+
 	return ResponsiveTableType;
 });

package/src/sap/ui/mdc/table/RowActionItem.js

@@ -0,0 +1,119 @@
+/*!
+ * 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/Element',
+	'../library',
+	'sap/ui/core/IconPool',
+	'sap/ui/core/Core'
+], function(Element, library, IconPool, Core) {
+	"use strict";
+
+	var RowAction = library.RowAction;
+
+	/**
+	 * Constructor for new RowActionItem.
+	 *
+	 * @param {string} [sId] Optional ID for the new object; generated automatically if no non-empty ID is given
+	 * @param {object} [mSettings] initial settings for the new control
+	 *
+	 * @class
+	 * The <code>RowActionItem</code> control represents a action for a row.
+	 * This control can only be used in the context of <code>sap.ui.mdc.Table</code> control to define row actions.
+	 * @extends sap.ui.core.Element
+	 * @version 1.100.0
+	 *
+	 * @constructor
+	 * @experimental
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
+	 * @alias sap.ui.mdc.table.RowActionItem
+	 */
+
+	var RowActionItem = Element.extend("sap.ui.mdc.table.RowActionItem", {
+		metadata: {
+			library: "sap.ui.mdc",
+			properties: {
+				/**
+				 * Type of the row action item.
+				 *
+				 * As of version 1.98, only sap.ui.mdc.RowAction.Navigation is available.
+				 * Setting the type ensures default values for the properties <code>icon</code> and <code>text</code>.
+				 * If an icon or text is set explicitly this setting is used.
+				 */
+				type: {type: "sap.ui.mdc.RowAction"},
+				/**
+				 * Text for the row action item.
+				 *
+				 * Custom text cannot be set when using <code>sap.m.Table</code>.
+				 */
+				text: {type: "string"},
+				/**
+				 * Icon for the row action item.
+				 *
+				 * A custom icon cannot be set when using <code>sap.m.Table</code>
+				 */
+				icon: {type: "sap.ui.core.URI"},
+				/**
+				 * Whether the item should be visible on the screen.
+				 */
+				visible: {type: "boolean", defaultValue: true}
+			},
+			events: {
+				/**
+				 * Fired when the row action item is pressed.
+				 *
+				 * <code>sap.ui.table.Table</code>: The press event is fired when a row action item is pressed.
+				 *
+				 * <code>sap.m.Table</code>: The press event is fired when a row with a row action item is pressed.
+				 * The <code>sap.ui.mdc.Table</code>'s <code>rowPress</code> event is fired as well, when pressing a row with a row action item.
+				 *
+				 * @private
+				 */
+				press: {
+					parameters: {
+						/**
+						 * The binding context of the pressed row action
+						 */
+						bindingContext: {
+							type: "sap.ui.model.Context"
+						}
+					}
+				}
+			}
+		}
+	});
+
+	var mThemeParameters = {
+		navigationIcon: "navigation-right-arrow"
+	};
+
+	RowActionItem.prototype._getText = function () {
+		var sText;
+		if (this.getText()) {
+			sText = this.getText();
+		} else {
+			var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.mdc");
+			if (this.getType() === RowAction.Navigation) {
+				sText = oResourceBundle.getText("table.ROW_ACTION_ITEM_NAVIGATE");
+			}
+		}
+		return sText;
+	};
+
+	RowActionItem.prototype._getIcon = function () {
+		var oIcon;
+		if (this.getIcon()) {
+			oIcon = this.getIcon();
+		} else if (this.getType() === RowAction.Navigation) {
+			oIcon = IconPool.getIconURI(mThemeParameters["navigationIcon"]);
+		}
+		return oIcon;
+	};
+
+	return RowActionItem;
+});

package/src/sap/ui/mdc/table/RowSettings.js

@@ -12,6 +12,8 @@ sap.ui.define([
 	/**
 	 * Constructor for new RowSettings.
 	 *
+	 * Caution: Only use bindings which are bound against the rows, as working functionalities cannot be ensured for other binding types.
+	 *
 	 * @param {string} [sId] Optional ID for the new object; generated automatically if no non-empty ID is given
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
@@ -19,7 +21,7 @@ sap.ui.define([
 	 * The <code>RowSettings</code> control is used to configure a row.
 	 * This control can only be used in the context of the <code>sap.ui.mdc.Table</code> control to define row settings.
 	 * @extends sap.ui.core.Element
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @experimental
@@ -60,6 +62,14 @@ sap.ui.define([
 				 * If set to <code>true</code>, a navigation indicator is displayed at the end of the row.
 				 */
 				navigated : {type : "boolean", group : "Appearance", defaultValue : false}
+			},
+			aggregations: {
+				/**
+				 * The available actions for a row.
+				 *
+				 * rowActions cannot be bound with a factory. Additionally, {@link sap.m.Table} only works with row actions of type navigation.
+				 */
+				rowActions: {type: "sap.ui.mdc.table.RowActionItem", multiple: true}
 			}
 		}
 	});
@@ -89,5 +99,36 @@ sap.ui.define([
 		return mSettings;
 	};
 
+	RowSettings.prototype.getAllActions = function () {
+		var mSettings = {},
+			thisCloned = this.clone();
+
+		if (this.isBound("rowActions")) {
+			// Set bindingInfo for items aggregation to bindingInfo of rowActions
+			mSettings.items = thisCloned.getBindingInfo("rowActions");
+			var oTemplate = mSettings.items.template;
+			// Create temporary metdata information for later processing
+			mSettings.templateInfo = {
+				type: oTemplate.isBound("type") ? oTemplate.getBindingInfo("type") : oTemplate.getType(),
+				text: oTemplate.isBound("text") ? oTemplate.getBindingInfo("text") : oTemplate.getText(),
+				icon: oTemplate.isBound("icon") ? oTemplate.getBindingInfo("icon") : oTemplate.getIcon(),
+				visible: oTemplate.isBound("visible") ? oTemplate.getBindingInfo("visible") : oTemplate.getVisible()
+			};
+		} else {
+			mSettings.items = this.getRowActions();
+		}
+		return mSettings;
+	};
+
+	RowSettings.prototype.getRowActionCount = function () {
+		var iCount = 0;
+		if (this.isBound("rowActions")) {
+			iCount = 1;
+		} else {
+			iCount = this.getRowActions().length;
+		}
+		return iCount;
+	};
+
 	return RowSettings;
 });

package/src/sap/ui/mdc/table/V4AnalyticsPropertyHelper.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aProperties
 	 *     The properties to process in this helper
-	 * @param {object<string, object>} [mExtensions]
+	 * @param {Object<string, object>} [mExtensions]
 	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
 	 *     The extension of a property is stored in a reserved <code>extension</code> attribute and its attributes must be specified with
 	 *     <code>mExtensionAttributeMetadata</code>.
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.table.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/themes/base/Chart.less

@@ -1,3 +1,5 @@
 .sapUiMDCChart {
     background: @sapUiChartBackgroundColor;
+    border-radius: @sapUiElementBorderCornerRadius;
+    padding-bottom: 1rem;
 }

package/src/sap/ui/mdc/themes/base/ValueHelpDialog.less

@@ -32,6 +32,7 @@
 	width: 100%;
 	border: 1px solid @sapUiFieldBorderColor;
 	background-color: @sapUiFieldBackground;
+	border-radius: @sapUiFieldBorderCornerRadius;
 }
 
 // Tokenizer height in Compact mode

package/src/sap/ui/mdc/util/DateUtil.js

@@ -6,12 +6,14 @@
 sap.ui.define([
 		'sap/ui/core/library',
 		'sap/ui/core/date/UniversalDate',
-		'sap/base/util/merge'
+		'sap/base/util/merge',
+		'sap/ui/mdc/enum/BaseType'
 	],
 	function(
 			coreLibrary,
 			UniversalDate,
-			merge
+			merge,
+			BaseType
 	) {
 		"use strict";
 
@@ -34,18 +36,29 @@ sap.ui.define([
 				 *
 				 * @param {any} vDate Date
 				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
 				 * @return {sap.ui.core.date.UniversalDate} UniversalDate
 				 * @private
 				 * @ui5-restricted sap.ui.mdc
 				 * @since 1.74.0
 				 */
-				typeToUniversalDate: function(vDate, oType) {
+				typeToUniversalDate: function(vDate, oType, sBaseType) {
 
-					var sDate = this.typeToString(vDate, oType, "yyyyMMdd");
+					var sPattern;
+					if (sBaseType && sBaseType === BaseType.DateTime) {
+						sPattern = "yyyyMMdd-HHmmssSSS";
+					} else {
+						sPattern = "yyyyMMdd";
+					}
+					var sDate = this.typeToString(vDate, oType, sPattern);
 					var iYear = parseInt(sDate.slice(0,4));
 					var iMonth = parseInt(sDate.slice(4,6)) - 1;
 					var iDate = parseInt(sDate.slice(6,8));
-					var oUniversalDate = new UniversalDate(UniversalDate.UTC(iYear, iMonth, iDate));
+					var iHour = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(9,11)) : 0;
+					var iMinute = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(11,13)) : 0;
+					var iSecond = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(13,15)) : 0;
+					var iMillisecond = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(15,18)) : 0;
+					var oUniversalDate = new UniversalDate(UniversalDate.UTC(iYear, iMonth, iDate, iHour, iMinute, iSecond, iMillisecond));
 
 					return oUniversalDate;
 
@@ -56,18 +69,30 @@ sap.ui.define([
 				 *
 				 * @param {sap.ui.core.date.UniversalDate} oDate UniversalDate
 				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
 				 * @return {any} type specific date
 				 * @private
 				 * @ui5-restricted sap.ui.mdc
 				 * @since 1.74.0
 				 */
-				universalDateToType: function(oDate, oType) {
+				universalDateToType: function(oDate, oType, sBaseType) {
 
 					var iYear = oDate.getUTCFullYear();
 					var iMonth = oDate.getUTCMonth() + 1;
 					var iDate = oDate.getUTCDate();
 					var sDate = iYear.toString() + ((iMonth < 10) ? "0" : "") + iMonth.toString() + ((iDate < 10) ? "0" : "") + iDate.toString();
-					var vDate = this.stringToType(sDate, oType, "yyyyMMdd");
+					var sPattern;
+					if (sBaseType && sBaseType === BaseType.DateTime) {
+						sPattern = "yyyyMMdd-HHmmssSSS";
+						var iHour = oDate.getUTCHours();
+						var iMinute = oDate.getUTCMinutes();
+						var iSecond = oDate.getUTCSeconds();
+						var iMillisecond = oDate.getUTCMilliseconds();
+						sDate = sDate + "-" + ((iHour < 10) ? "0" : "") + iHour.toString() + ((iMinute < 10) ? "0" : "") + iMinute.toString() + ((iSecond < 10) ? "0" : "") + iSecond.toString() + ((iMillisecond < 100) ? "0" : "") + ((iMillisecond < 10) ? "0" : "") + iMillisecond.toString();
+					} else {
+						sPattern = "yyyyMMdd";
+					}
+					var vDate = this.stringToType(sDate, oType, sPattern);
 
 					return vDate;
 

package/src/sap/ui/mdc/util/FilterUtil.js

@@ -132,7 +132,7 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 								var oProperty = FilterUtil.getPropertyByKey(aPropertiesMetadata, sFieldPath);
 								if (oProperty) {
 
-									mFilterTypes[sFieldPath] = { type: oProperty.typeConfig.typeInstance, caseSensitive: oProperty.caseSensitive };
+									mFilterTypes[sFieldPath] = { type: oProperty.typeConfig.typeInstance, caseSensitive: oProperty.caseSensitive, baseType: oProperty.typeConfig.baseType };
 									mInternalFilterConditions[sFieldPath] = [];
 
 									//convert from externalized to model-specific value representation

package/src/sap/ui/mdc/util/PromiseCache.js

@@ -44,7 +44,7 @@ sap.ui.define(
 		 * Destroying the cache will cancel all registered promises and delete references. Convenience methods for promise creation, wrapping and replacement are offered.
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @alias sap.ui.mdc.util.PromiseCache
 		 * @namespace
 		 * @since 1.85.0