@sapui5/sap.fe.macros 1.96.21 → 1.96.22

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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/sap/fe/macros/.library +1 -1
  3. package/src/sap/fe/macros/library.js +1 -1
  4. package/src/sap/fe/macros/messagebundle_ko.properties +1 -1
  5. package/src/sap/fe/macros/messagebundle_sh.properties +7 -7
  6. package/src/sap/fe/macros/messagebundle_sr.properties +7 -7
  7. package/src/sap/fe/macros/table/Utils.js +22 -18
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.fe.macros",
3
- "version": "1.96.21",
3
+ "version": "1.96.22",
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)",
package/src/sap/fe/macros/.library CHANGED
@@ -6,7 +6,7 @@
6
6
  <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
7
7
  (c) Copyright 2009-2021 SAP SE. All rights reserved
8
8
  </copyright>
9
- <version>1.96.21</version>
9
+ <version>1.96.22</version>
10
10
 
11
11
  <documentation>UI5 library: sap.fe.macros</documentation>
12
12
 
package/src/sap/fe/macros/library.js CHANGED
@@ -59,7 +59,7 @@ sap.ui.define(
59
59
  interfaces: [],
60
60
  controls: [],
61
61
  elements: [],
62
- version: "1.96.21",
62
+ version: "1.96.22",
63
63
  noLibraryCSS: true
64
64
  });
65
65
 
package/src/sap/fe/macros/messagebundle_ko.properties CHANGED
@@ -27,7 +27,7 @@ C_DRAFT_EDIT_STATE_DRAFT_OWN_DRAFT_FILTER=\uC0AC\uC6A9\uC790 \uB4DC\uB798\uD504\
27
27
 
28
28
  C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\uB2E4\uB978 \uC0AC\uC6A9\uC790\uC5D0 \uC758\uD574 \uC7A0\uAE40
29
29
 
30
- C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\uB2E4\uB978 \uC0AC\uC6A9\uC790\uC758 \uBCC0\uACBD\uC0AC\uD56D\uC774 \uC800\uC7A5\uB418\uC9C0 \uC54A\uC74C
30
+ C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\uB2E4\uB978 \uC0AC\uC6A9\uC790\uAC00 \uC800\uC7A5\uD558\uC9C0 \uC54A\uC740 \uBCC0\uACBD\uC0AC\uD56D
31
31
 
32
32
  M_DATAFIELD_FRAGMENT_FIELD_PREVIEW=\uBB38\uC11C \uC870\uD68C
33
33
 
package/src/sap/fe/macros/messagebundle_sh.properties CHANGED
@@ -29,7 +29,7 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Zaklju\u010Dao drugi korisnik
29
29
 
30
30
  C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Nesa\u010Duvane prom.dr.korisnika
31
31
 
32
- M_DATAFIELD_FRAGMENT_FIELD_PREVIEW=Display Document
32
+ M_DATAFIELD_FRAGMENT_FIELD_PREVIEW=Prika\u017Ei dokument
33
33
 
34
34
  M_FILTERBAR_SEARCH=Tra\u017Ei
35
35
 
@@ -46,7 +46,7 @@ M_COMMON_TABLE_DELETE=Izbri\u0161i
46
46
 
47
47
  M_COMMON_TABLE_PASTE=Zalepi
48
48
 
49
- M_COMMON_TABLE_MASSEDIT=Mass Edit
49
+ M_COMMON_TABLE_MASSEDIT=Masovne izmene
50
50
 
51
51
  M_COMMON_TABLE_FULLSCREEN_MAXIMIZE=Uve\u0107aj
52
52
 
@@ -54,9 +54,9 @@ M_COMMON_TABLE_FULLSCREEN_MINIMIZE=Umanji
54
54
 
55
55
  M_COMMON_TABLE_FULLSCREEN_CLOSE=Zatvori
56
56
 
57
- M_COMMON_TABLE_RATING_INDICATOR_TOOLTIP=Rating indicator\: {0}\: {1}
57
+ M_COMMON_TABLE_RATING_INDICATOR_TOOLTIP=Pokazatelj vrednovanja\: {0}\: {1}
58
58
 
59
- M_COMMON_TABLE_PROGRESS_INDICATOR_TOOLTIP=Progress indicator\: {0}\: {1}
59
+ M_COMMON_TABLE_PROGRESS_INDICATOR_TOOLTIP=Indikator napretka\: {0}\: {1}
60
60
 
61
61
  M_COMMON_TABLE_SEGMENTED_BUTTON_ITEM_TOOLTIP=Tabela
62
62
 
@@ -84,7 +84,7 @@ M_OP_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT=Za pokretanje postavite relevantne
84
84
 
85
85
  M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT=Stavke nisu dostupne.
86
86
 
87
- M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER=No data found. Try adjusting search or filter properties.
87
+ M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER=Podaci nisu na\u0111eni. Poku\u0161ajte da uskladite svojstva tra\u017Eenja ili filtriranja.
88
88
 
89
89
  TargetValue=Ciljna vrednost
90
90
 
@@ -116,7 +116,7 @@ M_VISUAL_FILTERS_MULTIPLE_UNIT=Da biste videli ovaj dijagram, postavite samo jed
116
116
 
117
117
  M_VISUAL_FILTER_UNSUPPORTED_CHART_TYPE=Tip dijagrama nije podr\u017Ean za vizuelne filtere. Koristite linijski ili trakasti dijagram.
118
118
 
119
- M_VISUAL_FILTER_HIDDEN_MEASURE=Unable to load visual filter. {0} measure is marked with UI.Hidden.
119
+ M_VISUAL_FILTER_HIDDEN_MEASURE=Nije mogu\u0107e u\u010Ditati vizuelni filter. Mera {0} je ozna\u010Dena kao KI skriven.
120
120
 
121
121
  M_VISUAL_FILTER_LINE_CHART_UNSUPPORTED_DIMENSION=Linijski dijagrami podr\u017Eavaju samo dimenzije zasnovane na Edm.Date, Edm.TimeOfDay ili Edm.DateTimeOffset.
122
122
 
@@ -126,7 +126,7 @@ M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE=Nije mogu\u0107e prikazati filter
126
126
 
127
127
  M_VISUAL_FILTER_LINE_CHART_INVALID_DATATYPE=Neva\u017Ee\u0107i tip podataka
128
128
 
129
- C_MASS_EDIT_DIALOG_TITLE=Mass Edit ({0})
129
+ C_MASS_EDIT_DIALOG_TITLE=Masovne izmene ({0})
130
130
 
131
131
  C_MASS_EDIT_APPLY_BUTTON_TEXT=Primeni
132
132
 
package/src/sap/fe/macros/messagebundle_sr.properties CHANGED
@@ -29,7 +29,7 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\u0417\u0430\u043A\u0459\u0443\u0447\u043
29
29
 
30
30
  C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\u041D\u0435\u0441\u0430\u0447\u0443\u0432\u0430\u043D\u0435 \u043F\u0440\u043E\u043C.\u0434\u0440.\u043A\u043E\u0440\u0438\u0441\u043D\u0438\u043A\u0430
31
31
 
32
- M_DATAFIELD_FRAGMENT_FIELD_PREVIEW=Display Document
32
+ M_DATAFIELD_FRAGMENT_FIELD_PREVIEW=\u041F\u0440\u0438\u043A\u0430\u0436\u0438 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442
33
33
 
34
34
  M_FILTERBAR_SEARCH=\u0422\u0440\u0430\u0436\u0438
35
35
 
@@ -46,7 +46,7 @@ M_COMMON_TABLE_DELETE=\u0418\u0437\u0431\u0440\u0438\u0448\u0438
46
46
 
47
47
  M_COMMON_TABLE_PASTE=\u0417\u0430\u043B\u0435\u043F\u0438
48
48
 
49
- M_COMMON_TABLE_MASSEDIT=Mass Edit
49
+ M_COMMON_TABLE_MASSEDIT=\u041C\u0430\u0441\u043E\u0432\u043D\u0435 \u0438\u0437\u043C\u0435\u043D\u0435
50
50
 
51
51
  M_COMMON_TABLE_FULLSCREEN_MAXIMIZE=\u0423\u0432\u0435\u045B\u0430\u0458
52
52
 
@@ -54,9 +54,9 @@ M_COMMON_TABLE_FULLSCREEN_MINIMIZE=\u0423\u043C\u0430\u045A\u0438
54
54
 
55
55
  M_COMMON_TABLE_FULLSCREEN_CLOSE=\u0417\u0430\u0442\u0432\u043E\u0440\u0438
56
56
 
57
- M_COMMON_TABLE_RATING_INDICATOR_TOOLTIP=Rating indicator\: {0}\: {1}
57
+ M_COMMON_TABLE_RATING_INDICATOR_TOOLTIP=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0435\u0459 \u0432\u0440\u0435\u0434\u043D\u043E\u0432\u0430\u045A\u0430\: {0}\: {1}
58
58
 
59
- M_COMMON_TABLE_PROGRESS_INDICATOR_TOOLTIP=Progress indicator\: {0}\: {1}
59
+ M_COMMON_TABLE_PROGRESS_INDICATOR_TOOLTIP=\u0418\u043D\u0434\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u043F\u0440\u0435\u0442\u043A\u0430\: {0}\: {1}
60
60
 
61
61
  M_COMMON_TABLE_SEGMENTED_BUTTON_ITEM_TOOLTIP=\u0422\u0430\u0431\u0435\u043B\u0430
62
62
 
@@ -84,7 +84,7 @@ M_OP_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT=\u0417\u0430 \u043F\u043E\u043A\u04
84
84
 
85
85
  M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT=\u0421\u0442\u0430\u0432\u043A\u0435 \u043D\u0438\u0441\u0443 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0435.
86
86
 
87
- M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER=No data found. Try adjusting search or filter properties.
87
+ M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER=\u041F\u043E\u0434\u0430\u0446\u0438 \u043D\u0438\u0441\u0443 \u043D\u0430\u0452\u0435\u043D\u0438. \u041F\u043E\u043A\u0443\u0448\u0430\u0458\u0442\u0435 \u0434\u0430 \u0443\u0441\u043A\u043B\u0430\u0434\u0438\u0442\u0435 \u0441\u0432\u043E\u0458\u0441\u0442\u0432\u0430 \u0442\u0440\u0430\u0436\u0435\u045A\u0430 \u0438\u043B\u0438 \u0444\u0438\u043B\u0442\u0440\u0438\u0440\u0430\u045A\u0430.
88
88
 
89
89
  TargetValue=\u0426\u0438\u0459\u043D\u0430 \u0432\u0440\u0435\u0434\u043D\u043E\u0441\u0442
90
90
 
@@ -116,7 +116,7 @@ M_VISUAL_FILTERS_MULTIPLE_UNIT=\u0414\u0430 \u0431\u0438\u0441\u0442\u0435 \u043
116
116
 
117
117
  M_VISUAL_FILTER_UNSUPPORTED_CHART_TYPE=\u0422\u0438\u043F \u0434\u0438\u0458\u0430\u0433\u0440\u0430\u043C\u0430 \u043D\u0438\u0458\u0435 \u043F\u043E\u0434\u0440\u0436\u0430\u043D \u0437\u0430 \u0432\u0438\u0437\u0443\u0435\u043B\u043D\u0435 \u0444\u0438\u043B\u0442\u0435\u0440\u0435. \u041A\u043E\u0440\u0438\u0441\u0442\u0438\u0442\u0435 \u043B\u0438\u043D\u0438\u0458\u0441\u043A\u0438 \u0438\u043B\u0438 \u0442\u0440\u0430\u043A\u0430\u0441\u0442\u0438 \u0434\u0438\u0458\u0430\u0433\u0440\u0430\u043C.
118
118
 
119
- M_VISUAL_FILTER_HIDDEN_MEASURE=Unable to load visual filter. {0} measure is marked with UI.Hidden.
119
+ M_VISUAL_FILTER_HIDDEN_MEASURE=\u041D\u0438\u0458\u0435 \u043C\u043E\u0433\u0443\u045B\u0435 \u0443\u0447\u0438\u0442\u0430\u0442\u0438 \u0432\u0438\u0437\u0443\u0435\u043B\u043D\u0438 \u0444\u0438\u043B\u0442\u0435\u0440. \u041C\u0435\u0440\u0430 {0} \u0458\u0435 \u043E\u0437\u043D\u0430\u0447\u0435\u043D\u0430 \u043A\u0430\u043E \u041A\u0418 \u0441\u043A\u0440\u0438\u0432\u0435\u043D.
120
120
 
121
121
  M_VISUAL_FILTER_LINE_CHART_UNSUPPORTED_DIMENSION=\u041B\u0438\u043D\u0438\u0458\u0441\u043A\u0438 \u0434\u0438\u0458\u0430\u0433\u0440\u0430\u043C\u0438 \u043F\u043E\u0434\u0440\u0436\u0430\u0432\u0430\u0458\u0443 \u0441\u0430\u043C\u043E \u0434\u0438\u043C\u0435\u043D\u0437\u0438\u0458\u0435 \u0437\u0430\u0441\u043D\u043E\u0432\u0430\u043D\u0435 \u043D\u0430 Edm.Date, Edm.TimeOfDay \u0438\u043B\u0438 Edm.DateTimeOffset.
122
122
 
@@ -126,7 +126,7 @@ M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE=\u041D\u0438\u0458\u0435 \u043C\u043E\u0433
126
126
 
127
127
  M_VISUAL_FILTER_LINE_CHART_INVALID_DATATYPE=\u041D\u0435\u0432\u0430\u0436\u0435\u045B\u0438 \u0442\u0438\u043F \u043F\u043E\u0434\u0430\u0442\u0430\u043A\u0430
128
128
 
129
- C_MASS_EDIT_DIALOG_TITLE=Mass Edit ({0})
129
+ C_MASS_EDIT_DIALOG_TITLE=\u041C\u0430\u0441\u043E\u0432\u043D\u0435 \u0438\u0437\u043C\u0435\u043D\u0435 ({0})
130
130
 
131
131
  C_MASS_EDIT_APPLY_BUTTON_TEXT=\u041F\u0440\u0438\u043C\u0435\u043D\u0438
132
132
 
package/src/sap/fe/macros/table/Utils.js CHANGED
@@ -16,7 +16,8 @@ sap.ui.define(
16
16
  "sap/fe/core/converters/MetaModelConverter",
17
17
  "sap/fe/core/converters/ConverterContext",
18
18
  "sap/base/util/merge",
19
- "sap/fe/core/helpers/BindingExpression"
19
+ "sap/fe/core/helpers/BindingExpression",
20
+ "sap/fe/core/converters/helpers/SelectionVariantHelper"
20
21
  ],
21
22
  function(
22
23
  Filter,
@@ -30,7 +31,8 @@ sap.ui.define(
30
31
  MetaModelConverter,
31
32
  ConverterContext,
32
33
  merge,
33
- BindingExpression
34
+ BindingExpression,
35
+ SelectionVariantHelper
34
36
  ) {
35
37
  "use strict";
36
38
 
@@ -46,9 +48,10 @@ sap.ui.define(
46
48
  * @ui5-restricted
47
49
  */
48
50
  function getFiltersInfoForSV(oTable, sSvPath) {
49
- var sEntityTypePath = oTable.data("entityType"),
50
- oMetaModel = CommonUtils.getAppComponent(oTable).getMetaModel(),
51
- oSelectionVariant = oMetaModel.getObject(sEntityTypePath + "@" + sSvPath),
51
+ var oMetaModel = CommonUtils.getAppComponent(oTable).getMetaModel(),
52
+ oSvContext = oMetaModel.getMetaContext(oTable.data("entityType")),
53
+ oEntityType = MetaModelConverter.getInvolvedDataModelObjects(oSvContext).targetEntityType,
54
+ oSelectionVariant = oEntityType.resolvePath("@" + sSvPath, true).target,
52
55
  mPropertyFilters = {},
53
56
  aFilters = [],
54
57
  aPaths = [],
@@ -56,19 +59,20 @@ sap.ui.define(
56
59
  if (oSelectionVariant) {
57
60
  sText = oSelectionVariant.Text;
58
61
  (oSelectionVariant.SelectOptions || [])
59
- .filter(function(oSelectOption) {
60
- return oSelectOption && oSelectOption.PropertyName && oSelectOption.PropertyName.$PropertyPath;
61
- })
62
- .forEach(function(oSelectOption) {
63
- var sPath = oSelectOption.PropertyName.$PropertyPath;
64
- if (!aPaths.includes(sPath)) {
65
- aPaths.push(sPath);
66
- }
67
- for (var j in oSelectOption.Ranges) {
68
- var oRange = oSelectOption.Ranges[j];
69
- mPropertyFilters[sPath] = (mPropertyFilters[sPath] || []).concat(
70
- new Filter(sPath, oRange.Option.$EnumMember.split("/").pop(), oRange.Low, oRange.High)
71
- );
62
+ .forEach(function(oSelectOption) {
63
+ if (oSelectOption.PropertyName && oSelectOption.PropertyName.$target && oSelectOption.Ranges && oSelectOption.Ranges.length > 0){
64
+ var sPath = oSelectOption.PropertyName.value;
65
+ var sPropertyType = oSelectOption.PropertyName.$target.type;
66
+
67
+ if (!aPaths.includes(sPath)) {
68
+ aPaths.push(sPath);
69
+ }
70
+ for (var j in oSelectOption.Ranges) {
71
+ var oRange = SelectionVariantHelper.getRangeDefinition(oSelectOption.Ranges[j], sPropertyType);
72
+ mPropertyFilters[sPath] = (mPropertyFilters[sPath] || []).concat(
73
+ new Filter(sPath, oRange.operator, oRange.rangeLow, oRange.rangeHigh)
74
+ );
75
+ }
72
76
  }
73
77
  });
74
78