Merge branch 'next' into feature/FOUR-16765

ProcessMaker · Sep 10, 2024 · ed087bb · ed087bb
2 parents aca6c32 + 727141a
commit ed087bb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/components/nodes/pool/pool.vue b/src/components/nodes/pool/pool.vue
@@ -530,7 +530,7 @@ export default {
 
     this.shape = configurePool(this.collaboration, this.node, this.graph);
     this.shape.component = this;
-    this.initDocumentingIcons({ labelX: '-10px', labelY: '-4px' });
+    this.initDocumentingIcons({ labelX: '-15px', labelY: '2px' });
 
 
 

diff --git a/src/components/nodes/pool/poolShape.js b/src/components/nodes/pool/poolShape.js
@@ -5,9 +5,9 @@ import { docIconMarkup, docIconAttrs, docIconAdaptMarkup } from '@/mixins/docume
 
 export function getPoolShape(forDocumenting = false) {
   let markup = [
+    ...shapes.standard.Rectangle.prototype.markup,
     docIconMarkup('doccircle'),
     docIconMarkup('doclabel'),
-    ...shapes.standard.Rectangle.prototype.markup,
     { tagName: 'polyline', selector: 'polyline' },
   ];
 
@@ -27,8 +27,8 @@ export function getPoolShape(forDocumenting = false) {
         fill: '#fff',
         strokeWidth: 2,
       },
-      ...docIconAttrs('doclabel', { 'x': -10, 'ref-y': -4 }),
-      ...docIconAttrs('doccircle', { 'cx': -18, 'cy': 5 }),
+      ...docIconAttrs('doclabel', { 'x': 28, 'ref-y': 0 }),
+      ...docIconAttrs('doccircle', { 'cx': 12, 'cy': 12 }),
     },
   });
 

diff --git a/src/components/nodes/poolLane/poolLane.vue b/src/components/nodes/poolLane/poolLane.vue
@@ -80,7 +80,7 @@ export default {
     this.shape.component = this;
     this.shape.addTo(this.graph);
 
-    this.initDocumentingIcons({ labelX: '995px', labelY: '-4px' });
+    this.initDocumentingIcons({ labelX: `${bounds.width + 7}px`, labelY: '-4px' });
 
 
     if (!this.planeElements.includes(this.node.diagram)) {

diff --git a/src/components/nodes/poolLane/poolLaneShape.js b/src/components/nodes/poolLane/poolLaneShape.js
@@ -3,18 +3,18 @@ import { docIconMarkup, docIconAttrs, docIconAdaptMarkup } from '@/mixins/docume
 
 export function getPoolLine(bounds, forDocumenting = false) {
   let markup = [
+    ...shapes.standard.Rectangle.prototype.markup,
     docIconMarkup('doccircle'),
     docIconMarkup('doclabel'),
-    ...shapes.standard.Rectangle.prototype.markup,
   ];
 
   markup = docIconAdaptMarkup(markup, forDocumenting);
 
   const PoolLaneClass = shapes.standard.Rectangle.define('processmaker.modeler.bpmn.poolLane', {
     markup,
     attrs: {
-      ...docIconAttrs('doclabel', { 'x': -108, 'ref-y': 5 }),
-      ...docIconAttrs('doccircle', { 'cx': bounds.width  + 22, 'cy': 5 }),
+      ...docIconAttrs('doclabel', { 'x': -20, 'y':22 }),
+      ...docIconAttrs('doccircle', { 'cx': bounds.width  - 12, 'cy': 12 }),
     },
   });
 

diff --git a/src/mixins/linkEditing.js b/src/mixins/linkEditing.js
@@ -443,7 +443,7 @@ export default {
       if (['processmaker-modeler-pool', 'processmaker-modeler-lane']
         .some(item => item === view.model.component.$options.propsData.node.type)
       ) {
-        const cursorClientCoords = this.paper.clientToLocalPoint(pos.x, pos.y);
+        const cursorClientCoords = this.paper.clientToLocalPoint(evt.clientX, evt.clientY);
         const circlePosX = view.model.attributes.attrs.doccircle.cx + view.model.component.shape.attributes.position.x;
         const circlePosY = view.model.attributes.attrs.doccircle.cy + view.model.component.shape.attributes.position.y;
         const distance = Math.sqrt((