@processmaker/modeler 1.39.3 → 1.39.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.39.3",
+  "version": "1.39.5",
   "scripts": {
     "serve": "vue-cli-service serve",
     "test:unit": "vue-cli-service test:unit",

package/src/components/modeler/Modeler.vue

@@ -2,6 +2,7 @@
   <span data-test="body-container">
     <tool-bar
       v-if="showComponent"
+      ref="tool-bar"
       :canvas-drag-position="canvasDragPosition"
       :cursor="cursor"
       :is-rendering="isRendering"
@@ -12,6 +13,7 @@
       :warnings="allWarnings"
       :xml-manager="xmlManager"
       :validationBar="validationBar"
+      :extra-actions="extraActions"
       @load-xml="loadXML"
       @toggle-panels-compressed="panelsCompressed = !panelsCompressed"
       @toggle-mini-map-open="miniMapOpen = $event"
@@ -21,6 +23,7 @@
       @close="close"
       @save-state="pushToUndoStack"
       @clearSelection="clearSelection"
+      @action="handleToolbarAction"
     />
     <b-row class="modeler h-100">
       <b-tooltip
@@ -242,6 +245,7 @@ export default {
   mixins: [hotkeys, cloneSelection],
   data() {
     return {
+      extraActions: [],
       pasteInProgress: false,
       cloneInProgress: false,
       internalClipboard: [],
@@ -354,6 +358,11 @@ export default {
     showComponent: () => store.getters.showComponent,
   },
   methods: {
+    handleToolbarAction(action) {
+      if (action.handler instanceof Function) {
+        action.handler(this);
+      }
+    },
     handleToggleInspector(value) {
       this.isOpenInspector = value;
     },
@@ -689,6 +698,15 @@ export default {
       });
       nodeTypesStore.commit('setPmBlockNodeTypes', this.pmBlockNodes);
     },
+    registerMenuAction(action) {
+      if (!action.value || typeof action.value !== 'string') {
+        throw new Error('Menu action must have a action.value');
+      }
+      if (!action.content || typeof action.content !== 'string') {
+        throw new Error('Menu action must have a action.content');
+      }
+      this.extraActions.push(action);
+    },
     addMessageFlows() {
       if (this.collaboration) {
         this.collaboration
@@ -1330,6 +1348,9 @@ export default {
     this.registerNode(Process);
     /* Initialize the BpmnModdle and its extensions */
     window.ProcessMaker.EventBus.$emit('modeler-init', {
+      $t: this.$t,
+      modeler: this,
+      registerMenuAction: this.registerMenuAction,
       registerInspectorExtension,
       registerBpmnExtension: this.registerBpmnExtension,
       registerNode: this.registerNode,
@@ -1464,6 +1485,9 @@ export default {
 
     /* Register custom nodes */
     window.ProcessMaker.EventBus.$emit('modeler-start', {
+      $t: this.$t,
+      modeler: this,
+      registerMenuAction: this.registerMenuAction,
       loadXML: async(xml) => {
         await this.loadXML(xml);
         await undoRedoStore.dispatch('pushState', xml);

package/src/components/nodes/sequenceFlow/sequenceFlow.vue

@@ -20,6 +20,7 @@ import { shapes } from 'jointjs';
 import linkConfig from '@/mixins/linkConfig';
 import get from 'lodash/get';
 import { namePosition } from './sequenceFlowConfig';
+import highlightConfig from '@/mixins/highlightConfig';
 import CrownConfig from '@/components/crown/crownConfig/crownConfig';
 import SequenceFlow from '@/components/nodes/genericFlow/SequenceFlow';
 
@@ -40,7 +41,7 @@ export default {
     'planeElements',
     'isRendering',
   ],
-  mixins: [linkConfig],
+  mixins: [highlightConfig, linkConfig],
   data() {
     return {
       shape: null,

package/src/components/toolbar/ToolBar.vue

@@ -56,7 +56,7 @@
               {{ $t('Close') }}
             </a>
             <EllipsisMenu
-              :actions="ellipsisMenuActions"
+              :actions="combinedMenuActions"
               :divider="false"
               @navigate="onNavigate"
               @show="onShow"
@@ -129,6 +129,7 @@ export default {
     'warnings',
     'xmlManager',
     'validationBar',
+    'extraActions',
   ],
   watch: {
     miniMapOpen(isOpen) {
@@ -146,6 +147,9 @@ export default {
     },
   },
   computed: {
+    combinedMenuActions() {
+      return this.extraActions ? this.ellipsisMenuActions.concat(this.extraActions) : this.ellipsisMenuActions;
+    },
     canUndo() {
       return undoRedoStore.getters.canUndo;
     },
@@ -237,7 +241,7 @@ export default {
           this.$emit('publishPmBlock');
           break;
         default:
-          break;
+          this.$emit('action', action);
       }
     },
     onShow() {

package/src/mixins/highlightConfig.js

@@ -113,7 +113,7 @@ export default {
       return this.shape.findView(this.paperManager.paper);
     },
     shapeBody() {
-      return this.shapeView.$el.find('[joint-selector=body]');
+      return this.shapeView.$el.find('[joint-selector=body]') || this.shapeView.$el;
     },
   },
   methods: {