sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(BpmnRules) allow move of muliple selected elements across pools 

The move was prevented by MessageFlow element being included in the moved selection.
The restrictions on MessageFlow canDrop rules were eased to allow such moves.

Closes #524
This commit is contained in:
robajz 2016-09-22 19:41:12 +01:00 committed by pedesen
parent 466ec559d9
commit 5441b2e09e
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/rules/BpmnRules.js
View File

@ -420,7 +420,9 @@ function canDrop(element, target, position) {
} }
if (is(element, 'bpmn:MessageFlow')) { if (is(element, 'bpmn:MessageFlow')) {
return is(target, 'bpmn:Collaboration'); return is(target, 'bpmn:Collaboration')
|| element.source.parent == target
|| element.target.parent == target;
} }
return false; return false;

37
test/spec/features/rules/BpmnRules.multiSelectionPools.bpmn Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
<bpmn:collaboration id="Collaboration_01hoeuv">
<bpmn:participant id="Participant_1" name="Participant_1" processRef="Process_1" />
<bpmn:participant id="Participant_2" name="Participant_2" processRef="Process_2" />
<bpmn:messageFlow id="MessageFlow_1v3u2fb" sourceRef="Task_A" targetRef="Task_B" />
</bpmn:collaboration>
<bpmn:process id="Process_1" isExecutable="false">
<bpmn:task id="Task_A" name="Task_A" />
</bpmn:process>
<bpmn:process id="Process_2">
<bpmn:task id="Task_B" name="Task_B" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_01hoeuv">
<bpmndi:BPMNShape id="Participant_1_di" bpmnElement="Participant_1">
<dc:Bounds x="114" y="49" width="600" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_2_di" bpmnElement="Participant_2">
<dc:Bounds x="114" y="370" width="600" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_B_di" bpmnElement="Task_B">
<dc:Bounds x="277" y="436" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_A_di" bpmnElement="Task_A">
<dc:Bounds x="277" y="97" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_1v3u2fb_di" bpmnElement="MessageFlow_1v3u2fb">
<di:waypoint xsi:type="dc:Point" x="327" y="177" />
<di:waypoint xsi:type="dc:Point" x="327" y="436" />
<bpmndi:BPMNLabel>
<dc:Bounds x="300" y="275" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

25
test/spec/features/rules/BpmnRulesSpec.js
View File

@ -890,6 +890,31 @@ describe('features/modeling/rules - BpmnRules', function() {
}); });
describe('multi selection move', function() {
var testXML = require('./BpmnRules.multiSelectionPools.bpmn');
beforeEach(bootstrapModeler(testXML, { modules: testModules }));
it('is allowed across pools when parent does not change', inject(function(elementRegistry) {
// when
var elements = [
elementRegistry.get('Task_A'),
elementRegistry.get('Task_B'),
elementRegistry.get('MessageFlow_1v3u2fb')
];
var target = 'Participant_1';
// then
expectCanMove(elements, target, {
attach: false,
move: true
});
}));
});
describe('event move', function() { describe('event move', function() {
var testXML = require('../../../fixtures/bpmn/boundary-events.bpmn'); var testXML = require('../../../fixtures/bpmn/boundary-events.bpmn');