@eclipse-scout/core 22.0.19 → 22.0.22

package/dist/file-list

@@ -1,5 +1,5 @@
-eclipse-scout-core-d110a434bcc809661ce5.min.js
-eclipse-scout-core-d110a434bcc809661ce5.min.js.map
+eclipse-scout-core-c4cad26b336b02535421.min.js
+eclipse-scout-core-c4cad26b336b02535421.min.js.map
 eclipse-scout-core-theme-dark-fd0e080c10f65e67b68b.min.css
 eclipse-scout-core-theme-dark.css
 eclipse-scout-core-theme-dark.css.map

package/dist/texts.json

@@ -188,19 +188,19 @@
     "ConfirmApplyChanges": "Voulez-vous appliquer les modifications?",
     "ErrorWhileLoadingData": "Erreur lors du chargement des données",
     "FormEmptyMandatoryFieldsMessage": "Les champs suivants doivent être remplis:",
-    "FormInvalidFieldsMessage": "Les champs suivants ont une valeur non valide:",
-    "FormSaveChangesQuestion": "Voulez-vous enregistrer les modifications?",
+    "FormInvalidFieldsMessage": "Les champs suivants ont une valeur invalide:",
+    "FormSaveChangesQuestion": "Est-ce que vous voulez enregistrer les modifications ?",
     "FormValidationFailedTitle": "Veuillez vérifier les données.",
-    "FormsCannotBeSaved": "Les masques suivants ne peuvent pas être enregistrés, car ils se trouvent dans un statut non valide:",
+    "FormsCannotBeSaved": "Les formulaires suivants ne peuvent pas être enregistrés car ils se trouvent dans un statut non valide:",
     "GroupBy": "Grouper par",
-    "InactiveState": "inactif",
+    "InactiveState": "Inactif",
     "InvalidNumberMessageX": "\"{0}\" est un chiffre non valide,",
     "InvalidValueMessageX": "\"{0}\" est une valeur non valide.",
     "NavigationBackward": "Retour",
     "No": "Non",
     "NoButton": "Non",
     "NoGrouping": "Aucun groupement",
-    "NotAllCheckedFormsCanBeSaved": "Tous les formulaires sélectionnés ne peuvent pas être enregistrés",
+    "NotAllCheckedFormsCanBeSaved": "Tous les formulaires sélectionnés n'ont pas pu être enregistrés",
     "NumberTooLargeMessageX": "La valeur est trop grande; doit être inférieure ou égale à {0}.",
     "NumberTooLargeMessageXY": "La valeur est trop grande; doit être comprise entre {0} et {1}.",
     "NumberTooSmallMessageX": "La valeur est trop petite; doit être supérieure ou égale à {0}.",
@@ -246,7 +246,7 @@
     "ui.CloseAllTabs": "Fermer tous les onglets",
     "ui.CloseOtherTabs": "Fermer les autres onglets",
     "ui.CodeUndefined": "[Inconnu]",
-    "ui.CollapseAll": "fermer tous",
+    "ui.CollapseAll": "tout fermer",
     "ui.Coloring": "Coloration",
     "ui.Column": "Colonne",
     "ui.ConnectionInterrupted": "Connexion interrompue",
@@ -261,7 +261,7 @@
     "ui.Done": "OK",
     "ui.EmptyCell": "-vide-",
     "ui.ErrorCodeX": "Code {0}",
-    "ui.ExpandAll": "déplier tous",
+    "ui.ExpandAll": "tout déplier",
     "ui.FileChooserHint": "Veuillez faire glisser les fichiers souhaités dans cette zone ou les sélectionner avec Parcourir.",
     "ui.FileSizeLimit": "La taille maximale autorisée du fichier a été dépassée ({0} MB}.",
     "ui.FileSizeLimitTitle": "Limitation de la taille des fichier",
@@ -315,7 +315,7 @@
     "ui.ReloadData": "Recharger les données",
     "ui.RemoveFilter": "Supprimer le filtre",
     "ui.SearchFor_": "Rechercher par…",
-    "ui.SelectAll": "Sélectionner tous",
+    "ui.SelectAll": "Tout sélectionner",
     "ui.SelectAllFilter": "Tous",
     "ui.SelectNone": "Sélectionner aucun",
     "ui.SelectNoneFilter": "Aucun",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/core",
-  "version": "22.0.19",
+  "version": "22.0.22",
   "description": "Eclipse Scout runtime",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -26,7 +26,7 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "22.0.19",
+    "@eclipse-scout/cli": "22.0.22",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "jasmine-ajax": "4.0.0",

package/src/desktop/outline/pages/Page.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -198,6 +198,11 @@ export default class Page extends TreeNode {
     if (form instanceof Form) {
       form.setModal(false);
       form.setClosable(false);
+
+      form.setDisplayHint(Form.DisplayHint.VIEW);
+      form.setDisplayViewId('C');
+
+      form.setShowOnOpen(false);
     }
     if (form instanceof TileOverviewForm) {
       form.setPage(this);

package/src/form/Form.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -21,6 +21,7 @@ export default class Form extends Widget {
     this.askIfNeedSave = true;
     this.askIfNeedSaveText = null; // if not set, a default text is used (see Lifecycle.js)
     this.data = {};
+    this.displayViewId = null;
     this.displayHint = Form.DisplayHint.DIALOG;
     this.displayParent = null; // only relevant if form is opened, not relevant if form is just rendered into another widget (not managed by a form controller)
     this.maximized = false;
@@ -44,6 +45,7 @@ export default class Form extends Widget {
     this.messageBoxController = null;
     this.fileChooserController = null;
     this.closeKeyStroke = null;
+    this.showOnOpen = true;
     this._glassPaneRenderer = null;
     this._preMaximizedBounds = null;
     this._resizeHandler = this._onResize.bind(this);
@@ -239,7 +241,9 @@ export default class Form extends Widget {
           // If form has been closed right after it was opened don't try to show it
           return;
         }
-        this.show();
+        if (this.showOnOpen) {
+          this.show();
+        }
       });
   }
 
@@ -754,6 +758,10 @@ export default class Form extends Widget {
     }
   }
 
+  setDisplayViewId(displayViewId) {
+    this.setProperty('displayViewId', displayViewId);
+  }
+
   setDisplayHint(displayHint) {
     this.setProperty('displayHint', displayHint);
   }
@@ -820,6 +828,10 @@ export default class Form extends Widget {
     return $prevIcon;
   }
 
+  setShowOnOpen(showOnOpen) {
+    this.setProperty('showOnOpen', showOnOpen);
+  }
+
   _updateTitleForWindow() {
     let formTitle = strings.join(' - ', this.title, this.subTitle),
       applicationTitle = this.session.desktop.title;

package/src/form/js/JsFormAdapter.js

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {FormAdapter} from '../../index';
+
+/**
+ * @typedef JsFormModel
+ * @property {object} parent
+ * @property {object} owner
+ * @property {object} displayParent
+ * @property {object} inputData
+ * @property {string} jsFormObjectType
+ * @property {object} jsFormModel
+ */
+
+export default class JsFormAdapter extends FormAdapter {
+
+  constructor() {
+    super();
+  }
+
+  /**
+   * @param {JsFormModel} model
+   */
+  _initModel(model, parent) {
+    model = super._initModel(model, parent);
+
+    if (!model.jsFormObjectType || !model.jsFormObjectType.length) {
+      throw new Error('jsFormObjectType not set');
+    }
+
+    let jsFormModel = {
+      parent: model.parent,
+      owner: model.owner,
+      objectType: model.jsFormObjectType,
+      displayParent: model.displayParent,
+      data: model.inputData
+    };
+
+    if (model.jsFormModel) {
+      jsFormModel = $.extend(true, {}, model.jsFormModel, jsFormModel);
+    }
+
+    return jsFormModel;
+  }
+
+  _createWidget(model) {
+    let widget = super._createWidget(model);
+
+    widget.showOnOpen = false;
+    widget.open();
+
+    return widget;
+  }
+
+  _onWidgetEvent(event) {
+    if (event.type === 'save') {
+      this._onWidgetSave(event);
+    } else {
+      super._onWidgetEvent(event);
+    }
+  }
+
+  _onWidgetSave(event) {
+    this._send('save', {
+      outputData: this.widget.data
+    });
+  }
+
+  _onWidgetClose(event) {
+    // marks the end of the js lifecycle
+    // prevent remove/destroy of the widget as it will be done by the UI server
+    event.preventDefault();
+    // fromClosing will trigger a 'formHide' event on the desktop which then removes the widget
+    this._send('formClosing');
+  }
+
+  _onWidgetAbort(event) {
+    // completely handled by the js lifecycle -> no need to notify the UI server
+  }
+}

package/src/index.js

@@ -3,7 +3,7 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -294,6 +294,7 @@ export {default as GroupBoxResponsiveHandler} from './form/GroupBoxResponsiveHan
 export {default as DesktopResponsiveHandler} from './form/DesktopResponsiveHandler';
 export {default as TileOverviewForm} from './form/TileOverviewForm';
 export {default as TileOverviewFormAdapter} from './form/TileOverviewFormAdapter';
+export {default as JsFormAdapter} from './form/js/JsFormAdapter';
 export {default as Table} from './table/Table';
 export {default as TableAdapter} from './table/TableAdapter';
 export {default as TableCompactHandler} from './table/TableCompactHandler';

package/src/scrollbar/scrollbars.js

@@ -152,7 +152,7 @@ export function installScrollShadow($container, session, options) {
   $container.data('scroll-shadow', $shadow);
   $container.data('scroll-shadow-style', scrollShadowStyle);
   $container.data('scroll-shadow-customizer', options.scrollShadowCustomizer);
-  let handler = () => updateScrollShadow($container);
+  let handler = () => updateScrollShadowWhileScrolling($container);
   $container.data('scroll-shadow-handler', handler);
   $container.on('scroll', handler);
   updateScrollShadow($container);
@@ -236,6 +236,17 @@ function _computeScrollShadowStyle(options) {
   return scrollShadow;
 }
 
+export function updateScrollShadowWhileScrolling($container) {
+  let $animatingParent = $container.findUp($elem => $elem.hasAnimationClass());
+  if ($animatingParent.length > 0) {
+    // If the container is scrolled while being animated, the shadow will likely get the wrong size and/or position if the animation changes the bounds.
+    // The scroll event is mostly probably not triggered by the user directly but by the scrollable container itself, e.g. to reveal a focused / selected / checked element.
+    $animatingParent.oneAnimationEnd(() => updateScrollShadow($container));
+    return;
+  }
+  updateScrollShadow($container);
+}
+
 export function updateScrollShadow($container) {
   let $shadow = $container.data('scroll-shadow');
   if (!$shadow) {