@sapui5/sap.suite.ui.generic.template 1.147.1 → 1.148.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.147.1",
+  "version": "1.148.0",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.147.1</version>
+	<version>1.148.0</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -1146,11 +1146,13 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 								var iToolbarContentLength = oToolbar.getContent().length,
 									oSegmentButton = oToolbar.getContent()[iToolbarContentLength - 1 ];
 								if (oSegmentButton) {
-									oSegmentButton.addEventDelegate({
-										onAfterRendering : function(oEvent) {
+									var oFocusDelegate = {
+										onAfterRendering: function(oEvent) {
 											oEvent.srcControl.focus();
+											oEvent.srcControl.removeEventDelegate(oFocusDelegate);
 										}
-									});
+									};
+									oSegmentButton.addEventDelegate(oFocusDelegate);
 								}
 							}
 						},

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_bg.properties

@@ -104,11 +104,11 @@ CONTACT_FAX=\u0424\u0430\u043A\u0441
 
 
 
-CONTAINER_VIEW_TABLE=\u041A\u0430\u0442\u043E \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+CONTAINER_VIEW_TABLE=\u0422\u0430\u0431\u043B\u0438\u0447\u0435\u043D \u0438\u0437\u0433\u043B\u0435\u0434
 
-CONTAINER_VIEW_CHART=\u041A\u0430\u0442\u043E \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u0430
+CONTAINER_VIEW_CHART=\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u0435\u043D \u0438\u0437\u0433\u043B\u0435\u0434
 
-CONTAINER_VIEW_CHARTTABLE=\u041A\u0430\u0442\u043E \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u0430 \u0438 \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+CONTAINER_VIEW_CHARTTABLE=\u0418\u0437\u0433\u043B\u0435\u0434 \u043D\u0430 \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u0430 \u0438 \u0442\u0430\u0431\u043B\u0438\u0446\u0430
 
 FILTER_VISUAL=\u0412\u0438\u0437\u0443\u0430\u043B\u0435\u043D \u0444\u0438\u043B\u0442\u044A\u0440
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_da.properties

@@ -104,11 +104,11 @@ CONTACT_FAX=Fax
 
 
 
-CONTAINER_VIEW_TABLE=Tabelview
+CONTAINER_VIEW_TABLE=Tabelvisning
 
-CONTAINER_VIEW_CHART=Diagramview
+CONTAINER_VIEW_CHART=Diagramvisning
 
-CONTAINER_VIEW_CHARTTABLE=Diagram- og tabelview
+CONTAINER_VIEW_CHARTTABLE=Diagram- og tabelvisning
 
 FILTER_VISUAL=Visuelt filter
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_id.properties

@@ -63,9 +63,9 @@ VISUAL_FILTER_CHART_TYPE_Donut=Bagan Donat
 
 VISUAL_FILTER_SORTING=Pengurutan
 
-VISUAL_FILTER_SORTING_ASCENDING=Naik
+VISUAL_FILTER_SORTING_ASCENDING=Menaik
 
-VISUAL_FILTER_SORTING_DESCENDING=Turun
+VISUAL_FILTER_SORTING_DESCENDING=Menurun
 
 VISUAL_FILTER_LINE_CHART_TIME_LINE=Tampilkan
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.147.1"
+			"version": "1.148.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.147.1"
+			"version": "1.148.0"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -841,6 +841,12 @@ sap.ui.define([
 					});
 				},
 
+				onExit: function () {
+					if (oState?.oEasyFilterBarHandler) {
+						oState.oEasyFilterBarHandler.detachSmartTableStateChangeHandler();
+					}
+				},
+
 				handlers: {
 					onAfterVariantInitialise: function(oEvent) {
 						oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
@@ -879,6 +885,7 @@ sap.ui.define([
 							oState.oIappStateHandler.onFEStartupInitialized().then(function() {
 								oState.oEasyFilterBarHandler = new EasyFilterBarHandler(oState, oController, oTemplateUtils);
 								oState.oEasyFilterBarHandler.initialiseEasyFilterBar();
+								oState.oEasyFilterBarHandler.attachSmartTableStateChangeHandler();
 								oState.oSmartFilterbar.attachFilterChange(function(oEvent) {
 									oState.oEasyFilterBarHandler.onFilterChange(oEvent);
 								});
@@ -909,6 +916,15 @@ sap.ui.define([
 					onEasyFilterTokensChanged: function(oEvent) {
 						oState.oEasyFilterBarHandler.onTokensChanged(oEvent);
 					},
+					onEasyFilterTokensChangedByUser: function(oEvent) {
+						oState.oEasyFilterBarHandler.onTokensChangedByUser(oEvent);
+					},
+					onEasyFilterSortersChanged: function(oEvent) {
+						oState.oEasyFilterBarHandler.onSortersChanged(oEvent);
+					},
+					onEasyFilterGroupLevelsChanged: function(oEvent) {
+						oState.oEasyFilterBarHandler.onGroupLevelsChanged(oEvent);
+					},
 					onEasyFilterQueryChanged: function(oEvent) {
 						oState.oEasyFilterBarHandler.onQueryChanged(oEvent);
 					},
@@ -921,17 +937,30 @@ sap.ui.define([
 					onFilterSwitch : function() {
 						var oSmartFilterbar = oState.oSmartFilterbar;
 						var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-						var oSmartVariant = oController.byId("template::PageVariant");
 						if (oTempModel.getProperty("/listReport/filterMode") === "easyFilter") {
 							oSmartFilterbar.setVisible(false);
-							oSmartVariant.setVisible(false);
 							var  oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 							oTemplatePrivateModel.setProperty("/listReport/firstSelection", true);
 							oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
 						} else {
 							PXFeedback.triggerPXIntegration("toggleSwitchV2");
 							oSmartFilterbar.setVisible(true);
-							oSmartVariant.setVisible(true);
+						}
+						// Mark variant dirty if filterMode differs from what was saved in the variant.
+						// "Once dirty, always dirty" — we only set dirty, never unset it here.
+						// Unsetting is left to the standard SFB/SVM mechanisms (save, reload, etc.).
+						// Use the cached loaded-variant filterMode instead of getCustomFilterData(),
+						// which can be overwritten by intermediate beforeVariantFetch calls during
+						// the async Go press flow.
+						if (oState.oEasyFilterBarHandler) {
+							var sSavedMode = oState.oEasyFilterBarHandler.getLoadedVariantFilterMode();
+							var sCurrentMode = oTempModel.getProperty("/listReport/filterMode");
+							if (sCurrentMode !== sSavedMode) {
+								var oSmartVariant = oSmartFilterbar.getSmartVariant();
+								if (oSmartVariant) {
+									oSmartVariant.currentVariantSetModified(true);
+								}
+							}
 						}
 					},
 					onBeforeRebindTable: function (oEvent) {

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_id.properties

@@ -99,7 +99,7 @@ LOCKED_OBJECT_FILTER=Dikunci oleh Pengguna Lain
 
 UNSAVED_CHANGES=Perubahan Belum Disimpan
 
-UNSAVED_CHANGES_FILTER=Perubahan oleh Pengguna Lain yang Belum Disimpan
+UNSAVED_CHANGES_FILTER=Perubahan yang Belum Disimpan oleh Pengguna Lain
 
 SHARE=Bagikan
 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_uk.properties

@@ -64,7 +64,7 @@ OBJECT_NOT_EDITABLE=\u0426\u0435\u0439 \u043E\u0431'\u0454\u043A\u0442 \u043D\u0
 NODATA_SMARTTABLE_LR=\u0429\u043E\u0431 \u0440\u043E\u0437\u043F\u043E\u0447\u0430\u0442\u0438, \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u0456\u0442\u044C \u0440\u0435\u043B\u0435\u0432\u0430\u043D\u0442.\u0444\u0456\u043B\u044C\u0442\u0440\u0438 \u0439 \u043E\u0431\u0435\u0440\u0456\u0442\u044C"\u041F\u0443\u0441\u043A".
 
 NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u043E\u0442\u0440\u0438\u043C\u0430\u0454\u043C\u043E \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0438
-NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=\u0420\u043E\u0437\u043F\u043E\u0447\u043D\u0456\u0442\u044C \u0437 \u043D\u0430\u0434\u0430\u043D\u043D\u044F \u0441\u0432\u043E\u0457\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457\u0432 \u043F\u043E\u0448\u0443\u043A\u0443 \u0430\u0431\u043E \u0444\u0456\u043B\u044C\u0442\u0440\u0430\u0446\u0456\u0457.
+NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=\u0420\u043E\u0437\u043F\u043E\u0447\u043D\u0456\u0442\u044C \u0456\u0437 \u0437\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F \u0441\u0432\u043E\u0457\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457\u0432 \u043F\u043E\u0448\u0443\u043A\u0443 \u0430\u0431\u043E \u0444\u0456\u043B\u044C\u0442\u0440\u0430\u0446\u0456\u0457.
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=\u041F\u0443\u0441\u043A
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.147.1"
+			"version": "1.148.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/Component.js

@@ -206,6 +206,10 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				// If EditFlow is direct, the save and cancel moves to LR after action, unless this property is set to false
 				// The default value of this property is undefined.
 				"navToListOnSave": "boolean",
+				"legacyNavToListOnSaveBehavior": {
+					"type": "boolean",
+					"defaultValue": false
+				},
 				"relatedAppsSettings": "object",
 				createWithParameterDialog: {
 					type: "object",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -204,7 +204,7 @@ sap.ui.define([
 			}
 
 			// Implementation of Save for the draft case
-			function onActivateImpl(bEditNextObject) {
+			function onActivateImpl(bEditNextObject, bNavToListOnSave) {
 				oLogger.info("Activate object");
 				var oActivationPromise = oTemplateUtils.oServices.oCRUDManager.activateDraftEntity();
 				var oUIModel = oObjectPage.getModel("ui");
@@ -220,14 +220,12 @@ sap.ui.define([
 					oTemplateUtils.oServices.oViewDependencyHelper.unbindChildren(oComponent);
 					// Draft activation is a kind of cross navigation -> invalidate paginator info
 
-					var bNavToListOnSave = oComponent.getNavToListOnSave();
 					var sEditFlow = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot();
 					if (sEditFlow === "direct" && bEditNextObject) {
 						oBase.utils.switchToNextObject();
 					} else if (sEditFlow === "direct" && bNavToListOnSave !== false ) {
 						oTemplateUtils.oServices.oApplication.invalidatePaginatorInfo();
 						oTemplateUtils.oServices.oApplication.navigateAfterActivation(false);
-
 					} else {
 						oTemplateUtils.oServices.oApplication.invalidatePaginatorInfo();
 						var oActiveContext = !bNavToListOnSave && oResponse.context;
@@ -282,7 +280,7 @@ sap.ui.define([
 			}
 
 			// Implementation of save for the non-draft case
-			function onSaveImpl(bStayInEdit, bEditNextObject) {
+			function onSaveImpl(bStayInEdit, bEditNextObject, bNavToListOnSave) {
 				var oView = oController.getView();
 				var oModel = oView.getModel();
 				var bIsComponentDirty = oTemplateUtils.oComponentUtils.isComponentDirty();
@@ -310,7 +308,7 @@ sap.ui.define([
 							fnReturnToDisplayNonDraft();
 							oViewProxy.setEditable(false);
 						}
-						performAfterSaveOperations(oContext, oView, bIsComponentDirty, mPendingChangesToContextInfo, bStayInEdit, bEditNextObject, fnSideEffectsExecuted, fnSideEffectsRejected);
+						performAfterSaveOperations(oContext, oView, bIsComponentDirty, mPendingChangesToContextInfo, bStayInEdit, bEditNextObject, bNavToListOnSave, fnSideEffectsExecuted, fnSideEffectsRejected);
 						bSuccess =  true;
 					}, function(){
 						oTemplateUtils.oInfoObjectHandler.executeForAllInformationObjects("smartTable", function(oInfoObject){
@@ -334,13 +332,12 @@ sap.ui.define([
 			}
 
 			//common flow for Save and Save-continue Edit (Non draft)
-			function performAfterSaveOperations(oContext, oView, bSomethingWasChanged, mPendingChangesToContextInfo, bStayInEdit, bEditNextObject, fnSideEffectsExecuted, fnSideEffectsRejected) {
+			function performAfterSaveOperations(oContext, oView, bSomethingWasChanged, mPendingChangesToContextInfo, bStayInEdit, bEditNextObject, bNavToListOnSave, fnSideEffectsExecuted, fnSideEffectsRejected) {
 				var oUIModel = oObjectPage.getModel("ui");
 				var bCreateMode = oUIModel.getProperty("/createMode");
 				var oComponent = oController.getOwnerComponent();
 				oTemplateUtils.oServices.oViewDependencyHelper.setParentToDirty(oComponent, oComponent.getEntitySet(), 1);
 				oTemplateUtils.oServices.oViewDependencyHelper.unbindChildren(oComponent);
-				var bNavToListOnSave = oComponent.getNavToListOnSave();
 				var sEditFlow = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot();
 				var bStayOnPage;
 				if (sEditFlow === "direct"){
@@ -397,6 +394,14 @@ sap.ui.define([
 				onSave("SaveAndEditNext", sButtonId);
 			}
 
+			function onSaveAndBack(oEvent) {
+				var oSourceElement = oEvent.getSource();
+				var sButtonId = controlHelper.isMenuItem(oSourceElement)
+					? StableIdHelper.getStableId({type: "ObjectPageAction", subType: "ActivateAndBackMenu"})
+					: StableIdHelper.getStableId({type: "ObjectPageAction", subType: "CommonAction", sAction: "saveAndBack"});
+				onSave("SaveAndBack", sButtonId);
+			}
+
 			// Save of draft and non-draft case. Forwards either to onActivateImpl (draft) or onSaveImpl (non-draft) or onSaveAndContinueEditImpl (non draft, save and continue edit)
 			// sSaveCase could either be an event object or a string.
 			function onSave(vSaveCase, sBtnId) {
@@ -404,35 +409,61 @@ sap.ui.define([
 				var iScenario;
 				var fnImpl;
 				var sButtonId;
+				var oComponent = oController.getOwnerComponent();
 				if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
 					iScenario = 1;
 					if (vSaveCase === "SaveAndEditNext") {
-						fnImpl = onActivateImpl.bind(null, true);
+						fnImpl = onActivateImpl.bind(null, true, oComponent.getNavToListOnSave());
 						sButtonId = sBtnId;
 					} else {
-						fnImpl = onActivateImpl.bind(null, false);
-						var oSourceElement = vSaveCase.getSource();
-						sButtonId = controlHelper.isMenuButton(oSourceElement) ?
-							StableIdHelper.getStableId({
-								type: "ObjectPageAction",
-								subType: "ActivateMenu"}) :
-							StableIdHelper.getStableId({
-								type: "ObjectPageAction",
-								subType: "CommonAction",
-								sAction: "activate"
-							});
+						if (vSaveCase === "SaveAndBack") {
+							fnImpl = onActivateImpl.bind(null, false, true);
+							sButtonId = sBtnId;
+						} else {
+							var bNavToListOnSave = false;
+							if (oComponent.getLegacyNavToListOnSaveBehavior() || oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct") {
+								bNavToListOnSave = oComponent.getNavToListOnSave();
+							}
+							fnImpl = onActivateImpl.bind(null, false, bNavToListOnSave);
+							var oSourceElement = vSaveCase && typeof vSaveCase.getSource === "function" && vSaveCase.getSource();
+							sButtonId = controlHelper.isMenuButton(oSourceElement) ?
+								StableIdHelper.getStableId({
+									type: "ObjectPageAction",
+									subType: "ActivateMenu"}) :
+								StableIdHelper.getStableId({
+									type: "ObjectPageAction",
+									subType: "CommonAction",
+									sAction: "activate"
+								});
+						}
 					}
 				} else {
 					iScenario = 3;
 					if (vSaveCase === "SaveAndContEdit") {
-						fnImpl = onSaveImpl.bind(null, true, false);
+						fnImpl = onSaveImpl.bind(null, true, false, oComponent.getNavToListOnSave());
 						sButtonId = sBtnId;
 					} else if (vSaveCase === "SaveAndEditNext") {
-						fnImpl = onSaveImpl.bind(null, true, true);
+						fnImpl = onSaveImpl.bind(null, true, true, oComponent.getNavToListOnSave());
+						sButtonId = sBtnId;
+					} else if (vSaveCase === "SaveAndBack") {
+						fnImpl = onSaveImpl.bind(null, false, false, true);
 						sButtonId = sBtnId;
 					} else {
-						fnImpl = onSaveImpl.bind(null, false, false);
-						sButtonId = "save";
+						var bNavToListOnSave = false;
+						if (oComponent.getLegacyNavToListOnSaveBehavior() || oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct") {
+							bNavToListOnSave = oComponent.getNavToListOnSave();
+						}
+						fnImpl = onSaveImpl.bind(null, false, false, bNavToListOnSave);
+						var oSourceElement = vSaveCase && typeof vSaveCase.getSource === "function" && vSaveCase.getSource();
+						sButtonId = controlHelper.isMenuButton(oSourceElement) ?
+								StableIdHelper.getStableId({
+									type: "ObjectPageAction",
+									subType: "ActivateMenu"}) :
+								StableIdHelper.getStableId({
+									type: "ObjectPageAction",
+									subType: "CommonAction",
+									sAction: "save"
+								});
 					}
 				}
 				oTemplateUtils.oCommonUtils.executeIfControlReady(function(){ // Make sure that the action is only performed if it is allowed
@@ -1493,7 +1524,7 @@ sap.ui.define([
 						return null;
 					}
 					if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
-						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl).then(function(bIsFocussable){
+						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl, true).then(function(bIsFocussable){
 							return bIsFocussable && oControl; // If the SmartField has turned out to be focussable take it. Otherwise no need to investigate the subtree below it.
 						});
 					}
@@ -1553,7 +1584,7 @@ sap.ui.define([
 						//set the focus on the control passed by application
 						if (controlHelper.isSmartField(oFocusControl)) {
 							// check whether the SmartField is the correct target for focussing
-							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl).then(function (bIsFocusable) {
+							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl, true).then(function (bIsFocusable) {
 								if (bIsFocusable) {
 									controlHelper.focusUI5Control(oFocusControl);
 								} else {
@@ -2701,6 +2732,7 @@ sap.ui.define([
 					onSave: onSave,
 					onSaveAndContinueEdit: onSaveAndContinueEdit,
 					onSaveAndEditNext: onSaveAndEditNext,
+					onSaveAndBack: onSaveAndBack,
 					onBreadCrumbUrlPressed: onBreadCrumbUrlPressed,
 					onDelete: onDelete,
 					onCallActionFromToolBar: function (oEvent) {

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n.properties

@@ -28,6 +28,9 @@ DRAFT_VERSION=Draft
 # XBUT,30
 SAVE=Save
 
+# XBUT
+SAVE_AND_BACK=Save and Back
+
 # XBUT
 SAVE_AND_EDIT=Save and Edit
 
@@ -40,6 +43,9 @@ VALIDATE_DRAFT=Validate
 # XBUT,30
 CREATE=Create
 
+# XBUT,30
+CREATE_AND_BACK=Create and Back
+
 # XBUT, 30
 CLOSE=Close
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_en_US_saprigi.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u206A\u206A\u206A\u200D\u200C\u200B\u200D\u200D\u200C\u200B\u200C
 
 SAVE=\u206A\u206A\u206A\u200D\u200C\u200C\u200C\u200C\u200B\u200D\u200D\u200D\u200B\u200D\u200D\u200B\u200D\u200B\u200B\u200B\u200D\u200B\u200D\u200D\u200B\u200B\u200D\u200B\u200C\u200C\u200B\u200C\u200B\u200C\u200C\u200D\u200D\u200C\u200C\u200D\u200C\u200C\u206ASave\u206A\u206A
 
+SAVE_AND_BACK=\u206A\u206A\u206A\u200D\u200D\u200B\u200C\u200B\u200D\u200B\u200C\u200C\u200C\u200D\u200D\u200C\u200C\u200D\u200B\u200C\u200B\u200B\u200B\u200B\u200C\u200B\u200D\u200C\u200B\u200C\u200C\u200C\u200D\u200D\u200B\u200B\u200B\u200C\u200C\u200B\u200B\u200B\u200D\u206ASave and Back\u206A\u206A
+
 SAVE_AND_EDIT=\u206A\u206A\u206A\u200D\u200D\u200D\u200B\u200C\u200C\u200D\u200C\u200D\u200C\u200C\u200B\u200D\u200D\u200B\u200D\u200D\u200B\u200C\u200B\u200C\u200C\u200C\u200C\u200B\u200C\u200B\u200C\u200D\u200D\u200D\u200D\u200B\u200D\u200D\u200C\u200C\u200D\u200D\u200D\u206ASave and Edit\u206A\u206A
 
 SAVE_AND_NEXT=\u206A\u206A\u206A\u200C\u200B\u200D\u200C\u200B\u200D\u200B\u200C\u200B\u200B\u200C\u200D\u200D\u200B\u200B\u200C\u200C\u200C\u200B\u200D\u200B\u200D\u200B\u200D\u200B\u200D\u200D\u200C\u200B\u200B\u200D\u200B\u200C\u200D\u200D\u206ASave and Next\u206A\u206A
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u206A\u206A\u206A\u200C\u200C\u200D\u200B\u200B\u200B\u200D\u200
 
 CREATE=\u206A\u206A\u206A\u200C\u200C\u200C\u200B\u200B\u200D\u200C\u200B\u200D\u200D\u200B\u200B\u200B\u200C\u200C\u200C\u200B\u200B\u200B\u200D\u200D\u200C\u200C\u200D\u200B\u200D\u200D\u200D\u200C\u200D\u200D\u200B\u200D\u200B\u200C\u200D\u200C\u200C\u200C\u206ACreate\u206A\u206A
 
+CREATE_AND_BACK=\u206A\u206A\u206A\u200C\u200D\u200D\u200D\u200B\u200C\u200D\u200D\u200D\u200C\u200C\u200C\u200B\u200B\u200D\u200D\u200D\u200B\u200C\u200C\u200C\u200B\u200D\u200C\u200D\u200C\u200D\u200B\u200C\u200B\u200B\u200D\u200C\u200C\u200C\u200B\u200D\u200B\u200B\u200C\u206ACreate and Back\u206A\u206A
+
 CLOSE=\u206A\u206A\u206A\u200C\u200C\u200B\u200D\u200D\u200D\u200B\u200C\u200C\u200B\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200D\u200B\u200C\u200B\u200B\u200B\u200B\u200B\u200C\u200C\u200D\u200C\u200D\u200C\u200C\u200D\u200B\u200D\u200C\u200C\u200B\u200D\u200D\u200D\u206AClose\u206A\u206A
 
 OK=\u206A\u206A\u206A\u200C\u200B\u200D\u200B\u200C\u200B\u200C\u200C\u200B\u200B\u200D\u200B\u200C\u200B\u200D\u200C\u200C\u200B\u200D\u200D\u200B\u200B\u200D\u200B\u200C\u200B\u200C\u200B\u200D\u200D\u200B\u200C\u200C\u200C\u200B\u200D\u200D\u200C\u200C\u200C\u200B\u206AOK\u206A\u206A

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.147.1"
+			"version": "1.148.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",
@@ -97,6 +97,11 @@
 			"Share": {
 				"ref": "sap:share"
 			},
+			"SaveAndBack": {
+				"name": "SaveAndBack",
+				"shortcut": "Ctrl+F3",
+				"description": "{{SAVE_AND_BACK}}"
+			},
 			"TableEntryAdd": {
 				"name": "TableEntryAdd",
 				"shortcut": "Ctrl+Enter",

package/src/sap/suite/ui/generic/template/ObjectPage/templateSpecificPreparationHelper.js

@@ -1427,7 +1427,7 @@ sap.ui.define([
 			var oEntityType = oMetaModel.getODataEntityType(oMetaModel.getODataEntitySet(sLeadingEntitySet).entityType),
 				sSaveAndEditButtonTypeExpression = AnnotationHelper.buildEmphasizedButtonExpression(oEntityType["com.sap.vocabularies.UI.v1.Identification"]);
 
-			function fnGetPageLevelStandardActions() {
+			function fnGetPageLevelStandardActions(oOpSettings) {
 				/*  Collection of standard actions available on OP at page level. Maps the logical action name to an object containing the relevant properties i.e.
 						action => action name corresponding to the standard action
 						callbackName => standard button's press event handler used in the command execution
@@ -1508,26 +1508,42 @@ sap.ui.define([
 					}
 				};
 
-				// For mobile and tablet devices, a menu button containing Save and Validate button is rendered instead of the below standard Save button. Logic WRT visibility of
-				// said menu button is present in the footer fragment.
-				if (oDevice.system.desktop || !oComponentUtils.isDraftEnabled()) {
-					oStandardActions.Save = {
-						action: "Save",
-						callbackName: "._templateEventHandlers.onSave",
-						id: StableIdHelper.getStableId({
-							type: "ObjectPageAction",
-							subType: "CommonAction",
-							sAction: oComponentUtils.isDraftEnabled() ? "activate" : "save"
-						}),
-						text: "{= ${ui>/createMode} ? ${i18n>CREATE} : ${i18n>SAVE}}",
-						type: sSaveAndEditButtonTypeExpression,
-						press: "cmd:Save",
+				var sEditFlow = oInternalManifest
+					&& oInternalManifest["sap.ui.generic.app"]
+					&& oInternalManifest["sap.ui.generic.app"].pages
+					&& oInternalManifest["sap.ui.generic.app"].pages.length
+					&& oInternalManifest["sap.ui.generic.app"].pages[0].component.settings
+					&& oInternalManifest["sap.ui.generic.app"].pages[0].component.settings.editFlow;
+				if (oOpSettings && oOpSettings.navToListOnSave && (sEditFlow !== "direct") && !oOpSettings.legacyNavToListOnSaveBehavior) {
+					oStandardActions.SaveAndBack = {
+						action: "SaveAndBack",
+						callbackName: "._templateEventHandlers.onSaveAndBack",
+						id: StableIdHelper.getStableId({ type: "ObjectPageAction", subType: "CommonAction", sAction: "saveAndBack" }),
+						text: "{= ${ui>/createMode} ? ${i18n>CREATE_AND_BACK} : ${i18n>SAVE_AND_BACK}}",
 						visible: "{ui>/editable}",
-						isStandardAction: true,
-						determining: true
+						determining: true,
+						press: "cmd:SaveAndBack"
 					};
 				}
 
+				oStandardActions.Save = {
+					action: "Save",
+					callbackName: "._templateEventHandlers.onSave",
+					id: StableIdHelper.getStableId({
+						type: "ObjectPageAction",
+						subType: "CommonAction",
+						sAction: oComponentUtils.isDraftEnabled() ? "activate" : "save"
+					}),
+					text: ((sEditFlow === "direct") && (oOpSettings.navToListOnSave !== false) && !oOpSettings.legacyNavToListOnSaveBehavior)
+						? "{= ${ui>/createMode} ? ${i18n>CREATE_AND_BACK} : ${i18n>SAVE_AND_BACK}}"
+						: "{= ${ui>/createMode} ? ${i18n>CREATE} : ${i18n>SAVE}}",
+					type: sSaveAndEditButtonTypeExpression,
+					press: "cmd:Save",
+					visible: "{ui>/editable}",
+					isStandardAction: true,
+					determining: true
+				};
+
 				return oStandardActions;
 			}
 
@@ -1589,7 +1605,8 @@ sap.ui.define([
 				return Object.create(null);
 			}
 
-			var oPageLevelStandardActions = fnGetPageLevelStandardActions();
+			var oOpSettings = oComponentUtils.getSettings();
+			var oPageLevelStandardActions = fnGetPageLevelStandardActions(oOpSettings);
 			var oControllerExtensions = oComponentUtils.getControllerExtensions();
 			var aExtensionActionsWithoutLogicalAction = [],
 				mCustomActionsWithCommand = Object.create(null),
@@ -1618,7 +1635,6 @@ sap.ui.define([
 			});
 
 			// handle keyboard shortcut related manifest settings for actions defined via annotations e.g. DataFieldForAction and DataFieldForIBN
-			var oOpSettings = oComponentUtils.getSettings();
 			(oEntityType["com.sap.vocabularies.UI.v1.Identification"] || []).forEach(function (oDataField) {
 				switch (oDataField.RecordType) {
 					case "com.sap.vocabularies.UI.v1.DataFieldForAction":