Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Step/wwwroot/src/modules/base-components/ModalHelper.ts

@@ -1,9 +1,18 @@
 import Vue from "vue";
 import { Factory, MessageService } from "src/_base";
-import { ConfirmModal } from "./";
+import { ConfirmModal, Modal } from "./";
 export class ModalHelper {
 
-
+  private static _modalData = {
+    title: "",
+    content: "",
+    onConfirm: null,
+    onCancel: null,
+    containername: "modal"
+  };
+  public static GetModalData() {
+    return ModalHelper._modalData;
+  };
 
   public static ShowModal(view, modalname: string = "modal") {
 
@@ -17,23 +26,12 @@ export class ModalHelper {
 
   public static AskConfirm(title: string, body: string, onConfirm: Function, onCancel: Function, modalcontainer: string = "modal2") {
 
-    ConfirmModal.data = function () {
-      return {
-        title: title,
-        content: body,
-        onConfirm: onConfirm,
-        onCancel: onCancel,
-        containername: modalcontainer
-      }
-    };
+    ModalHelper._modalData.title = title;
+    ModalHelper._modalData.content = body;
+    ModalHelper._modalData.onCancel = onCancel;
+    ModalHelper._modalData.onConfirm = onConfirm;
+    ModalHelper._modalData.containername = modalcontainer;
 
-    var cm = Vue.component("confirmModal", ConfirmModal);
-
-      // cm.$data.title = title;
-      // Vue.set(cm, "content", body);
-      // Vue.set(cm, "onCancel", onCancel);
-      // Vue.set(cm, "onConfirm", onConfirm);
-
-      this.ShowModal(cm, modalcontainer);
+    this.ShowModal(ConfirmModal, modalcontainer);
   }
 }

Step/wwwroot/src/modules/base-components/modal-confirm.vue

@@ -13,18 +13,26 @@
 </template>
 <script>
 import Modal from "./modal.vue";
-import {ModalHelper} from "./ModalHelper.ts";
+import { ModalHelper } from "./ModalHelper.ts";
 
 export default {
   name: "modalconfirm",
   components: { modal: Modal },
-  data: function() {
-    return {
-    title: "",
-    content: "",
-    onConfirm: null,
-    onCancel: null,
-    containername: "modal"
+  computed: {
+    title: function() {
+      return ModalHelper.GetModalData().title;
+    },
+    content: function() {
+      return ModalHelper.GetModalData().content;
+    },
+    onConfirm: function() {
+      return ModalHelper.GetModalData().onConfirm;
+    },
+    onCancel: function() {
+      return ModalHelper.GetModalData().onCancel;
+    },
+    containername: function() {
+      return ModalHelper.GetModalData().containername;
     }
   },
   methods: {

Step/wwwroot/src/modules/base-components/modal-container.ts

@@ -16,14 +16,14 @@ export default {
   },
   created() {
     Factory.Get(MessageService).subscribeToChannel("show-" + this.containerName, args => {
-      debugger
+
       if (this.informHmi)
         Factory.Get(MessageService).publishToChannel("HMI-show-modal");
       this.currentView = args[0];
     });
 
     Factory.Get(MessageService).subscribeToChannel("hide-" + this.containerName, args => {
-      debugger
+
       if (this.informHmi)
         Factory.Get(MessageService).publishToChannel("HMI-hide-modal", 300);
       this.currentView = null;