@sapui5/sap.suite.ui.generic.template 1.124.7 → 1.124.9
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/controller/VisualFilterDialogController.js +1 -1
- package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/Canvas/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/ListReport/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/ObjectPage/controller/RelatedAppsHandler.js +22 -8
- package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/QuickView/manifest.json +1 -1
- package/src/sap/suite/ui/generic/template/designtime/AnalyticalListPage.designtime.js +1 -1
- package/src/sap/suite/ui/generic/template/designtime/ListReport.designtime.js +1 -1
- package/src/sap/suite/ui/generic/template/fragments/EasyFilter.fragment.xml +3 -2
- package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js +27 -21
- package/src/sap/suite/ui/generic/template/lib/AppComponent.js +1 -1
- package/src/sap/suite/ui/generic/template/lib/ShareUtils.js +2 -12
- package/src/sap/suite/ui/generic/template/lib/i18n/i18n_es.properties +2 -2
- package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js +38 -22
- package/src/sap/suite/ui/generic/template/lib/multipleViews/MultipleTablesModeHelper.js +2 -1
- 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
|
@@ -433,7 +433,7 @@ sap.ui.define([
|
|
|
433
433
|
oVisualFilterDialogModelClone.setProperty('/filterCompList/' + idx + '/searchVisible', bVisible);
|
|
434
434
|
oVisualFilterDialogModel.setData(oVisualFilterDialogModelClone.getData());
|
|
435
435
|
//update config object when VFConfig model is updated
|
|
436
|
-
this.oConfig = oVisualFilterDialogModel.
|
|
436
|
+
this.oConfig = oVisualFilterDialogModel.getData();
|
|
437
437
|
//to enable Restore button on change of chart type, sort order, measure field and show in filter bar changes
|
|
438
438
|
this.oState.oSmartFilterbar._oVariantManagement.currentVariantSetModified(true);
|
|
439
439
|
},
|
|
@@ -98,18 +98,32 @@ sap.ui.define([
|
|
|
98
98
|
|
|
99
99
|
var oLinksPromise;
|
|
100
100
|
var bHasRelatedAppSettings = oRelatedAppsSettings && Object.keys(oRelatedAppsSettings).length > 0;
|
|
101
|
+
|
|
102
|
+
|
|
101
103
|
if (bHasRelatedAppSettings) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
104
|
+
// Create a set to hold string data types
|
|
105
|
+
var oSemanticObjectSet = new Set();
|
|
106
|
+
|
|
107
|
+
// Add the current semantic object into the set
|
|
108
|
+
oSemanticObjectSet.add(sCurrentSemObj);
|
|
109
|
+
|
|
110
|
+
// Iterate through oRelatedAppSettings and add all related apps into the set
|
|
106
111
|
for (var sKey in oRelatedAppsSettings) {
|
|
107
|
-
if (sKey) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
});
|
|
112
|
+
if (oRelatedAppsSettings.hasOwnProperty(sKey)) {
|
|
113
|
+
var sSemanticObject = oRelatedAppsSettings[sKey].semanticObject;
|
|
114
|
+
oSemanticObjectSet.add(sSemanticObject); // Set will handle duplicates
|
|
111
115
|
}
|
|
112
116
|
}
|
|
117
|
+
|
|
118
|
+
// Create an array from the set
|
|
119
|
+
var aSemanticObjects = Array.from(oSemanticObjectSet);
|
|
120
|
+
|
|
121
|
+
// Use the map method to convert the array of strings into an array of objects
|
|
122
|
+
aSemanticObjects = aSemanticObjects.map(function(sSemObj) {
|
|
123
|
+
return { semanticObject: sSemObj };
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
// aSemanticObjects now contains the desired format
|
|
113
127
|
oLinksPromise = oNavigationService.getLinks(aSemanticObjects);
|
|
114
128
|
} else {
|
|
115
129
|
var oAppComponent = oController.getOwnerComponent().getAppComponent();
|
|
@@ -39,7 +39,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
|
|
|
39
39
|
properties: ["visible", "icon", "activeIcon", "type", "tooltip"]
|
|
40
40
|
},
|
|
41
41
|
"sap.ui.comp.smartfilterbar.SmartFilterBar": {
|
|
42
|
-
properties: ["liveMode", "showClearOnFB", "showFilterConfiguration", "showRestoreOnFB"]
|
|
42
|
+
properties: ["liveMode", "showClearOnFB", "showFilterConfiguration", "showRestoreOnFB", "considerPresentationVariant"]
|
|
43
43
|
},
|
|
44
44
|
"sap.m.Table": {
|
|
45
45
|
properties: ["growingThreshold"]
|
|
@@ -16,7 +16,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
|
|
|
16
16
|
properties: ["fitContent"]
|
|
17
17
|
},
|
|
18
18
|
"sap.ui.comp.smartfilterbar.SmartFilterBar": {
|
|
19
|
-
properties: ["liveMode"]
|
|
19
|
+
properties: ["liveMode", "considerPresentationVariant"]
|
|
20
20
|
},
|
|
21
21
|
"sap.ui.comp.smarttable.SmartTable": {
|
|
22
22
|
properties: ["useExportToExcel"],
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
|
|
1
|
+
<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1">
|
|
2
2
|
<VBox visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
|
|
3
3
|
<MessageStrip
|
|
4
4
|
text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
|
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
<Button text="{i18n>ST_EASY_FILTER_GO_BUTTON_TEXT}"
|
|
18
18
|
type="Emphasized"
|
|
19
19
|
icon="sap-icon://ai"
|
|
20
|
-
press="._templateEventHandlers.onEasyFilterGoButtonPress"
|
|
20
|
+
press="._templateEventHandlers.onEasyFilterGoButtonPress"
|
|
21
|
+
fesr:press="fe:ai:search">
|
|
21
22
|
</Button>
|
|
22
23
|
</FlexBox>
|
|
23
24
|
</VBox>
|
|
@@ -5,13 +5,13 @@ sap.ui.define([
|
|
|
5
5
|
/**
|
|
6
6
|
* Constructor for SmartTableChartCommon
|
|
7
7
|
* ...
|
|
8
|
-
* @param {object} mParams
|
|
8
|
+
* @param {object} mParams
|
|
9
9
|
* @param mParams.oCustomFiltersWrapper - wrapper for custom filters (from SFB point of view)
|
|
10
|
-
* (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
|
|
11
|
-
* @returns
|
|
10
|
+
* (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
|
|
11
|
+
* @returns {object}
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
|
-
// deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button
|
|
14
|
+
// deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button
|
|
15
15
|
// (does not contain a state from SFB point of view - however, we remember whether it was pressed once
|
|
16
16
|
// to restore data - this information is not considered being part of SFB)
|
|
17
17
|
function SmartTableChartCommon(vTarget, oController, oFactory, sInitializationEvent) {
|
|
@@ -44,7 +44,7 @@ sap.ui.define([
|
|
|
44
44
|
function fnSetState(oState) {
|
|
45
45
|
if (oState) {
|
|
46
46
|
if (!oState.oUiState) {
|
|
47
|
-
// Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM
|
|
47
|
+
// Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM
|
|
48
48
|
oState = {
|
|
49
49
|
oUiState: oState
|
|
50
50
|
};
|
|
@@ -82,7 +82,7 @@ sap.ui.define([
|
|
|
82
82
|
getState: fnGetState,
|
|
83
83
|
setState: fnSetState,
|
|
84
84
|
getLocalId: fnGetLocalId,
|
|
85
|
-
bVMConnection:
|
|
85
|
+
bVMConnection: oControl && oControl.getSmartVariant && !!oControl.getSmartVariant(),
|
|
86
86
|
attachStateChanged: fnAttachStateChanged
|
|
87
87
|
};
|
|
88
88
|
}
|
|
@@ -90,32 +90,38 @@ sap.ui.define([
|
|
|
90
90
|
function fnGetState() {
|
|
91
91
|
if (bSmartControlInitialized) {
|
|
92
92
|
if (oVariantManagementStateWrapper) {
|
|
93
|
-
// oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized
|
|
94
|
-
// or VariantManagement is not enabled.
|
|
93
|
+
// oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized
|
|
94
|
+
// or VariantManagement is not enabled.
|
|
95
95
|
return oVariantManagementStateWrapper.getState();
|
|
96
96
|
}
|
|
97
|
-
|
|
97
|
+
|
|
98
98
|
if (oSmartControlStateWrapper && !bVariantManagementActive) {
|
|
99
|
-
// VariantManagement is not turned on & SmartControlStateWrapper instance
|
|
99
|
+
// VariantManagement is not turned on & SmartControlStateWrapper instance
|
|
100
100
|
return oSmartControlStateWrapper.getState();
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
|
|
104
|
-
// Control is not available and StateWrapper is not initialized
|
|
103
|
+
|
|
104
|
+
// Control is not available and StateWrapper is not initialized
|
|
105
105
|
return oPreliminaryState;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
function fnSetState(oState) {
|
|
109
109
|
oPreliminaryState = oState;
|
|
110
110
|
oControlAssignedPromise.then(function () {
|
|
111
|
-
// map legacy states - before separating VM state from state of managed control, inner state information
|
|
112
|
-
// (presentation variant and selection variant) were put as oUiState on the same level as VM state
|
|
111
|
+
// map legacy states - before separating VM state from state of managed control, inner state information
|
|
112
|
+
// (presentation variant and selection variant) were put as oUiState on the same level as VM state
|
|
113
113
|
// information (variant id and dirty indicator), now they are contained in map managedControlStates
|
|
114
|
-
if (oState
|
|
115
|
-
oState.
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
114
|
+
if (oState){
|
|
115
|
+
if (oState.oUiState && !oState.managedControlStates) {
|
|
116
|
+
oState.managedControlStates = Object.create(null);
|
|
117
|
+
oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
|
|
118
|
+
}
|
|
119
|
+
if (oState.bVariantModified !== undefined) {
|
|
120
|
+
oState.modified = oState.bVariantModified;
|
|
121
|
+
}
|
|
122
|
+
if (oState.sVariantId !== undefined) {
|
|
123
|
+
oState.variantId = oState.sVariantId;
|
|
124
|
+
}
|
|
119
125
|
}
|
|
120
126
|
|
|
121
127
|
if (bVariantManagementActive) {
|
|
@@ -124,7 +130,7 @@ sap.ui.define([
|
|
|
124
130
|
return;
|
|
125
131
|
}
|
|
126
132
|
|
|
127
|
-
// SmartTable/Chart shall be used
|
|
133
|
+
// SmartTable/Chart shall be used
|
|
128
134
|
oSmartControlStateWrapper.setState(oPreliminaryState);
|
|
129
135
|
});
|
|
130
136
|
}
|
|
@@ -155,7 +161,7 @@ sap.ui.define([
|
|
|
155
161
|
// in each case) -thus, we better create and return a vm wrapper here, passing the inner wrapper (the same, we would create in the other cases).
|
|
156
162
|
// Additionally, this simplifies the adaptation to the change of format (formerly, variant data and control data were mixed on same level)
|
|
157
163
|
|
|
158
|
-
// to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not
|
|
164
|
+
// to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not
|
|
159
165
|
// in OP, as they could be different per section. Checking control's properties would also incorporate UI changes, however, these properties are anyway not allowed to be changed.)
|
|
160
166
|
// values: smartVariant useVariantManagement
|
|
161
167
|
// a) null false on LR currently: truthy (id of VM) and true - but PageVM is not created, and thus being ignored => adapt how properties are set in xml
|
|
@@ -920,7 +920,7 @@ sap.ui.define([
|
|
|
920
920
|
* @extends sap.ui.core.UIComponent
|
|
921
921
|
* @abstract
|
|
922
922
|
* @author SAP SE
|
|
923
|
-
* @version 1.124.
|
|
923
|
+
* @version 1.124.9
|
|
924
924
|
* @name sap.suite.ui.generic.template.lib.AppComponent
|
|
925
925
|
*/
|
|
926
926
|
var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkButton",
|
|
2
2
|
"sap/suite/ui/commons/collaboration/ServiceContainer", "sap/ui/core/CustomData", 'sap/ui/performance/trace/FESRHelper', "sap/ui/core/Component",
|
|
3
|
-
"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib"
|
|
4
|
-
], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library
|
|
3
|
+
"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib"
|
|
4
|
+
], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library) {
|
|
5
5
|
"use strict";
|
|
6
6
|
|
|
7
7
|
var ShareUtils = {};
|
|
@@ -85,22 +85,12 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
|
|
|
85
85
|
|
|
86
86
|
oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.fragments.ShareSheet", oFragmentController, "share", ShareUtils.setStaticShareData, true).then(function (oFragment) {
|
|
87
87
|
oShareActionSheet = oFragment;
|
|
88
|
-
var oUshellContainer = sap.ui.require("sap/ushell/Container");
|
|
89
88
|
var oShareModel = oShareActionSheet.getModel("share");
|
|
90
|
-
var that = this;
|
|
91
89
|
oFragmentController.getModelData().then(function (oFragmentModelData) {
|
|
92
90
|
oShareModel.setData(oFragmentModelData, true);
|
|
93
|
-
if (oUshellContainer && oUshellContainer.inAppRuntime()) {
|
|
94
|
-
CollaborationMessageConsumer.getProviderConfiguration().then(function(oProviderConfiguration){
|
|
95
|
-
ServiceContainer.getServiceAsyncForAppRuntime(oProviderConfiguration).then(function (oTeamsHelper) {
|
|
96
|
-
that.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
|
|
97
|
-
});
|
|
98
|
-
});
|
|
99
|
-
} else {
|
|
100
91
|
ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
|
|
101
92
|
this.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
|
|
102
93
|
}.bind(this));
|
|
103
|
-
}
|
|
104
94
|
}.bind(this));
|
|
105
95
|
}.bind(this));
|
|
106
96
|
};
|
|
@@ -25,9 +25,9 @@ ST_SUCCESS=Con \u00E9xito
|
|
|
25
25
|
|
|
26
26
|
ST_CHANGES_APPLIED=Se han aplicado las modificaciones
|
|
27
27
|
|
|
28
|
-
DATA_LOSS_MESSAGE=
|
|
28
|
+
DATA_LOSS_MESSAGE=Sus entradas se perder\u00E1n al abandonar esta p\u00E1gina.
|
|
29
29
|
|
|
30
|
-
DATA_LOSS_GENERAL_MESSAGE=Si
|
|
30
|
+
DATA_LOSS_GENERAL_MESSAGE=Si contin\u00FAa se perder\u00E1n sus entradas.
|
|
31
31
|
|
|
32
32
|
PROCEED=Continuar
|
|
33
33
|
|
|
@@ -5,8 +5,9 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
5
5
|
"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper",
|
|
6
6
|
"sap/ui/core/library",
|
|
7
7
|
"sap/base/strings/formatMessage",
|
|
8
|
-
"sap/suite/ui/generic/template/genericUtilities/FeLogger"
|
|
9
|
-
|
|
8
|
+
"sap/suite/ui/generic/template/genericUtilities/FeLogger",
|
|
9
|
+
"sap/base/util/ObjectPath"
|
|
10
|
+
], function (metadataAnalyser, filterHelper, SelectionVariant, deepExtend, semanticDateRangeTypeHelper, SapCoreLibrary, formatMessage, FeLogger, ObjectPath) {
|
|
10
11
|
"use strict";
|
|
11
12
|
|
|
12
13
|
var InsightsCardHelper = {};
|
|
@@ -289,8 +290,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
289
290
|
if (bIsValidSemanticDateRange) {
|
|
290
291
|
filterHelper.setFilterRestrictionToSemanticDateRange(oFilterProp, false);
|
|
291
292
|
filterHelper.addDateRangeValueToSV(oCardDefinition, oFilterProp, sDefaultValue, oSelectionVariant, aFilterLabel);
|
|
292
|
-
} else {
|
|
293
|
-
if (sParamActualValue) {
|
|
293
|
+
} else if (sParamActualValue) {
|
|
294
294
|
filterHelper.addFiltervalues(oSmartFilterbar, oFilterProp.name, oSelectionVariant, aFilterLabel);
|
|
295
295
|
} else if (sDefaultValue) {
|
|
296
296
|
var sText = filterHelper.getRelatedTextToRange({Low : sDefaultValue}, aFilterLabel, oSmartFilterbar, oFilterProp.name);
|
|
@@ -298,7 +298,6 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
298
298
|
} else {
|
|
299
299
|
oSelectionVariant.addSelectOption(oFilterProp.name, "I", "EQ", sFilterVal);
|
|
300
300
|
}
|
|
301
|
-
}
|
|
302
301
|
|
|
303
302
|
oFinal[oFilterProp.name] = {
|
|
304
303
|
value: oSelectionVariant.toJSONString(),
|
|
@@ -585,21 +584,40 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
585
584
|
return oSapCardContent;
|
|
586
585
|
};
|
|
587
586
|
|
|
587
|
+
/**
|
|
588
|
+
* Extracts relevant visualization properties from the given vizProperties object based on the specified key.
|
|
589
|
+
*
|
|
590
|
+
* @param {Object} oVizProperties - The visualization properties object.
|
|
591
|
+
* @param {string} key - The key to extract properties from within the vizProperties object.
|
|
592
|
+
* @returns {Object|undefined} An object containing the filtered properties, or undefined if the key does not exist in the vizProperties object.
|
|
593
|
+
*/
|
|
594
|
+
function fnExtractRelevantVizProperties(oVizProperties, key) {
|
|
595
|
+
var aPropertiesToFilter = ["axisTick", "axisLine", "label.visible", "label.formatString", "title.visible"];
|
|
596
|
+
if (!oVizProperties || !oVizProperties[key]) {
|
|
597
|
+
return undefined;
|
|
598
|
+
}
|
|
599
|
+
var oValueOrCategoryAxis = oVizProperties[key];
|
|
600
|
+
var oFilteredProperties = {};
|
|
601
|
+
aPropertiesToFilter.forEach(function(property) {
|
|
602
|
+
var value = ObjectPath.get(property, oValueOrCategoryAxis);
|
|
603
|
+
if (value !== undefined) {
|
|
604
|
+
ObjectPath.set(property, value, oFilteredProperties);
|
|
605
|
+
}
|
|
606
|
+
});
|
|
607
|
+
return oFilteredProperties;
|
|
608
|
+
}
|
|
609
|
+
|
|
588
610
|
var fnResolveChartProperties = function (oInnerChart) {
|
|
589
|
-
var oVizProperties =
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
}
|
|
600
|
-
};
|
|
601
|
-
oInnerChart.setVizProperties(oVizProperties);
|
|
602
|
-
return oInnerChart.getVizProperties();
|
|
611
|
+
var oVizProperties = oInnerChart.getProperty("vizProperties");
|
|
612
|
+
var oAllVizProperties = oInnerChart.getVizProperties();
|
|
613
|
+
var oChartProperties = Object.assign({}, oVizProperties);
|
|
614
|
+
var aAxisKeys = ["valueAxis", "valueAxis2", "categoryAxis", "categoryAxis2"];
|
|
615
|
+
aAxisKeys.forEach(function(key) {
|
|
616
|
+
if (oAllVizProperties[key]) {
|
|
617
|
+
oChartProperties[key] = fnExtractRelevantVizProperties(oAllVizProperties, key);
|
|
618
|
+
}
|
|
619
|
+
});
|
|
620
|
+
return oChartProperties;
|
|
603
621
|
};
|
|
604
622
|
|
|
605
623
|
var fnResolveChartMeasures = function (aMeasureDetails, aVisibleMeasure) {
|
|
@@ -803,8 +821,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
803
821
|
oColumnObject.additionalText = "{= $" + sColumnValue + " === '' ? '' : $" + sColumnValue + "}";
|
|
804
822
|
}
|
|
805
823
|
oColumnObject.identifier = true;
|
|
806
|
-
} else {
|
|
807
|
-
if (sTextArrangementType === "TextOnly") {
|
|
824
|
+
} else if (sTextArrangementType === "TextOnly") {
|
|
808
825
|
oColumnObject['value'] = "{= $" + sColumnKeyDescription + " === '' ? '' : $" + sColumnKeyDescription + "}";
|
|
809
826
|
} else if (sTextArrangementType === "TextLast") {
|
|
810
827
|
oColumnObject['value'] = "{= $" + sColumnValue + " === '' ? '' : $" + sColumnValue + "}" + "{= $" + sColumnKeyDescription + " === '' ? '' : ' (' + ($" + sColumnKeyDescription + ") + ')'}";
|
|
@@ -813,7 +830,6 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
813
830
|
} else { // Default case
|
|
814
831
|
oColumnObject['value'] = "{= $" + sColumnKeyDescription + " === '' ? '' : $" + sColumnKeyDescription + "}" + "{= $" + sColumnValue + " === '' ? '' : ' (' + ($" + sColumnValue + ") + ')'}";
|
|
815
832
|
}
|
|
816
|
-
}
|
|
817
833
|
} else {
|
|
818
834
|
oColumnObject['value'] = sColumnValue;
|
|
819
835
|
if (bIsPropertySemanticKey) {
|
|
@@ -3149,7 +3149,7 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
3149
3149
|
* @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
|
|
3150
3150
|
* @public
|
|
3151
3151
|
* @extends sap.ui.base.Object
|
|
3152
|
-
* @version 1.124.
|
|
3152
|
+
* @version 1.124.9
|
|
3153
3153
|
* @since 1.30.0
|
|
3154
3154
|
* @alias sap.suite.ui.generic.template.lib.NavigationController
|
|
3155
3155
|
*/
|