@sapui5/sap.fe.macros 1.84.6 → 1.84.10
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 +2 -2
- package/src/sap/fe/macros/.library +1 -1
- package/src/sap/fe/macros/Chart.metadata.js +1 -1
- package/src/sap/fe/macros/ChartDelegate.js +1 -1
- package/src/sap/fe/macros/CommonHelper.js +1 -1
- package/src/sap/fe/macros/Constants.js +1 -1
- package/src/sap/fe/macros/Contact.designtime.js +1 -1
- package/src/sap/fe/macros/Contact.metadata.js +1 -1
- package/src/sap/fe/macros/ContactHelper.js +1 -1
- package/src/sap/fe/macros/DelegateUtil.js +1 -1
- package/src/sap/fe/macros/DraftIndicator.metadata.js +1 -1
- package/src/sap/fe/macros/DraftIndicatorRuntime.js +1 -1
- package/src/sap/fe/macros/Field.designtime.js +1 -1
- package/src/sap/fe/macros/Field.metadata.js +1 -1
- package/src/sap/fe/macros/FieldValueHelpDelegate.js +1 -1
- package/src/sap/fe/macros/FilterBar.designtime.js +1 -1
- package/src/sap/fe/macros/FilterBar.metadata.js +1 -1
- package/src/sap/fe/macros/FilterBarDelegate.js +36 -8
- package/src/sap/fe/macros/FilterBarHelper.js +1 -1
- package/src/sap/fe/macros/FilterField.designtime.js +1 -1
- package/src/sap/fe/macros/FilterField.metadata.js +1 -1
- package/src/sap/fe/macros/Form.designtime.js +1 -1
- package/src/sap/fe/macros/Form.metadata.js +1 -1
- package/src/sap/fe/macros/FormContainer.designtime.js +1 -1
- package/src/sap/fe/macros/FormContainer.metadata.js +1 -1
- package/src/sap/fe/macros/MacroMetadata.js +1 -1
- package/src/sap/fe/macros/MicroChart.designtime.js +1 -1
- package/src/sap/fe/macros/MicroChart.metadata.js +1 -1
- package/src/sap/fe/macros/ODataMetaModelUtil.js +1 -1
- package/src/sap/fe/macros/PhantomUtil.js +1 -1
- package/src/sap/fe/macros/ResourceModel.js +1 -1
- package/src/sap/fe/macros/SizeHelper.js +1 -1
- package/src/sap/fe/macros/Table.metadata.js +1 -1
- package/src/sap/fe/macros/TableDelegate.js +1 -1
- package/src/sap/fe/macros/TraceInfo.js +1 -1
- package/src/sap/fe/macros/ValueHelp.designtime.js +1 -1
- package/src/sap/fe/macros/ValueHelp.metadata.js +1 -1
- package/src/sap/fe/macros/chart/ChartHelper.js +1 -1
- package/src/sap/fe/macros/chart/ChartRuntime.js +1 -1
- package/src/sap/fe/macros/chart/ChartUtils.js +1 -1
- package/src/sap/fe/macros/designtime/DialogUtil.js +1 -1
- package/src/sap/fe/macros/designtime/SimpleDialogUtil.js +1 -1
- package/src/sap/fe/macros/field/FieldHelper.js +1 -1
- package/src/sap/fe/macros/field/FieldRuntime.js +1 -1
- package/src/sap/fe/macros/field/QuickViewForm.designtime.js +1 -1
- package/src/sap/fe/macros/field/QuickViewForm.metadata.js +1 -1
- package/src/sap/fe/macros/field/QuickViewLinkDelegate.js +1 -1
- package/src/sap/fe/macros/filter/DraftEditState.js +1 -1
- package/src/sap/fe/macros/filter/FilterUtils.js +1 -1
- package/src/sap/fe/macros/form/FormHelper.js +1 -1
- package/src/sap/fe/macros/fpm/CustomFragment.metadata.js +1 -1
- package/src/sap/fe/macros/fpm/CustomSection.metadata.js +1 -1
- package/src/sap/fe/macros/fpm/InputField.metadata.js +1 -1
- package/src/sap/fe/macros/fpm/fpm.js +1 -1
- package/src/sap/fe/macros/library.js +2 -2
- package/src/sap/fe/macros/macroLibrary.js +2 -2
- package/src/sap/fe/macros/microchart/MicroChartContainer.js +1 -1
- package/src/sap/fe/macros/microchart/MicroChartHelper.js +1 -1
- package/src/sap/fe/macros/table/TableHelper.js +1 -1
- package/src/sap/fe/macros/table/TableRuntime.js +1 -1
- package/src/sap/fe/macros/table/Utils.js +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sapui5/sap.fe.macros",
|
|
3
|
-
"version": "1.84.
|
|
3
|
+
"version": "1.84.10",
|
|
4
4
|
"description": "SAPUI5 Library sap.fe.macros",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
6
6
|
"author": "SAP SE (https://www.sap.com)",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
],
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@babel/cli": "7.8.4",
|
|
19
|
-
"@ui5/cli": "
|
|
19
|
+
"@ui5/cli": "2.4.3",
|
|
20
20
|
"yarn": "1.22.4"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
// ---------------------------------------------------------------------------------------
|
|
@@ -23,7 +23,8 @@ sap.ui.define(
|
|
|
23
23
|
"sap/fe/macros/DelegateUtil",
|
|
24
24
|
"sap/fe/macros/FilterBarHelper",
|
|
25
25
|
"sap/base/Log",
|
|
26
|
-
"sap/base/util/JSTokenizer"
|
|
26
|
+
"sap/base/util/JSTokenizer",
|
|
27
|
+
"sap/fe/core/templating/PropertyFormatters"
|
|
27
28
|
],
|
|
28
29
|
function(
|
|
29
30
|
FilterBarDelegate,
|
|
@@ -40,13 +41,15 @@ sap.ui.define(
|
|
|
40
41
|
DelegateUtil,
|
|
41
42
|
FilterBarHelper,
|
|
42
43
|
Log,
|
|
43
|
-
JSTokenizer
|
|
44
|
+
JSTokenizer,
|
|
45
|
+
PropertyFormatters
|
|
44
46
|
) {
|
|
45
47
|
"use strict";
|
|
46
48
|
var ODataFilterBarDelegate = Object.assign({}, FilterBarDelegate),
|
|
47
49
|
EDIT_STATE_PROPERTY_NAME = "$editState",
|
|
48
50
|
SEARCH_PROPERTY_NAME = "$search",
|
|
49
51
|
VALUE_HELP_TYPE = "FilterFieldValueHelp",
|
|
52
|
+
FETCHED_PROPERTIES_DATA_KEY = "sap_fe_FilterBarDelegate_propertyInfoMap",
|
|
50
53
|
CONDITION_PATH_TO_PROPERTY_PATH_REGEX = /\+|\*/g;
|
|
51
54
|
|
|
52
55
|
function _isMultiValue(oProperty) {
|
|
@@ -201,7 +204,8 @@ sap.ui.define(
|
|
|
201
204
|
label: sLabel,
|
|
202
205
|
tooltip: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.QuickInfo"] || null,
|
|
203
206
|
hiddenFilter: oFilterFieldInfo.hiddenFilter,
|
|
204
|
-
removeFromAppState: bRemoveFromAppState
|
|
207
|
+
removeFromAppState: bRemoveFromAppState,
|
|
208
|
+
hasValueHelp: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext })
|
|
205
209
|
};
|
|
206
210
|
|
|
207
211
|
if (oFilterDefaultValue) {
|
|
@@ -341,7 +345,7 @@ sap.ui.define(
|
|
|
341
345
|
ODataFilterBarDelegate.fetchPropertiesForEntity = function(sEntitySetPath, oMetaModel, oFilterControl) {
|
|
342
346
|
var oEntityType = oMetaModel.getObject(sEntitySetPath + "/");
|
|
343
347
|
if (!oFilterControl || !oEntityType) {
|
|
344
|
-
return
|
|
348
|
+
return [];
|
|
345
349
|
}
|
|
346
350
|
var mEntitySetAnnotations = oMetaModel.getObject(sEntitySetPath + "@"),
|
|
347
351
|
mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntitySetPath),
|
|
@@ -476,6 +480,32 @@ sap.ui.define(
|
|
|
476
480
|
.then(_templateFilterField.bind(undefined, oSettings, oParameters));
|
|
477
481
|
};
|
|
478
482
|
|
|
483
|
+
function _getCachedProperties(oFilterBar) {
|
|
484
|
+
// properties are not cached during templating
|
|
485
|
+
if (oFilterBar instanceof window.Element) {
|
|
486
|
+
return null;
|
|
487
|
+
}
|
|
488
|
+
return DelegateUtil.getCustomData(oFilterBar, FETCHED_PROPERTIES_DATA_KEY);
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
function _setCachedProperties(oFilterBar, aFetchedProperties) {
|
|
492
|
+
// do not cache during templating, else it becomes part of the cached view
|
|
493
|
+
if (oFilterBar instanceof window.Element) {
|
|
494
|
+
return;
|
|
495
|
+
}
|
|
496
|
+
DelegateUtil.setCustomData(oFilterBar, FETCHED_PROPERTIES_DATA_KEY, aFetchedProperties);
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
function _getCachedOrFetchPropertiesForEntity(sEntitySet, oMetaModel, oFilterBar) {
|
|
500
|
+
var aFetchedProperties = _getCachedProperties(oFilterBar);
|
|
501
|
+
|
|
502
|
+
if (!aFetchedProperties) {
|
|
503
|
+
aFetchedProperties = ODataFilterBarDelegate.fetchPropertiesForEntity(sEntitySet, oMetaModel, oFilterBar);
|
|
504
|
+
_setCachedProperties(oFilterBar, aFetchedProperties);
|
|
505
|
+
}
|
|
506
|
+
return aFetchedProperties;
|
|
507
|
+
}
|
|
508
|
+
|
|
479
509
|
/**
|
|
480
510
|
* Fetches the relevant metadata for the filter bar and returns property info array.
|
|
481
511
|
* @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
|
|
@@ -488,9 +518,7 @@ sap.ui.define(
|
|
|
488
518
|
return [];
|
|
489
519
|
}
|
|
490
520
|
|
|
491
|
-
|
|
492
|
-
var aProperties = ODataFilterBarDelegate.fetchPropertiesForEntity(sEntitySet, oMetaModel, oFilterBar);
|
|
493
|
-
return aProperties;
|
|
521
|
+
return _getCachedOrFetchPropertiesForEntity(sEntitySet, oModel.getMetaModel(), oFilterBar);
|
|
494
522
|
});
|
|
495
523
|
};
|
|
496
524
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
sap.ui.define(
|
|
6
6
|
["sap/ui/model/json/JSONModel", "sap/fe/macros/CommonHelper", "sap/fe/macros/chart/ChartUtils", "sap/fe/macros/DelegateUtil"],
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
// Provides the Dialogs for Design Time Metadata Features of OData v4 Macros
|
|
6
6
|
sap.ui.define(["../Constants", "sap/ui/core/Fragment", "sap/ui/model/resource/ResourceModel", "sap/ui/model/json/JSONModel"], function(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -53,7 +53,7 @@ sap.ui.define(
|
|
|
53
53
|
interfaces: [],
|
|
54
54
|
controls: [],
|
|
55
55
|
elements: [],
|
|
56
|
-
version: "1.84.
|
|
56
|
+
version: "1.84.10",
|
|
57
57
|
noLibraryCSS: true
|
|
58
58
|
});
|
|
59
59
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -85,7 +85,7 @@ sap.ui.define(
|
|
|
85
85
|
* @namespace reserved for Fiori Elements
|
|
86
86
|
* @name sap.fe.macros
|
|
87
87
|
* @author SAP SE
|
|
88
|
-
* @version 1.84.
|
|
88
|
+
* @version 1.84.10
|
|
89
89
|
* @private
|
|
90
90
|
* @sap-restricted
|
|
91
91
|
* @experimental
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
sap.ui.define(
|
|
@@ -33,7 +33,7 @@ sap.ui.define(
|
|
|
33
33
|
oSelectionVariant = oMetaModel.getObject(sEntitySetPath + "/@" + sSvPath),
|
|
34
34
|
aFilters = [],
|
|
35
35
|
sText = "";
|
|
36
|
-
if (oSelectionVariant
|
|
36
|
+
if (oSelectionVariant) {
|
|
37
37
|
sText = oSelectionVariant.Text;
|
|
38
38
|
for (var i in oSelectionVariant.SelectOptions) {
|
|
39
39
|
var oSelectOption = oSelectionVariant.SelectOptions[i];
|
|
@@ -180,7 +180,7 @@ sap.ui.define(
|
|
|
180
180
|
oFilterInfo = getFilterInfo(oTable),
|
|
181
181
|
aFilters = Array.isArray(oParams.additionalFilters) ? oParams.additionalFilters : [];
|
|
182
182
|
|
|
183
|
-
aFilters = aFilters.concat(oFilterInfo.filters);
|
|
183
|
+
aFilters = aFilters.concat(oFilterInfo.filters).concat(getP13nFilters(oTable));
|
|
184
184
|
oTableContextFilter = new Filter({
|
|
185
185
|
filters: aFilters,
|
|
186
186
|
and: true
|