@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/messagebundle_zh_CN.properties

@@ -183,6 +183,10 @@ field.VALUE_NOT_VALID=\u503C\u65E0\u6548\u3002
 
 field.NO_VALUE=\u65E0\u4EFB\u4F55\u503C
 
+field.SEPARATOR=\u00A0\u00B7\u00A0
+
+valuehelp.DIALOGSHORTTITLECOLONTITLE={0}\: {1}
+
 valuehelp.SELECTED_ITEM=\u6240\u9009\u7684 {0}
 
 valuehelp.OK=\u786E\u5B9A
@@ -207,10 +211,14 @@ valuehelp.SINGLE_ITEM_SELECT=\u9009\u62E9\uFF1A
 
 valuehelp.SELECTFROMLIST=\u641C\u7D22\u5E76\u9009\u62E9 ({0})
 
+valuehelp.SELECTFROMLIST.Shorttitle=Select
+
 valuehelp.SELECTFROMLISTNONUMBER=\u641C\u7D22\u5E76\u9009\u62E9
 
 valuehelp.DEFINECONDITIONS=\u5B9A\u4E49\u6761\u4EF6 ({0})
 
+valuehelp.DEFINECONDITIONS.Shorttitle=Conditions
+
 valuehelp.DEFINECONDITIONSNONUMBER=\u5B9A\u4E49\u6761\u4EF6
 
 valuehelp.TABLETITLE=\u9879\u76EE ({0})
@@ -341,7 +349,6 @@ chart.NO_RESULTS=\u672A\u627E\u5230\u6570\u636E\u3002\u5C1D\u8BD5\u8C03\u6574\u8
 table.SETTINGS_COLUMN=\u6DFB\u52A0/\u79FB\u9664\u5217
 table.SETTINGS=\u8BBE\u7F6E
 table.SETTINGS_COLUMN_REORDER=\u91CD\u65B0\u6392\u5E8F\u5217
-table.SETTINGS_SORT=\u6392\u5E8F
 table.SETTINGS_FILTER=\u8FC7\u6EE4
 table.SETTINGS_ASCENDING=\u5347\u5E8F\u6392\u5E8F
 table.SETTINGS_DESCENDING=\u964D\u5E8F\u6392\u5E8F
@@ -379,11 +386,11 @@ table.SHORTCUT_EXPORT_TO_EXCEL_MAC=Cmd+Shift+E
 table.PERSONALIZATION_DIALOG_SORT_RESTRICTION=\u53EA\u80FD\u5BF9\u53EF\u89C1\u5217\u8FDB\u884C\u6392\u5E8F\u3002\u5982\u679C\u5C1A\u672A\u4F7F\u5217\u53EF\u89C1\uFF0C\u5219\u4E0D\u4F1A\u5BF9\u5176\u8FDB\u884C\u6392\u5E8F\u3002
 table.PERSONALIZATION_DIALOG_GROUP_RESTRICTION=\u7531\u4E8E\u5DF2\u4F7F\u7528\u603B\u8BA1\uFF0C\u65E0\u6CD5\u5728\u6B64\u67E5\u770B {0} \u5217\u3002\u79FB\u9664\u603B\u8BA1\u4EE5\u67E5\u770B\u8FD9\u4E9B\u5217\u3002
 table.PERSONALIZATION_DIALOG_TOTAL_RESTRICTION=\u53EA\u80FD\u4E3A\u53EF\u89C1\u5217\u8BA1\u7B97\u603B\u8BA1\u3002\u5982\u679C\u5C1A\u672A\u4F7F\u5217\u53EF\u89C1\uFF0C\u5219\u4E0D\u4F1A\u663E\u793A\u603B\u8BA1\u3002
-table.PERSONALIZATION_DIALOG_FILTER_MESSAGESTRIP=The table was filtered for rows with related messages. The defined filters are temporarily ignored.
+table.PERSONALIZATION_DIALOG_FILTER_MESSAGESTRIP=\u5DF2\u8FC7\u6EE4\u51FA\u8868\u4E2D\u542B\u6709\u76F8\u5173\u6D88\u606F\u7684\u884C\u3002\u6682\u65F6\u5FFD\u7565\u5DF2\u5B9A\u4E49\u7684\u8FC7\u6EE4\u5668\u3002
 
 
 fieldsui.COLUMNS=\u5217
 
 COL_SEARCH_TRIGGER_TT=\u9009\u62E9\u641C\u7D22\u6A21\u677F
 COL_SEARCH_SEL_INVISIBLETXT=\u641C\u7D22\u6A21\u677F {0}\u3002\u8981\u6253\u5F00\uFF0C\u8BF7\u6309\u7A7A\u683C\u952E\u3002
-COL_SEARCH_SEL_TITLE=\u6211\u7684\u641C\u7D22\u6A21\u677F
+COL_SEARCH_SEL_TITLE=\u9009\u62E9\u641C\u7D22\u6A21\u677F

package/src/sap/ui/mdc/messagebundle_zh_TW.properties

@@ -183,6 +183,10 @@ field.VALUE_NOT_VALID=\u503C\u7121\u6548\u3002
 
 field.NO_VALUE=\u6C92\u6709\u503C
 
+field.SEPARATOR=\u00A0\u00B7\u00A0
+
+valuehelp.DIALOGSHORTTITLECOLONTITLE={0}\: {1}
+
 valuehelp.SELECTED_ITEM=\u6240\u9078 {0}
 
 valuehelp.OK=\u78BA\u5B9A
@@ -207,10 +211,14 @@ valuehelp.SINGLE_ITEM_SELECT=\u9078\u64C7\uFF1A
 
 valuehelp.SELECTFROMLIST=\u641C\u5C0B\u548C\u9078\u64C7 ({0})
 
+valuehelp.SELECTFROMLIST.Shorttitle=Select
+
 valuehelp.SELECTFROMLISTNONUMBER=\u641C\u5C0B\u548C\u9078\u64C7
 
 valuehelp.DEFINECONDITIONS=\u5B9A\u7FA9\u689D\u4EF6 ({0})
 
+valuehelp.DEFINECONDITIONS.Shorttitle=Conditions
+
 valuehelp.DEFINECONDITIONSNONUMBER=\u5B9A\u7FA9\u689D\u4EF6
 
 valuehelp.TABLETITLE=\u9805\u76EE ({0})
@@ -341,7 +349,6 @@ chart.NO_RESULTS=\u627E\u4E0D\u5230\u8CC7\u6599\uFF0C\u8ACB\u5617\u8A66\u8ABF\u6
 table.SETTINGS_COLUMN=\u65B0\u589E/\u79FB\u9664\u6B04
 table.SETTINGS=\u8A2D\u5B9A
 table.SETTINGS_COLUMN_REORDER=\u91CD\u65B0\u6392\u5E8F\u6B04
-table.SETTINGS_SORT=\u6392\u5E8F
 table.SETTINGS_FILTER=\u7BE9\u9078
 table.SETTINGS_ASCENDING=\u905E\u589E\u6392\u5E8F
 table.SETTINGS_DESCENDING=\u905E\u6E1B\u6392\u5E8F
@@ -379,11 +386,11 @@ table.SHORTCUT_EXPORT_TO_EXCEL_MAC=Cmd+Shift+E
 table.PERSONALIZATION_DIALOG_SORT_RESTRICTION=\u60A8\u50C5\u53EF\u6392\u5E8F\u53EF\u898B\u6B04\u3002\u82E5\u7121\u6CD5\u770B\u5230\u67D0\u6B04\uFF0C\u5247\u4E0D\u6703\u4E88\u4EE5\u6392\u5E8F\u3002
 table.PERSONALIZATION_DIALOG_GROUP_RESTRICTION=\u7531\u65BC\u5DF2\u4F7F\u7528\u7E3D\u8A08\uFF0C\u56E0\u6B64\u60A8\u770B\u4E0D\u5230 {0} \u6B04\u3002\u8ACB\u79FB\u9664\u7E3D\u8A08\u4EE5\u4FBF\u67E5\u770B\u9019\u4E9B\u6B04\u3002
 table.PERSONALIZATION_DIALOG_TOTAL_RESTRICTION=\u60A8\u50C5\u53EF\u8A08\u7B97\u53EF\u898B\u6B04\u7684\u7E3D\u8A08\u3002\u82E5\u7121\u6CD5\u770B\u5230\u67D0\u6B04\uFF0C\u5247\u4E0D\u6703\u986F\u793A\u7E3D\u8A08\u3002
-table.PERSONALIZATION_DIALOG_FILTER_MESSAGESTRIP=The table was filtered for rows with related messages. The defined filters are temporarily ignored.
+table.PERSONALIZATION_DIALOG_FILTER_MESSAGESTRIP=\u5DF2\u7BE9\u9078\u8868\u683C\u4E2D\u542B\u6709\u76F8\u95DC\u8A0A\u606F\u7684\u8CC7\u6599\u5217\uFF0C\u6240\u5B9A\u7FA9\u7684\u7BE9\u9078\u6703\u66AB\u6642\u5FFD\u7565\u3002
 
 
 fieldsui.COLUMNS=\u6B04
 
 COL_SEARCH_TRIGGER_TT=\u9078\u64C7\u641C\u5C0B\u7BC4\u672C
 COL_SEARCH_SEL_INVISIBLETXT=\u641C\u5C0B\u7BC4\u672C {0}\uFF1B\u82E5\u8981\u958B\u555F\uFF0C\u8ACB\u6309\u4E0B\u7A7A\u767D\u9375\u3002
-COL_SEARCH_SEL_TITLE=\u6211\u7684\u641C\u5C0B\u7BC4\u672C
+COL_SEARCH_SEL_TITLE=\u9078\u64C7\u641C\u5C0B\u7BC4\u672C

package/src/sap/ui/mdc/mixin/AdaptationMixin.js

@@ -41,7 +41,7 @@ sap.ui.define(
          *
          *
          * @author SAP SE
-         * @version 1.93.3
+         * @version 1.96.1
          * @alias sap.ui.mdc.mixin.AdaptationMixin
          * @namespace
          * @since 1.82.0

package/src/sap/ui/mdc/mixin/DelegateMixin.js

@@ -69,7 +69,7 @@ sap.ui.define(["sap/ui/mdc/util/loadModules", "sap/base/Log"], function (loadMod
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @alias sap.ui.mdc.mixin.DelegateMixin
 	 * @namespace
 	 * @since 1.76.0
@@ -334,7 +334,7 @@ sap.ui.define(["sap/ui/mdc/util/loadModules", "sap/base/Log"], function (loadMod
 			this._oPayload = null;
 			this._oTypeUtil = null;
 
-			if (this._oPropertyHelper) {
+			if (this._oPropertyHelper && !this._oPropertyHelper.bIsDestroyed) {
 				this._oPropertyHelper.destroy();
 			}
 			this._oPropertyHelper = null;

package/src/sap/ui/mdc/mixin/FilterIntegrationMixin.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @alias sap.ui.mdc.mixin.FilterIntegrationMixin
 	 * @namespace
 	 * @since 1.82.0
@@ -196,12 +196,12 @@ sap.ui.define([
 		if (bInbuiltEnabled || oFilter) {
 
 			if (oFilter) {
-				pOuterFilterSearch = oFilter.valid(false);
+				pOuterFilterSearch = oFilter.validate();
 			}
 
 			if (bInbuiltEnabled) {
 				pInnerFilterSearch = this.retrieveInbuiltFilter().then(function(oInnerFilter){
-					return oInnerFilter.valid(false);
+					return oInnerFilter.validate();
 				});
 			}
 

package/src/sap/ui/mdc/mixin/PromiseMixin.js

@@ -0,0 +1,94 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define(
+	["sap/ui/mdc/util/PromiseCache"]
+,
+	function (PromiseCache) {
+		"use strict";
+		/**
+		 * Enhances a given control prototype with a management mechanism for lifecycle related promises.
+		 * Calling any of the enhanced methods after control exit will result in a no-op.
+		 *
+		 * @author SAP SE
+		 * @version 1.96.1
+		 * @alias sap.ui.mdc.mixin.PromiseMixin
+		 * @namespace
+		 * @since 1.85.0
+		 * @private
+		 * @experimental
+		 * @ui5-restricted sap.ui.mdc
+		 *
+		 * @borrows sap.ui.mdc.util.PromiseCache.add as addPromise
+		 * @borrows sap.ui.mdc.util.PromiseCache.remove as removePromise
+		 * @borrows sap.ui.mdc.util.PromiseCache.resolve as resolvePromise
+		 * @borrows sap.ui.mdc.util.PromiseCache.reject as rejectPromise
+		 * @borrows sap.ui.mdc.util.PromiseCache.retrieve as retrievePromise
+		 * @borrows sap.ui.mdc.util.PromiseCache.retrieveMany as retrievePromises
+		*/
+		var PromiseMixin = {};
+		PromiseMixin.addPromise = function (sName, fnCreate) {
+			return this.promiseCache.add(sName, fnCreate);
+		};
+		PromiseMixin.cancelPromise = function (sName, oReason) {
+			return this.promiseCache.cancel(sName, oReason);
+		};
+		PromiseMixin.retrievePromise = function (sName, fnCreate) {
+			return this.promiseCache.retrieve(sName, fnCreate);
+		};
+		PromiseMixin.retrievePromises = function () {
+			return this.promiseCache.retrieveMany.apply(this.promiseCache, arguments);
+		};
+		PromiseMixin.removePromise = function (sName) {
+			return this.promiseCache.remove(sName);
+		};
+		PromiseMixin.resolvePromise = function (sName, oValue) {
+			return this.promiseCache.resolve(sName, oValue);
+		};
+		PromiseMixin.rejectPromise = function (sName, oValue) {
+			return this.promiseCache.reject(sName, oValue);
+		};
+		 /**
+		 * Provides cleanup functionality for the controls promise cache
+		 *
+		 * @private
+		 * @param {function} fnExit Existing exit callback function
+		 * @returns {function} Returns a thunk applicable to a control prototype, wrapping an existing exit method
+		 */
+		PromiseMixin.exit = function (fnExit) {
+			return function () {
+				if (this.promiseCache) {
+					this.promiseCache.destroy();
+					this.promiseCache = null;
+				}
+				if (fnExit) {
+					fnExit.apply(this, arguments);
+				}
+			};
+		};
+		return function () {
+			var _noop = function (fnMethod) {
+				return function () {
+					if (this.bIsDestroyed) {
+						return undefined;
+					}
+					if (!this.promiseCache) {
+						this.promiseCache = new PromiseCache();
+					}
+					return fnMethod.apply(this, arguments);
+				};
+			};
+			this._addPromise = _noop(PromiseMixin.addPromise);
+			this._cancelPromise = _noop(PromiseMixin.cancelPromise);
+			this._removePromise = _noop(PromiseMixin.removePromise);
+			this._resolvePromise = _noop(PromiseMixin.resolvePromise);
+			this._rejectPromise = _noop(PromiseMixin.rejectPromise);
+			this._retrievePromise = _noop(PromiseMixin.retrievePromise);
+			this._retrievePromises = _noop(PromiseMixin.retrievePromises);
+			this.exit = PromiseMixin.exit(this.exit);
+		};
+	},
+	/* bExport= */ true
+);

package/src/sap/ui/mdc/odata/v4/ChartPropertyHelperNew.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.chartNew.PropertyHelperNew
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/odata/v4/FilterBarDelegate.js

@@ -355,13 +355,13 @@ sap.ui.define([
 			oProperty.display = sDisplay;
 		}
 
-		if (oObj.$Type === "Edm.DateTimeOffset") {
-			if (!oConstraints) {
-				oConstraints = {};
-			}
+		// if (oObj.$Type === "Edm.DateTimeOffset") {
+		// 	if (!oConstraints) {
+		// 		oConstraints = {};
+		// 	}
 
-			oConstraints.V4 = true;
-		}
+		// 	oConstraints.V4 = true;
+		// }
 
 		if (oConstraints) {
 			oProperty.constraints = oConstraints;

package/src/sap/ui/mdc/odata/v4/TableDelegate.js

@@ -126,11 +126,14 @@ sap.ui.define([
 	};
 
 	Delegate.validateState = function(oControl, oState, sKey) {
+		var oBaseStates = TableDelegate.validateState.apply(this, arguments);
+		var oValidation;
+
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 
 		if (sKey == "Sort" && oState.sorters) {
 			if (!checkForValidity(oControl, oState.items, oState.sorters)) {
-				return {
+				oValidation = {
 					validation: coreLibrary.MessageType.Information,
 					message: oResourceBundle.getText("table.PERSONALIZATION_DIALOG_SORT_RESTRICTION")
 				};
@@ -146,7 +149,7 @@ sap.ui.define([
 			});
 
 			if (aAggregateGroupableProperties.length) {
-				return {
+				oValidation = {
 					validation: coreLibrary.MessageType.Information,
 					message: oResourceBundle.getText("table.PERSONALIZATION_DIALOG_GROUP_RESTRICTION", [oListFormat.format(aAggregateGroupableProperties)])
 				};
@@ -164,15 +167,14 @@ sap.ui.define([
 					: oResourceBundle.getText("table.PERSONALIZATION_DIALOG_SORT_RESTRICTION");
 			}
 			if (sMessage) {
-				return {
+				oValidation = {
 					validation: coreLibrary.MessageType.Information,
 					message: sMessage
 				};
 			}
 		}
-		return {
-			validation: coreLibrary.MessageType.None
-		};
+
+		return mergeValidation(oBaseStates, oValidation);
 	};
 
 	/**
@@ -220,10 +222,11 @@ sap.ui.define([
 			if (bHasRootBindingAndWasNotSuspended) {
 				oRootBinding.suspend();
 			}
+
+			setAggregation(oTable, oBindingInfo);
 			oBinding.changeParameters(oBindingInfo.parameters);
 			oBinding.filter(oBindingInfo.filters, "Application");
 			oBinding.sort(oBindingInfo.sorter);
-			setAggregation(oTable);
 		} catch (e) {
 			this.rebindTable(oTable, oBindingInfo);
 			if (oRootBinding == oBinding) {
@@ -243,7 +246,7 @@ sap.ui.define([
 	 * @inheritDoc
 	 */
 	Delegate.rebindTable = function (oTable, oBindingInfo) {
-		setAggregation(oTable);
+		setAggregation(oTable, oBindingInfo);
 		TableDelegate.rebindTable(oTable, oBindingInfo);
 	};
 
@@ -399,10 +402,15 @@ sap.ui.define([
 	 * Updates the aggregation info if the plugin is enabled.
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
+	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} [oBindingInfo] The binding info object to be used to bind the table to the model
 	 */
-	function setAggregation(oTable) {
+	function setAggregation(oTable, oBindingInfo) {
 		if (isInnerTableReadyForAnalytics(oTable)) {
 			var aAggregates = Object.keys(oTable._getAggregatedProperties());
+			var sSearch = oBindingInfo && oBindingInfo.parameters["$search"] || undefined;
+			if (sSearch ) {
+				delete oBindingInfo.parameters["$search"];
+			}
 			var aGroupLevels = oTable._getGroupedProperties().map(function (mGroupLevel) {
 				return mGroupLevel.name;
 			});
@@ -411,7 +419,8 @@ sap.ui.define([
 				groupLevels: aGroupLevels,
 				grandTotal: aAggregates,
 				subtotals: aAggregates,
-				columnState: getColumnState(oTable, aAggregates)
+				columnState: getColumnState(oTable, aAggregates),
+				search: sSearch
 			};
 
 			TableMap.get(oTable).plugin.setAggregationInfo(oAggregationInfo);
@@ -542,6 +551,24 @@ sap.ui.define([
 		return bOnlyVisibleColumns;
 	}
 
+	/**
+	 * Compares the message type and returns the message with higher priority.
+	 *
+	 * @param {Object} oBaseState message set by the base table delegate.
+	 * @param {Object} oValidationState message set by the odata v4 delegate.
+	 * @return {Object} A message with higher priority.
+	 * @private
+	 */
+	function mergeValidation(oBaseState, oValidationState) {
+		var oSeverity = { Error: 1, Warning: 2, Information: 3, None: 4};
+
+		if (!oValidationState || oSeverity[oValidationState.validation] - oSeverity[oBaseState.validation] > 0) {
+			return oBaseState;
+		} else {
+			return oValidationState;
+		}
+	}
+
 	/**
 	 * Configures the inner table to support the p13n settings of the MDC table.
 	 *

package/src/sap/ui/mdc/odata/v4/ValueHelpDelegate.js

@@ -0,0 +1,94 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"../../ValueHelpDelegate",
+	"sap/ui/model/FilterType"
+], function(
+	ValueHelpDelegate,
+	FilterType
+) {
+	"use strict";
+
+	var ODataV4ValueHelpDelegate = Object.assign({}, ValueHelpDelegate);
+
+	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
+		return true; // only on V4
+	};
+
+	var _waitForBindingData = function (oBinding) {
+		return new Promise(function (resolve) {
+			var _bIsExecutionComplete = false;
+			var fnHandleBindingEvent = function (oParameters) {
+				if (oParameters.mParameters.detailedReason) { // do not consider virtualcontext events triggered during automatic determination of $expand and $select
+					return;
+				}
+
+				if (!_bIsExecutionComplete) {
+					_bIsExecutionComplete = true;
+					oBinding.detachEvent("change", fnHandleBindingEvent);
+					resolve(oBinding);
+				}
+			};
+			oBinding.attachEvent("change", fnHandleBindingEvent); // Note: According to an earlier change the change event may not always be fired in some scenarios
+			oBinding.attachEventOnce("dataReceived", fnHandleBindingEvent); // Note: According to an earlier change the dataReceived event may not always be fired in some caching scenarios
+		});
+	};
+
+	ODataV4ValueHelpDelegate.executeSearch = function(oPayload, oListBinding, sSearch) {
+
+		if (sSearch) {
+			oListBinding.changeParameters({ $search: sSearch });
+		} else {
+			oListBinding.changeParameters({ $search: undefined });
+		}
+
+		return _waitForBindingData(oListBinding);
+
+	};
+
+	ODataV4ValueHelpDelegate.executeFilter = function(oPayload, oListBinding, oFilter, iRequestedItems) {
+
+		oListBinding.initialize();
+		oListBinding.filter(oFilter, FilterType.Application);
+		oListBinding.getContexts(0, iRequestedItems); // trigger request. not all entries needed, we only need to know if there is one, none or more
+
+		return _waitForBindingData(oListBinding);
+	};
+
+	ODataV4ValueHelpDelegate.checkBindingsPending = function(oPayload, aBindings) {
+
+		var aPromises = [];
+
+		for (var i = 0; i < aBindings.length; i++) {
+			var oBinding = aBindings[i];
+			if (oBinding && oBinding.requestValue) {
+				aPromises.push(oBinding.requestValue());
+			}
+		}
+
+		if (aPromises.length > 0) {
+			return Promise.all(aPromises);
+		}
+
+		return null;
+
+	};
+
+	ODataV4ValueHelpDelegate.checkListBindingPending = function(oPayload, oListBinding, oListBindingInfo) {
+
+		if (!oListBinding || oListBinding.isSuspended()) {
+			return false;
+		}
+
+		return oListBinding.requestContexts(0, oListBindingInfo && oListBindingInfo.length).then(function(aContexts){	// TODO: never resolves for mdc.table and prevents loading??
+			return aContexts.length === 0;
+		});
+
+	};
+
+	return ODataV4ValueHelpDelegate;
+});