@openui5/sap.ui.integration 1.97.1 → 1.98.0

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

@@ -16,51 +16,62 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.EditorResourceBundles
 	 * @author SAP SE
 	 * @since 1.94.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.94.0
 	 * @ui5-restricted
 	 */
 	var EditorResourceBundles = (function () {
 
-		var aEditorResourceBundles;
+		var _aEditorResourceBundles,
+			_aLanguageList,
+			_sResourceBundleURL;
+		LoaderExtensions.loadResource("sap/ui/integration/editor/languages.json", {
+			dataType: "json",
+			failOnError: false,
+			async: true
+		}).then(function (o) {
+			_aLanguageList = o;
+		});
 
-		function init(sResourceBundleURL) {
-			aEditorResourceBundles = [];
-			//load the language list from languages.json file
-			var aLanguageList = LoaderExtensions.loadResource("sap/ui/integration/editor/languages.json", {
-				dataType: "json",
-				failOnError: false,
-				async: false
-			});
+		function init() {
+			_aEditorResourceBundles = [];
 			//according to the language list, load each resource bundle
-			for (var p in aLanguageList) {
-				var aFallbacks = [p];
-				if (p.indexOf("-") > -1) {
-					aFallbacks.push(p.substring(0, p.indexOf("-")));
+			for (var p in _aLanguageList) {
+				var oResourceBundleTemp;
+				if (_sResourceBundleURL) {
+					var aFallbacks = [p];
+					if (p.indexOf("-") > -1) {
+						aFallbacks.push(p.substring(0, p.indexOf("-")));
+					}
+					//add en into fallbacks
+					if (!includes(aFallbacks, "en")) {
+						aFallbacks.push("en");
+					}
+					oResourceBundleTemp = ResourceBundle.create({
+						url: _sResourceBundleURL,
+						async: false,
+						locale: p,
+						supportedLocales: aFallbacks
+					});
 				}
-				//add en into fallbacks
-				if (!includes(aFallbacks, "en")) {
-					aFallbacks.push("en");
-				}
-				var oResourceBundleTemp = ResourceBundle.create({
-					url: sResourceBundleURL,
-					async: false,
-					locale: p,
-					supportedLocales: aFallbacks,
-					fallbackLocale: "en"
-				});
-				aEditorResourceBundles[p] = {"language": aLanguageList[p], "resourceBundle": oResourceBundleTemp};
+				_aEditorResourceBundles[p] = {"language": _aLanguageList[p], "resourceBundle": oResourceBundleTemp};
 			}
-			return aEditorResourceBundles;
+			return _aEditorResourceBundles;
 		}
 
 		return {
-			getInstance: function (sResourceBundleURL) {
-				if (!aEditorResourceBundles) {
-					aEditorResourceBundles = init(sResourceBundleURL);
+			getResourceBundleURL: function() {
+				return _sResourceBundleURL;
+			},
+			setResourceBundleURL: function(sResourceBundleURL) {
+				_sResourceBundleURL = sResourceBundleURL;
+			},
+			getInstance: function () {
+				if (!_aEditorResourceBundles) {
+					_aEditorResourceBundles = init();
 				}
-				return aEditorResourceBundles;
+				return _aEditorResourceBundles;
 			}
 		};
 

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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @since 1.94
@@ -32,4 +32,4 @@ sap.ui.define([
 	};
 
 	return Manifest;
-}, true);
+});

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

@@ -19,27 +19,9 @@ sap.ui.define([
 	var Merger = {
 		layers: { "admin": 0, "content": 5, "translation": 10, "all": 20 },
 		mergeManifestPathChanges: function (oModel, oChange) {
-			/* hide multi language function since there has a translation issue in Portal
-			var sLanguage =  Core.getConfiguration().getLanguage().replaceAll('_', '-');
-			*/
 			Object.keys(oChange).forEach(function (s) {
 				if (s.charAt(0) === "/") {
 					var value = oChange[s];
-					/* hide multi language function since there has a translation issue in Portal
-					if (s.endsWith("/valueTranslations")) {
-						//merge the valueTranslations with existing one
-						var aValueTranslations = oModel.getProperty(s);
-						if (aValueTranslations) {
-							//clone the exist value translations list since sometimes it is readonly
-							var aValueTranslationsUpdated = deepClone(aValueTranslations, 500);
-							value = merge(aValueTranslationsUpdated, value);
-						}
-						//update the value property via current language in Core
-						if (sLanguage in value) {
-							var sPath = s.substring(0, s.lastIndexOf("/")) + "/value";
-							oModel.setProperty(sPath, value[sLanguage]);
-						}
-					}*/
 					oModel.setProperty(s, value);
 				}
 			});

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.Settings
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
@@ -571,12 +571,14 @@ sap.ui.define([
 		var oBox = new VBox().addStyleClass("commonSettings");
 		oSettingsPanel.addItem(oBox);
 		oBox.addItem(new Title({
-			text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN")
+			text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN"),
+			wrapping: true
 		}).addStyleClass("stitle"));
 		oBox.addItem(new HBox({
 			items: [
 				new Label({
-					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_VISIBLE")
+					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_VISIBLE"),
+					wrapping: true
 				}),
 				new CheckBox({
 					selected: "{= ${currentSettings>_next/visible} !== false}",
@@ -589,7 +591,8 @@ sap.ui.define([
 		oBox.addItem(new HBox({
 			items: [
 				new Label({
-					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_EDIT")
+					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_EDIT"),
+					wrapping: true
 				}),
 				new CheckBox({
 					selected: "{= ${currentSettings>_next/editable} !== false}",
@@ -604,7 +607,8 @@ sap.ui.define([
 			visible: "{= ${currentSettings>allowDynamicValues}!== false}",
 			items: [
 				new Label({
-					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_DYN")
+					text: oResourceBundle.getText("EDITOR_MORE_SETTINGS_P_ADMIN_DYN"),
+					wrapping: true
 				}),
 				new CheckBox({
 					selected: "{= ${currentSettings>_next/allowDynamicValues} !== false}",

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

@@ -520,4 +520,26 @@
 }
 .sapUiIntegrationEditorItem .sapUiIntegrationEditorSettingBox {
 	max-width: 5rem;
+}
+
+/* Color Select */
+.sapUiIntegrationColorSelect.noColorValueOrTransparentValue .sapUiIcon::before {
+	opacity: 0.5;
+	color: transparent;
+	background-size: 10px 10px;
+	background-position: 0px 0px, 0px 10px, 10px -10px, -10px 10px;
+	border: 1px dashed #808080;
+	padding: 0px 0px;
+	background-image: linear-gradient(45deg, #ddd 25%, transparent 25%), linear-gradient(-45deg, #ddd 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #ddd 75%), linear-gradient(-45deg, transparent 75%, #ddd 75%);
+}
+
+.sapUiIntegrationColorSelect.hasColorValue .sapUiIcon::before {
+	text-shadow: unset;
+	opacity: unset;
+	background-size: unset;
+	background-position: unset;
+	border: unset;
+	padding: unset;
+	background-image: unset;
+	color: var(--colorValue);
 }

package/src/sap/ui/integration/editor/fields/BaseField.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BaseField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted
 	 * @experimental since 1.83.0
@@ -106,13 +106,10 @@ sap.ui.define([
 			if (!oControl.getVisible()) {
 				oRm.addStyle("display", "none");
 			}
-			oRm.writeClasses();
-			oRm.writeStyles();
 			oRm.writeElementData(oControl);
 			oRm.openEnd();
 			if (oControl.getVisible()) {
 				oRm.openStart("span");
-				oRm.writeClasses();
 				oRm.openEnd();
 				oRm.openStart("span");
 				oRm.addClass("sapUiIntegrationEditorEditor");
@@ -122,8 +119,6 @@ sap.ui.define([
 				} else {
 					oRm.addStyle("width", "100%");
 				}
-				oRm.writeStyles();
-				oRm.writeClasses();
 				oRm.openEnd();
 				oRm.renderControl(oField);
 				oRm.close("span");
@@ -131,14 +126,11 @@ sap.ui.define([
 				if (oControl._hasDynamicValue()) {
 					oRm.openStart("span");
 					oRm.addClass("sapUiIntegrationEditorSettings");
-					oRm.writeClasses();
 					oRm.openEnd();
 					oRm.openStart("span");
 					oRm.addClass("sapUiIntegrationEditorSettingsField");
 					oRm.addStyle("width", "100%");
 					oRm.addStyle("opacity", "1");
-					oRm.writeClasses();
-					oRm.writeStyles();
 					oRm.openEnd();
 					oRm.renderControl(oDynamicField);
 					oRm.close("span");
@@ -146,7 +138,6 @@ sap.ui.define([
 				oRm.openStart("div");
 				oRm.writeAttribute("id", oControl.getId() + "-ms");
 				oRm.addStyle("height", "0");
-				oRm.writeStyles();
 				oRm.openEnd();
 				oRm.close("div");
 			}

package/src/sap/ui/integration/editor/fields/BooleanField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BooleanField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DateField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DateField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DateTimeField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DateTimeField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DestinationField.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DestinationField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/IntegerField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.IntegerField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/ListField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.ListField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
@@ -167,12 +167,14 @@ sap.ui.define([
 				//listen to the selectionChange event of MultiComboBox
 				oControl.attachSelectionChange(this.onSelectionChangeForFilterBackend);
 				//listen to the selectionFinish event of MultiComboBox
-				oControl.attachSelectionFinish(this.onSelectionFinish);
+				oControl.attachSelectionFinish(this.onSelectionFinishForFilterBackend);
 				//merge the previous selected items with new items got from request
-				oModel.attachPropertyChange(this.onPropertyChange, this);
+				oModel.attachPropertyChange(this.onPropertyChangeForFilterBackend, this);
 			} else {
 				//listen to the selectionChange event of MultiComboBox
 				oControl.attachSelectionChange(this.onSelectionChange);
+				//clean the selected keys with the items got from request
+				oModel.attachPropertyChange(this.onPropertyChange, this);
 			}
 		} else if (oControl instanceof MultiInput) {
 			//init tokens from changes
@@ -181,7 +183,7 @@ sap.ui.define([
 			//if need to filter backend by input value, need to hook the onInput function which only support filter locally.
 			oControl.oninput = this.onInputForMultiInput;
 			//merge the previous selected items with new items got from request
-			oModel.attachPropertyChange(this.onPropertyChange, this);
+			oModel.attachPropertyChange(this.onPropertyChangeForFilterBackend, this);
 			//init tokens with new items got from request
 			oModel.attachPropertyChange(this.initTokens, this);
 			oControl.attachTokenChange(this.onTokenChange);
@@ -251,7 +253,7 @@ sap.ui.define([
 		return sItemKey;
 	};
 
-	ListField.prototype.onPropertyChange = function(oEvent) {
+	ListField.prototype.onPropertyChangeForFilterBackend = function(oEvent) {
 		var oConfig = this.getConfiguration();
 		if (!oConfig.valueItems) {
 			oConfig.valueItems = [];
@@ -280,6 +282,19 @@ sap.ui.define([
 		this.setSuggestValue();
 	};
 
+	ListField.prototype.onPropertyChange = function(oEvent) {
+		var oControl = this.getAggregation("_field");
+		//get the keys of the selected items
+		var aSelectedItemKeys = oControl.getSelectedItems().map(function (oSelectedItem) {
+			return oSelectedItem.getKey();
+		});
+
+		var sSettingspath = this.getBindingContext("currentSettings").sPath;
+		var oSettingsModel = this.getModel("currentSettings");
+		//save the selected keys as field value
+		oSettingsModel.setProperty(sSettingspath + "/value", aSelectedItemKeys);
+	};
+
 	ListField.prototype.mergeSelectedItems = function(oConfig, oData) {
 		if (Array.isArray(oData)) {
 			//get keys of previous selected items
@@ -546,7 +561,7 @@ sap.ui.define([
 		this.getModel().checkUpdate(true);
 	};
 
-	ListField.prototype.onSelectionFinish = function(oEvent) {
+	ListField.prototype.onSelectionFinishForFilterBackend = function(oEvent) {
 		var oField = this.getParent();
 		var oConfig = oField.getConfiguration();
 

package/src/sap/ui/integration/editor/fields/NumberField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.NumberField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted