@sapui5/sap.suite.ui.generic.template 1.84.23 → 1.84.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/sap/suite/ui/generic/template/.library +1 -1
- package/src/sap/suite/ui/generic/template/AnalyticalListPage/util/FilterUtil.js +6 -3
- package/src/sap/suite/ui/generic/template/changeHandler/AddFilterItem.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddFooterActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddGroup.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddGroupElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddHeaderActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddHeaderFacet.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddSubSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddTableColumn.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/AddToolbarActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveFilterItems.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveGroup.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveGroupElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveHeaderAndFooterActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveHeaderFacet.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveSubSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveTableColumns.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/MoveToolbarActionButtons.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveFilterItem.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveGroup.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveGroupElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveHeaderAndFooterActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveHeaderFacet.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveSubSection.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveTableColumn.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RemoveToolbarActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RevealFilterItem.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RevealHeaderFacet.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RevealTableColumn.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/RevealToolbarActionButton.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/generic/AddElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/generic/MoveElements.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/generic/RemoveElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/generic/RevealElement.js +1 -1
- package/src/sap/suite/ui/generic/template/changeHandler/util/AnnotationPropertyCommand.js +1 -1
- package/src/sap/suite/ui/generic/template/lib/CommonUtils.js +4 -3
- package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js +1 -1
- package/src/sap/suite/ui/generic/template/library.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sapui5/sap.suite.ui.generic.template",
|
|
3
|
-
"version": "1.84.
|
|
3
|
+
"version": "1.84.25",
|
|
4
4
|
"description": "SAPUI5 Library sap.suite.ui.generic.template",
|
|
5
5
|
"homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
|
|
6
6
|
"author": "SAP SE (https://www.sap.com)",
|
|
@@ -458,9 +458,12 @@ sap.ui.define([
|
|
|
458
458
|
*/
|
|
459
459
|
FilterUtil.getPropertyNameDisplay = function (model, entitySet, propertyName, oAppI18nModel) {
|
|
460
460
|
var oRB = oAppI18nModel ? oAppI18nModel.getResourceBundle() : undefined,
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
461
|
+
oMetamodel = model.getMetaModel(),
|
|
462
|
+
oEntityType = oMetamodel.getODataEntityType(oMetamodel.getODataEntitySet(entitySet).entityType),
|
|
463
|
+
prop = oMetamodel.getODataProperty(oEntityType, propertyName);
|
|
464
|
+
if (!prop) {
|
|
465
|
+
return propertyName;
|
|
466
|
+
}
|
|
464
467
|
var sLabel = (prop["com.sap.vocabularies.Common.v1.Label"] && prop["com.sap.vocabularies.Common.v1.Label"].String) ? prop["com.sap.vocabularies.Common.v1.Label"].String : prop["sap:label"];
|
|
465
468
|
if (sLabel) {
|
|
466
469
|
if (sLabel.match(/{@i18n>.+}/gi) && oRB) {
|
|
@@ -960,9 +960,6 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
960
960
|
// oSelectionVariant now contains all selectOptions and parameters from semanticObject, store these in aSelVariantPropertyNames before calling extension
|
|
961
961
|
aSelVariantPropertyNames = oSelectionVariant.getPropertyNames();
|
|
962
962
|
oObjectInfo.semanticObject = sSemanticObject;
|
|
963
|
-
// call extension
|
|
964
|
-
oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
|
|
965
|
-
// get the modified selectOptions and parameters after extension call
|
|
966
963
|
aSelOptionPropertyNames = oSelectionVariant.getSelectOptionsPropertyNames();
|
|
967
964
|
aParameterNames = oSelectionVariant.getParameterNames();
|
|
968
965
|
//remove not selected parameters from oEventParameters and not selected selectOptions from oSelectionVariant
|
|
@@ -987,6 +984,8 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
987
984
|
}
|
|
988
985
|
// add the resulting selectOptions and parameters (if any!) in oSelectionVariant with the ones of the semanticObject in oEventParameters as selectOptions to oSelectionVariant
|
|
989
986
|
oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant(oEventParameters.semanticAttributesOfSemanticObjects[sSemanticObject], oSelectionVariant.toJSONString());
|
|
987
|
+
// call extension
|
|
988
|
+
oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
|
|
990
989
|
sSelectionVariantPrepared = oSelectionVariant.toJSONString();
|
|
991
990
|
}
|
|
992
991
|
}
|
|
@@ -1496,6 +1495,7 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
1496
1495
|
// copy selection options
|
|
1497
1496
|
aVariantOptions = oVariant.getSelectOptionsPropertyNames();
|
|
1498
1497
|
aVariantOptions.forEach(function (sProperty) {
|
|
1498
|
+
oMergedVariant.removeParameter(sProperty);
|
|
1499
1499
|
oMergedVariant.removeSelectOption(sProperty);
|
|
1500
1500
|
oMergedVariant.massAddSelectOption(sProperty, oVariant.getSelectOption(sProperty));
|
|
1501
1501
|
});
|
|
@@ -1503,6 +1503,7 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
1503
1503
|
aVariantParameters = oVariant.getParameterNames();
|
|
1504
1504
|
aVariantParameters.forEach(function (sParam) {
|
|
1505
1505
|
oMergedVariant.removeParameter(sParam);
|
|
1506
|
+
oMergedVariant.removeSelectOption(sParam);
|
|
1506
1507
|
oMergedVariant.addParameter(sParam, oVariant.getParameter(sParam));
|
|
1507
1508
|
});
|
|
1508
1509
|
});
|
|
@@ -2352,7 +2352,7 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
2352
2352
|
* @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
|
|
2353
2353
|
* @public
|
|
2354
2354
|
* @extends sap.ui.base.Object
|
|
2355
|
-
* @version 1.84.
|
|
2355
|
+
* @version 1.84.25
|
|
2356
2356
|
* @since 1.30.0
|
|
2357
2357
|
* @alias sap.suite.ui.generic.template.lib.NavigationController
|
|
2358
2358
|
*/
|