@sapui5/sap.zen.dsh 1.114.3 → 1.114.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.zen.dsh",
-  "version": "1.114.3",
+  "version": "1.114.5",
   "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

@@ -4,7 +4,7 @@
   <vendor>SAP SE</vendor>
   <copyright>SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved</copyright>
-  <version>1.114.3</version>
+  <version>1.114.5</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/firefly/ff8310.zen.buddha.js

@@ -10675,7 +10675,12 @@ sap.zen.CharacteristicWrapper.prototype.getAxis = function()
 };
 sap.zen.CharacteristicWrapper.prototype.getValueType = function()
 {
-	var loInternalField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getDimensionName(), null, false);
+	var loVariable = null;
+	if (this.mVariableMode)
+	{
+		loVariable = this.getVariable();
+	}
+	var loInternalField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getDimensionName(), null, false, loVariable);
 	return loInternalField.getValueType();
 };
 sap.zen.CharacteristicWrapper.prototype.getMemberType = function()
@@ -11473,7 +11478,13 @@ sap.zen.CharacteristicWrapper.prototype.hasSelectionState = function()
 };
 sap.zen.CharacteristicWrapper.prototype.getKeyField = function(useDisplayKey)
 {
-	return sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getDimensionName(), null, useDisplayKey);
+	var loVariable = null;
+	if (this.mVariableMode)
+	{
+		loVariable = this.getVariable();
+	}
+	var loInternalField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getDimensionName(), null, useDisplayKey, loVariable);
+	return loInternalField;
 };
 sap.zen.CharacteristicWrapper.prototype.getCorrectFieldForCartesianList = function(oCartesianList)
 {
@@ -12379,16 +12390,27 @@ 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);
-		loCartesianElement.getLow().setIsManualInput(true);
+		if (oFF.XString.startsWith(lValueFrom.toString(), cWildcard) || oFF.XString.endsWith(lValueFrom.toString(), cWildcard))
+		{
+			loCartesianElement.getLow().setIsManualInput(false);
+		} else {
+			loCartesianElement.getLow().setIsManualInput(true);
+		}
 		if (loRange.getOperation() === sap.zen.Operation.BT)
 		{
 			loFieldValue = loCartesianList.getField().createFieldLiteralValue();
 			loFieldValue.setValue(lValueTo);
 			loCartesianElement.getHigh().setFieldValue(loFieldValue);
-			loCartesianElement.getHigh().setIsManualInput(true);
+			if (oFF.XString.startsWith(lValueTo.toString(), cWildcard) || oFF.XString.endsWith(lValueTo.toString(), cWildcard))
+			{
+				loCartesianElement.getHigh().setIsManualInput(false);
+			} else {
+				loCartesianElement.getHigh().setIsManualInput(true);
+			}
 		}
 	}
 };
@@ -21245,7 +21267,7 @@ sap.zen.Dimension.sGetAttributeObject = function(oDataSource, dimensionName, att
 	}
 	return loInternalAttribute;
 };
-sap.zen.Dimension.sGetKeyFieldObject = function(oDataSource, dimensionName, attributeName, useDisplayKey)
+sap.zen.Dimension.sGetKeyFieldObject = function(oDataSource, dimensionName, attributeName, useDisplayKey, oInternalVariable)
 {
 	if (oFF.isNull(oDataSource))
 	{
@@ -21267,38 +21289,39 @@ sap.zen.Dimension.sGetKeyFieldObject = function(oDataSource, dimensionName, attr
 		return null;
 	}
 	var lIsMainAttribute = oFF.XString.isEqual(loInternalAttribute.getName(), loInternalDimension.getMainAttribute().getName());
+	var lIsHierarchy = loInternalDimension.supportsHierarchy() && loInternalDimension.isHierarchyAssignedAndActive();
+	if (oFF.notNull(oInternalVariable))
+	{
+		lIsHierarchy = oInternalVariable.getVariableType().isTypeOf(oFF.VariableType.DIMENSION_MEMBER_VARIABLE) && oFF.XStringUtils.isNotNullAndNotEmpty(oInternalVariable.getHierarchyName());
+	}
+	var lIsCompound = loInternalDimension.isCompound() || loInternalDimension.getFirstFieldByType(oFF.PresentationType.DISPLAY_KEY_NOT_COMPOUND) !== null;
 	var loInternalField = null;
 	if (lIsMainAttribute)
 	{
-		if (useDisplayKey)
+		if (lIsHierarchy)
 		{
-			if (loInternalDimension.isCompound() || loInternalDimension.getFirstFieldByType(oFF.PresentationType.DISPLAY_KEY_NOT_COMPOUND) !== null)
+			if (useDisplayKey)
 			{
-				loInternalField = loInternalAttribute.getFirstFieldByType(oFF.PresentationType.DISPLAY_KEY_NOT_COMPOUND);
+				loInternalField = loInternalAttribute.getHierarchyDisplayKeyField();
 			}
 			if (oFF.isNull(loInternalField))
 			{
-				if (loInternalDimension.supportsHierarchy() && loInternalDimension.isHierarchyAssignedAndActive())
-				{
-					loInternalField = loInternalAttribute.getHierarchyDisplayKeyField();
-				}
+				loInternalField = loInternalAttribute.getHierarchyKeyField();
 			}
 		}
-		if (oFF.isNull(loInternalField))
+		if (oFF.isNull(loInternalField) && lIsCompound)
 		{
-			if (loInternalDimension.supportsHierarchy() && loInternalDimension.isHierarchyAssignedAndActive())
+			if (useDisplayKey)
 			{
-				loInternalField = loInternalAttribute.getHierarchyKeyField();
+				loInternalField = loInternalAttribute.getFirstFieldByType(oFF.PresentationType.DISPLAY_KEY_NOT_COMPOUND);
 			}
-		}
-		if (oFF.isNull(loInternalField))
-		{
-			if (loInternalDimension.isCompound() || loInternalDimension.getFirstFieldByType(oFF.PresentationType.DISPLAY_KEY_NOT_COMPOUND) !== null)
+			if (oFF.isNull(loInternalField))
 			{
 				loInternalField = loInternalAttribute.getFirstFieldByType(oFF.PresentationType.KEY_NOT_COMPOUND);
 			}
 		}
 	}
+	// standard
 	if (oFF.isNull(loInternalField))
 	{
 		if (useDisplayKey)
@@ -22118,7 +22141,7 @@ sap.zen.Dimension.prototype.getHeaderText = function(fieldName)
 sap.zen.Dimension.prototype.getKeyField = function(attributeName, useDisplayKey)
 {
 	var lFieldName = null;
-	var loInternalField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getName(), attributeName, useDisplayKey);
+	var loInternalField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getName(), attributeName, useDisplayKey, null);
 	if (oFF.notNull(loInternalField))
 	{
 		lFieldName = loInternalField.getName();
@@ -22137,7 +22160,7 @@ sap.zen.Dimension.prototype.getTextField = function(attributeName, textPresentat
 };
 sap.zen.Dimension.prototype.getValueType = function()
 {
-	var loField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getName(), null, false);
+	var loField = sap.zen.Dimension.sGetKeyFieldObject(this.getDataSource(), this.getName(), null, false, null);
 	if (oFF.notNull(loField))
 	{
 		return loField.getValueType();
@@ -23327,7 +23350,7 @@ sap.zen.Dimension.prototype.setMemberDisplay = function(attributeName, memberDis
 	var ltInternalKeyFields = oFF.XList.create();
 	var loInternalKeyField = null;
 	ltInternalKeyFields.add(loInternalAttribute.getFlatKeyField());
-	loInternalKeyField = sap.zen.Dimension.sGetKeyFieldObject(loDataSource, this.getName(), attributeName, false);
+	loInternalKeyField = sap.zen.Dimension.sGetKeyFieldObject(loDataSource, this.getName(), attributeName, false, null);
 	if (!ltInternalKeyFields.contains(loInternalKeyField))
 	{
 		ltInternalKeyFields.add(loInternalKeyField);
@@ -23342,7 +23365,7 @@ sap.zen.Dimension.prototype.setMemberDisplay = function(attributeName, memberDis
 		}
 		loField.setObtainability(oFF.ObtainabilityType.USER_INTERFACE);
 	}
-	var loInternalDisplayKeyField = sap.zen.Dimension.sGetKeyFieldObject(loDataSource, this.getName(), attributeName, true);
+	var loInternalDisplayKeyField = sap.zen.Dimension.sGetKeyFieldObject(loDataSource, this.getName(), attributeName, true, null);
 	var loInternalTextField = sap.zen.Dimension.sGetTextFieldObject(loDataSource, this.getName(), attributeName, textPresentationType);
 	var ltInternalResultSetFields = loInternalAttribute.getResultSetFields();
 	ltInternalResultSetFields.clear();

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.3
+     * @version 1.114.5
      */
     var thisLib = sap.ui.getCore().initLibrary(
       {
@@ -56,7 +56,7 @@ sap.ui.define(
         ],
         elements: [],
         noLibraryCSS: true,
-        version: "1.114.3"
+        version: "1.114.5"
       }
     );