@sapui5/sap.suite.ui.generic.template 1.120.14 → 1.120.15
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/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/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/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js +6 -4
- package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js +3 -3
- package/src/sap/suite/ui/generic/template/lib/AdaptiveCardHelper.js +1 -1
- package/src/sap/suite/ui/generic/template/lib/AppComponent.js +1 -1
- package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js +7 -4
- package/src/sap/suite/ui/generic/template/lib/i18n/i18n_id.properties +1 -1
- package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js +11 -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/src/sap/suite/ui/generic/template/listTemplates/controller/DetailController.js +1 -1
- package/src/sap/suite/ui/generic/template/listTemplates/controller/IappStateHandler.js +7 -2
- package/src/sap/suite/ui/generic/template/listTemplates/controller/SmartChartController.js +1 -1
package/package.json
CHANGED
|
@@ -53,9 +53,11 @@ sap.ui.define([
|
|
|
53
53
|
// don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
|
|
54
54
|
// interfere with them
|
|
55
55
|
var oUiState = oControl.getUiState();
|
|
56
|
-
oUiState.
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
if (!oUiState.getProperty("variantName")){
|
|
57
|
+
oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
|
|
58
|
+
oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
|
|
59
|
+
oControl.setUiState(oUiState);
|
|
60
|
+
}
|
|
59
61
|
bIsApplying = false;
|
|
60
62
|
} else {
|
|
61
63
|
// set standard variant to overcome "implicit personalization" (esp. for OP when navigating to different object in discovery mode)
|
|
@@ -198,7 +200,7 @@ sap.ui.define([
|
|
|
198
200
|
setState: fnSetState,
|
|
199
201
|
setControl: fnSetControl,
|
|
200
202
|
attachStateChanged: fnAttachStateChanged,
|
|
201
|
-
bVMConnection:
|
|
203
|
+
bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
|
|
202
204
|
};
|
|
203
205
|
}
|
|
204
206
|
|
|
@@ -103,9 +103,9 @@ sap.ui.define([
|
|
|
103
103
|
var oControl = oController.getView().byId(sId);
|
|
104
104
|
if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
|
|
105
105
|
oControl.attachAfterVariantInitialise(function() {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (sVariantId !== '*standard*' && oControl.
|
|
106
|
+
//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
|
|
107
|
+
//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
|
|
108
|
+
if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
|
|
109
109
|
oControl.setCurrentVariantId(sVariantId);
|
|
110
110
|
oSmartVariantManagement.setModified(false);
|
|
111
111
|
}
|
|
@@ -776,7 +776,7 @@ sap.ui.define([
|
|
|
776
776
|
if (aTargetAnnotation.length > 0) {
|
|
777
777
|
var aDataFields = oEntityType["com.sap.vocabularies.UI.v1.Identification"];
|
|
778
778
|
for (var i = 0; i < aDataFields.length; i++) {
|
|
779
|
-
var sActionlabel = aDataFields[i].Label.String;
|
|
779
|
+
var sActionlabel = aDataFields[i].Label && aDataFields[i].Label.String;
|
|
780
780
|
if (sActionlabel) {
|
|
781
781
|
sI18nKeyForLabel = sActionlabel.indexOf("i18n>") > 1 ? sActionlabel.split("i18n>")[1].replace("}", "") : "";
|
|
782
782
|
if (sI18nKeyForLabel !== "") {
|
|
@@ -922,7 +922,7 @@ sap.ui.define([
|
|
|
922
922
|
* @extends sap.ui.core.UIComponent
|
|
923
923
|
* @abstract
|
|
924
924
|
* @author SAP SE
|
|
925
|
-
* @version 1.120.
|
|
925
|
+
* @version 1.120.15
|
|
926
926
|
* @name sap.suite.ui.generic.template.lib.AppComponent
|
|
927
927
|
*/
|
|
928
928
|
return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
|
|
@@ -523,15 +523,18 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
|
|
|
523
523
|
aTransientErrors.push(oMessage);
|
|
524
524
|
}
|
|
525
525
|
});
|
|
526
|
-
var bHasStateError = aCurrentStateMessages.some(function(oMessage){
|
|
526
|
+
var bHasStateError = aCurrentStateMessages.some(function(oMessage) {
|
|
527
527
|
return oMessage.type === "Error";
|
|
528
528
|
});
|
|
529
529
|
var bIsWarning = bIs412 && !bHasStateError;
|
|
530
|
-
if (bIsWarning){
|
|
530
|
+
if (bIsWarning) {
|
|
531
531
|
// Only show transient warnings in the confirmation popup if no state warning is available (note that backend sometimes sends warnings redundantly as transient and state message)
|
|
532
|
-
var
|
|
532
|
+
var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
|
|
533
|
+
return oMessage.type === "Warning";
|
|
534
|
+
});
|
|
535
|
+
var aMessagesForUserDecision = bHasStateWarning ? aCurrentStateMessages : aTransientWarnings;
|
|
533
536
|
var oCustomMessageProvider = aCurrentStateMessages.length === 0 && { // if confirmation popup is to show transient messages these messages should be excluded from the
|
|
534
|
-
isCustomMessage: function(oMessage){ // normal handling of transient messages (until the confirmation popup is closed)
|
|
537
|
+
isCustomMessage: function (oMessage) { // normal handling of transient messages (until the confirmation popup is closed)
|
|
535
538
|
return aTransientWarnings.indexOf(oMessage) >= 0;
|
|
536
539
|
}
|
|
537
540
|
};
|
|
@@ -836,7 +836,17 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
|
|
|
836
836
|
}
|
|
837
837
|
}
|
|
838
838
|
|
|
839
|
-
|
|
839
|
+
if (oProperty['com.sap.vocabularies.Common.v1.Label'] && oProperty['com.sap.vocabularies.Common.v1.Label'].String) {
|
|
840
|
+
var sLabel = oProperty['com.sap.vocabularies.Common.v1.Label'].String,
|
|
841
|
+
oRB = oCardDefinition['component'].getModel('i18n').getResourceBundle();
|
|
842
|
+
if (sLabel.match(/{@i18n>.+}/gi) && oRB) {
|
|
843
|
+
oColumnObject['title'] = oRB.getText(sLabel.substring(sLabel.indexOf(">") + 1, sLabel.length - 1));
|
|
844
|
+
} else {
|
|
845
|
+
oColumnObject['title'] = sLabel;
|
|
846
|
+
}
|
|
847
|
+
} else {
|
|
848
|
+
oColumnObject['title'] = oProperty['sap:label'];
|
|
849
|
+
}
|
|
840
850
|
if (oProperty.type === 'Edm.DateTime' || oProperty.type === 'Edm.DateTimeOffset') {
|
|
841
851
|
var oFormatOption = JSON.stringify(oColumnData.typeInstance.oFormat.oFormatOptions).replace(/"/g, "'");
|
|
842
852
|
oColumnObject['value'] = "{=$" + sColumnValue + " ? format.dateTime($" + sColumnValue + ", " + oFormatOption + ") : ''}";
|
|
@@ -3051,7 +3051,7 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
3051
3051
|
* @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
|
|
3052
3052
|
* @public
|
|
3053
3053
|
* @extends sap.ui.base.Object
|
|
3054
|
-
* @version 1.120.
|
|
3054
|
+
* @version 1.120.15
|
|
3055
3055
|
* @since 1.30.0
|
|
3056
3056
|
* @alias sap.suite.ui.generic.template.lib.NavigationController
|
|
3057
3057
|
*/
|
|
@@ -812,7 +812,7 @@ sap.ui.define([
|
|
|
812
812
|
*/
|
|
813
813
|
_getSelParamsFromChart: function(chart) {
|
|
814
814
|
var dpList = [];
|
|
815
|
-
dpList =
|
|
815
|
+
dpList = this.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).dataPoints;
|
|
816
816
|
return this._getSelParamsFromDPList(dpList);
|
|
817
817
|
},
|
|
818
818
|
/**
|
|
@@ -247,6 +247,8 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
247
247
|
sNavType = sap.fe.navigation.NavType.iAppState;
|
|
248
248
|
}
|
|
249
249
|
oState.oSmartFilterbar.setSuppressSelection(false);
|
|
250
|
+
//Pref Improvement - Resume SetFilterData
|
|
251
|
+
oState.oSmartFilterbar.resumeSetFilterData();
|
|
250
252
|
var sAppStateKey = oAppData.appStateKey || "";
|
|
251
253
|
//Make sure that no two resolve functions are executing at the same time.
|
|
252
254
|
if (bIsTransferringUrlStateToPageState){
|
|
@@ -260,8 +262,6 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
260
262
|
bIsTransferringUrlStateToPageState = true;
|
|
261
263
|
oState.sNavType = sNavType;
|
|
262
264
|
var oNewUrlParameters = (!sAppStateKey && oURLParameters) || {};
|
|
263
|
-
//Pref Improvement - Resume SetFilterData
|
|
264
|
-
oState.oSmartFilterbar.resumeSetFilterData();
|
|
265
265
|
handleVariantIdPassedViaURLParams(oNewUrlParameters);
|
|
266
266
|
//Apply sort order coming from the XAppState to the smart table.
|
|
267
267
|
if (sNavType !== sap.fe.navigation.NavType.iAppState && oAppData.presentationVariant !== undefined) {
|
|
@@ -385,6 +385,11 @@ sap.ui.define(["sap/ui/base/Object",
|
|
|
385
385
|
// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
|
|
386
386
|
// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the BCP - 2180400040
|
|
387
387
|
oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption){
|
|
388
|
+
var oSelectionDateOption = oStartupObject.selectionVariant.getSelectOption(oSelectDateOption.PropertyName);
|
|
389
|
+
//If startup object contains date range with the oSelectionDateOption PropertyName no need to override
|
|
390
|
+
if (oSelectionDateOption && oSelectionDateOption.length != 0) {
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
388
393
|
oStartupObject.selectionVariant.addSelectOption(oSelectDateOption.PropertyName, "I", "EQ", "");
|
|
389
394
|
});
|
|
390
395
|
|
|
@@ -278,7 +278,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
|
|
|
278
278
|
var oEvent = deepExtend({}, ev);
|
|
279
279
|
setTimeout(function() { // due to the selection data points not being updated during the deselectData event, must check again asynchronously
|
|
280
280
|
var chart = me.oChart;
|
|
281
|
-
if (
|
|
281
|
+
if (me.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).count == 0) {// Clear the filter if no selections remain. If a selection exists it would have come through the SelectData event
|
|
282
282
|
me._updateTable();
|
|
283
283
|
} else if (chart.getSelectionMode() == "MULTIPLE") {// Treat an unselect with remaining selection points as a select
|
|
284
284
|
me._onChartSelectData(oEvent);
|