@openui5/sap.ui.integration 1.101.0 → 1.102.0

package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/separatorEditor/SeparatorEditor.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.baseEditor.propertyEditor.separatorEditor.SeparatorEditor
 	 * @author SAP SE
 	 * @since 1.91
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.91

package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/stringEditor/StringEditor.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.baseEditor.propertyEditor.stringEditor.StringEditor
 	 * @author SAP SE
 	 * @since 1.70
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.70

package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/textAreaEditor/TextAreaEditor.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.baseEditor.propertyEditor.textAreaEditor.TextAreaEditor
 	 * @author SAP SE
 	 * @since 1.85
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.85

package/src/sap/ui/integration/designtime/baseEditor/util/binding/ObjectBinding.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.baseEditor.util.ObjectBinding
 	 * @author SAP SE
 	 * @since 1.70.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 * @experimental since 1.70.0
 	 */

package/src/sap/ui/integration/designtime/baseEditor/util/unset.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @alias module:sap/ui/integration/designtime/baseEditor/util/unset
 	 * @author SAP SE
 	 * @since 1.76
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.76

package/src/sap/ui/integration/designtime/baseEditor/validator/IsBoolean.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsBoolean
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsDate.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsDate
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsInteger.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsInteger
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsNumber.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsNumber
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsSelectedKey.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsSelectedKey
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsStringList.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsStringList
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueKey.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueKey
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueList.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueList
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsValidBinding.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsValidBinding
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/MaxLength.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.MaxLength
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/NotABinding.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.NotABinding
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/ValidatorRegistry.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.ValidatorRegistry
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/complexMapEditor/ComplexMapEditor.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.complexMapEditor.ComplexMapEditor
 	 * @author SAP SE
 	 * @since 1.76
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.76

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/destinationsEditor/DestinationsEditor.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.destinationsEditor.DestinationsEditor
 	 * @author SAP SE
 	 * @since 1.77
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.77

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/filtersEditor/FiltersEditor.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.filtersEditor.FiltersEditor
 	 * @author SAP SE
 	 * @since 1.98
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.97

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/iconEditor/IconEditor.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.iconEditor.IconEditor
 	 * @author SAP SE
 	 * @since 1.81
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.81

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/parametersEditor/ParametersEditor.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.parametersEditor.ParametersEditor
 	 * @author SAP SE
 	 * @since 1.70
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental 1.70

package/src/sap/ui/integration/designtime/editor/CardEditor.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.editor.Editor
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
 	 * @since 1.83
@@ -159,9 +159,17 @@ sap.ui.define([
 
 		this._oEditorManifest = this._oEditorCard._oCardManifest;
 		this._registerManifestModulePath();
-		this._oInitialManifestModel = new JSONModel(this._oEditorManifest._oInitialJson);
-		this.setProperty("json", this._oEditorManifest._oInitialJson, bSuppress);
-		var oManifestJson = this._oEditorManifest._oManifest.getRawJson();
+		// since Manifest.js will translate i18n values in the manifest.json which we don't want to,
+		// so we need to get inital manifest json, merge it with before layer changes by ourself to keep the i18n key
+		var oInitialJson = this._oEditorManifest._oInitialJson;
+		this._oInitialManifestModel = new JSONModel(oInitialJson);
+		this.setProperty("json", oInitialJson, bSuppress);
+		var oManifestJson;
+		if (this._beforeLayerManifestChanges) {
+			oManifestJson = Merger.mergeDelta(oInitialJson, [this._beforeLayerManifestChanges]);
+		} else {
+			oManifestJson = oInitialJson;
+		}
 		var _beforeCurrentLayer = merge({}, oManifestJson);
 		this._beforeManifestModel = new JSONModel(_beforeCurrentLayer);
 		if (iCurrentModeIndex < Merger.layers["translation"] && this._currentLayerManifestChanges) {

package/src/sap/ui/integration/designtime/editor/CardPreview.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.editor.CardPreview
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/Editor.js

@@ -144,7 +144,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @constructor
 	 * @since 1.94
 	 * @private
@@ -892,7 +892,7 @@ sap.ui.define([
 		 * @experimental since 1.94
 		 * @public
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 * @borrows sap.ui.integration.editor.Editor#getParameters as getParameters
 		 * @borrows sap.ui.integration.editor.Editor#resolveDestination as resolveDestination
 		 * @borrows sap.ui.integration.editor.Editor#request as request
@@ -1308,6 +1308,8 @@ sap.ui.define([
 				var oTranslationChange = {
 					"texts": {}
 				};
+				// delete the error texts property
+				delete oChange.texts;
 				oTranslationChange.texts[sLanguage] = {};
 				Object.keys(oChange).forEach(function (s) {
 					if (s.charAt(0) === "/") {
@@ -1463,8 +1465,8 @@ sap.ui.define([
 						if (oItem.translatable && !oItem._changed && oItem._translatedPlaceholder && !this._currentLayerManifestChanges[oItem.manifestpath]) {
 							//do not save a value that was not changed and comes from a translated default value
 							//mResult[oItem.manifestpath] = oItem._translatedPlaceholder;
-							//if we would save it
-							continue;
+							//but we need to save the setting changes for the next layer, so remove the continue sentence.
+							//continue;
 						} else {
 							if (oItem.valueItems) {
 								mResult[oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueItems"] = oItem.valueItems;
@@ -1476,6 +1478,13 @@ sap.ui.define([
 								case "string":
 									if (!oItem.translatable) {
 										mResult[oItem.manifestpath] = oItem.value;
+									} else if (oItem._hasDynamicValue) {
+										// if value is dynamic value of a translatable parameter, save it and delete all the current translations
+										mResult[oItem.manifestpath] = oItem.value;
+										this.deleteAllTranslationValuesInTexts(oItem.manifestpath);
+									} else if (oItem._beforeValue && (oItem._beforeValue.indexOf("{context>") === 0 || oItem._beforeValue.indexOf("{{parameters") === 0)) {
+										// if before value is dynamic value of a translatable parameter, save it
+										mResult[oItem.manifestpath] = oItem.value;
 									}
 									break;
 								case "group":
@@ -1517,24 +1526,64 @@ sap.ui.define([
 				}
 			}
 		}
-		if (oSettings.texts) {
-			mResult.texts = {};
-			for (var language in oSettings.texts) {
-				mResult.texts[language] = {};
-				for (var translation in oSettings.texts[language]) {
-					mResult.texts[language][translation] = oSettings.texts[language][translation];
+		if (this.getMode() === "translation") {
+			// translation mode don't have texts property
+			delete mResult.texts;
+		} else if (oSettings.texts) {
+			mResult.texts = deepClone(oSettings.texts, 500) || {};
+			// Clean the translations of object or object list field :
+			// - remove the translations if the object is not exist in value
+			for (var language in mResult.texts){
+				for (var key in mResult.texts[language]) {
+					if (typeof mResult.texts[language][key] === "object") {
+						var vValue = mResult[key];
+						if (!vValue || typeof vValue !== "object" || deepEqual(vValue, {}) || deepEqual(vValue, [])) {
+							delete mResult.texts[language][key];
+						} else if (Array.isArray(vValue)) {
+							// get all the uuids in value list of object list field
+							var aUUIDs = vValue.map(function (oObject) {
+								return oObject._dt ? oObject._dt._uuid || "" : "";
+							});
+							// delete translation texts if uuid not included in value list
+							for (var uuid in mResult.texts[language][key]) {
+								if (!includes(aUUIDs, uuid)) {
+									delete mResult.texts[language][key][uuid];
+								}
+							}
+						} else {
+							// get the uuid in the object value of object field
+							var sUUID = vValue._dt ? vValue._dt._uuid || "" : "";
+							if (sUUID !== "") {
+								// only save the translation texts of current uuid
+								var oTranslation = mResult.texts[language][key][sUUID];
+								if (!oTranslation) {
+									delete mResult.texts[language][key];
+								} else {
+									mResult.texts[language][key] = {};
+									mResult.texts[language][key][sUUID] = oTranslation;
+								}
+							} else {
+								delete mResult.texts[language][key];
+							}
+						}
+					}
+				}
+				if (deepEqual(mResult.texts[language], {})) {
+					delete mResult.texts[language];
 				}
 			}
-		}
-		//add a property ":multipleLanguage" for backward compatibility of multiple language feature
-		if (this.getMode() !== "translation") {
-			mResult[":multipleLanguage"] = true;
+			if (deepEqual(mResult.texts, {})) {
+				delete mResult.texts;
+			}
 		}
 		mResult[":layer"] = Merger.layers[this.getMode()];
 		mResult[":errors"] = this.checkCurrentSettings()[":errors"];
 		if (mNext) {
 			mResult[":designtime"] = mNext;
 		}
+		if (oSettings[":designtime"]) {
+			mResult[":designtime"] = merge(mResult[":designtime"], oSettings[":designtime"]);
+		}
 		return mResult;
 	};
 	/**
@@ -1956,8 +2005,8 @@ sap.ui.define([
 			}
 		}.bind(this)));
 		//listen to value changes on the settings
-		var oValueBinding = this._settingsModel.bindProperty(oConfig._settingspath + "/value");
-		oValueBinding.attachChange(function () {
+		oField._oValueBinding = this._settingsModel.bindProperty(oConfig._settingspath + "/value");
+		oField._oValueBinding.attachChange(function () {
 			if (!this._bIgnoreUpdates) {
 				oConfig._changed = true;
 				if (oConfig._dependentFields && oConfig._dependentFields.length > 0) {
@@ -1994,7 +2043,7 @@ sap.ui.define([
 		}
 		oField._oDataProviderFactory = this._oDataProviderFactory;
 		oField.setAssociation("_messageStrip", MessageStripId);
-		oField._previewPostion = this.getPreviewPosition();
+		oField._previewPosition = this.getPreviewPosition();
 		return oField;
 	};
 
@@ -2034,7 +2083,7 @@ sap.ui.define([
 	/**
 	 * request data via data provider in RT
 	 * @param {object} oConfig
-	 * @param {BaseField} oField
+	 * @param {sap.ui.integration.editor.fields.BaseField} oField
 	 */
 	Editor.prototype._requestData = function (oConfig, oField) {
 		var oDataProvider = this._oDataProviderFactory.create(oConfig.values.data);
@@ -2072,7 +2121,9 @@ sap.ui.define([
 			}
 			if (oConfig.type === "object" || oConfig.type === "object[]") {
 				tResult.forEach(function (oResult) {
-					oResult._editable = false;
+					oResult._dt = {
+						_editable: false
+					};
 				});
 			}
 			if (this.getMode() === "content" && oConfig.pageAdminValues && oConfig.pageAdminValues.length > 0) {
@@ -2282,7 +2333,7 @@ sap.ui.define([
 	/**
 	 * Creates a unnamed model if a values.data section exists in the configuration
 	 * @param {object} oConfig
-	 * @param {BaseField} oField
+	 * @param {sap.ui.integration.editor.fields.BaseField} oField
 	 */
 	Editor.prototype._addValueListModel = function (oConfig, oField, nTimeout) {
 		if (oConfig.values) {
@@ -2347,7 +2398,7 @@ sap.ui.define([
 	/**
 	 * Creates a meta model if a values.metadata section exists in the configuration
 	 * @param {object} oConfig
-	 * @param {BaseField} oField
+	 * @param {sap.ui.integration.editor.fields.BaseField} oField
 	 */
 	 Editor.prototype._addMetadataModel = function (oConfig, oField) {
 		if (oConfig.values && oConfig.values.metadata) {
@@ -2370,16 +2421,6 @@ sap.ui.define([
 				oRequestDefaultParameters.serviceUrl = oData.url;
 				var oMetaDataModel = new ODataModel(oRequestDefaultParameters);
 				oMetaDataModel.oMetaModel.fetchData().then(function(oMetaData) {
-					if (oConfig.type === "object" || oConfig.type === "object[]") {
-						var sPath = oConfig.values.metadata.namespace + "." + oConfig.values.metadata.entityTypeName;
-						oMetaData[sPath] = Object.assign(oMetaData[sPath], {
-							_Actions: {
-								$kind: 'Property',
-								$Type: 'Actions',
-								$MaxLength: 15
-							}
-						});
-					}
 					oField.setModel(new JSONModel(oMetaData), "meta");
 				});
 			});
@@ -2424,17 +2465,33 @@ sap.ui.define([
 		}
 	};
 
-	Editor.prototype.getBeforeLayerChange = function (sKey) {
+	Editor.prototype.getBeforeLayerChange = function (sManifestPath) {
 		if (!this._beforeLayerManifestChanges) {
 			this._beforeLayerManifestChanges = {};
 		}
-		return this._beforeLayerManifestChanges[sKey];
+		return this._beforeLayerManifestChanges[sManifestPath];
 	};
 
-	Editor.prototype.getTranslationValueInTexts = function (sLanguage, sKey) {
+	Editor.prototype.getTranslationValueInTexts = function (sLanguage, sManifestPath) {
 		var sTranslationPath = "/texts/" + sLanguage;
 		var oProperty = this._settingsModel.getProperty(sTranslationPath) || {};
-		return oProperty[sKey];
+		return oProperty[sManifestPath];
+	};
+
+	Editor.prototype.deleteAllTranslationValuesInTexts = function (sManifestPath) {
+		var that = this;
+		var oData = that._settingsModel.getData();
+		if (!oData || !oData.texts) {
+			return;
+		}
+		var sTranslationPath = "/texts";
+		var oTexts = deepClone(oData.texts, 500);
+		for (var n in oTexts) {
+			if (oTexts[n][sManifestPath]) {
+				delete oTexts[n][sManifestPath];
+			}
+		}
+		this._settingsModel.setProperty(sTranslationPath, oTexts);
 	};
 
 	Editor.prototype._handleITBValidation = function (oEditor, sItem, sErrorType) {
@@ -2787,6 +2844,9 @@ sap.ui.define([
 		var oNewLabel = null;
 		var sLanguage = Core.getConfiguration().getLanguage().replaceAll('_', '-');
 		if (sMode === "translation") {
+			if (oConfig.type !== "string") {
+				return;
+			}
 			if ((typeof oConfig.value === "string" && oConfig.value.indexOf("{") === 0) || typeof oConfig.values !== "undefined") {
 				//do not show dynamic values for translation
 				return;
@@ -2861,10 +2921,13 @@ sap.ui.define([
 				oConfig.value = this._currentLayerManifestChanges[oConfig.manifestpath];
 				oConfig._beforeLayerChange = oConfig.value;
 			}
-			sLanguage = this._language;
-			var sTranslateText = this.getTranslationValueInTexts(sLanguage, oConfig.manifestpath);
-			if (sTranslateText) {
-				oConfig.value = sTranslateText;
+			//only get translations of string fields
+			if (oConfig.type === "string") {
+				sLanguage = this._language;
+				var sTranslateText = this.getTranslationValueInTexts(sLanguage, oConfig.manifestpath);
+				if (sTranslateText) {
+					oConfig.value = sTranslateText;
+				}
 			}
 			var oField = this._createField(oConfig);
 			this.addAggregation("_formContent",
@@ -3057,6 +3120,11 @@ sap.ui.define([
 								sTranslationTextKey = sPlaceholder.substring(6, sPlaceholder.length - 1);
 							}
 						}
+						// if the value is a dynamic value, do not allow to translate, and delete all the translations
+						if (oItem.value && (oItem.value.indexOf("{context>") === 0 || oItem.value.indexOf("{{parameters") === 0)) {
+							this.deleteAllTranslationValuesInTexts(oItem.manifestpath);
+							sTranslationTextKey = null;
+						}
 						var sTranslationValueinTexts = this.getTranslationValueInTexts(sLanguage, oItem.manifestpath);
 						//only if there is a translation key
 						if (sTranslationTextKey) {
@@ -3103,6 +3171,24 @@ sap.ui.define([
 						if (oValueTokens) {
 							oItem.valueTokens = oValueTokens;
 						}
+					} else if (typeof oItem.value === "object" && oItem.type === "object") {
+						// backward compatibility for pre saved value
+						if (typeof oItem.value._editable === "boolean") {
+							oItem.value._dt = {
+								"_editable" : oItem.value._editable
+							};
+							delete oItem.value._editable;
+						}
+					} else if (Array.isArray(oItem.value) && oItem.value.length > 0 && oItem.type === "object[]") {
+						// backward compatibility for pre saved value
+						oItem.value.forEach(function (oObject) {
+							if (typeof oObject._editable === "boolean") {
+								oObject._dt = {
+									"_editable" : oObject._editable
+								};
+								delete oObject._editable;
+							}
+						});
 					}
 
 					//translate label if it is {{KEY}}
@@ -3259,6 +3345,7 @@ sap.ui.define([
 	 */
 	Editor.prototype._applyDesigntimeLayers = function (oSettings) {
 		var oTexts = {};
+		var oDesigntime = {};
 		//pull current values
 		if (this._appliedLayerManifestChanges && Array.isArray(this._appliedLayerManifestChanges)) {
 			for (var i = 0; i < this._appliedLayerManifestChanges.length; i++) {
@@ -3266,7 +3353,14 @@ sap.ui.define([
 				if (oChanges) {
 					var aKeys = Object.keys(oChanges);
 					for (var j = 0; j < aKeys.length; j++) {
-						this._settingsModel.setProperty(aKeys[j], oChanges[aKeys[j]]);
+						var vValue = oChanges[aKeys[j]];
+						// if the value of design time is object type,it should for the object field/object list field
+						// add it into designtime of settings
+						if (typeof vValue === "object") {
+							oDesigntime[aKeys[j]] = merge(oDesigntime[aKeys[j]], vValue);
+							continue;
+						}
+						this._settingsModel.setProperty(aKeys[j], vValue);
 					}
 				}
 				var oAppliedLayerManifestChangeTexts = this._appliedLayerManifestChanges[i]["texts"];
@@ -3283,14 +3377,21 @@ sap.ui.define([
 					//apply the values to a "_next/editable", "_next/visible" entry to the settings.
 					//the current layer needs to be able to change those values
 					var sPath = aKeys[j],
+						vValue = oChanges[sPath];
 						sNext = sPath.substring(0, sPath.lastIndexOf("/") + 1) + "_next";
+					// if the value of design time is object type,it should for the object field/object list field
+					// add it into designtime of settings
+					if (typeof vValue === "object") {
+						oDesigntime[sPath] = merge(oDesigntime[sPath], vValue);
+						continue;
+					}
 					if (!this._settingsModel.getProperty(sNext)) {
 						//create a _next entry if it does not exist
 						this._settingsModel.setProperty(sNext, {});
 					}
 					var sNext = sPath.substring(0, sPath.lastIndexOf("/") + 1) + "_next",
 						sProp = sPath.substring(sPath.lastIndexOf("/") + 1);
-					this._settingsModel.setProperty(sNext + "/" + sProp, oChanges[aKeys[j]]);
+					this._settingsModel.setProperty(sNext + "/" + sProp, vValue);
 				}
 			}
 			var ocurrentLayerManifestChangeTexts = this._currentLayerManifestChanges["texts"];
@@ -3301,6 +3402,9 @@ sap.ui.define([
 		if (!deepEqual(oTexts, {})) {
 			this._settingsModel.setProperty("/texts", oTexts);
 		}
+		if (!deepEqual(oDesigntime, {})) {
+			this._settingsModel.setProperty("/:designtime", oDesigntime);
+		}
 	};
 	/**
 	 * Creates a designtime instance based on an configuration section within the manifest.

package/src/sap/ui/integration/editor/EditorResourceBundles.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.EditorResourceBundles
 	 * @author SAP SE
 	 * @since 1.94.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 * @experimental since 1.94.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/Extension.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/editor/Manifest.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.Manifest
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.94

package/src/sap/ui/integration/editor/Merger.js

@@ -43,7 +43,6 @@ sap.ui.define([
 						Merger.mergeManifestPathChanges(oModel, oChange);
 					}
 				});
-
 			}
 			return oInitialManifest;
 		},