@sapui5/sap.zen.dsh 1.114.7 → 1.114.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.zen.dsh",
-  "version": "1.114.7",
+  "version": "1.114.13",
   "description": "SAPUI5 Library sap.zen.dsh",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/zen/dsh/.library

@@ -7,7 +7,7 @@
   <vendor>SAP SE</vendor>
   <copyright>SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved</copyright>
-  <version>1.114.7</version>
+  <version>1.114.13</version>
   <documentation>Design Studio Runtime Library.  Intended only to be used within S/4 HANA Fiori applications.</documentation>
   <appData>
     <jsdoc xmlns="http://www.sap.com/ui5/buildext/jsdoc" >

package/src/sap/zen/dsh/AnalyticGrid.js

@@ -15,24 +15,24 @@ sap.ui.define(
   ],
   function (jQuery, Log, Control, URI, AnalyticGridRenderer ) {
     // Provides control sap.zen.dsh.AnalyticGrid.
-    /**
-     * Constructor for a new AnalyticGrid.
-     *
-     * @param {string} [sId] id for the new control, generated automatically if no id is given
-     * @param {object} [mSettings] initial settings for the new control
-     *
-     * @class
-     * Control for embedding a Design Studio Analytic Grid in an S/4 HANA Fiori application
-     * @extends sap.ui.core.Control
-     *
-     * @constructor
-     * @public
-     * @since 1.46
-     * @deprecated since 1.89.0
-     * @experimental Since version 1.46.
-     * API is incomplete and may change incompatibly
-     * @alias sap.zen.dsh.AnalyticGrid
-     */
+  /**
+    * Constructor for a new AnalyticGrid.
+    *
+    * @param {string} [sId] id for the new control, generated automatically if no id is given
+    * @param {object} [mSettings] initial settings for the new control
+    *
+    * @class
+    * Control for embedding a Design Studio Analytic Grid in an S/4 HANA Fiori application
+    * @extends sap.ui.core.Control
+    *
+    * @constructor
+    * @public
+    * @since 1.46
+    * @deprecated Since version 1.89.0, Please use the WD Grid control instead.
+    * @experimental Since version 1.46.
+    * API is incomplete and may change incompatibly
+    * @alias sap.zen.dsh.AnalyticGrid
+    */
     var AnalyticGrid = Control.extend(
       "sap.zen.dsh.AnalyticGrid", /** @lends sap.zen.dsh.AnalyticGrid.prototype */
       {

package/src/sap/zen/dsh/Dsh.js

@@ -105,7 +105,7 @@ sap.ui.define( "sap/zen/dsh/Dsh",
      *
      * @constructor
      * @public
-     * @deprecated since 1.89
+     * @deprecated Since version 1.89.0, Please use the WD Grid control instead.
      * @since 1.44
      * @name sap.zen.dsh.Dsh
      */

package/src/sap/zen/dsh/ValueHelpRangeOperation.js

@@ -8,15 +8,15 @@ sap.ui.define(
   [
   ],
   function(){
-    /**
-     * Sort Type
-     *
-     * @enum {string}
-     * @alias sap.zen.dsh.ValueHelpRangeOperation
-     * @public
-     * @experimental
-     * @deprecated since 1.89
-     */
+  /**
+    * Sort Type
+    *
+    * @enum {string}
+    * @alias sap.zen.dsh.ValueHelpRangeOperation
+    * @public
+    * @experimental
+    * @deprecated Since version 1.89.0, Please use the WD Grid control instead.
+    */
     var ValueHelpRangeOperation = {
       /**
        * The Between operation for the ranges.

package/src/sap/zen/dsh/firefly/ff8310.zen.buddha.js

@@ -11457,9 +11457,17 @@ sap.zen.CharacteristicWrapper.prototype.getMembersByField = function(tKeys, oFie
 			var loFieldValue = loInternalDimensionMember.getFieldValue(oField);
 			if (oFF.notNull(loFieldValue))
 			{
-				if (tKeys.contains(loFieldValue.getString()))
-				{
-					ltInternalMembers.add(loInternalDimensionMember);
+				for (lKeyIndex = 0; lKeyIndex < tKeys.size(); lKeyIndex++) {
+					lSearchString = tKeys.get(lKeyIndex);
+					if (!loInternalDimension.supportsLowerCase() || oField.getValueType() === oFF.XValueType.UPPER_CASE_STRING) {
+						lSearchString = oFF.XString.toUpperCase(lSearchString);
+					}
+					else if (oField.getValueType() === oFF.XValueType.LOWER_CASE_STRING) {
+						lSearchString = oFF.XString.toLowerCase(lSearchString);
+					}
+					if (oFF.XString.isEqual(lSearchString, loFieldValue.getString())) {
+						ltInternalMembers.add(loInternalDimensionMember);
+					}
 				}
 			}
 		}
@@ -11661,6 +11669,17 @@ sap.zen.CharacteristicWrapper.prototype.getMemberFromListByFieldValue = function
 				lFound = true;
 				break;
 			}
+			var lValueRespectingCase = value;
+			if (!loInternalDimension.supportsLowerCase() || loInternalFieldValue.getValueType() === oFF.XValueType.UPPER_CASE_STRING) {
+				lValueRespectingCase = oFF.XString.toUpperCase(value);
+			}
+			else if (loInternalFieldValue.getValueType() === oFF.XValueType.LOWER_CASE_STRING) {
+				lValueRespectingCase = oFF.XString.toLowerCase(value);
+			}
+			if (oFF.XString.isEqual(loInternalFieldValue.getString(), lValueRespectingCase)) {
+				lFound = true;
+				break;
+			}
 			if (oFF.XString.containsString(loInternalFieldValue.getString(), value))
 			{
 				ltMatchingDimensionMembers.add(loInternalDimensionMember);
@@ -12267,47 +12286,34 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 	{
 		loInternalField = loInternalDimension.getFlatKeyField();
 	}
-	if (oInternalField !== loInternalField || tFullRanges.size() !== lFullRangesProvidedSize)
-	{
-		for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
-		{
-			loRange = tFullRanges.get(lFullRangesIndex);
-			if (oFF.isNull(loRange))
-			{
-				continue;
-			}
-			if (loRange.getFrom() !== null)
-			{
-				if (loRange.getFrom().getKey() !== null)
-				{
-					if (lFullRangesIndex < lCartesianListOriginalSize)
-					{
-						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
-					}
-					else
-					{
-						ltKeysForProvidedField.add(loRange.getFrom().getKey());
-					}
+	for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++) {
+		loRange = tFullRanges.get(lFullRangesIndex);
+		if (oFF.isNull(loRange)) {
+			continue;
+		}
+		if (loRange.getFrom() !== null) {
+			if (loRange.getFrom().getKey() !== null) {
+				if (lFullRangesIndex < lCartesianListOriginalSize) {
+					ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+				}
+				else {
+					ltKeysForProvidedField.add(loRange.getFrom().getKey());
 				}
 			}
-			if (loRange.getTo() !== null)
-			{
-				if (loRange.getTo().getKey() !== null)
-				{
-					if (lFullRangesIndex < lCartesianListOriginalSize)
-					{
-						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
-					}
-					else
-					{
-						ltKeysForProvidedField.add(loRange.getTo().getKey());
-					}
+		}
+		if (loRange.getTo() !== null) {
+			if (loRange.getTo().getKey() !== null) {
+				if (lFullRangesIndex < lCartesianListOriginalSize) {
+					ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+				}
+				else {
+					ltKeysForProvidedField.add(loRange.getTo().getKey());
 				}
 			}
 		}
-		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForProvidedField, oInternalField));
-		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianListOriginalField));
 	}
+	ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForProvidedField, oInternalField));
+	ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianListOriginalField));
 	loCartesianList.setField(loInternalField);
 	for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
 	{
@@ -12317,7 +12323,7 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			continue;
 		}
 		var loLookupField = null;
-		if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
+		if (!ltInternalDimensionMembers.isEmpty())
 		{
 			if (lFullRangesIndex < lCartesianListOriginalSize)
 			{
@@ -12342,7 +12348,7 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		var lValueFrom = null;
 		if (oFF.notNull(lStringValueFrom))
 		{
-			if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
+			if (!ltInternalDimensionMembers.isEmpty())
 			{
 				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, loLookupField, lStringValueFrom.getString(), false);
 				if (oFF.notNull(loInternalDimensionMember))
@@ -12362,7 +12368,7 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		var lValueTo = null;
 		if (loRange.getOperation() === sap.zen.Operation.BT && oFF.notNull(lStringValueTo))
 		{
-			if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
+			if (!ltInternalDimensionMembers.isEmpty())
 			{
 				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, loLookupField, lStringValueTo.getString(), false);
 				if (oFF.notNull(loInternalDimensionMember))
@@ -12380,6 +12386,9 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			}
 		}
 		var loCartesianElement = loCartesianList.addNewCartesianElement();
+		var cWildcard = "*";
+		var lIsManualInput = !(oFF.XString.startsWith(lValueFrom.toString(), cWildcard) || oFF.XString.endsWith(lValueFrom.toString(), cWildcard)) &&
+			!(loCartesianList.getField().isHierarchyKeyField() || this.mVariableMode && this.getVariable().getVariableType() === oFF.VariableType.HIERARCHY_NODE_VARIABLE);
 		loCartesianElement.setComparisonOperator(lOperation);
 		if (loRange.isExclude())
 		{
@@ -12389,27 +12398,16 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		{
 			loCartesianElement.setSetSign(oFF.SetSign.INCLUDING);
 		}
-		var cWildcard = "*";
 		var loFieldValue = loCartesianList.getField().createFieldLiteralValue();
 		loFieldValue.setValue(lValueFrom);
 		loCartesianElement.getLow().setFieldValue(loFieldValue);
-		if (oFF.XString.startsWith(lValueFrom.toString(), cWildcard) || oFF.XString.endsWith(lValueFrom.toString(), cWildcard))
-		{
-			loCartesianElement.getLow().setIsManualInput(false);
-		} else {
-			loCartesianElement.getLow().setIsManualInput(true);
-		}
+		loCartesianElement.getLow().setIsManualInput(lIsManualInput);
 		if (loRange.getOperation() === sap.zen.Operation.BT)
 		{
 			loFieldValue = loCartesianList.getField().createFieldLiteralValue();
 			loFieldValue.setValue(lValueTo);
 			loCartesianElement.getHigh().setFieldValue(loFieldValue);
-			if (oFF.XString.startsWith(lValueTo.toString(), cWildcard) || oFF.XString.endsWith(lValueTo.toString(), cWildcard))
-			{
-				loCartesianElement.getHigh().setIsManualInput(false);
-			} else {
-				loCartesianElement.getHigh().setIsManualInput(true);
-			}
+			loCartesianElement.getHigh().setIsManualInput(lIsManualInput);
 		}
 	}
 };
@@ -21308,7 +21306,7 @@ sap.zen.Dimension.sGetKeyFieldObject = function(oDataSource, dimensionName, attr
 				loInternalField = loInternalAttribute.getHierarchyKeyField();
 			}
 		}
-		if (oFF.isNull(loInternalField) && lIsCompound)
+		if (lIsCompound)
 		{
 			if (useDisplayKey)
 			{
@@ -21320,7 +21318,6 @@ sap.zen.Dimension.sGetKeyFieldObject = function(oDataSource, dimensionName, attr
 			}
 		}
 	}
-	// standard
 	if (oFF.isNull(loInternalField))
 	{
 		if (useDisplayKey)

package/src/sap/zen/dsh/library.js

@@ -31,7 +31,7 @@ sap.ui.define(
      * @alias sap.zen.dsh
      * @public
      * @author SAP SE
-     * @version 1.114.7
+     * @version 1.114.13
      */
     var thisLib = sap.ui.getCore().initLibrary(
       {
@@ -56,7 +56,7 @@ sap.ui.define(
         ],
         elements: [],
         noLibraryCSS: true,
-        version: "1.114.7"
+        version: "1.114.13"
       }
     );
    

package/src/sap/zen/dsh/widgets/SDKModel.js

@@ -26,7 +26,7 @@ sap.ui.define(
      * @constructor
      * @public
      * @name sap.zen.dsh.widgets.SDKModel
-     * @deprecated since 1.89.0
+     * @deprecated Since version 1.89.0, Please use the WD Grid control instead.
      */
     var SDKModel = ClientModel.extend(
       "sap.zen.dsh.widgets.SDKModel",  {

package/src/sap/zen/dsh/widgets/ValueHelpDialog.js

@@ -55,7 +55,7 @@ sap.ui.define(
      * @param {object} [mSettings] Initial settings for the new control
      * @class The ValueHelpDialog control can be used to implement a value help for an input field.
      * @extends sap.m.Dialog
-     * @deprecated since 1.89
+     * @deprecated Since version 1.89.0, Please use the WD Grid control instead.
      * @constructor
      * @public
      * @alias sap.zen.dsh.ValueHelpDialog
@@ -1688,7 +1688,7 @@ sap.ui.define(
         this._oColSearchBox = loDestroyObject(this._oColSearchBox);
       }
       Dialog.prototype.exit.apply(this);
-  
+
     };
 
     /**

package/src/sap/zen/dsh/widgets/formattedTextView.js

@@ -144,8 +144,11 @@ sap.ui.define(
         setContent :  function(sContent, bFromHtml){
           var sanitizePrev = this.getSanitizeContent();
           this.setSanitizeContent(!bFromHtml && sanitizePrev);
-  
-          HTML.prototype.setContent.call(this, sContent);
+
+          var encodeXML = sap.ui.require("sap/base/security/encodeXML");
+          var sSanitizedContent = encodeXML(sContent);
+          HTML.prototype.setContent.call(this, sSanitizedContent);
+
           this.setSanitizeContent(sanitizePrev);
         },
         getHtmlText : function(){