@openui5/sap.ui.integration 1.100.0 → 1.102.1

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

@@ -5,35 +5,28 @@
  */
 sap.ui.define([
 	"sap/ui/core/Control",
-	"sap/m/Button",
-	"sap/m/FormattedText",
 	"sap/m/MultiInput",
 	"sap/m/Token",
 	"sap/ui/core/Core",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/core/ListItem",
 	"sap/base/util/ObjectPath",
-	"sap/ui/integration/util/Utils",
 	"sap/base/util/deepEqual",
-	"sap/m/MessageToast"
+	"sap/base/util/deepClone"
 ], function (
 	Control,
-	Button,
-	FormattedText,
 	MultiInput,
 	Token,
 	Core,
 	BindingHelper,
 	ListItem,
 	ObjectPath,
-	Utils,
 	deepEqual,
-	MessageToast
+	deepClone
 ) {
 	"use strict";
 
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration"),
-		sBuildInViz = "sap/ui/integration/editor/fields/viz";
+	var sBuildInViz = "sap/ui/integration/editor/fields/viz";
 
 	/**
 	 * @class
@@ -41,7 +34,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BaseField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @private
 	 * @ui5-restricted
 	 * @experimental since 1.83.0
@@ -173,10 +166,11 @@ sap.ui.define([
 		}
 	};
 
+	BaseField.prototype.getResourceBundle = function() {
+		return this.getModel("i18n").getResourceBundle();
+	};
+
 	BaseField.prototype.setConfiguration = function (oConfig, bSuppress) {
-		if (oResourceBundle && oResourceBundle.sLocale !== Core.getConfiguration().getLanguage()) {
-			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
-		}
 		if (oConfig !== this.getConfiguration()) {
 			//sanitize configuration
 			this._sanitizeValidationSettings(oConfig);
@@ -210,6 +204,36 @@ sap.ui.define([
 		}
 	};
 
+	// delete the translation text
+	BaseField.prototype.deleteTranslationValuesInTexts = function (sLanguage) {
+		var that = this;
+		var oConfig = that.getConfiguration();
+		var sTranslationPath = "/texts";
+		var oData = this._settingsModel.getData();
+		if (!oData || !oData.texts) {
+			return;
+		}
+		var oTexts = deepClone(oData.texts, 500);
+		if (sLanguage) {
+			if (oTexts[sLanguage]) {
+				delete oTexts[sLanguage][oConfig.manifestpath];
+				if (deepEqual(oTexts[sLanguage], {})) {
+					delete oTexts[sLanguage];
+				}
+				if (deepEqual(oTexts, {})) {
+					delete oData.texts;
+					this._settingsModel.setData(oData);
+				} else {
+					this._settingsModel.setProperty(sTranslationPath, oTexts);
+				}
+			}
+		} else {
+			for (var n in oTexts) {
+				that.deleteTranslationValuesInTexts(n);
+			}
+		}
+	};
+
 	BaseField.prototype._triggerValidation = function (value) {
 		if (deepEqual(value, this._preChangedValue) && this._messageFrom === "validation") {
 			return;
@@ -407,9 +431,9 @@ sap.ui.define([
 			}
 			if (!sError) {
 				if (oSettings._txt) {
-					sError = oResourceBundle.getText(oValidations[oSettings._txt], [oSettings[n]]);
+					sError = this.getResourceBundle().getText(oValidations[oSettings._txt], [oSettings[n]]);
 				} else {
-					sError = oResourceBundle.getText(oValidations[n + "Txt"], [oSettings[n]]);
+					sError = this.getResourceBundle().getText(oValidations[n + "Txt"], [oSettings[n]]);
 				}
 			}
 			this._showValueState(oSettings.type || "error", sError);
@@ -617,6 +641,7 @@ sap.ui.define([
 
 	BaseField.prototype.initEditor = function (oConfig) {
 		var oControl;
+		this._settingsModel = this.getModel("currentSettings");
 		this.initVisualization && this.initVisualization(oConfig);
 		if (this._visualization.editor) {
 			oControl = this._visualization.editor;
@@ -804,6 +829,10 @@ sap.ui.define([
 				text: o.object.label,
 				"delete": function () {
 					this._setCurrentProperty("value", "");
+					// save "" value to overwrite the dynamic value
+					var oInput = this.getAggregation("_field");
+					oInput.setValue("");
+					oInput.fireChange();
 					if (!this._hasDynamicValue()) {
 						this._hideDynamicField();
 					}
@@ -814,6 +843,11 @@ sap.ui.define([
 					}.bind(this), 100);
 				}.bind(this)
 			}));
+			// delete all the transalation texts since the translatable string value now is a dynamic value
+			var oConfig = this.getConfiguration();
+			if (oConfig.type === "string" && oConfig.translatable) {
+				this.deleteTranslationValuesInTexts();
+			}
 		} else {
 			this._setCurrentProperty("value", oData.value);
 			this._setCurrentProperty("_changed", oData._changed);

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.100.0
+	 * @version 1.102.1
 	 * @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.100.0
+	 * @version 1.102.1
 	 * @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.100.0
+	 * @version 1.102.1
 	 * @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.100.0
+	 * @version 1.102.1
 	 * @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.100.0
+	 * @version 1.102.1
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

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.100.0
+	 * @version 1.102.1
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted