@sapui5/sap.ui.comp - npm Package Compare versions

Comparing version 1.86.3 to 1.87.0

package.json

 {
   "name": "@sapui5/sap.ui.comp",
-  "version": "1.86.3",
+  "version": "1.87.0",
   "description": "SAPUI5 Library sap.ui.comp",
@@ -5,0 +5,0 @@ "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",

src/sap/ui/comp/designtime/smartfield/SmartField.designtime.js

@@ -1419,2 +1419,109 @@ /*
 				since: "1.74"
+			},
+
+			/**
+			 * Indicates that the <code>SmartField</code> is of high importance. When <code>SmartField</code> is used inside <code>SmartForm</code>, the field will be visible regardless of the <code>importance</code> property of the form.
+			 *
+			 * <b>Note:</b> If the field is annotated as mandatory or hidden, its visibility will not change based on this annotation.
+			 *
+			 * <i>XML Example of the OData V4 Annotation</i>
+			 *
+			 * <pre>
+			 *    &lt;Property Name=&quot;Price&quot; /&gt;
+			 *    &lt;Annotations Target=&quot;Price&quot;&gt;
+			 *        &lt;Annotation Term=&quot;com.sap.vocabularies.UI.v1.Importance&quot; EnumMember=&quot;com.sap.vocabularies.UI.v1.ImportanceType/High&quot;/&gt;
+			 *    &lt;/Annotations&gt;
+			 * </pre>
+			 */
+			fieldHighImportance: {
+				namespace: "com.sap.vocabularies.UI.v1",
+				annotation: "Importance",
+				target: [
+					"Annotation", "Record"
+				],
+				allowList: {
+					values: [
+						"High"
+					]
+				},
+				defaultValue: false,
+				appliesTo: [
+					"field"
+				],
+				group: [
+					"Appearance", "Behavior"
+				],
+				since: "1.87.0"
+			},
+
+			/**
+			 * Indicates that the <code>SmartField</code> is of medium importance. When <code>SmartField</code> is used inside <code>SmartForm</code>, the field will be hidden
+			 * when the <code>importance</code> property of the form is set to <code>low</code>.
+			 *
+			 * <b>Note:</b> If the field is annotated as mandatory or hidden, its visibility will not change based on this annotation.
+			 *
+			 * <i>XML Example of the OData V4 Annotation</i>
+			 *
+			 * <pre>
+			 *    &lt;Property Name=&quot;Price&quot; /&gt;
+			 *    &lt;Annotations Target=&quot;Price&quot;&gt;
+			 *        &lt;Annotation Term=&quot;com.sap.vocabularies.UI.v1.Importance&quot; EnumMember=&quot;com.sap.vocabularies.UI.v1.ImportanceType/Medium&quot;/&gt;
+			 *    &lt;/Annotations&gt;
+			 * </pre>
+			 */
+			fieldMediumImportance: {
+				namespace: "com.sap.vocabularies.UI.v1",
+				annotation: "Importance",
+				target: [
+					"Annotation", "Record"
+				],
+				allowList: {
+					values: [
+						"Medium"
+					]
+				},
+				defaultValue: false,
+				appliesTo: [
+					"field"
+				],
+				group: [
+					"Appearance", "Behavior"
+				],
+				since: "1.87.0"
+			},
+
+			/**
+			 * Indicates that the <code>SmartField</code> is of low importance. When <code>SmartField</code> is used inside <code>SmartForm</code>, the field will be hidden
+			 * when the <code>importance</code> property of the form is set to <code>medium</code> or <code>high</code>.
+			 *
+			 * <b>Note:</b> If the field is annotated as mandatory or hidden, its visibility will change based on this annotation.
+			 *
+			 * <i>XML Example of the OData V4 Annotation</i>
+			 *
+			 * <pre>
+			 *    &lt;Property Name=&quot;Price&quot; /&gt;
+			 *    &lt;Annotations Target=&quot;Price&quot;&gt;
+			 *        &lt;Annotation Term=&quot;com.sap.vocabularies.UI.v1.Importance&quot; EnumMember=&quot;com.sap.vocabularies.UI.v1.ImportanceType/Low&quot;/&gt;
+			 *    &lt;/Annotations&gt;
+			 * </pre>
+			 */
+			fieldLowImportance: {
+				namespace: "com.sap.vocabularies.UI.v1",
+				annotation: "Importance",
+				target: [
+					"Annotation", "Record"
+				],
+				allowList: {
+					values: [
+						"Low"
+					]
+				},
+				defaultValue: false,
+				appliesTo: [
+					"field"
+				],
+				group: [
+					"Appearance", "Behavior"
+				],
+				since: "1.87.0"
 			}
@@ -1527,2 +1634,5 @@ },
 				ignore: true
+			},
+			importance: {
+				ignore: true
 			}
@@ -1529,0 +1639,0 @@ },

src/sap/ui/comp/designtime/smartfilterbar/SmartFilterBar.designtime.js

@@ -10,2 +10,25 @@ /*
 	return {
+		actions: {
+			settings: function () {
+					return {
+						name: "FILTER_BAR_ADAPT_FILTERS_DIALOG",
+						runtime: true,
+						handler: function(oControl, mPropertyBag) {
+							return new Promise(function (resolve, reject) {
+								if (oControl.isA("sap.ui.comp.smartfilterbar.SmartFilterBar") &&
+									oControl.getVariantManagement() &&
+									oControl.getVariantManagement().isA("sap.ui.comp.smartvariants.SmartVariantManagement") &&
+									oControl.getVariantManagement().isVariantAdaptationEnabled()) {
+									var fCallBack = function(oData) {
+										resolve(oData);
+									};
+									oControl.showAdaptFilterDialogForKeyUser(mPropertyBag.styleClass, fCallBack);
+								} else {
+									reject("wrong conrol type");
+								}
+							});
+						}
+					};
+			}
+		},
 		annotations: {
@@ -12,0 +35,0 @@ /**

src/sap/ui/comp/designtime/smartform/SmartForm.designtime.js

@@ -78,2 +78,5 @@ /*
 				ignore: true
+			},
+			importance: {
+				ignore: true
 			}
@@ -80,0 +83,0 @@ }

src/sap/ui/comp/designtime/smartvariants/SmartVariantManagement.designtime.js

@@ -7,28 +7,26 @@ /*
 // Provides the Design Time Metadata for the sap.ui.comp.smartvariants.SmartVariantManagement control.
-sap.ui.define([], function() {
+sap.ui.define(["sap/ui/comp/variants/VariantManagement"], function(VariantManagement) {
 	"use strict";
 	return {
 		actions: {
-			settings: function () {
-					return {
-						name: "VARIANT_MANAGEMENT_MANAGEDIALOG",
-						handler: function(oControl, mPropertyBag) {
-							return new Promise(function (resolve, reject) {
-								if (oControl.isA("sap.ui.comp.smartvariants.SmartVariantManagement")) {
-									if (!oControl.getShowShare()) {
-										reject("share not enabled");
-										return;
-									}
-									var fCallBack = function(aData) {
-										resolve(aData);
-									};
-									oControl.openManageViewsDialogForKeyUser(mPropertyBag.styleClass, fCallBack);
-								} else {
-									reject("wrong conrol type");
-								}
-							});
+			compVariant: function(oVariantManagement) {
+				return {
+					validators: [
+						"noEmptyText",
+						{
+							validatorFunction: function(sNewText) {
+								return !oVariantManagement.isNameDuplicate(sNewText);
+							},
+							errorMessage:
+								oVariantManagement.oResourceBundle.getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE")
+						},
+						{
+							validatorFunction: function(sNewText) {
+								return !oVariantManagement.isNameTooLong(sNewText);
+							},
+							errorMessage: oVariantManagement.oResourceBundle.getText("VARIANT_MANAGEMENT_MAX_LEN", [ VariantManagement.MAX_NAME_LEN ])
 						}
-					};
-				}
-
+					]
+				};
+			}
 		},
@@ -59,4 +57,13 @@ aggregations: {
 		},
+		variantRenameDomRef: function(oVariantManagement) {
+			return oVariantManagement.getTitle().getDomRef("inner");
+		},
+		tool: {
+			start: function(oVariantManagement) {
+			},
+			stop: function(oVariantManagement) {
+			}
+		},
 		customData: {}
 	};
 });

src/sap/ui/comp/designtime/variants/VariantManagement.designtime.js

@@ -58,2 +58,5 @@ /*
 				ignore: false
+			},
+			standardItemAuthor: {
+				ignore: false
 			}
@@ -60,0 +63,0 @@ },

src/sap/ui/comp/library.js

@@ -28,3 +28,3 @@ /*
 		name: "sap.ui.comp",
-		version: "1.86.3",
+		version: "1.87.0",
 		dependencies: [
@@ -162,2 +162,8 @@ "sap.ui.core",
 						}
+					},
+					"variantContent": {
+						"changeHandler": "sap/ui/comp/smartvariants/flexibility/changes/VariantContent",
+						"layers": {
+							"USER": false
+						}
 					}
@@ -680,2 +686,30 @@ },
 	/**
+	 * Provides information about the importance of the field
+	 *
+	 * @enum {string}
+	 * @public
+	 * @since 1.87
+	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	sap.ui.comp.smartfield.Importance = {
+		/**
+		 * <code>SmartField</code> with high importance
+		 * @public
+		 */
+		High: "High",
+
+		/**
+		 * <code>SmartField</code> with medium importance
+		 * @public
+		 */
+		Medium: "Medium",
+
+		/**
+		 * <code>SmartField</code> with low importance
+		 * @public
+		 */
+		Low: "Low"
+	};
+
+	/**
 	 * Provides the type of services available for export in the <code>SmartTable</code> control.
@@ -1239,2 +1273,30 @@ *
 	/**
+	 * Enumeration of SmartForm Importance types
+	 *
+	 * @enum {string}
+	 * @public
+	 * @since 1.87
+	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	sap.ui.comp.smartform.Importance = {
+		/**
+		 * Shows fields that are annotated with UI.ImportanceType/High or have importance property set to High
+		 * @public
+		 */
+		High: "High",
+
+		/**
+		 * Shows fields that are annotated with <code>UI.ImportanceType/Medium</code> or <code>UI.ImportanceType/High</code> or have the <code>importance</code> property set to <code>medium</code> or <code>high</code>.
+		 * @public
+		 */
+		Medium: "Medium",
+
+		/**
+		 * Shows all fields
+		 * @public
+		 */
+		Low: "Low"
+	};
+
+	/**
 	 * Enumeration of FilterBar personalization mode. Defines the available view types within the Adapt Filters Dialog
@@ -1241,0 +1303,0 @@ *

src/sap/ui/comp/navpopover/Factory.js

@@ -10,3 +10,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -13,0 +13,0 @@ * @since 1.36.0

src/sap/ui/comp/navpopover/FakeFlpConnector.js

@@ -15,3 +15,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -18,0 +18,0 @@ * @since 1.58.0

src/sap/ui/comp/navpopover/FlexConnector.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.44.0

src/sap/ui/comp/navpopover/SmartLink.js

@@ -545,3 +545,3 @@ /*
 	 * @param {Function} fnBeforeNavigationCallback the function that should be called before the navigation is triggered. This has to return a promise which the navigation will wait for.
-	 * @returns {sap.ui.comp.navpopover.SmartLink} this
+	 * @returns {this} this
 	 */
@@ -548,0 +548,0 @@ SmartLink.prototype.setBeforeNavigationCallback = function(fnBeforeNavigationCallback) {

src/sap/ui/comp/navpopover/Util.js

@@ -10,3 +10,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -13,0 +13,0 @@ * @since 1.25.0

src/sap/ui/comp/odata/FiscalFormat.js

@@ -29,3 +29,3 @@ /*
 	 * @param {string} oFormatOptions.calendarType format options.
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental This module is only for internal/experimental use!
@@ -118,3 +118,3 @@ * @private
 	 * @private
-	 * @sap-restricted sap.ui.comp.SmartTable
+	 * @ui5-restricted sap.ui.comp.SmartTable
 	 */
@@ -128,3 +128,3 @@ FiscalFormat.prototype.getRegExPattern = function() {
 	 * groups of the pattern. Each placeholder consists of a $ (dollar sign)
-	 * followed by a non-zero based index (integer).
+	 * followed by a non-zero based index ().
 	 *
@@ -300,3 +300,7 @@ * The template is locale dependent.
 	FiscalFormat.prototype.parse = function(sValue) {
-		return sValue.replace(this.sParseRegExPattern, this.fnParseRegExReplacer);
+		if (sValue) {
+			return sValue.replace(this.sParseRegExPattern, this.fnParseRegExReplacer);
+		}
+
+		return null;
 	};
@@ -303,0 +307,0 @@

src/sap/ui/comp/odata/FiscalMetadata.js

@@ -16,3 +16,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -19,0 +19,0 @@ * @experimental This module is only for internal/experimental use!

src/sap/ui/comp/odata/SideEffects.js

@@ -17,3 +17,3 @@ /*
 	 * @experimental to be productized soon
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.31.0
@@ -131,2 +131,10 @@ * @alias sap.ui.comp.odata.SideEffects
 			}
+		} else if (oSideEffect.SourceEntities && Array.isArray(oSideEffect.SourceEntities)) {
+			len = oSideEffect.SourceEntities.length;
+
+			for (i = 0; i < len; i++) {
+				if (oSideEffect.SourceEntities[i].NavigationPropertyPath === sPath) {
+					return true;
+				}
+			}
 		}
@@ -133,0 +141,0 @@

src/sap/ui/comp/odata/type/FiscalDate.js

@@ -10,6 +10,7 @@ /*
 	"sap/ui/comp/smartfield/type/String",
+	"sap/ui/comp/odata/type/NumericText",
 	"sap/ui/comp/odata/FiscalFormat",
 	"sap/ui/model/ValidateException"
 
-], function(Core, coreLibrary, String, FiscalFormat, ValidateException) {
+], function(Core, coreLibrary, String, NumericText, FiscalFormat, ValidateException) {
 	"use strict";
@@ -23,6 +24,6 @@ /**
 	 * @param {object} oSettings Settings.
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental
 	 * @private
-	 * @extends sap.ui.model.odata.type.String
+	 * @extends sap.ui.comp.smartfield.type.String
 	 * @alias {sap.ui.comp.odata.type.FiscalDate} the fiscal date implementation.
@@ -33,2 +34,5 @@ */
 			String.call(this, oFormatOptions, oConstraints);
+			if (this.oConstraints && this.oConstraints.isDigitSequence) {
+				NumericText.call(this, oFormatOptions, oConstraints);
+			}
 			this.sAnotationType = oSettings.anotationType;
@@ -53,2 +57,5 @@ this.formatter = FiscalFormat.getDateInstance(Object.assign({ format: FiscalDate.oDateFormats[oSettings.anotationType], calendarType: coreLibrary.CalendarType.Gregorian }, oFormatOptions));
 		}
+		if (this.oConstraints && this.oConstraints.isDigitSequence) {
+			return this.formatter.parse(NumericText.prototype.parseValue.apply(this, arguments));
+		}
 		return this.formatter.parse(String.prototype.parseValue.apply(this, arguments));
@@ -70,3 +77,9 @@ };
 	FiscalDate.prototype.formatValue = function(sValue) {
-		var vFormattedValue = String.prototype.formatValue.apply(this, arguments);
+		var vFormattedValue;
+		if (this.oConstraints && this.oConstraints.isDigitSequence) {
+			vFormattedValue = NumericText.prototype.formatValue.apply(this, arguments);
+		} else {
+			vFormattedValue = String.prototype.formatValue.apply(this, arguments);
+		}
+
 		if (vFormattedValue === null) {
@@ -73,0 +86,0 @@ return null;

src/sap/ui/comp/odata/type/StringDate.js

@@ -26,3 +26,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental
@@ -29,0 +29,0 @@ * @since 1.54.0

src/sap/ui/comp/personalization/ColumnHelper.js

@@ -19,3 +19,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @constructor
@@ -22,0 +22,0 @@ * @experimental This module is only for internal/experimental use!

src/sap/ui/comp/personalization/ColumnsController.js

@@ -12,4 +12,4 @@ /*
 	'./Util',
-	'sap/base/util/merge'
-
+	'sap/base/util/merge',
+	'sap/m/plugins/PluginBase'
 ], function(
@@ -20,3 +20,4 @@ BaseController,
 	Util,
-	merge
+	merge,
+	PluginBase
 ) {
@@ -31,3 +32,3 @@ "use strict";
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -70,3 +71,9 @@ * @since 1.26.0
 
-		if (this.getTableType() === CompLibrary.personalization.TableType.AnalyticalTable || this.getTableType() === CompLibrary.personalization.TableType.Table || this.getTableType() === CompLibrary.personalization.TableType.TreeTable) {
+		if (this.getTableType() === CompLibrary.personalization.TableType.ResponsiveTable) {
+			var oColumnResizerPlugin = PluginBase.getPlugin(oTable, "sap.m.plugins.ColumnResizer");
+			if (oColumnResizerPlugin) {
+				oColumnResizerPlugin.detachColumnResize(this._onColumnResize, this);
+				oColumnResizerPlugin.attachColumnResize(this._onColumnResize, this);
+			}
+		} else if (this.getTableType() === CompLibrary.personalization.TableType.AnalyticalTable || this.getTableType() === CompLibrary.personalization.TableType.Table || this.getTableType() === CompLibrary.personalization.TableType.TreeTable) {
 			oTable.detachColumnMove(this._onColumnMove, this);
@@ -494,2 +501,9 @@ oTable.detachColumnVisibility(this._onColumnVisibility, this);
 
+		var fSetWidth = function(oColumnsItem, oColumn) {
+			// Apply column width
+			if (oColumnsItem.width !== undefined && oColumn.getWidth() !== oColumnsItem.width) {
+				oColumn.setWidth(oColumnsItem.width);
+			}
+		};
+
 		// organize columnsItems by it's index to apply them in the right order
@@ -513,2 +527,3 @@ if (oJson.columns.columnsItems.length) {
 					fSetVisibility(oColumnsItem, oColumn);
+					fSetWidth(oColumnsItem, oColumn);
 				}
@@ -515,0 +530,0 @@ }, this);

src/sap/ui/comp/personalization/Controller.js

@@ -30,3 +30,3 @@ /* eslint-disable strict */
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @constructor
@@ -33,0 +33,0 @@ * @experimental This module is only for internal/experimental use!

src/sap/ui/comp/personalization/DimeasureController.js

@@ -20,3 +20,3 @@ /* eslint-disable strict */
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -23,0 +23,0 @@ * @since 1.34.0

src/sap/ui/comp/personalization/SelectionController.js

@@ -16,3 +16,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -19,0 +19,0 @@ * @since 1.34.0

src/sap/ui/comp/personalization/Util.js

@@ -10,3 +10,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -13,0 +13,0 @@ * @since 1.25.0

src/sap/ui/comp/personalization/Validator.js

@@ -10,3 +10,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -13,0 +13,0 @@ * @since 1.48.0

src/sap/ui/comp/providers/ChartProvider.js

@@ -44,2 +44,3 @@ /*!
 			this._oDefaultDropDownDisplayBehaviour = mPropertyBag.defaultDropDownDisplayBehaviour;
+			this._bUseTimeseries = mPropertyBag.useTimeSeries;
 			try {
@@ -306,3 +307,4 @@ this._oDateFormatSettings = mPropertyBag.dateFormatSettings ? JSON.parse(mPropertyBag.dateFormatSettings) : undefined;
 
-				if (oField.isCalendarDate) {
+				if (oField.isCalendarDate && this._oDateFormatSettings) {
+
 					var oConstraints;
@@ -312,6 +314,16 @@ var oSettings = {
 					};
-					var oStringDateType = ODataType.getType("Edm.String", this._oDateFormatSettings, oConstraints, oSettings);
-					fnCustomFormatter = function(oValue) {
-						return oStringDateType.formatValue(oValue, "string");
+
+					if (!fnCustomFormatter) {
+						var oStringDateType = ODataType.getType("Edm.String", this._oDateFormatSettings, oConstraints, oSettings);
+						fnCustomFormatter = function(oValue) {
+							return oStringDateType.formatValue(oValue, "string");
+						};
+					}
+				} else if (!this._bUseTimeseries) {
+
+					var oConstraints;
+					var oSettings = {
+						isCalendarDate: true
 					};
+					fnCustomFormatter = this._getDateFormatterForAnnotation(oField, oConstraints, oSettings);
 				}
@@ -340,2 +352,77 @@
 	/**
+	 * returns a custom date formatter depending on an time annotation for the field
+	 */
+	ChartProvider.prototype._getDateFormatterForAnnotation = function(oField, oConstraints, oSettings) {
+		var oDateFormatterSetting = {};
+		var sParserPattern = this._getParserSettingsForAnnotation(oField);
+		var sPrefix = this._getParserPrefixForAnnotation(oField);
+
+		if (this._oDateFormatSettings) {
+			//Take over cutstom data configuration
+			Object.assign(oDateFormatterSetting, this._oDateFormatSettings);
+		}
+
+		//Overrule pattern for dateFormatSettings
+		oDateFormatterSetting.pattern = this._getFormatterPatternForAnnotation(oField);
+
+		if (oDateFormatterSetting.pattern) {
+			var oStringDateType = ODataType.getType("Edm.String", oDateFormatterSetting, oConstraints, oSettings);
+
+			var fnCustomFormatter = function(oValue) {
+				oValue = DateFormat.getInstance({pattern: sParserPattern}).parse(oValue);
+
+				return sPrefix + oStringDateType.formatValue(oValue, "string");
+
+			};
+			//var fnCustomFormatter = DateFormat.getDateInstance(sDateFormatterSetting);
+
+			return fnCustomFormatter;
+		}
+	};
+
+	ChartProvider.prototype._getParserPrefixForAnnotation = function(oField) {
+		if (CalendarMetadata.isYearWeek(oField)) {
+			return "CW ";
+		} else if (CalendarMetadata.isYearQuarter(oField)) {
+			return "Q";
+		}
+
+		return "";
+	};
+
+	ChartProvider.prototype._getParserSettingsForAnnotation = function(oField){
+		if (oField.type === "Edm.String"){
+			var sFormatterSettings;
+
+			if (CalendarMetadata.isYearWeek(oField)) {
+				sFormatterSettings = "yyyyww";
+			} else if (CalendarMetadata.isYearMonth(oField)) {
+				sFormatterSettings = "yyyyMM";
+			} else if (CalendarMetadata.isYearQuarter(oField)) {
+				sFormatterSettings = "yyyyQQQQQ";
+			}
+
+			return sFormatterSettings;
+		}
+	};
+
+	ChartProvider.prototype._getFormatterPatternForAnnotation = function(oField) {
+		if (oField.type === "Edm.String"){
+			var sFormatterSettings;
+
+			if (oField.isCalendarDate) {
+				sFormatterSettings = "d MMMM y";
+			} else if (CalendarMetadata.isYearWeek(oField)) {
+				sFormatterSettings = "ww y";
+			} else if (CalendarMetadata.isYearMonth(oField)) {
+				sFormatterSettings = "MMMM y";
+			} else if (CalendarMetadata.isYearQuarter(oField)) {
+				sFormatterSettings = "Q y";
+			}
+
+			return sFormatterSettings;
+		}
+	};
+
+	/**
 	 * Sets inResult on the field metadata if the field exists in the RequestAtLeast of PresentationVariant annotation
@@ -342,0 +429,0 @@ * @param {object} oField - OData metadata for the table field

src/sap/ui/comp/providers/ControlProvider.js

@@ -399,3 +399,3 @@ /*
 	 * @param {object} oViewField The view field
-	 * @returns {integer} iIndex The index
+	 * @returns {int} iIndex The index
 	 * @private
@@ -402,0 +402,0 @@ */

src/sap/ui/comp/providers/TableProvider.js

@@ -286,2 +286,21 @@ /*
 	/**
+	 * Returns whether the provided field has default importance within the line item annotations.
+	 *
+	 * @param {object} mField The field metadata
+	 * @returns {boolean} Whether default importance or not
+	 * @since 1.87
+	 * @protected
+	 */
+	TableProvider.prototype.isLineItemDefaultImportance = function(mField) {
+		if (mField.importance != "High") {
+			return false;
+		}
+
+		var aLineItemAnnotations = (this._oLineItemAnnotation && this._oLineItemAnnotation.annotation) || [];
+		return aLineItemAnnotations.some(function(mAnnotation) {
+		    return mAnnotation.Value && mAnnotation.Value.Path == mField.name && !MetadataAnalyser.hasImportance(mAnnotation);
+		});
+	};
+
+	/**
 	 * Returns the metadata of the provided field path from the entity set.
@@ -296,7 +315,7 @@ * If the modelType is missing on the found field metadata then it is created and set on the field.
 	TableProvider.prototype.getFieldMetadata = function(sName) {
-		var oFieldMetadata = (this._aODataFieldMetadata || []).find(function(mField) {
+		var oFieldMetadata = this._aTableViewMetadata.concat(this._aODataFieldMetadata).find(function(mField) {
 			return mField.name == sName;
 		});
 
-		if (!oFieldMetadata && sName.includes("/")) {
+		if (!oFieldMetadata && sName && sName.includes("/")) {
 			try {
@@ -303,0 +322,0 @@ oFieldMetadata = this._oMetadataAnalyser.extractNavigationPropertyField(sName, this.sEntitySet);

src/sap/ui/comp/providers/ValueListProvider.js

@@ -891,3 +891,5 @@ /*
 			// Add InParams as filter in the initial GET request for ComboBox/MultiComboBox
-			if (this._isControlDropdown(this.oControl) && this.mInParams && Object.keys(this.mInParams).length > 1) {
+			if (this._isControlDropdown(this.oControl) &&
+				(this.mInParams && Object.keys(this.mInParams).length > 1 ||
+				this.mConstParams && Object.keys(this.mConstParams).length >= 1)) {
 
@@ -1612,3 +1614,3 @@ // When the request is completed and the filtering is done remove the busy indicator
 	 *
-	 * @returns {sap.ui.comp.providers.ValueListProvider} The <code>this</code> instance to allow method chaining
+	 * @returns {this} The <code>this</code> instance to allow method chaining
 	 * @protected
@@ -1615,0 +1617,0 @@ * @since 1.54

src/sap/ui/comp/smartfield/AnnotationHelper.js

@@ -12,3 +12,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -319,2 +319,26 @@ * @since 1.29.0
 	/**
+	 * Checks whether a property is marked as important.
+	 *
+	 * @param {object} oProperty the given property from the meta model
+	 * @return {sap.ui.comp.smartfield.Importance} The value of the <code>UI.Importance</code> property. If it is not explicitly set, this method returns '<code>low</code>.
+	 * @public
+	 */
+	AnnotationHelper.prototype.getImportanceAnnotation = function(oProperty) {
+		var sImportance,
+			oImportance = this._getObject("com.sap.vocabularies.UI.v1.Importance", oProperty);
+
+        if (oImportance) {
+			sImportance = oImportance.EnumMember;
+        }
+		switch (sImportance) {
+			case "com.sap.vocabularies.UI.v1.ImportanceType/High":
+				return "High";
+			case "com.sap.vocabularies.UI.v1.ImportanceType/Medium":
+				return "Medium";
+			default:
+				return "Low";
+		}
+	};
+
+	/**
 	 * Returns an object that is addressed by a given path. If no object can be found <code>null</code> is returned.
@@ -321,0 +345,0 @@ *

src/sap/ui/comp/smartfield/BindingUtil.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/ControlFactoryBase.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/FieldControl.js

@@ -27,3 +27,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -169,3 +169,3 @@ * @constructor
 				if (oMetaData.entitySet["sap:updatable-path"]) {
-					aPaths.push(oMetaData.entitySet["sap:updatable-path"]);
+					aPaths.push(that._toPath(oMetaData, oMetaData.entitySet["sap:updatable-path"]));
 					iEntitySetPos = len;
@@ -460,2 +460,3 @@ len++;
 					aVisibleStates.push(arguments[iPropertyPos] !== 0);
+					oSmartFieldThisContext._fieldControlValue = vValue;
 				}
@@ -462,0 +463,0 @@

src/sap/ui/comp/smartfield/JSONControlFactory.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/JSONTypes.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/ODataControlSelector.js

@@ -12,3 +12,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @since 1.28.0
@@ -15,0 +15,0 @@ * @returns {sap.ui.comp.smartfield.ODataControlSelector} new control selector instance.

src/sap/ui/comp/smartfield/ODataHelper.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/ODataTypes.js

@@ -65,3 +65,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -106,2 +106,3 @@ * @constructor
 				mConstraints = this.getConstraints(oProperty.property, mConstraints);
+				mFormatOptions = this.getFormatOptions(oProperty.property, mFormatOptions);
 			}
@@ -215,2 +216,12 @@
 
+	ODataTypes.prototype.getFormatOptions = function(oProperty, mFormatOptions) {
+		var oOdataFormatOptions = {};
+
+		if (MetadataAnalyser.isUpperCase(oProperty)) {
+			oOdataFormatOptions.displayFormat = "UpperCase";
+		}
+
+		return Object.assign({}, mFormatOptions, oOdataFormatOptions);
+	};
+
 	/**
@@ -217,0 +228,0 @@ * Calculates the constraints for <code>Edm.DateTime</code>.

src/sap/ui/comp/smartfield/SideEffectUtil.js

@@ -14,3 +14,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -17,0 +17,0 @@ * @since 1.31.0

src/sap/ui/comp/smartfield/TextArrangementDelegate.js

@@ -127,3 +127,4 @@ /*!
 	TextArrangementDelegate.prototype.getBindingInfo = function(oSettings) {
-		var	bValueListNoValidation = oSettings.valueListNoValidation,
+		var	oBindSettings,
+			bValueListNoValidation = oSettings.valueListNoValidation,
 			oFormatOptions = {},
@@ -144,6 +145,2 @@ oSmartField = this.oSmartField,
 
-			if (oSettings.sDisplayFormat) {
-				oFormatOptions.displayFormat = oSettings.sDisplayFormat;
-			}
-
 			this.oTextArrangementType = oFactory._oTypes.getType(oMetadata.property, Object.assign(oFormatOptions, this.oTextArrangementType.oFormatOptions), this.oTextArrangementType.oConstraints, {
@@ -166,4 +163,7 @@ composite: true,
 		}
-		if (oSettings.skipValidation) {
-			return {
+
+		// The Core layer will raise an error
+		// if oTextArrangementType is not composite and we pass bind setting with "parts" property
+		if (oSettings.skipValidation || !this.oTextArrangementType.isA("sap.ui.model.CompositeType")) {
+			oBindSettings = {
 				model: oMetadata.model,
@@ -173,15 +173,18 @@ type: this.oStringType,
 			};
+		} else {
+			oBindSettings = {
+				model: oMetadata.model,
+				type: this.oTextArrangementType,
+				parts: [
+					{
+						path: oMetadata.path
+					},
+					{
+						path: sTextAnnotationPropertyPath
+					}
+				]
+			};
 		}
-		return {
-			model: oMetadata.model,
-			type: this.oTextArrangementType,
-			parts: [
-				{
-					path: oMetadata.path
-				},
-				{
-					path: sTextAnnotationPropertyPath
-				}
-			]
-		};
+
+		return oBindSettings;
 	};
@@ -308,3 +311,4 @@
 			error: fnOnFetchError,
-			filterFields: oSettings.filterFields
+			filterFields: oSettings.filterFields,
+			bCheckValuesValidity: oSettings.bCheckValuesValidity
 		};
@@ -372,3 +376,3 @@
 
-		if (bValueBeingUpdatedByMutator && !bValueBeingUpdatedByModel) {
+		if (bValueBeingUpdatedByMutator && !bValueBeingUpdatedByModel && !oSettings.bCheckValuesValidity) {
 			oInputField.attachEventOnce("change", function onTextInputFieldChange(oControlEvent) {
@@ -387,3 +391,3 @@ var bValueValidated = !!oControlEvent.getParameter("validated");
 
-			if (bValueBeingUpdatedByModel) {
+			if (bValueBeingUpdatedByModel || oSettings.bCheckValuesValidity) {
 				oSettings.filterFields = ["keyField"];
@@ -429,9 +433,2 @@ }
 
-		if (this.oTextArrangementType &&
-			this.oTextArrangementType.oFormatOptions &&
-			this.oTextArrangementType.oFormatOptions.displayFormat === "UpperCase" &&
-			oSettings.value) {
-			oSettings.value = oSettings.value.toUpperCase();
-		}
-
 		var aFilters = this.getFilters(oSettings.value, oFiltersSettings);
@@ -618,4 +615,4 @@
 		this.destroyFilters();
-		var aFilterFields = oSettings.aFilterFields;
-		var oAdditionalParamFilters;
+		var aFilterFields = oSettings.aFilterFields,
+			oAdditionalParamFilters;
 
@@ -638,3 +635,2 @@ if (aFilterFields.length === 1) {
 		this.oIDFilter = getIDFilter(vValue, oSettings);
-		this.oDescriptionFilter = getDescriptionFilter(vValue, oSettings);
 		oAdditionalParamFilters = getAdditionalFilters(oSettings);
@@ -648,4 +644,3 @@
 					filters: [
-						this.oIDFilter,
-						this.oDescriptionFilter
+						this.oIDFilter
 					]
@@ -652,0 +647,0 @@ })

src/sap/ui/comp/smartfield/type/AbapBool.js

@@ -18,3 +18,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @private
@@ -21,0 +21,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/DateTime.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/DateTimeOffset.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/Decimal.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/Int16.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/Int32.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/Int64.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.31.0

src/sap/ui/comp/smartfield/type/SByte.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.28.0

src/sap/ui/comp/smartfield/type/String.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -23,2 +23,3 @@ * @since 1.28.0
 			StringBase.apply(this, arguments);
+			this.oFormatOptions = oFormatOptions;
 			this.oFieldControl = null;
@@ -31,2 +32,6 @@ }
 
+		if (this.oFormatOptions && this.oFormatOptions.displayFormat === "UpperCase" && oReturn && oReturn.toUpperCase ) {
+			oReturn = oReturn.toUpperCase();
+		}
+
 		if (typeof this.oFieldControl === "function") {
@@ -33,0 +38,0 @@ this.oFieldControl(sValue, sSourceType);

src/sap/ui/comp/smartfield/type/TextArrangement.js

@@ -195,3 +195,3 @@ /*
 
-	TextArrangement.prototype.validateValue = function(aValues) {
+	TextArrangement.prototype.validateValue = function(aValues, bCheckValuesValidity) {
 		this.validateIDOnly(aValues);
@@ -239,3 +239,4 @@ var vID = aValues[0];
 				success: handleSuccess.bind(this),
-				error: handleException.bind(this)
+				error: handleException.bind(this),
+				bCheckValuesValidity: bCheckValuesValidity
 			};
@@ -242,0 +243,0 @@

src/sap/ui/comp/smartfield/type/Time.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.34.0

src/sap/ui/comp/smartfilterbar/SFBMultiInput.js

@@ -29,3 +29,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -32,0 +32,0 @@ * @constructor

src/sap/ui/comp/smartfilterbar/SortingUtil.js

@@ -11,3 +11,3 @@ /*
  * @author SAP SE
- * @version 1.86.3
+ * @version 1.87.0
  * @private
@@ -14,0 +14,0 @@ * @since 1.85.0

src/sap/ui/comp/smartform/flexibility/changes/AddField.js

@@ -23,3 +23,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -26,0 +26,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/AddFields.js

@@ -84,3 +84,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.33.0
@@ -87,0 +87,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/AddGroup.js

@@ -17,3 +17,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -20,0 +20,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/CombineFields.js

@@ -20,3 +20,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.46
@@ -23,0 +23,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/MoveFields.js

@@ -17,3 +17,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -20,0 +20,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/MoveGroups.js

@@ -17,3 +17,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.86.3
+		 * @version 1.87.0
 		 * @experimental Since 1.27.0
@@ -20,0 +20,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/RemoveField.js

@@ -13,3 +13,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -16,0 +16,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/RemoveGroup.js

@@ -14,3 +14,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -17,0 +17,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/RenameField.js

@@ -24,3 +24,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -27,0 +27,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/RenameGroup.js

@@ -18,3 +18,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.27.0
@@ -21,0 +21,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/RenameTitle.js

@@ -14,3 +14,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.46
@@ -17,0 +17,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/SplitField.js

@@ -15,3 +15,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.46
@@ -18,0 +18,0 @@ */

src/sap/ui/comp/smartform/flexibility/changes/UnhideControl.js

@@ -13,3 +13,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental Since 1.44.0
@@ -16,0 +16,0 @@ */

src/sap/ui/comp/smartform/Group.js

@@ -199,3 +199,3 @@ /*
 	 * @param {boolean} bEditMode new value for editable property of smart fields.
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining.
+	 * @returns {this} <code>this</code> to allow method chaining.
 	 * @public
@@ -350,3 +350,3 @@ * @deprecated Since version 1.74.0, please do not change the edit mode on group level, let the SmartForm inheritance do it
 	 * @param {boolean} bVisible New value for property <code>visible</code>
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining.
+	 * @returns {this} <code>this</code> to allow method chaining.
 	 * @public
@@ -537,3 +537,3 @@ */
 	 * @param {sap.ui.core.CustomData} oCustomData the customData to add; if empty, nothing is added
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -568,3 +568,3 @@ */
 	 * @param {int} iIndex the 0-based index the customData should be inserted at; for a negative value of iIndex, the customData is inserted at position 0; for a value greater than the current size of the aggregation, the customData is inserted at the last position
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -710,3 +710,3 @@ */
 	 * @param {sap.ui.core.Title|string} vTitle The title to set
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining
+	 * @returns {this} <code>this</code> to allow method chaining
 	 * @private
@@ -733,3 +733,3 @@ * @name sap.ui.comp.smartform.Group#setTitle
 	 *
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining
+	 * @returns {this} <code>this</code> to allow method chaining
 	 * @private
@@ -746,3 +746,3 @@ * @name sap.ui.comp.smartform.Group#destroyTitle
 	 * @param {sap.ui.layout.form.FormElement} oFormElement the <code>formElement</code> to add; if empty, nothing is inserted
-	 * @return {sap.ui.comp.smartform.Group} Reference to <code>this</code> in order to allow method chaining
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @private
@@ -759,3 +759,3 @@ * @name sap.ui.comp.smartform.Group#addFormElement
 	 * @param {int} iIndex the 0-based index the <code>formElement</code> should be inserted at; for a negative value of iIndex, the <code>formElement</code> is inserted at position 0; for a value greater than the current size of the aggregation, the <code>formElement</code> is inserted at the last position
-	 * @return {sap.ui.comp.smartform.Group} Reference to <code>this</code> in order to allow method chaining
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @private
@@ -812,3 +812,3 @@ * @name sap.ui.comp.smartform.Group#insertFormElement
 	 *
-	 * @return {sap.ui.comp.smartform.Group} Reference to <code>this</code> in order to allow method chaining
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @private
@@ -824,3 +824,3 @@ * @name sap.ui.comp.smartform.Group#destroyFormElements
 	 * @param {sap.ui.core.Toolbar} vToolbar The toolbar to set
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining
+	 * @returns {this} <code>this</code> to allow method chaining
 	 * @private
@@ -847,3 +847,3 @@ * @name sap.ui.comp.smartform.Group#setToolbar
 	 *
-	 * @return {sap.ui.comp.smartform.Group} <code>this</code> to allow method chaining
+	 * @returns {this} <code>this</code> to allow method chaining
 	 * @private
@@ -850,0 +850,0 @@ * @name sap.ui.comp.smartform.Group#destroyToolbar

src/sap/ui/comp/smartform/GroupElement.js

@@ -666,3 +666,3 @@ /*
 	 * @param {boolean} bEditMode new value for editable property of smart fields.
-	 * @return {sap.ui.comp.smartform.GroupElement} <code>this</code> to allow method chaining.
+	 * @returns {this} <code>this</code> to allow method chaining.
 	 * @public
@@ -1704,3 +1704,3 @@ * @deprecated Since version 1.74.0, please do not change the edit mode on groupElement level, let the SmartForm inheritance do it
 	 * @param {sap.ui.core.CustomData} oCustomData the customData to add; if empty, nothing is added
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -1736,3 +1736,3 @@ */
 	 * @param {int} iIndex the 0-based index the customData should be inserted at; for a negative value of iIndex, the customData is inserted at position 0; for a value greater than the current size of the aggregation, the customData is inserted at the last position
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -1739,0 +1739,0 @@ */

src/sap/ui/comp/smartform/SmartForm.js

@@ -26,2 +26,3 @@ /*
 	var SmartFormValidationMode = library.smartform.SmartFormValidationMode;
+	var Importance = library.smartform.Importance;
 
@@ -227,2 +228,21 @@ var mFormLayouts = {
 					defaultValue: SmartFormValidationMode.Standard
+				},
+
+				/**
+				 * Specifies which smart fields will be visible inside the <code>SmartForm</code>.
+				 *
+				 * If set to <b>high</b>, only smart fields with high importance will be visible.
+				 *
+				 * If set to <b>medium</b>, only smart fields with high and medium importance will be visible.
+				 *
+				 * If set to <b>low</b> (default), all the smart fields will be visible regardless of their importance.
+				 *
+				 * <b>Note<b>: If a smart field is annotated as mandatory or hidden, its visibility will not be affected by the <code>importance</code> property.
+				 *
+				 * @since 1.87
+				 */
+				importance: {
+					type: "sap.ui.comp.smartform.Importance",
+					group: "Misc",
+					defaultValue: Importance.Low
 				}
@@ -364,4 +384,19 @@ },
 
+	SmartForm.prototype.onAfterRendering = function() {
+		var aFields = this.getSmartFields(false, false),
+			sImportance = this.getImportance();
+		if (!this.isPropertyInitial("importance")) {
+			aFields.forEach(function(oField) {
+				oField._setVisibilityBasedOnImportance(sImportance);
+			});
+		}
+	};
+
 	SmartForm.prototype.addGroup = function(oGroup) {
 
+		var that = this,
+			fnSetImportance,
+			sFormImportance,
+			aSmartFields;
+
 		if (!oGroup) {
@@ -371,2 +406,15 @@ return this;
 
+		aSmartFields = this._getSmartFieldsByGroup(oGroup, false);
+
+		aSmartFields.forEach(function(oField) {
+			fnSetImportance = oField.setImportance;
+			// override the setter for Importance property so that when the property is changed it can recalculate the field's visibility
+			// this cannot be handled in the SmartField because the field does not have information of the form properties
+			oField.setImportance = function() {
+				fnSetImportance.apply(this, arguments);
+				sFormImportance = that.getImportance();
+				this._setVisibilityBasedOnImportance(sFormImportance);
+			};
+		});
+
 		// as "groups" aggregation is not used, at least validate it
@@ -493,3 +541,3 @@ oGroup = this.validateAggregation("groups", oGroup, /* multiple */ true);
 	 * if the <code>GridDataSpan</code> property of the <code>Layout</code> aggregation changes or the <code>Layout</code> aggregation is added.
-	 * @return {sap.ui.comp.smartform.SmartForm} <code>this</code> to allow method chaining.
+	 * @returns {this} <code>this</code> to allow method chaining.
 	 * @public
@@ -1113,3 +1161,3 @@ */
 	 * @param {sap.ui.core.CustomData} oCustomData the customData to add; if empty, nothing is added
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -1131,3 +1179,3 @@ * @name sap.ui.comp.smartform.SmartForm#addCustomData
 	 * @param {int} iIndex the 0-based index the customData should be inserted at; for a negative value of iIndex, the customData is inserted at position 0; for a value greater than the current size of the aggregation, the customData is inserted at the last position
-	 * @return {sap.ui.comp.smartform.GroupElement} Reference to <code>this</code> to allow method chaining.
+	 * @returns {this} Reference to <code>this</code> to allow method chaining.
 	 * @public
@@ -1214,9 +1262,40 @@ * @name sap.ui.comp.smartform.SmartForm#insertCustomData
 	 * @return {sap.ui.comp.smartfield.SmartField[]} An array of smart fields (might be empty).
+	 * @private
+	 */
+	SmartForm.prototype._getSmartFieldsByGroup = function(oGroup, bConsiderOnlyVisibleGroupElements) {
+		var aGroupElements = [],
+			aElements = [],
+			aSmartFields = [];
+
+		aGroupElements = oGroup.getGroupElements();
+		for (var j = 0; j < aGroupElements.length; j++) {
+			var oGroupElement = aGroupElements[j];
+			if (!bConsiderOnlyVisibleGroupElements || (bConsiderOnlyVisibleGroupElements && oGroupElement.isVisible())) {
+				aElements = oGroupElement.getElements();
+				for (var k = 0; k < aElements.length; k++) {
+					var oElement = aElements[k];
+					if (oElement.isA("sap.ui.comp.smartfield.SmartField")) {
+						aSmartFields.push(oElement);
+					}
+				}
+			}
+		}
+
+		return aSmartFields;
+	};
+
+	/**
+	 * Retrieves all the smart fields of the form.
+	 *
+	 * <b>Note:</b> Even invisible <code>SmartField</code> controls are returned if the <code>group</code> or <code>groupElement</code> is visible.
+	 *
+	 * @param {boolean} [bConsiderOnlyVisibleGroups=true] Determines if only visible <code>groups</code> are taken into account
+	 * @param {boolean} [bConsiderOnlyVisibleGroupElements=false] Determines if only visible <code>groupElement</code> elements are taken into account
+	 * @return {sap.ui.comp.smartfield.SmartField[]} An array of smart fields (might be empty).
 	 * @public
 	 */
 	SmartForm.prototype.getSmartFields = function(bConsiderOnlyVisibleGroups, bConsiderOnlyVisibleGroupElements) {
-		var aGroups = [];
-		var aGroupElements = [];
-		var aElements = [];
-		var aSmartFields = [];
+		var aGroups = [],
+			aGroupSmartFields,
+			aSmartFields = [];
 
@@ -1232,15 +1311,4 @@ if (bConsiderOnlyVisibleGroups === undefined) {
 			if (!bConsiderOnlyVisibleGroups || (bConsiderOnlyVisibleGroups && oGroup.isVisible())) {
-				aGroupElements = oGroup.getGroupElements();
-				for (var j = 0; j < aGroupElements.length; j++) {
-					var oGroupElement = aGroupElements[j];
-					if (!bConsiderOnlyVisibleGroupElements || (bConsiderOnlyVisibleGroupElements && oGroupElement.isVisible())) {
-						aElements = oGroupElement.getElements();
-						for (var k = 0; k < aElements.length; k++) {
-							var oElement = aElements[k];
-							if (oElement.isA("sap.ui.comp.smartfield.SmartField")) {
-								aSmartFields.push(oElement);
-							}
-						}
-					}
-				}
+				aGroupSmartFields = this._getSmartFieldsByGroup(oGroup, bConsiderOnlyVisibleGroupElements);
+				aSmartFields = aSmartFields.concat(aGroupSmartFields);
 			}
@@ -2005,3 +2073,3 @@ }
 	 * @private
-	 * @return {sap.ui.comp.smartform.SmartForm} Reference to <code>this</code> to allow method chaining
+	 * @returns {this} Reference to <code>this</code> to allow method chaining
 	 */
@@ -2008,0 +2076,0 @@ SmartForm.prototype._suggestTitleId = function (sTitleID) {

src/sap/ui/comp/smartmicrochart/SmartAreaMicroChart.js

@@ -48,3 +48,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.38
@@ -102,3 +102,3 @@ * @constructor
 	/**
-	 * @returns {sap.ui.comp.smartmicrochart.SmartAreaMicroChart} Reference to 'this' in order to allow method chaining.
+	 * @returns {this} Reference to 'this' in order to allow method chaining.
 	 * @private
@@ -112,3 +112,3 @@ */
 	 * The control itself may not be bound.
-	 * @returns {sap.ui.comp.smartmicrochart.SmartAreaMicroChart} Reference to 'this' in order to allow method chaining.
+	 * @returns {this} Reference to 'this' in order to allow method chaining.
 	 * @private
@@ -115,0 +115,0 @@ */

src/sap/ui/comp/smartmicrochart/SmartBulletMicroChart.js

@@ -36,3 +36,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.38
@@ -39,0 +39,0 @@ * @constructor

src/sap/ui/comp/smartmicrochart/SmartColumnMicroChart.js

@@ -37,3 +37,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.60
@@ -40,0 +40,0 @@ * @constructor

src/sap/ui/comp/smartmicrochart/SmartComparisonMicroChart.js

@@ -38,3 +38,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.58
@@ -41,0 +41,0 @@ * @constructor

src/sap/ui/comp/smartmicrochart/SmartDeltaMicroChart.js

@@ -34,3 +34,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.61
@@ -37,0 +37,0 @@ * @constructor

src/sap/ui/comp/smartmicrochart/SmartHarveyBallMicroChart.js

@@ -34,3 +34,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @constructor
@@ -37,0 +37,0 @@ * @public

src/sap/ui/comp/smartmicrochart/SmartLineMicroChart.js

@@ -37,3 +37,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.60
@@ -40,0 +40,0 @@ * @constructor

src/sap/ui/comp/smartmicrochart/SmartMicroChart.js

@@ -35,3 +35,3 @@ /*
 	 * @extends sap.ui.core.Control
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.38
@@ -204,3 +204,3 @@ * @constructor
 	 * @private
-	 * @returns {sap.ui.comp.smartmicrochart.SmartMicroChart} Returns <code>this</code> to allow method chaining
+	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
@@ -207,0 +207,0 @@ SmartMicroChart.prototype.setChartType = function() {

src/sap/ui/comp/smartmicrochart/SmartMicroChartBase.js

@@ -928,10 +928,3 @@ /*
 		if (pattern) {
-			if (this._oDateType) {
-				this._oDateType.setFormatOptions({
-					style: "short",
-					source: {
-						pattern: pattern
-					}
-				});
-			} else {
+			if (!this._oDateType) {
 				this._oDateType = new DateType({
@@ -938,0 +931,0 @@ style: "short",

src/sap/ui/comp/smartmicrochart/SmartMicroChartRenderer.js

@@ -10,3 +10,3 @@ /*!
 	 * @static
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.38.0
@@ -13,0 +13,0 @@ */

src/sap/ui/comp/smartmicrochart/SmartRadialMicroChart.js

@@ -32,3 +32,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @constructor
@@ -35,0 +35,0 @@ * @public

src/sap/ui/comp/smartmicrochart/SmartStackedBarMicroChart.js

@@ -35,3 +35,3 @@ /*
 	 * @extends sap.ui.comp.smartmicrochart.SmartMicroChartBase
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.58
@@ -38,0 +38,0 @@ * @constructor

src/sap/ui/comp/smartmultiedit/Container.js

@@ -26,3 +26,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -92,3 +92,3 @@ * @public
 	 * @param {string} entitySet Entity set to use.
-	 * @returns {sap.ui.comp.smartmultiedit.Container} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -110,3 +110,3 @@ */
 	 * @param {sap.ui.model.Context[]} contexts Contexts to be used. This property must be an array.
-	 * @returns {sap.ui.comp.smartmultiedit.Container} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -134,3 +134,3 @@ */
 	 * @param {sap.ui.comp.smartmultiedit.Field} oSmartForm Smart form with the layout.
-	 * @returns {sap.ui.comp.smartmultiedit.Container} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -137,0 +137,0 @@ */

src/sap/ui/comp/smartmultiedit/Field.js

@@ -112,3 +112,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -449,3 +449,3 @@ * @public
 	 * @param {boolean} bSuppressInvalidate If set to <code>true</code>, this smart multi edit field (ManagedObject) is not marked as changed. The old parent, however, is marked as changed.
-	 * @returns {sap.ui.comp.smartmultiedit.Field} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @private
@@ -520,3 +520,3 @@ */
 	 * @param {string} sName Name of the property to bind to.
-	 * @returns {sap.ui.comp.smartmultiedit.Field} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -533,3 +533,3 @@ */
 	 * @param {sap.ui.comp.smartfield.Configuration} oConfig Optional configuration to set.
-	 * @returns {sap.ui.comp.smartmultiedit.Field} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -559,3 +559,3 @@ */
 	 * @param {sap.ui.core.Item | null} oItem An {@link sap.ui.core.Item} instance or <code>null</code>.
-	 * @returns {sap.ui.comp.smartmultiedit.Field} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -571,3 +571,3 @@ */
 	 * @param {number} iIndex An index of the item inside the Select action.
-	 * @returns {sap.ui.comp.smartmultiedit.Field} Returns <code>this</code> to allow method chaining.
+	 * @returns {this} Returns <code>this</code> to allow method chaining.
 	 * @public
@@ -574,0 +574,0 @@ */

src/sap/ui/comp/smartmultiedit/flexibility/changes/AddMultiEditFields.js

@@ -19,3 +19,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 */
@@ -22,0 +22,0 @@ var AddMultiEditFields = {};

src/sap/ui/comp/smartmultiinput/SmartMultiInput.js

@@ -98,3 +98,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 *
@@ -310,2 +310,11 @@ * @public
 
+			//Removing tokens from inner multi-input which are deleted before firing tokenUpdate of SMI (not in case of TwoWay binding mode)
+			if (this.getBinding("value").getBindingMode() !== "TwoWay" || !this.getBindingContext()){
+				if (oEvent.getParameter("removedTokens")) {
+					oEvent.getParameter("removedTokens").forEach(function(oToken) {
+						oToken.destroy();
+					});
+				}
+			}
+
 			this.fireTokenUpdate(mParameters);
@@ -640,2 +649,35 @@ }, this);
 
+	/**
+	 * Checks whether fieldGroupIDs can be assigned to the inner control. This method is overriden from the SmartField
+	 * implementation so that the MetaData of the EntitySet containing the navigation property is used to determine
+	 * the SideEffects rather than the EntitySet of the value to which the SmartMultiInput is bound
+	 * @override
+	 */
+	SmartMultiInput.prototype._checkFieldGroups = function() {
+		var oView,
+			oMetaData,
+			sMode = this.getMode();
+
+		if (this.getBindingContext() && this._oFactory && this._oFactory._oMeta &&
+			(sMode === "edit") && !this._bSideEffects) {
+
+			var oParentEntitySetName = this._oFactory._oMeta.entitySet,
+				oParentEntitySet = this.getModel().getMetaModel().getODataEntitySet(oParentEntitySetName),
+				oParentEntityType = this.getModel().getMetaModel().getODataEntityType(oParentEntitySet.entityType);
+			oMetaData = {
+				entitySet: oParentEntitySet,
+				entityType: oParentEntityType,
+				path: this._getNavigationPath()
+			};
+
+			// view should be available.
+			oView = this._getView();
+
+			// now set the field group ids.
+			if (oView && oMetaData) {
+				this._setFieldGroup(oMetaData, oView);
+			}
+		}
+	};
+
 	SmartMultiInput.prototype._bindMultiComboBox = function () {
@@ -642,0 +684,0 @@ var sBindingMode = this.getBinding("value").getBindingMode();

src/sap/ui/comp/smartvariants/SmartVariantManagementAdapter.js

@@ -74,43 +74,21 @@ /*
 
-	/**
-	 * Creates variant item for a given VariantManagment control.
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} oVariantManagement for which the items are created.
-	 * @internal
-	 */
-	SmartVariantManagementAdapter.prototype.createSelectionPresentationVariants = function(oVariantManagement) {
-		var aSelectionPresentationVariants, oVariantItem, sKeyPrefix = "#", aVariantKeys = [];
 
-		if (!this.getSelectionPresentationVariants()) {
-			return;
-		}
+	SmartVariantManagementAdapter.prototype.getODataVariants = function() {
+		var sKeyPrefix = "#", aVariants = [];
 
-		aSelectionPresentationVariants = this.getSelectionPresentationVariants();
+		var aSelectionPresentationVariants = this.getSelectionPresentationVariants();
 		if (aSelectionPresentationVariants) {
-
 			aSelectionPresentationVariants.forEach(function(oSPVariant) {
-				var sVariantKey = sKeyPrefix + oSPVariant.qualifier;
 				if (oSPVariant.qualifier) {
-					oVariantItem = new VariantItem({
-						key: sVariantKey,
-						text: oSPVariant.text,
-						global: true,
-						executeOnSelection: this._getExecuteOnSelection(oVariantManagement, sVariantKey),
-						lifecycleTransportId: "",
-						lifecyclePackage: "",
-						namespace: "",
-						readOnly: true,
-						labelReadOnly: true,
-						author: ""
-					});
-
-					oVariantManagement.insertVariantItem(oVariantItem, 0);
-
-					aVariantKeys.push(sVariantKey);
+					var sVariantKey = sKeyPrefix + oSPVariant.qualifier;
+					aVariants.push({id: sVariantKey,
+									favorite: true,
+									name: oSPVariant.text});
 				}
 
-			}.bind(this));
-
-			oVariantManagement.applyDefaultFavorites(aVariantKeys, true);
+			});
 		}
 
+		return aVariants;
+
 	};
@@ -117,0 +95,0 @@

src/sap/ui/comp/state/UIState.js

@@ -17,3 +17,3 @@ /*
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @constructor
@@ -20,0 +20,0 @@ * @public

src/sap/ui/comp/type/Interval.js

@@ -33,3 +33,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @since 1.63.0
@@ -36,0 +36,0 @@ *

src/sap/ui/comp/valuehelpdialog/P13nConditionPanel.js

@@ -99,6 +99,6 @@ /*
 	 * @param {object} [mSettings] initial settings for the new control
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental
 	 * @private
-	 * @extends sap.ui.model.odata.type.Stringsap.m.P13nConditionPanel
+	 * @extends sap.m.P13nConditionPanel
 	 * @alias {sap.ui.comp.valuehelpdialog.P13nConditionPanel}
@@ -919,4 +919,5 @@ */
 						oConditionGrid.operation.getSelectedKey() === P13nConditionOperation.BT && // and we are in "Between" scenario
-						this._isFieldNumeric(oConditionGrid) && // and the type is numeric or numc
-						this._isInvalidRange(oConditionGrid)) { // and the range is invalid
+						(this._isInvalidFiscalRange(oConditionGrid) || // and the field has invalid fiscal range
+						(this._isFieldNumeric(oConditionGrid) && // or the type is numeric or numc and the range is invalid
+						this._isInvalidRange(oConditionGrid)))) {
 							sValue = "";
@@ -1054,2 +1055,8 @@ }
 
+	P13nConditionPanel.prototype._isFiscalField = function(oConditionGrid) {
+		var oKeyFieldItem = this._getCurrentKeyFieldItem(oConditionGrid.keyField);
+
+		return oKeyFieldItem.typeInstance && oKeyFieldItem.typeInstance.isA("sap.ui.comp.odata.type.FiscalDate");
+	};
+
 	P13nConditionPanel.prototype._isInvalidRange = function(oConditionGrid) {
@@ -1062,3 +1069,34 @@ var vValue1 = oConditionGrid.value1.getValue(),
 
+	P13nConditionPanel.prototype._isInvalidFiscalRange = function(oConditionGrid) {
+		var sValue1Period,
+			sValue1Year,
+			sValue2Period,
+			sValue2Year,
+			vValue1 = oConditionGrid.value1.getValue(),
+			vValue2 = oConditionGrid.value2.getValue(),
+			oKeyFieldItem = this._getCurrentKeyFieldItem(oConditionGrid.keyField),
+			sFiscalAnotation = oKeyFieldItem.typeInstance && oKeyFieldItem.typeInstance.sAnotationType;
 
+			if (!this._isFiscalField(oConditionGrid) || !vValue1 || !vValue2) {
+				return false;
+			}
+
+			if (sFiscalAnotation === "com.sap.vocabularies.Common.v1.IsFiscalYearPeriod" ||
+				sFiscalAnotation === "com.sap.vocabularies.Common.v1.IsFiscalYearQuarter" ||
+				sFiscalAnotation === "com.sap.vocabularies.Common.v1.IsFiscalYearWeek") {
+				if (vValue1.indexOf("/") !== -1 && vValue2.indexOf("/") !== -1) {
+					// assume that the vValue will be in format 001/2021 or 01/2021 or 1/2021
+					sValue1Period = vValue1.split("/")[0];
+					sValue2Period = vValue2.split("/")[0];
+					sValue1Year = vValue1.split("/")[1];
+					sValue2Year = vValue2.split("/")[1];
+
+					return sValue1Year === sValue2Year ? sValue1Period > sValue2Period : sValue1Year > sValue2Year;
+				}
+			} else {
+				return parseFloat(vValue1) > parseFloat(vValue2);
+			}
+	};
+
+
 	/*
@@ -1099,10 +1137,12 @@ * change event handler for a value1 and value2 field control
 
-				if (oConditionGrid.operation.getSelectedKey() === P13nConditionOperation.BT &&
-					this._isFieldNumeric(oConditionGrid)) {
-						if (this._isInvalidRange(oConditionGrid, oEvent)) {
-							this._makeFieldValid(oCtrl, false, sRangeWarning);
-						} else {
-							this._makeFieldValid(oConditionGrid.value1, true);
-							this._makeFieldValid(oConditionGrid.value2, true);
-						}
+				// When between operator is selected and the field is numeric or has FiscalDate anotation
+				// check if the range is valid
+				if (oConditionGrid.operation.getSelectedKey() === P13nConditionOperation.BT) {
+					if ((this._isFieldNumeric(oConditionGrid) && this._isInvalidRange(oConditionGrid, oEvent)) ||
+						this._isInvalidFiscalRange(oConditionGrid, oEvent)) {
+						this._makeFieldValid(oCtrl, false, sRangeWarning);
+					} else {
+						this._makeFieldValid(oConditionGrid.value1, true);
+						this._makeFieldValid(oConditionGrid.value2, true);
+					}
 				}
@@ -1109,0 +1149,0 @@ } catch (err) {

src/sap/ui/comp/valuehelpdialog/P13nFilterPanel.js

@@ -35,3 +35,3 @@ /*
 	 * @param {object} [mSettings] initial settings for the new control
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @experimental
@@ -38,0 +38,0 @@ * @private

src/sap/ui/comp/valuehelpdialog/P13nOperationsHelper.js

@@ -20,3 +20,3 @@ /*
 	 * @ui5-restricted sap.ui.comp.valuehelpdialog.P13nFilterPanel
-	 * @version 1.86.3
+	 * @version 1.87.0
 	 * @alias sap.ui.comp.valuehelpdialog.P13nOperationsHelper
@@ -23,0 +23,0 @@ */

src/sap/ui/comp/variants/EditableVariantItem.js

@@ -139,2 +139,13 @@ /*
 					defaultValue: false
+				},
+
+				/**
+				 * Assigned roles.
+				 * @since 1.86
+				 */
+				_roles: {
+					type: "string[]",
+					group: "Misc",
+					visibility: "hidden",
+					defaultValue: []
 				}
@@ -146,4 +157,12 @@ }
 
+	EditableVariantItem.prototype.setRoles = function(aRoles) {
+		this.setProperty("_roles", aRoles);
+	};
+	EditableVariantItem.prototype.getRoles = function() {
+		return this.getProperty("_roles");
+	};
+
+
 	return EditableVariantItem;
 
 });

src/sap/ui/comp/variants/VariantItem.js

@@ -130,2 +130,13 @@ /*
 					defaultValue: false
+				},
+
+				/**
+				 * Assigned roles.
+				 * @since 1.86
+				 */
+				_roles: {
+					type: "string[]",
+					group: "Misc",
+					visibility: "hidden",
+					defaultValue: []
 				}
@@ -154,5 +165,6 @@ },
 	/**
-	 * Setter for visible property.
+	 * Setter for text property.
 	 * @public
-	 * @param {boolean} bVisible State of visibility
+	 * @param {string} sText New text
+	 * @returns {this} Reference to <code>this</code> to allow method chaining
 	 */
@@ -167,4 +179,11 @@ VariantItem.prototype.setText = function(sText) {
 
+	VariantItem.prototype.setRoles = function(aRoles) {
+		this.setProperty("_roles", aRoles);
+	};
+	VariantItem.prototype.getRoles = function() {
+		return this.getProperty("_roles");
+	};
+
 	return VariantItem;
 
 });

No alert changes

Improved metrics

Total package byte prevSize

5106165

increased by2.13%

Number of package files

336

increased by0.9%

Lines of code

98194

increased by1.85%

No dependency changes