@sapui5/sap.fe.macros 1.96.12 → 1.96.13
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/fe/macros/.library +1 -1
- package/src/sap/fe/macros/DelegateUtil.js +1 -1
- package/src/sap/fe/macros/FieldValueHelpDelegate.js +7 -2
- package/src/sap/fe/macros/internal/field/displayStyle/Button.fragment.xml +3 -2
- package/src/sap/fe/macros/internal/valuehelp/TableDelegate.js +5 -3
- package/src/sap/fe/macros/library.js +1 -1
- package/src/sap/fe/macros/table/Utils.js +1 -1
package/package.json
CHANGED
|
@@ -214,7 +214,7 @@ sap.ui.define(
|
|
|
214
214
|
if (sValueHelpProperty.indexOf("$Path") > -1) {
|
|
215
215
|
sValueHelpProperty = oMetaModel.getObject(sValueHelpProperty);
|
|
216
216
|
}
|
|
217
|
-
if (bIsAbsolute) {
|
|
217
|
+
if (bIsAbsolute && sValueHelpProperty.indexOf("/") !== 0) {
|
|
218
218
|
sValueHelpProperty = mParameters.sBindingPath + "/" + sValueHelpProperty;
|
|
219
219
|
}
|
|
220
220
|
var sGeneratedId = ValueHelpTemplating.generateID(
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
// ---------------------------------------------------------------------------------------
|
|
10
10
|
/* eslint-disable no-console */
|
|
11
11
|
sap.ui.define(
|
|
12
|
-
["sap/ui/mdc/odata/v4/FieldValueHelpDelegate", "sap/fe/macros/internal/valuehelp/ValueListHelper"],
|
|
13
|
-
function(FieldValueHelpDelegate, ValueListHelper) {
|
|
12
|
+
["sap/ui/mdc/odata/v4/FieldValueHelpDelegate", "sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/fe/core/CommonUtils"],
|
|
13
|
+
function(FieldValueHelpDelegate, ValueListHelper, CommonUtils) {
|
|
14
14
|
"use strict";
|
|
15
15
|
|
|
16
16
|
var ODataFieldValueHelpDelegate = Object.assign({}, FieldValueHelpDelegate);
|
|
@@ -48,6 +48,11 @@ sap.ui.define(
|
|
|
48
48
|
return ValueListHelper.showValueListInfo(oPayload.propertyPath, oFieldHelp, bSuggestion, oPayload.conditionModel, oProperties);
|
|
49
49
|
};
|
|
50
50
|
|
|
51
|
+
ODataFieldValueHelpDelegate.executeSearch = function(oPayload, oListBinding, sSearch) {
|
|
52
|
+
//adapt the search term before applying it
|
|
53
|
+
FieldValueHelpDelegate.executeSearch(oPayload, oListBinding, CommonUtils.normalizeSearchTerm(sSearch));
|
|
54
|
+
};
|
|
55
|
+
|
|
51
56
|
return ODataFieldValueHelpDelegate;
|
|
52
57
|
},
|
|
53
58
|
/* bExport= */ false
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
|
|
8
8
|
COMMON: 'sap/fe/macros/CommonHelper',
|
|
9
9
|
FIELD: 'sap/fe/macros/field/FieldHelper',
|
|
10
|
+
FIELDTEMPLATING: 'sap/fe/macros/field/FieldTemplating',
|
|
10
11
|
UI: 'sap/fe/core/templating/UIFormatters',
|
|
11
12
|
CRIT: 'sap/fe/core/templating/CriticalityFormatters'
|
|
12
13
|
}"
|
|
@@ -16,7 +17,7 @@
|
|
|
16
17
|
<template:then>
|
|
17
18
|
<Button
|
|
18
19
|
unittest:id="MacroDataFieldForIntentBasedNavigationButton"
|
|
19
|
-
visible="{= ${dataField
|
|
20
|
+
visible="{= FIELDTEMPLATING.getVisibleExpression(${dataField>@@UI.getDataModelObjectPath}, ${this>formatOptions}) }"
|
|
20
21
|
text="{= !${this>formatOptions/showIconUrl} ? ${dataField>Label} : undefined}"
|
|
21
22
|
icon="{= ${this>formatOptions/showIconUrl} ? ${dataField>IconUrl} : undefined}"
|
|
22
23
|
enabled="{this>formatOptions/navigationAvailable}"
|
|
@@ -43,7 +44,7 @@
|
|
|
43
44
|
enabled="{= FIELD.isDataFieldActionButtonEnabled(${dataField>}, ${isBound>$IsBound},
|
|
44
45
|
${actionContext>@Org.OData.Core.V1.OperationAvailable}, ${actionContext>@Org.OData.Core.V1.OperationAvailable@@MODEL.format})
|
|
45
46
|
}"
|
|
46
|
-
visible="{= ${dataField
|
|
47
|
+
visible="{= FIELDTEMPLATING.getVisibleExpression(${dataField>@@UI.getDataModelObjectPath}, ${this>formatOptions}) }"
|
|
47
48
|
type="{= CRIT.buildExpressionForCriticalityButtonType(${dataField>@@UI.getDataModelObjectPath}) }"
|
|
48
49
|
/>
|
|
49
50
|
</template:if>
|
|
@@ -16,7 +16,8 @@ sap.ui.define(
|
|
|
16
16
|
"sap/ui/model/FilterOperator",
|
|
17
17
|
"sap/base/Log",
|
|
18
18
|
"sap/fe/macros/DelegateUtil",
|
|
19
|
-
"sap/fe/core/helpers/ModelHelper"
|
|
19
|
+
"sap/fe/core/helpers/ModelHelper",
|
|
20
|
+
"sap/fe/core/CommonUtils"
|
|
20
21
|
],
|
|
21
22
|
function(
|
|
22
23
|
deepEqual,
|
|
@@ -31,7 +32,8 @@ sap.ui.define(
|
|
|
31
32
|
FilterOperator,
|
|
32
33
|
Log,
|
|
33
34
|
MacrosDelegateUtil,
|
|
34
|
-
ModelHelper
|
|
35
|
+
ModelHelper,
|
|
36
|
+
CommonUtils
|
|
35
37
|
) {
|
|
36
38
|
"use strict";
|
|
37
39
|
|
|
@@ -178,7 +180,7 @@ sap.ui.define(
|
|
|
178
180
|
}
|
|
179
181
|
|
|
180
182
|
// get the basic search
|
|
181
|
-
oBindingInfo.parameters.$search = oFilter.getSearch()
|
|
183
|
+
oBindingInfo.parameters.$search = CommonUtils.normalizeSearchTerm(oFilter.getSearch());
|
|
182
184
|
}
|
|
183
185
|
// add select to oBindingInfo (BCP 2170163012)
|
|
184
186
|
oBindingInfo.parameters.$select = aTableProperties.reduce(function(sQuery, oProperty) {
|
|
@@ -300,7 +300,7 @@ sap.ui.define(
|
|
|
300
300
|
function updateBindingInfo(oBindingInfo, oFilterInfo, oFilter) {
|
|
301
301
|
oBindingInfo.filters = oFilter;
|
|
302
302
|
if (oFilterInfo.search) {
|
|
303
|
-
oBindingInfo.parameters.$search = oFilterInfo.search;
|
|
303
|
+
oBindingInfo.parameters.$search = CommonUtils.normalizeSearchTerm(oFilterInfo.search);
|
|
304
304
|
} else {
|
|
305
305
|
oBindingInfo.parameters.$search = undefined;
|
|
306
306
|
}
|