WFE 7.1.2 (autocommit)

optimajet · Oct 5, 2022 · 660a70c · 660a70c
1 parent fda1eb6
commit 660a70c
Show file tree

Hide file tree

Showing 274 changed files with 997 additions and 774 deletions.
diff --git a/Designer/Localization/ar.json b/Designer/Localization/ar.json
@@ -486,6 +486,8 @@
 	},
 	"ReadMore": "اقرأ المزيد.",
 	"SaveConfirm": "حفظ التغييرات?",
+	"SchemeNotSaved": "لم يتم حفظ المخطط",
+	"SchemeSaved": "تم حفظ المخطط",
 	"SwitchToDefaultMode": "التبديل إلى الوضع الافتراضي",
 	"SwitchToExpertMode": "التبديل إلى وضع الخبراء",
 	"TimerFormLabel": {
@@ -515,6 +517,7 @@
 		"Delete": "حذف",
 		"Download": "تحميل",
 		"DownloadBPMN": "تحميل كما ببمن",
+		"DownloadScheme": "مخطط التحميل",
 		"DownloadXML": "تحميل كما شمل",
 		"Elements": "الأركان",
 		"File": "الملف",
@@ -535,6 +538,7 @@
 		"Refresh": "تحديث",
 		"ResetSettings": "إعادة ضبط الإعدادات",
 		"ResetZoom": "إعادة تعيين التكبير",
+		"Save": "حفظ",
 		"SaveToImage": "حفظ للصورة",
 		"Scheme": "مخطط",
 		"Settings": "الإعدادات",
@@ -544,6 +548,7 @@
 		"Undo": "تراجع",
 		"Upload": "تحميل",
 		"UploadBPMN": "تحميل بي بي إم إن",
+		"UploadScheme": "مخطط التحميل",
 		"UploadXML": "تحميل أكس",
 		"View": "عرض",
 		"ZoomIn": "تكبير",

diff --git a/Designer/Localization/de.json b/Designer/Localization/de.json
@@ -485,6 +485,8 @@
 	},
 	"ReadMore": "Lesen Sie mehr.",
 	"SaveConfirm": "Änderungen speichern?",
+	"SchemeNotSaved": "Schema nicht gespeichert",
+	"SchemeSaved": "Schema gespeichert",
 	"SwitchToDefaultMode": "In den Standardmodus wechseln",
 	"SwitchToExpertMode": "In den Expertenmodus wechseln",
 	"TimerFormLabel": {
@@ -514,6 +516,7 @@
 		"Delete": "Löschen",
 		"Download": "Herunterladen",
 		"DownloadBPMN": "Als BPMN herunterladen",
+		"DownloadScheme": "Schema herunterladen",
 		"DownloadXML": "Als XML herunterladen",
 		"Elements": "Schlüsselelemente",
 		"File": "Datei",
@@ -534,6 +537,7 @@
 		"Refresh": "Aktualisieren",
 		"ResetSettings": "Einstellungen zurücksetzen",
 		"ResetZoom": "Zoom zurücksetzen",
+		"Save": "Speichern",
 		"SaveToImage": "In Bild speichern",
 		"Scheme": "Scheme",
 		"Settings": "Einstellung",
@@ -543,6 +547,7 @@
 		"Undo": "Rückgängig",
 		"Upload": "Laden",
 		"UploadBPMN": "BPMN hochladen",
+		"UploadScheme": "Upload-Schema",
 		"UploadXML": "XML hochladen",
 		"View": "Blick",
 		"ZoomIn": "vergrößern",

diff --git a/Designer/Localization/en_default.json b/Designer/Localization/en_default.json
@@ -30,6 +30,8 @@
   "ReadMore": "Read more.",
   "None": "None",
   "Warning": "Warning",
+  "SchemeSaved": "Scheme saved",
+  "SchemeNotSaved": "Scheme not saved",
   "SwitchToExpertMode": "Switch To Expert Mode",
   "SwitchToDefaultMode": "Switch To Default Mode",
   "InfoBlockLabel": {
@@ -500,6 +502,7 @@
   },
   "ToolbarLabel": {
     "CopySelected": "Copy selected",
+    "Save": "Save",
     "Undo": "Undo",
     "Redo": "Redo",
     "Move": "Move",

diff --git a/Designer/Localization/es.json b/Designer/Localization/es.json
@@ -485,6 +485,8 @@
 	},
 	"ReadMore": "Leer más.",
 	"SaveConfirm": "¿Guardar cambios?",
+	"SchemeNotSaved": "Esquema no guardado",
+	"SchemeSaved": "Esquema guardado",
 	"SwitchToDefaultMode": "Cambiar Al Modo Predeterminado",
 	"SwitchToExpertMode": "Cambiar Al Modo Experto",
 	"TimerFormLabel": {
@@ -514,6 +516,7 @@
 		"Delete": "Eliminar",
 		"Download": "Descargar",
 		"DownloadBPMN": "Descargar como BPMN",
+		"DownloadScheme": "Descargar esquema",
 		"DownloadXML": "Descargar como XML",
 		"Elements": "Elemento",
 		"File": "File",
@@ -534,6 +537,7 @@
 		"Refresh": "Actualizar",
 		"ResetSettings": "Restablecer la configuración",
 		"ResetZoom": "Restablecer zoom",
+		"Save": "Guardar",
 		"SaveToImage": "Guardar en imagen",
 		"Scheme": "Esquema",
 		"Settings": "Configuración",
@@ -543,6 +547,7 @@
 		"Undo": "Deshacer",
 		"Upload": "Subir",
 		"UploadBPMN": "Cargar BPMN",
+		"UploadScheme": "Esquema de carga",
 		"UploadXML": "Cargar XML",
 		"View": "Vista",
 		"ZoomIn": "acercar",

diff --git a/Designer/Localization/fr.json b/Designer/Localization/fr.json
@@ -485,6 +485,8 @@
 	},
 	"ReadMore": "Lire la suite.",
 	"SaveConfirm": "Enregistrer les modifications?",
+	"SchemeNotSaved": "Schéma non enregistré",
+	"SchemeSaved": "Schéma sauvegardé",
 	"SwitchToDefaultMode": "Passer En Mode Par Défaut",
 	"SwitchToExpertMode": "Passer En Mode Expert",
 	"TimerFormLabel": {
@@ -514,6 +516,7 @@
 		"Delete": "Supprimer",
 		"Download": "Télécharger",
 		"DownloadBPMN": "Télécharger comme BPMN",
+		"DownloadScheme": "Télécharger le schéma",
 		"DownloadXML": "Télécharger au format XML",
 		"Elements": "Élément",
 		"File": "Fichier",
@@ -534,6 +537,7 @@
 		"Refresh": "Rafraîchir",
 		"ResetSettings": "Réinitialiser les paramètres",
 		"ResetZoom": "Réinitialiser le zoom",
+		"Save": "Enregistrer",
 		"SaveToImage": "Enregistrer dans l'image",
 		"Scheme": "Régime",
 		"Settings": "Paramètre",
@@ -543,6 +547,7 @@
 		"Undo": "Annuler",
 		"Upload": "Télécharger",
 		"UploadBPMN": "Télécharger BPMN",
+		"UploadScheme": "Schéma de téléchargement",
 		"UploadXML": "Télécharger XML",
 		"View": "Vue",
 		"ZoomIn": "zoomer",

diff --git a/Designer/Localization/it.json b/Designer/Localization/it.json
@@ -485,6 +485,8 @@
 	},
 	"ReadMore": "Per saperne di più.",
 	"SaveConfirm": "Salvare le modifiche?",
+	"SchemeNotSaved": "Schema non salvato",
+	"SchemeSaved": "Schema salvato",
 	"SwitchToDefaultMode": "Passa alla modalità predefinita",
 	"SwitchToExpertMode": "Passa alla modalità Esperto",
 	"TimerFormLabel": {
@@ -514,6 +516,7 @@
 		"Delete": "Eliminare",
 		"Download": "Scaricare",
 		"DownloadBPMN": "Scarica come BPMN",
+		"DownloadScheme": "Scarica schema",
 		"DownloadXML": "Scarica come XML",
 		"Elements": "Elemento",
 		"File": "File",
@@ -534,6 +537,7 @@
 		"Refresh": "Aggiornare",
 		"ResetSettings": "Ripristina impostazioni",
 		"ResetZoom": "Azzera zoom",
+		"Save": "Salvare",
 		"SaveToImage": "Salva nell'immagine",
 		"Scheme": "Schema",
 		"Settings": "Impostazioni",
@@ -543,6 +547,7 @@
 		"Undo": "Annullare",
 		"Upload": "Caricare",
 		"UploadBPMN": "Carica BPMN",
+		"UploadScheme": "Schema di caricamento",
 		"UploadXML": "Carica XML",
 		"View": "Mostra",
 		"ZoomIn": "ingrandire",

diff --git a/Designer/Localization/pt.json b/Designer/Localization/pt.json
@@ -485,6 +485,8 @@
 	},
 	"ReadMore": "Continuar.",
 	"SaveConfirm": "Salvar alterações?",
+	"SchemeNotSaved": "Regime não guardado",
+	"SchemeSaved": "Regime guardado",
 	"SwitchToDefaultMode": "Mudar Para O Modo Padrão",
 	"SwitchToExpertMode": "Mudar Para O Modo Expert",
 	"TimerFormLabel": {
@@ -514,6 +516,7 @@
 		"Delete": "Excluir",
 		"Download": "Baixar",
 		"DownloadBPMN": "Baixar como BPMN",
+		"DownloadScheme": "Esquema de transferência",
 		"DownloadXML": "Baixar como XML",
 		"Elements": "Elemento",
 		"File": "Arquivo",
@@ -534,6 +537,7 @@
 		"Refresh": "Actualizar",
 		"ResetSettings": "Redefinir configurações",
 		"ResetZoom": "Redefinir zoom",
+		"Save": "Salvar",
 		"SaveToImage": "Salvar na imagem",
 		"Scheme": "Esquema",
 		"Settings": "Definicao",
@@ -543,6 +547,7 @@
 		"Undo": "Desfazer",
 		"Upload": "Carregamento",
 		"UploadBPMN": "Carregar BPMN",
+		"UploadScheme": "Esquema de carregamento",
 		"UploadXML": "Carregar XML",
 		"View": "Visualizar",
 		"ZoomIn": "ampliar",

diff --git a/Designer/Localization/ru.json b/Designer/Localization/ru.json
@@ -4,7 +4,7 @@
 		"dialect": "RU",
 		"name": "Русский",
 		"description": "Russian (Standard)",
-    "elementUICode": "ru-RU"
+		"elementUICode": "ru-RU"
 	},
 	"ActivityFormLabel": {
 		"ActivityLabel": "Активность",
@@ -486,6 +486,8 @@
 	},
 	"ReadMore": "Подробнее.",
 	"SaveConfirm": "Сохранить изменения?",
+	"SchemeNotSaved": "Схема не сохранена",
+	"SchemeSaved": "Схема сохранена",
 	"SwitchToDefaultMode": "Режим По умолчанию",
 	"SwitchToExpertMode": "Экспертный режим",
 	"TimerFormLabel": {
@@ -515,6 +517,7 @@
 		"Delete": "Удалить",
 		"Download": "Скачать",
 		"DownloadBPMN": "Скачать как BPMN",
+		"DownloadScheme": "Схема загрузки",
 		"DownloadXML": "Скачать в формате XML",
 		"Elements": "Элементы",
 		"File": "Файл",
@@ -535,6 +538,7 @@
 		"Refresh": "Обновить",
 		"ResetSettings": "Сброс настроек",
 		"ResetZoom": "Сброс масштаба",
+		"Save": "Сохранить",
 		"SaveToImage": "Сохранить в изображение",
 		"Scheme": "Схема",
 		"Settings": "Настройки",
@@ -544,6 +548,7 @@
 		"Undo": "Отменить",
 		"Upload": "Загрузить",
 		"UploadBPMN": "Загрузить BPMN",
+		"UploadScheme": "Схема загрузки",
 		"UploadXML": "Загрузить XML",
 		"View": "Вид",
 		"ZoomIn": "Увеличить масштаб",
@@ -629,4 +634,4 @@
 		"UserComment": "Комментарий"
 	},
 	"Warning": "Предупреждение"
-}
+}
diff --git a/Designer/Localization/tr.json b/Designer/Localization/tr.json
@@ -4,7 +4,7 @@
 		"dialect": "TR",
 		"name": "Türk",
 		"description": "Turkish",
-    "elementUICode": "tr-TR"
+		"elementUICode": "tr-TR"
 	},
 	"ActivityFormLabel": {
 		"ActivityLabel": "Aktivite",
@@ -486,6 +486,8 @@
 	},
 	"ReadMore": "Daha fazla oku.",
 	"SaveConfirm": "Değişiklikleri kaydet?",
+	"SchemeNotSaved": "Şema kaydedilmedi",
+	"SchemeSaved": "Şema kaydedildi",
 	"SwitchToDefaultMode": "Varsayılan Moda Geç",
 	"SwitchToExpertMode": "Uzman Moduna Geç",
 	"TimerFormLabel": {
@@ -515,6 +517,7 @@
 		"Delete": "Silmek",
 		"Download": "İndirmek",
 		"DownloadBPMN": "BPMN olarak indir",
+		"DownloadScheme": "İndirme şeması",
 		"DownloadXML": "XML olarak indir",
 		"Elements": "Öğeler",
 		"File": "Dosya",
@@ -535,6 +538,7 @@
 		"Refresh": "Yenilemek",
 		"ResetSettings": "Ayarları sıfırla",
 		"ResetZoom": "Yakınlaştırmayı sıfırla",
+		"Save": "Kaydetmek",
 		"SaveToImage": "Görüntüye kaydet",
 		"Scheme": "Şema",
 		"Settings": "Ayarlar",
@@ -544,6 +548,7 @@
 		"Undo": "Geri alma",
 		"Upload": "Yükle",
 		"UploadBPMN": "Bpmn'yi yükle",
+		"UploadScheme": "Yükleme şeması",
 		"UploadXML": "XML yükle",
 		"View": "Manzara",
 		"ZoomIn": "yakınlaştırmak",
@@ -629,4 +634,4 @@
 		"UserComment": "Yorum"
 	},
 	"Warning": "Uyarı"
-}
+}
diff --git a/Designer/templates/activity.html b/Designer/templates/activity.html
@@ -475,37 +475,36 @@ <h4 v-if="itemHasComment" style="padding-bottom: 1px;border-bottom: 1px solid rg
       formdata.DisablePersistParameters = item.DisablePersistParameters;
       formdata.UserComment = item.UserComment;
       formdata.Implementation = Array.isArray(item.Implementation) ? WorkflowDesignerCommon.clone(item.Implementation) : [];
-      formdata.PreExecutionImplementation = Array.isArray(item.PreExecutionImplementation) ? WorkflowDesignerCommon.clone(item.PreExecutionImplementation) : [];
-      formdata.Annotations = Array.isArray(item.Annotations) ? WorkflowDesignerCommon.clone(item.Annotations) : [];
-
-      me.linkItem = item;
-      me.VueConfig.data.originalItem = WorkflowDesignerCommon.clone(formdata);
-      me.VueConfig.data.prevName = item.Name;
-      me.VueConfig.data.readonly = me.graph.Settings.readonly;
-      me.VueConfig.data.actions = me.graph.getActionNames();
-      me.VueConfig.data.itemHasComment = formdata.UserComment != null && formdata.UserComment.length > 0;
-
-      me.graph.data.Activities.forEach(function (element) {
-        if (element == item) //not add current activity
-          return;
-        me.VueConfig.data.activities.push(element.Name);
-        if (element.State && element.State !== '') {
-          me.VueConfig.data.states.push(element.State);
-        }
-      });
-
-      me.VueConfig.data.activities.sort();
-      me.VueConfig.data.states.sort();
-
-      me.VueConfig.data.disableAllPersist = formdata.DisablePersistState && formdata.DisablePersistTransitionHistory && formdata.DisablePersistParameters;
-      me.VueConfig.data.isIndeterminate = formdata.DisablePersistState || formdata.DisablePersistTransitionHistory || formdata.DisablePersistParameters;
-      me.VueConfig.data.persists = [
-        me.VueConfig.data.labels.DisablePersists.DisablePersistState,
-        me.VueConfig.data.labels.DisablePersists.DisablePersistParameters,
-        me.VueConfig.data.labels.DisablePersists.DisablePersistTransitionHistory
-      ];
-      if (formdata.DisablePersistState != undefined && formdata.DisablePersistState) {
-        me.VueConfig.data.checkedPersists.push(me.VueConfig.data.labels.DisablePersists.DisablePersistState);
+          formdata.PreExecutionImplementation = Array.isArray(item.PreExecutionImplementation) ? WorkflowDesignerCommon.clone(item.PreExecutionImplementation) : [];
+          formdata.Annotations = Array.isArray(item.Annotations) ? WorkflowDesignerCommon.clone(item.Annotations) : [];
+
+          me.linkItem = item;
+          me.VueConfig.data.originalItem = WorkflowDesignerCommon.clone(formdata);
+          me.VueConfig.data.prevName = item.Name;
+          me.VueConfig.data.readonly = me.graph.Settings.readonly;
+          me.VueConfig.data.actions = me.graph.getActionNames();
+          me.VueConfig.data.itemHasComment = formdata.UserComment != null && formdata.UserComment.length > 0;
+
+          const {activities, states} = me.VueConfig.data;
+          me.graph.data.Activities.forEach(({Name, State}) => {
+            if (item.Name === Name) return;
+
+            if (!activities.includes(Name)) activities.push(Name);
+            if (State && !states.includes(State)) states.push(State);
+          });
+
+          activities.sort();
+          states.sort();
+
+          me.VueConfig.data.disableAllPersist = formdata.DisablePersistState && formdata.DisablePersistTransitionHistory && formdata.DisablePersistParameters;
+          me.VueConfig.data.isIndeterminate = formdata.DisablePersistState || formdata.DisablePersistTransitionHistory || formdata.DisablePersistParameters;
+          me.VueConfig.data.persists = [
+            me.VueConfig.data.labels.DisablePersists.DisablePersistState,
+            me.VueConfig.data.labels.DisablePersists.DisablePersistParameters,
+            me.VueConfig.data.labels.DisablePersists.DisablePersistTransitionHistory
+          ];
+          if (formdata.DisablePersistState != undefined && formdata.DisablePersistState) {
+            me.VueConfig.data.checkedPersists.push(me.VueConfig.data.labels.DisablePersists.DisablePersistState);
       }
       if (formdata.DisablePersistParameters != undefined && formdata.DisablePersistParameters) {
         me.VueConfig.data.checkedPersists.push(me.VueConfig.data.labels.DisablePersists.DisablePersistParameters);

diff --git a/Designer/templates/confirmDialog.html b/Designer/templates/confirmDialog.html
@@ -4,7 +4,7 @@
   :title="title"
   :visible="visible"
   width="30%">
-  <span style="word-break: normal;" v-html="message"></span>
+  <span v-html="message"></span>
   <span slot="footer" class="dialog-footer">
         <template v-if="typeof actions !== 'undefined' && actions.length > 0">
             <el-button v-for="(action, index) in actions" :key="index" :type="action.type" @click="funcWrapper(action.onClick)">

diff --git a/Designer/templates/customforms/assignmentplugin/assignmentchangeform.html b/Designer/templates/customforms/assignmentplugin/assignmentchangeform.html
@@ -385,7 +385,7 @@ <h4 class="WorkflowDesignerTitleWithCreate">
             delete me.VueConfig.data.FormData[key];
       }
 
-      me.graph.insertDefaultValuesInForm(me.VueConfig.data.Field, me.VueConfig.data.FormData);
+      me.VueConfig.data.FormData = me.graph.insertDefaultValuesInForm(me.VueConfig.data.Field, me.VueConfig.data.FormData);
 
       me.VueConfig.methods.initializeData();
     };