Skip to content

Commit c0a6541

Browse files
author
pipeline
committed
v25.1.41 is released
1 parent bd485ea commit c0a6541

File tree

168 files changed

+3095
-1542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+3095
-1542
lines changed

Diff for: ‎controls/barcodegenerator/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 25.1.40 (2024-04-16)
5+
## 25.1.41 (2024-04-23)
66

77
### Barcode
88

Diff for: ‎controls/calendars/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-calendars",
3-
"version": "25.1.39",
3+
"version": "25.1.40",
44
"description": "A complete package of date or time components with built-in features such as date formatting, inline editing, multiple (range) selection, range restriction, month and year selection, strict mode, and globalization.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

Diff for: ‎controls/circulargauge/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## [Unreleased]
66

7-
## 25.1.40 (2024-04-16)
7+
## 25.1.41 (2024-04-23)
88

99
### Circular Gauge
1010

Diff for: ‎controls/diagrams/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
## [Unreleased]
44

5+
## 25.1.41 (2024-04-23)
6+
7+
### Diagram
8+
9+
#### Bug Fixes
10+
11+
- `#FB52256` - Now, dropping child node inside the subprocess node within the swimlane is working properly.
12+
- `#FB52022` - Now, the swimlane highlighter rendered properly while dropping opposite orientation lane and the lane added to swimlane properly.
13+
- `#I573514` - Now, the connector annotation text updated properly while adjusting its end points dynamically.
14+
- `#FB52023` - Now, The Swimlane helper guides are shown at correct position with Zoom Changes.
15+
516
## 25.1.40 (2024-04-16)
617

718
### Diagram

Diff for: ‎controls/diagrams/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-diagrams",
3-
"version": "25.1.39",
3+
"version": "25.1.40",
44
"description": "Feature-rich diagram control to create diagrams like flow charts, organizational charts, mind maps, and BPMN diagrams. Its rich feature set includes built-in shapes, editing, serializing, exporting, printing, overview, data binding, and automatic layouts.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

Diff for: ‎controls/diagrams/spec/diagram/interaction/annotation-editing.spec.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ describe('Diagram Control', () => {
154154
(document.getElementById(diagram.element.id + '_editBox') as HTMLTextAreaElement).value = 'editLabel';
155155
let position = document.getElementById(diagram.element.id + '_editBox');
156156
let labelPosition: any = position.getBoundingClientRect();
157-
expect((Math.round(labelPosition.x) === 548 || Math.round(labelPosition.x) === 555 ) && (Math.round(labelPosition.y) === 184 || Math.round(labelPosition.y) === 224 || Math.round(labelPosition.y) === 232)).toBe(true);
157+
console.log('labelPosition.x' , Math.round(labelPosition.x));
158+
expect((Math.round(labelPosition.x) === 548 || Math.round(labelPosition.x) === 555 || Math.round(labelPosition.x) === 553 ) && (Math.round(labelPosition.y) === 184 || Math.round(labelPosition.y) === 224 || Math.round(labelPosition.y) === 232)).toBe(true);
158159
done();
159160
});
160161
it('Checking textediting when text box change using keydown', (done: Function) => {

Diff for: ‎controls/diagrams/spec/diagram/objects/bpmntransactions.spec.ts

+104
Original file line numberDiff line numberDiff line change
@@ -249,4 +249,108 @@ describe('Diagram Control', () => {
249249
done()
250250
});
251251
});
252+
253+
describe('880814-Adding element to bpmn expanded subprocess located in swimlane throws an exception', () => {
254+
let diagram: Diagram;
255+
let ele: HTMLElement;
256+
let mouseEvents: MouseEvents = new MouseEvents();
257+
258+
beforeAll((): void => {
259+
const isDef = (o: any) => o !== undefined && o !== null;
260+
if (!isDef(window.performance)) {
261+
console.log("Unsupported environment, window.performance.memory is unavailable");
262+
this.skip(); //Skips test (in Chai)
263+
return;
264+
}
265+
ele = createElement('div', { id: 'diagramSub-Swim' });
266+
document.body.appendChild(ele);
267+
let nodes: NodeModel[] = [
268+
{
269+
id: 'Start',
270+
height: 50, width: 50,
271+
margin: { left: 30, top: 30 },
272+
shape: {
273+
type: 'Bpmn',
274+
shape: 'Event',
275+
event: { event: 'Start' },
276+
},
277+
},
278+
{
279+
id: 'swimlane',
280+
shape: {
281+
type: 'SwimLane',
282+
header: {
283+
annotation: { content: 'ONLINE PURCHASE STATUS', style: { fill: '#111111' } },
284+
height: 50, style: { fontSize: 11 },
285+
orientation: 'Horizontal',
286+
},
287+
lanes: [
288+
{
289+
id: 'stackCanvas1',
290+
header: {
291+
annotation: { content: 'CUSTOMER' }, width: 50,
292+
style: { fontSize: 11 }
293+
},
294+
height: 200,
295+
children:[
296+
{
297+
id: 'subProcess',
298+
width: 300,
299+
height: 100,
300+
constraints: NodeConstraints.Default | NodeConstraints.AllowDrop,
301+
margin: { left: 60, top: 20 },
302+
shape: {
303+
shape: 'Activity',
304+
type: 'Bpmn',
305+
activity: {
306+
activity: 'SubProcess',
307+
subProcess: {
308+
collapsed: false,
309+
processes: ['Start']
310+
},
311+
},
312+
},
313+
},
314+
]
315+
},
316+
],
317+
phases: [
318+
{
319+
id: 'phase1', offset: 170,
320+
header: { content: { content: 'Phase' } }
321+
},
322+
],
323+
phaseSize: 20,
324+
},
325+
offsetX: 520, offsetY: 270,
326+
height: 100,
327+
width: 750
328+
},
329+
];
330+
diagram = new Diagram({
331+
width: 1200, height: 1200, nodes: nodes,
332+
});
333+
334+
diagram.appendTo('#diagramSub-Swim');
335+
});
336+
337+
afterAll((): void => {
338+
diagram.destroy();
339+
ele.remove();
340+
});
341+
342+
it('drag and drop the process child from subProcess to diagram ', (done: Function) => {
343+
let diagramCanvas: HTMLElement = document.getElementById(diagram.element.id + 'content');
344+
let node = diagram.nameTable['subProcess'].wrapper;
345+
let obj = diagram.nameTable['subProcess'];
346+
mouseEvents.mouseDownEvent(diagramCanvas,node.bounds.center.x, node.bounds.center.y);
347+
mouseEvents.mouseMoveEvent(diagramCanvas,node.bounds.center.x + 150, node.bounds.center.y);
348+
mouseEvents.mouseMoveEvent(diagramCanvas,node.bounds.center.x + 300, node.bounds.center.y);
349+
mouseEvents.mouseMoveEvent(diagramCanvas,node.bounds.center.x + 600, node.bounds.center.y);
350+
mouseEvents.mouseMoveEvent(diagramCanvas,node.bounds.center.x + 700, node.bounds.center.y);
351+
mouseEvents.mouseUpEvent(diagramCanvas,node.bounds.center.x + 700, node.bounds.center.y);
352+
expect(obj.id === 'subProcess' && (obj.shape as BpmnShape).activity.subProcess.processes.length > 0).toBe(true);
353+
done()
354+
});
355+
});
252356
});

Diff for: ‎controls/diagrams/spec/diagram/objects/connector.spec.ts

+97-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Diagram } from '../../../src/diagram/diagram';
33
import { ConnectorModel } from '../../../src/diagram/objects/connector-model';
44
import { NodeModel, BasicShapeModel } from '../../../src/diagram/objects/node-model';
55
import { PathPortModel, PointPortModel } from '../../../src/diagram/objects/port-model';
6-
import { Segments, accessibilityElement, ConnectorConstraints, NodeConstraints, PortVisibility, PortConstraints, ControlPointsVisibility } from '../../../src/diagram/enum/enum';
6+
import { Segments, accessibilityElement, ConnectorConstraints, NodeConstraints, PortVisibility, PortConstraints, ControlPointsVisibility, AnnotationConstraints } from '../../../src/diagram/enum/enum';
77
import { Connector } from '../../../src/diagram/objects/connector';
88
import { StraightSegmentModel } from '../../../src/diagram/objects/connector-model';
99
import { PathElement } from '../../../src/diagram/core/elements/path-element';
@@ -2347,4 +2347,100 @@ describe('Diagram Control', () => {
23472347
done();
23482348
});
23492349
});
2350+
2351+
describe('881512-Wrapping of the connector annotation at run time not working properly.', () => {
2352+
let diagram: Diagram;
2353+
let ele: HTMLElement;
2354+
let count: number = 0;
2355+
let mouseEvents: MouseEvents = new MouseEvents();
2356+
beforeAll((): void => {
2357+
const isDef = (o: any) => o !== undefined && o !== null;
2358+
if (!isDef(window.performance)) {
2359+
console.log("Unsupported environment, window.performance.memory is unavailable");
2360+
this.skip(); //Skips test (in Chai)
2361+
return;
2362+
}
2363+
ele = createElement('div', { id: 'diagramConnectorWrap' });
2364+
document.body.appendChild(ele);
2365+
2366+
let connectors: ConnectorModel[] = [
2367+
{
2368+
id: 'connector1', sourcePoint: { x: 280, y: 300 }, targetPoint: { x: 400, y: 300 }, annotations: [ {content: 'This is very longlonglong text',style: {
2369+
textWrapping: 'Wrap',
2370+
fontSize: 8,
2371+
color: 'Black',
2372+
},
2373+
verticalAlignment: 'Top',
2374+
horizontalAlignment: 'Center',
2375+
constraints: AnnotationConstraints.ReadOnly,
2376+
type: 'Path',}]
2377+
},
2378+
{
2379+
id: 'connector2', sourceID:'node1', targetID:'node2', annotations: [ {content: 'This is very longlonglong text',style: {
2380+
textWrapping: 'Wrap',
2381+
fontSize: 8,
2382+
color: 'Black',
2383+
},
2384+
verticalAlignment: 'Top',
2385+
horizontalAlignment: 'Center',
2386+
constraints: AnnotationConstraints.ReadOnly,
2387+
type: 'Path',}]
2388+
},
2389+
];
2390+
let nodes: NodeModel[] = [
2391+
{
2392+
id: 'node1', width: 70, height: 50, offsetX: 100, offsetY: 100, annotations: [ { content: 'Node1'}]
2393+
},
2394+
{
2395+
id: 'node2', width: 70, height: 50, offsetX: 270, offsetY: 100, annotations: [ { content: 'Node2'}]
2396+
},
2397+
];
2398+
diagram = new Diagram({
2399+
2400+
width: '1000px', height: '500px', nodes: nodes, connectors: connectors,
2401+
2402+
});
2403+
diagram.appendTo('#diagramConnectorWrap');
2404+
2405+
});
2406+
afterAll((): void => {
2407+
diagram.destroy();
2408+
ele.remove();
2409+
});
2410+
it('Changing node offset dynamically and checking connector annotation size', function (done: Function) {
2411+
let connector = diagram.nameTable['connector2'];
2412+
let preTextBounds = connector.wrapper.children[3].bounds;
2413+
let node = diagram.nodes[0];
2414+
node.offsetX = 130;
2415+
diagram.dataBind();
2416+
let curTextBounds = connector.wrapper.children[3].bounds;
2417+
expect(preTextBounds.width !== curTextBounds.width && curTextBounds.width < preTextBounds.width).toBe(true);
2418+
done();
2419+
});
2420+
it('Changing connector source point dynamically and checking connector annotation size', function (done: Function) {
2421+
let connector = diagram.nameTable['connector1'];
2422+
let preTextBounds = connector.wrapper.children[3].bounds;
2423+
connector.sourcePoint= { x:320,y:300};
2424+
diagram.dataBind();
2425+
let curTextBounds = connector.wrapper.children[3].bounds;
2426+
expect(preTextBounds.width !== curTextBounds.width && curTextBounds.width < preTextBounds.width).toBe(true);
2427+
done();
2428+
});
2429+
it('Changing node offset using mouse events and checking connector annotation size', function (done: Function) {
2430+
let connector = diagram.nameTable['connector2'];
2431+
let preTextBounds = connector.wrapper.children[3].bounds;
2432+
let diagramCanvas = document.getElementById(diagram.element.id + 'content');
2433+
let node = diagram.nodes[1];
2434+
mouseEvents.clickEvent(diagramCanvas, node.offsetX, node.offsetY);
2435+
mouseEvents.mouseMoveEvent(diagramCanvas, node.offsetX, node.offsetY);
2436+
mouseEvents.mouseDownEvent(diagramCanvas, node.offsetX, node.offsetY);
2437+
mouseEvents.mouseMoveEvent(diagramCanvas, node.offsetX + 30, node.offsetY);
2438+
mouseEvents.mouseMoveEvent(diagramCanvas, node.offsetX + 80, node.offsetY);
2439+
mouseEvents.mouseMoveEvent(diagramCanvas, node.offsetX + 120, node.offsetY);
2440+
mouseEvents.mouseUpEvent(diagramCanvas, node.offsetX + 120, node.offsetY);
2441+
let curTextBounds = connector.wrapper.children[3].bounds;
2442+
expect(preTextBounds.width !== curTextBounds.width && curTextBounds.width > preTextBounds.width).toBe(true);
2443+
done();
2444+
});
2445+
});
23502446
});

0 commit comments

Comments
 (0)