@genexus/diagram-editors 0.5.27 → 0.8.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/{editor-27988eb7.js → editor-386996a2.js} +248 -248
- package/dist/cjs/gx-bpmn-editor.cjs.entry.js +69 -124
- package/dist/cjs/gx-report-layout-editor.cjs.entry.js +3 -18
- package/dist/collection/components/bpmn/bpmn-editor-component.js +1 -3
- package/dist/collection/components/bpmn/bpmn-editor.js +10 -27
- package/dist/collection/components/bpmn/bpmn-graph.js +19 -35
- package/dist/collection/components/bpmn/layout.js +0 -2
- package/dist/collection/components/bpmn/shapes/activity-shape.js +0 -21
- package/dist/collection/components/bpmn/shapes/connector-shape.js +0 -1
- package/dist/collection/components/bpmn/shapes/event-shape.js +4 -3
- package/dist/collection/components/bpmn/shapes/gateway-shape.js +2 -1
- package/dist/collection/components/bpmn/style-tokens.js +4 -0
- package/dist/collection/components/common/cell.js +1 -1
- package/dist/collection/components/common/common-style-tokens.js +1 -1
- package/dist/collection/components/common/connection-handler.js +3 -33
- package/dist/collection/components/common/editor.js +7 -55
- package/dist/collection/components/common/event-converter.js +3 -3
- package/dist/collection/components/common/graph-handler.js +0 -14
- package/dist/collection/components/common/graph.js +235 -90
- package/dist/collection/components/common/mx.js +0 -51
- package/dist/collection/components/common/panning-handler.js +0 -2
- package/dist/collection/components/report/report-editor-component.js +1 -1
- package/dist/collection/components/report/report-editor.js +1 -12
- package/dist/collection/components/report/report-graph.js +0 -2
- package/dist/collection/components/report/shapes/rectangle-shape.js +0 -2
- package/dist/diagram-editors/diagram-editors.esm.js +1 -1
- package/dist/diagram-editors/{p-dc5159a2.system.entry.js → p-009a6590.system.entry.js} +1 -1
- package/dist/diagram-editors/{p-534c30c2.entry.js → p-0cbf75ed.entry.js} +1 -1
- package/dist/diagram-editors/{p-a5f6012d.js → p-52c75d65.js} +1 -1
- package/dist/diagram-editors/p-60b39e5b.system.entry.js +1 -0
- package/dist/diagram-editors/{p-99c06652.system.js → p-80e1f1a5.system.js} +1 -1
- package/dist/diagram-editors/p-e435d3dc.system.js +1 -1
- package/dist/diagram-editors/p-f022f8f7.entry.js +1 -0
- package/dist/esm/{editor-786b0cd7.js → editor-4d1ececd.js} +248 -248
- package/dist/esm/gx-bpmn-editor.entry.js +69 -124
- package/dist/esm/gx-report-layout-editor.entry.js +3 -18
- package/dist/esm-es5/{editor-786b0cd7.js → editor-4d1ececd.js} +250 -245
- package/dist/esm-es5/gx-bpmn-editor.entry.js +67 -122
- package/dist/esm-es5/gx-report-layout-editor.entry.js +3 -18
- package/dist/types/components/bpmn/bpmn-graph.d.ts +1 -0
- package/dist/types/components/bpmn/style-tokens.d.ts +5 -0
- package/dist/types/components/common/graph.d.ts +7 -0
- package/dist/types/components/common/interop-types.d.ts +6 -0
- package/package.json +3 -3
- package/dist/diagram-editors/p-1ed04dc8.system.entry.js +0 -1
- package/dist/diagram-editors/p-5d0e2e7a.entry.js +0 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
const index = require('./index-e8fa91cf.js');
|
|
6
|
-
const editor = require('./editor-
|
|
6
|
+
const editor = require('./editor-386996a2.js');
|
|
7
7
|
|
|
8
8
|
const CellTypes = {
|
|
9
9
|
TASK: 'Task',
|
|
@@ -23,9 +23,7 @@ const CellTypes = {
|
|
|
23
23
|
class StackLayout extends editor.mx.mxStackLayout {
|
|
24
24
|
constructor(graph) {
|
|
25
25
|
super(graph, false, undefined, undefined, undefined, undefined);
|
|
26
|
-
// Makes sure all children fit into the parent swimlane
|
|
27
26
|
this.resizeParent = true;
|
|
28
|
-
// Applies the size to children if parent size changes
|
|
29
27
|
this.fill = true;
|
|
30
28
|
}
|
|
31
29
|
isVertexIgnored(cell) {
|
|
@@ -124,6 +122,40 @@ var ArtifactProperties;
|
|
|
124
122
|
ArtifactProperties["Name"] = "PWFArtifactName";
|
|
125
123
|
})(ArtifactProperties || (ArtifactProperties = {}));
|
|
126
124
|
|
|
125
|
+
var StyleTokens;
|
|
126
|
+
(function (StyleTokens) {
|
|
127
|
+
StyleTokens.ACTIVITY_SIZE = { width: 130, height: 50 };
|
|
128
|
+
StyleTokens.EVENT_SIZE = { width: 32, height: 32 };
|
|
129
|
+
StyleTokens.ATTACHED_EVENT_SIZE = { width: 24, height: 24 };
|
|
130
|
+
StyleTokens.GATEWAY_SIZE = { width: 40, height: 40 };
|
|
131
|
+
StyleTokens.STROKE_WIDTH_THICK = 4;
|
|
132
|
+
StyleTokens.STROKE_WIDTH_MEDIUM = 2;
|
|
133
|
+
StyleTokens.STROKE_WIDTH_LIGHT = 1;
|
|
134
|
+
StyleTokens.DEFAULT_STROKE_COLOR = '#a4a5a6';
|
|
135
|
+
StyleTokens.BACKGROUND_COLOR = 'var(--color-background)';
|
|
136
|
+
StyleTokens.DEFAULT_STROKE_WIDTH = StyleTokens.STROKE_WIDTH_LIGHT;
|
|
137
|
+
StyleTokens.DEFAULT_BACKGROUND_COLOR = '#1d1e22';
|
|
138
|
+
StyleTokens.DEFAULT_FONT_COLOR = '#ffffff';
|
|
139
|
+
StyleTokens.DEFAULT_FONT_SIZE = '12';
|
|
140
|
+
StyleTokens.LABEL_BACKGROUND_COLOR = 'transparent';
|
|
141
|
+
StyleTokens.TASK_NONE_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
142
|
+
StyleTokens.TASK_NONE_STROKE_COLOR = StyleTokens.DEFAULT_STROKE_COLOR;
|
|
143
|
+
StyleTokens.TASK_USER_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
144
|
+
StyleTokens.TASK_USER_STROKE_COLOR = '#96e3b0';
|
|
145
|
+
StyleTokens.TASK_SCRIPT_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
146
|
+
StyleTokens.TASK_SCRIPT_STROKE_COLOR = '#5bb2ff';
|
|
147
|
+
StyleTokens.SUB_PROCESS_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
148
|
+
StyleTokens.SUB_PROCESS_STROKE_COLOR = '#f89491';
|
|
149
|
+
StyleTokens.GATEWAY_STROKE_COLOR = '#2dcf76';
|
|
150
|
+
StyleTokens.GATEWAY_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
151
|
+
StyleTokens.EVENT_START_STROKE_COLOR = '#87cf2d';
|
|
152
|
+
StyleTokens.EVENT_INTERMEDIATE_STROKE_COLOR = '#bbbbbb';
|
|
153
|
+
StyleTokens.EVENT_END_STROKE_COLOR = '#ff261b';
|
|
154
|
+
StyleTokens.CONNECTOR_STROKE_COLOR = '#e8e8e9';
|
|
155
|
+
StyleTokens.CONNECTOR_CONDITIONAL_COLOR = '#96e3b0';
|
|
156
|
+
StyleTokens.CONNECTOR_OPTIONAL_COLOR = '#5bb2ff';
|
|
157
|
+
})(StyleTokens || (StyleTokens = {}));
|
|
158
|
+
|
|
127
159
|
class BpmnGraph extends editor.Graph {
|
|
128
160
|
constructor(options) {
|
|
129
161
|
super(options);
|
|
@@ -131,8 +163,6 @@ class BpmnGraph extends editor.Graph {
|
|
|
131
163
|
this.swimlaneManager = new SwimlaneManager(this, false, undefined, undefined);
|
|
132
164
|
this.layoutManager = new LayoutManager(this);
|
|
133
165
|
this.addListener(editor.mx.mxEvent.CELL_CONNECTED, (_, evt) => this._onCellConnected(evt));
|
|
134
|
-
// This event handler fixes the problem when user throws an element over a Connectors that coresses Lanes. The parent assigned to the element is the Pool
|
|
135
|
-
// and the correct parent should be the Lane that encoloses the element's bounds.
|
|
136
166
|
this.addListener(editor.mx.mxEvent.SPLIT_EDGE, (_, evt) => this._onSplitEdge(evt));
|
|
137
167
|
}
|
|
138
168
|
convertLogicalPointToPixels(cell, point) {
|
|
@@ -150,11 +180,11 @@ class BpmnGraph extends editor.Graph {
|
|
|
150
180
|
absOffset.x -= t.x;
|
|
151
181
|
absOffset.y -= t.y;
|
|
152
182
|
}
|
|
153
|
-
return absOffset;
|
|
183
|
+
return absOffset;
|
|
154
184
|
}
|
|
155
185
|
}
|
|
156
186
|
convertLogicalOffsetToPixels(cell, point) {
|
|
157
|
-
let labelPos = point;
|
|
187
|
+
let labelPos = point;
|
|
158
188
|
let cx, cy;
|
|
159
189
|
if (cell.isEdge()) {
|
|
160
190
|
let vstate = this.view.getState(cell, true);
|
|
@@ -178,25 +208,6 @@ class BpmnGraph extends editor.Graph {
|
|
|
178
208
|
y: labelPos.y - cy
|
|
179
209
|
};
|
|
180
210
|
}
|
|
181
|
-
// setCellValue(cell: mxgraph.mxCell, value: Object) {
|
|
182
|
-
// if (!this.settingState && cell.isEdge()) {
|
|
183
|
-
// let style = this.getCellStyle(cell);
|
|
184
|
-
// let cstyle = Object.assign({}, style);
|
|
185
|
-
// cstyle.edgeStyle = mx.mxConstants.STYLE_NOEDGESTYLE;
|
|
186
|
-
// let strStyle = [];
|
|
187
|
-
// for (let key of Object.keys(cstyle)) {
|
|
188
|
-
// strStyle.push(`${key}=${cstyle[key]}`);
|
|
189
|
-
// }
|
|
190
|
-
// //console.log('CELL Style', style, strStyle.join(';'));
|
|
191
|
-
// this.model.beginUpdate();
|
|
192
|
-
// this.setCellStyle(strStyle.join(';'), [cell]);
|
|
193
|
-
// let geo = cell.getGeometry().clone();
|
|
194
|
-
// geo.points = null;
|
|
195
|
-
// this.model.setGeometry(cell, geo);
|
|
196
|
-
// this.model.endUpdate();
|
|
197
|
-
// }
|
|
198
|
-
// super.setCellValue(cell, value);
|
|
199
|
-
// }
|
|
200
211
|
isSwimlane(cell) {
|
|
201
212
|
return editor.Utils.cellOfType(cell, [
|
|
202
213
|
CellTypes.TASK,
|
|
@@ -214,12 +225,7 @@ class BpmnGraph extends editor.Graph {
|
|
|
214
225
|
isCellFoldable(cell) {
|
|
215
226
|
return false;
|
|
216
227
|
}
|
|
217
|
-
// isConstrainChild(cell) {
|
|
218
|
-
// console.log('Cons child', cell);
|
|
219
|
-
// return false;
|
|
220
|
-
// }
|
|
221
228
|
dblClick(evt, cell) {
|
|
222
|
-
//console.log('EVT', evt);
|
|
223
229
|
super.dblClick(evt, cell);
|
|
224
230
|
}
|
|
225
231
|
isValidRoot(cell) {
|
|
@@ -227,20 +233,30 @@ class BpmnGraph extends editor.Graph {
|
|
|
227
233
|
}
|
|
228
234
|
constrainChild(cell) {
|
|
229
235
|
let parent = cell.getParent();
|
|
230
|
-
if (editor.Utils.cellOfType(cell, CellTypes.INTERMEDIATE_EVENT)
|
|
231
|
-
editor.Utils.cellOfType(parent, [CellTypes.TASK, CellTypes.EXPANDED_EMBEDDED_SUB_PROCESS]))
|
|
232
|
-
|
|
236
|
+
if (editor.Utils.cellOfType(cell, CellTypes.INTERMEDIATE_EVENT)) {
|
|
237
|
+
if (editor.Utils.cellOfType(parent, [CellTypes.TASK, CellTypes.EMBEDDED_SUB_PROCESS, CellTypes.EXPANDED_EMBEDDED_SUB_PROCESS]))
|
|
238
|
+
this._constrainAttachedEvent(cell);
|
|
239
|
+
else
|
|
240
|
+
this._constrainNonAttachedEvent(cell);
|
|
233
241
|
}
|
|
234
242
|
else if (editor.Utils.cellOfType(parent, CellTypes.EXPANDED_EMBEDDED_SUB_PROCESS) && editor.Utils.cellOfType(cell, CellTypes.SUB_PROCESS_CHILDREN_SLOT)) {
|
|
235
243
|
this._constrainSubProcessChildrenSlot(cell);
|
|
236
244
|
}
|
|
237
|
-
|
|
238
|
-
|
|
245
|
+
}
|
|
246
|
+
_constrainNonAttachedEvent(cell) {
|
|
247
|
+
if (cell instanceof editor.Cell) {
|
|
248
|
+
let geo = cell.getGeometry().clone();
|
|
249
|
+
geo.width = cell.descriptor.size.width;
|
|
250
|
+
geo.height = cell.descriptor.size.height;
|
|
251
|
+
this.model.setGeometry(cell, geo);
|
|
252
|
+
}
|
|
239
253
|
}
|
|
240
254
|
_constrainAttachedEvent(cell) {
|
|
241
255
|
let parent = cell.getParent();
|
|
242
256
|
let pgeo = parent.getGeometry();
|
|
243
257
|
let geo = cell.getGeometry().clone();
|
|
258
|
+
geo.width = StyleTokens.ATTACHED_EVENT_SIZE.width;
|
|
259
|
+
geo.height = StyleTokens.ATTACHED_EVENT_SIZE.height;
|
|
244
260
|
let pMidX = pgeo.width / 2;
|
|
245
261
|
let pMidY = pgeo.height / 2;
|
|
246
262
|
let midX = geo.width / 2;
|
|
@@ -321,8 +337,6 @@ class BpmnGraph extends editor.Graph {
|
|
|
321
337
|
pt.y += t.y;
|
|
322
338
|
let lane = this.getCellAt(pt.x, pt.y, undefined, true, false, (c) => !editor.Utils.cellOfType(c.cell, CellTypes.LANE));
|
|
323
339
|
if (lane) {
|
|
324
|
-
// TODO: fix this if possible. This is done delayed becuase otherwose Cell position continues to be relative to de Pool instead of the Lane.
|
|
325
|
-
// The problem with this solution is that this operation generates another entry in the undo stack, in other words it belongs to another transaction.
|
|
326
340
|
setTimeout(() => {
|
|
327
341
|
this.moveCells([cell], 0, 0, false, lane);
|
|
328
342
|
});
|
|
@@ -334,43 +348,7 @@ class BpmnGraph extends editor.Graph {
|
|
|
334
348
|
}
|
|
335
349
|
BpmnGraph.EXPANDED_SUB_PROCESS_MARGIN = 18;
|
|
336
350
|
|
|
337
|
-
var StyleTokens;
|
|
338
|
-
(function (StyleTokens) {
|
|
339
|
-
StyleTokens.STROKE_WIDTH_THICK = 4;
|
|
340
|
-
StyleTokens.STROKE_WIDTH_MEDIUM = 2;
|
|
341
|
-
StyleTokens.STROKE_WIDTH_LIGHT = 1;
|
|
342
|
-
StyleTokens.DEFAULT_STROKE_COLOR = '#a4a5a6';
|
|
343
|
-
StyleTokens.BACKGROUND_COLOR = 'var(--color-background)';
|
|
344
|
-
StyleTokens.DEFAULT_STROKE_WIDTH = StyleTokens.STROKE_WIDTH_LIGHT;
|
|
345
|
-
StyleTokens.DEFAULT_BACKGROUND_COLOR = '#1d1e22';
|
|
346
|
-
StyleTokens.DEFAULT_FONT_COLOR = '#ffffff';
|
|
347
|
-
StyleTokens.DEFAULT_FONT_SIZE = '12';
|
|
348
|
-
StyleTokens.LABEL_BACKGROUND_COLOR = 'transparent';
|
|
349
|
-
StyleTokens.TASK_NONE_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
350
|
-
StyleTokens.TASK_NONE_STROKE_COLOR = StyleTokens.DEFAULT_STROKE_COLOR;
|
|
351
|
-
StyleTokens.TASK_USER_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
352
|
-
StyleTokens.TASK_USER_STROKE_COLOR = '#96e3b0';
|
|
353
|
-
StyleTokens.TASK_SCRIPT_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
354
|
-
StyleTokens.TASK_SCRIPT_STROKE_COLOR = '#5bb2ff';
|
|
355
|
-
StyleTokens.SUB_PROCESS_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
356
|
-
StyleTokens.SUB_PROCESS_STROKE_COLOR = '#f89491';
|
|
357
|
-
StyleTokens.GATEWAY_STROKE_COLOR = '#2dcf76';
|
|
358
|
-
StyleTokens.GATEWAY_BACKGROUND_COLOR = 'rgb(40,41,45)';
|
|
359
|
-
StyleTokens.EVENT_START_STROKE_COLOR = '#87cf2d';
|
|
360
|
-
StyleTokens.EVENT_INTERMEDIATE_STROKE_COLOR = '#bbbbbb';
|
|
361
|
-
StyleTokens.EVENT_END_STROKE_COLOR = '#ff261b';
|
|
362
|
-
StyleTokens.CONNECTOR_STROKE_COLOR = '#e8e8e9';
|
|
363
|
-
StyleTokens.CONNECTOR_CONDITIONAL_COLOR = '#96e3b0';
|
|
364
|
-
StyleTokens.CONNECTOR_OPTIONAL_COLOR = '#5bb2ff';
|
|
365
|
-
})(StyleTokens || (StyleTokens = {}));
|
|
366
|
-
|
|
367
351
|
class ActivityShape extends editor.mx.mxShape {
|
|
368
|
-
// get constraints() {
|
|
369
|
-
// let c = new mx.mxConnectionConstraint(new mx.mxPoint(0.25, 0), true);
|
|
370
|
-
// // (<any>c).dx = 100;
|
|
371
|
-
// // (<any>c).dy = 100;
|
|
372
|
-
// return [c];
|
|
373
|
-
// }
|
|
374
352
|
paintBackground(c, x, y, w, h) {
|
|
375
353
|
this.paintBorder(c, x, y, w, h);
|
|
376
354
|
this.paintTypeIcon(c, x, y, w, h);
|
|
@@ -450,22 +428,8 @@ class ActivityShape extends editor.mx.mxShape {
|
|
|
450
428
|
d: "M8.54,8.45a4.2,4.2,0,1,0-1.08,0C4.92,8.61.09,9.85.09,12.63v3.28H15.91V12.63C15.91,9.85,11.08,8.61,8.54,8.45ZM4.8,4.3A3.2,3.2,0,1,1,8,7.5,3.21,3.21,0,0,1,4.8,4.3ZM14.91,14.91H1.09V12.63c0-2,4.47-3.2,6.91-3.2s6.91,1.21,6.91,3.2Z",
|
|
451
429
|
transform: `translate(5, 5)scale(${scale}, ${scale})`
|
|
452
430
|
});
|
|
453
|
-
// c.addSvgElement('path', {
|
|
454
|
-
// d: 'm 15,12 c 0.909,-0.845 1.594,-2.049 1.594,-3.385 0,-2.554 -1.805,-4.62199999 -4.357,-4.62199999 -2.55199998,0 -4.28799998,2.06799999 -4.28799998,4.62199999 0,1.348 0.974,2.562 1.89599998,3.405 -0.52899998,0.187 -5.669,2.097 -5.794,4.7560005 v 6.718 h 17 v -6.718 c 0,-2.2980005 -5.5279996,-4.5950005 -6.0509996,-4.7760005 zm -8,6 l 0,5.5 m 11,0 l 0,-5',
|
|
455
|
-
// transform: `scale(${scale}, ${scale})`
|
|
456
|
-
// });
|
|
457
|
-
// c.addSvgElement('path', {
|
|
458
|
-
// d: 'm 15,12 m 2.162,1.009 c 0,2.4470005 -2.158,4.4310005 -4.821,4.4310005 -2.66499998,0 -4.822,-1.981 -4.822,-4.4310005',
|
|
459
|
-
// transform: `scale(${scale}, ${scale})`
|
|
460
|
-
// });
|
|
461
|
-
// c.addSvgElement('path', {
|
|
462
|
-
// d: 'm 15,12 m -6.9,-3.80 c 0,0 2.25099998,-2.358 4.27399998,-1.177 2.024,1.181 4.221,1.537 4.124,0.965 -0.098,-0.57 -0.117,-3.79099999 -4.191,-4.13599999 -3.57499998,0.001 -4.20799998,3.36699999 -4.20699998,4.34799999 z',
|
|
463
|
-
// style: 'fill:transparent',
|
|
464
|
-
// transform: `scale(${scale}, ${scale})`
|
|
465
|
-
// });
|
|
466
431
|
}
|
|
467
432
|
paintSendIcon(c) {
|
|
468
|
-
//<path d="m 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6" style="fill: black; stroke-width: 1px; stroke: white;"></path>
|
|
469
433
|
let scale = this.getScale(c);
|
|
470
434
|
c.addSvgElement('path', {
|
|
471
435
|
d: 'm 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6',
|
|
@@ -566,7 +530,6 @@ class ActivityShape extends editor.mx.mxShape {
|
|
|
566
530
|
transform: `scale(${scale}, ${scale})`,
|
|
567
531
|
});
|
|
568
532
|
}
|
|
569
|
-
//m42.5,60 m 7,2 l 0,10 m -5,-5 l 10,0
|
|
570
533
|
getScale(c) {
|
|
571
534
|
let state = c.state;
|
|
572
535
|
return state.scale;
|
|
@@ -575,11 +538,11 @@ class ActivityShape extends editor.mx.mxShape {
|
|
|
575
538
|
|
|
576
539
|
class ConnectorShape extends editor.mx.mxConnector {
|
|
577
540
|
paintEdgeShape(c, pts) {
|
|
578
|
-
//c.setStrokeColor('pink');
|
|
579
541
|
super.paintEdgeShape(c, pts);
|
|
580
542
|
}
|
|
581
543
|
}
|
|
582
544
|
|
|
545
|
+
const EVENT_SHAPE_SIZE = 36;
|
|
583
546
|
class EventShape extends editor.mx.mxShape {
|
|
584
547
|
paintVertexShape(c, x, y, w, h) {
|
|
585
548
|
let cell = this.state.cell;
|
|
@@ -590,8 +553,8 @@ class EventShape extends editor.mx.mxShape {
|
|
|
590
553
|
let isThrow = editor.Utils.convertToBoolean(value[EventProperties.IsThrow]);
|
|
591
554
|
let interrupts = !attached || editor.Utils.convertToBoolean(isIntermediate && value[EventProperties.Interrupts]);
|
|
592
555
|
let scale = this.getScale(c);
|
|
593
|
-
let cx =
|
|
594
|
-
let cy =
|
|
556
|
+
let cx = EVENT_SHAPE_SIZE / 2 * scale;
|
|
557
|
+
let cy = EVENT_SHAPE_SIZE / 2 * scale;
|
|
595
558
|
switch (descriptor.id) {
|
|
596
559
|
case CellTypes.START_EVENT:
|
|
597
560
|
c.setStrokeColor(StyleTokens.EVENT_START_STROKE_COLOR);
|
|
@@ -606,7 +569,7 @@ class EventShape extends editor.mx.mxShape {
|
|
|
606
569
|
c.setStrokeWidth(StyleTokens.STROKE_WIDTH_THICK);
|
|
607
570
|
break;
|
|
608
571
|
}
|
|
609
|
-
c.beginSvgGroup({ transform: `matrix(1 0 0 1 ${x * scale} ${y * scale})` });
|
|
572
|
+
c.beginSvgGroup({ transform: `matrix(1 0 0 1 ${x * scale} ${y * scale}) scale(${w / EVENT_SHAPE_SIZE}, ${h / EVENT_SHAPE_SIZE})` });
|
|
610
573
|
c.addSvgElement('circle', {
|
|
611
574
|
cx,
|
|
612
575
|
cy,
|
|
@@ -801,12 +764,13 @@ class EventShape extends editor.mx.mxShape {
|
|
|
801
764
|
}
|
|
802
765
|
}
|
|
803
766
|
|
|
767
|
+
const GATEWAY_SHAPE_SIZE = 50;
|
|
804
768
|
class GatewayShape extends editor.mx.mxShape {
|
|
805
769
|
paintVertexShape(c, x, y, w, h) {
|
|
806
770
|
let scale = this.getScale(c);
|
|
807
771
|
c.setStrokeColor(StyleTokens.GATEWAY_STROKE_COLOR);
|
|
808
772
|
c.setFillColor(StyleTokens.GATEWAY_BACKGROUND_COLOR);
|
|
809
|
-
c.beginSvgGroup({ transform: `matrix(1 0 0 1 ${x * scale} ${y * scale})` });
|
|
773
|
+
c.beginSvgGroup({ transform: `matrix(1 0 0 1 ${x * scale} ${y * scale}) scale(${w / GATEWAY_SHAPE_SIZE}, ${h / GATEWAY_SHAPE_SIZE})` });
|
|
810
774
|
c.addSvgElement('polygon', {
|
|
811
775
|
points: '25,0 50,25 25,50 0,25',
|
|
812
776
|
style: 'fill-opacity: 0.95',
|
|
@@ -1093,7 +1057,7 @@ class BpmnEditor extends editor.Editor {
|
|
|
1093
1057
|
slotId: _SLOT_ACTIVITY_EVENTS,
|
|
1094
1058
|
labelAttribute: ActivityProperties.Name,
|
|
1095
1059
|
isVertex: true,
|
|
1096
|
-
size:
|
|
1060
|
+
size: StyleTokens.ACTIVITY_SIZE,
|
|
1097
1061
|
shape: ActivityShape,
|
|
1098
1062
|
radialMenu: {
|
|
1099
1063
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
@@ -1130,7 +1094,7 @@ class BpmnEditor extends editor.Editor {
|
|
|
1130
1094
|
slotId: _SLOT_ACTIVITY_EVENTS,
|
|
1131
1095
|
labelAttribute: ActivityProperties.Name,
|
|
1132
1096
|
isVertex: true,
|
|
1133
|
-
size:
|
|
1097
|
+
size: StyleTokens.ACTIVITY_SIZE,
|
|
1134
1098
|
shape: ActivityShape,
|
|
1135
1099
|
radialMenu: {
|
|
1136
1100
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
@@ -1164,7 +1128,6 @@ class BpmnEditor extends editor.Editor {
|
|
|
1164
1128
|
slotCell.style = `${editor.mx.mxConstants.STYLE_RESIZABLE}=0;${editor.mx.mxConstants.STYLE_FILLCOLOR}=transparent;${editor.mx.mxConstants.STYLE_STROKECOLOR}=transparent`;
|
|
1165
1129
|
slotCell.setConnectable(false);
|
|
1166
1130
|
slotCell.setCollapsed(true);
|
|
1167
|
-
//slotCell.visible = false;
|
|
1168
1131
|
cell.insert(slotCell);
|
|
1169
1132
|
return cell;
|
|
1170
1133
|
}
|
|
@@ -1215,11 +1178,11 @@ class BpmnEditor extends editor.Editor {
|
|
|
1215
1178
|
labelAttribute: EventProperties.Name,
|
|
1216
1179
|
icon: 'bpmn-icon-start-event-none',
|
|
1217
1180
|
isVertex: true,
|
|
1218
|
-
size:
|
|
1181
|
+
size: StyleTokens.EVENT_SIZE,
|
|
1219
1182
|
labelOffset: { width: 0, height: 30 },
|
|
1220
1183
|
shape: EventShape,
|
|
1221
1184
|
resizable: false,
|
|
1222
|
-
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE}
|
|
1185
|
+
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE};${editor.mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
1223
1186
|
radialMenu: {
|
|
1224
1187
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
1225
1188
|
customTools: {
|
|
@@ -1238,11 +1201,11 @@ class BpmnEditor extends editor.Editor {
|
|
|
1238
1201
|
labelAttribute: EventProperties.Name,
|
|
1239
1202
|
icon: 'bpmn-icon-intermediate-event-none',
|
|
1240
1203
|
isVertex: true,
|
|
1241
|
-
size:
|
|
1204
|
+
size: StyleTokens.EVENT_SIZE,
|
|
1242
1205
|
labelOffset: { width: 0, height: 30 },
|
|
1243
1206
|
shape: EventShape,
|
|
1244
1207
|
resizable: false,
|
|
1245
|
-
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE}`,
|
|
1208
|
+
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE};${editor.mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
1246
1209
|
radialMenu: {
|
|
1247
1210
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
1248
1211
|
customTools: {
|
|
@@ -1270,11 +1233,11 @@ class BpmnEditor extends editor.Editor {
|
|
|
1270
1233
|
labelAttribute: EventProperties.Name,
|
|
1271
1234
|
icon: 'bpmn-icon-end-event-none',
|
|
1272
1235
|
isVertex: true,
|
|
1273
|
-
size:
|
|
1236
|
+
size: StyleTokens.EVENT_SIZE,
|
|
1274
1237
|
labelOffset: { width: 0, height: 30 },
|
|
1275
1238
|
shape: EventShape,
|
|
1276
1239
|
resizable: false,
|
|
1277
|
-
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE}`,
|
|
1240
|
+
style: `defaultVertex;${editor.mx.mxConstants.STYLE_PERIMETER}=${editor.mx.mxConstants.PERIMETER_ELLIPSE};${editor.mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
1278
1241
|
radialMenu: {
|
|
1279
1242
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
1280
1243
|
customTools: {
|
|
@@ -1295,7 +1258,7 @@ class BpmnEditor extends editor.Editor {
|
|
|
1295
1258
|
icon: 'bpmn-icon-gateway-none',
|
|
1296
1259
|
labelAttribute: GatewayProperties.Name,
|
|
1297
1260
|
isVertex: true,
|
|
1298
|
-
size:
|
|
1261
|
+
size: StyleTokens.GATEWAY_SIZE,
|
|
1299
1262
|
labelOffset: { width: 0, height: 35 },
|
|
1300
1263
|
shape: GatewayShape,
|
|
1301
1264
|
resizable: false,
|
|
@@ -1366,9 +1329,7 @@ class BpmnEditor extends editor.Editor {
|
|
|
1366
1329
|
name: 'defaultEdge',
|
|
1367
1330
|
value: {
|
|
1368
1331
|
[editor.mx.mxConstants.STYLE_SHAPE]: editor.mx.mxConstants.SHAPE_CONNECTOR,
|
|
1369
|
-
//[mx.mxConstants.STYLE_STARTARROW]: mx.mxConstants.ARROW_OVAL,
|
|
1370
1332
|
[editor.mx.mxConstants.STYLE_ENDARROW]: editor.mx.mxConstants.ARROW_BLOCK,
|
|
1371
|
-
//[mx.mxConstants.STYLE_EDGE]: mx.mxConstants.STYLE_NOEDGESTYLE,
|
|
1372
1333
|
[editor.mx.mxConstants.STYLE_EDGE]: editor.mx.mxConstants.EDGESTYLE_ORTHOGONAL,
|
|
1373
1334
|
[editor.mx.mxConstants.STYLE_ROUNDED]: '1',
|
|
1374
1335
|
[editor.mx.mxConstants.STYLE_ARCSIZE]: 10,
|
|
@@ -1376,22 +1337,11 @@ class BpmnEditor extends editor.Editor {
|
|
|
1376
1337
|
[editor.mx.mxConstants.STYLE_ALIGN]: editor.mx.mxConstants.ALIGN_CENTER,
|
|
1377
1338
|
[editor.mx.mxConstants.STYLE_STROKECOLOR]: StyleTokens.CONNECTOR_STROKE_COLOR,
|
|
1378
1339
|
[editor.mx.mxConstants.STYLE_FONTCOLOR]: StyleTokens.DEFAULT_FONT_COLOR,
|
|
1379
|
-
[editor.mx.mxConstants.STYLE_STROKEWIDTH]: StyleTokens.DEFAULT_STROKE_WIDTH
|
|
1340
|
+
[editor.mx.mxConstants.STYLE_STROKEWIDTH]: StyleTokens.DEFAULT_STROKE_WIDTH,
|
|
1380
1341
|
}
|
|
1381
1342
|
}
|
|
1382
1343
|
]
|
|
1383
1344
|
});
|
|
1384
|
-
//this.graph.recursiveResize = true;
|
|
1385
|
-
// let g = new MyGroup();
|
|
1386
|
-
// let geo = new mx.mxGeometry(100, 100, 200, 100);
|
|
1387
|
-
// g.setGeometry(geo);
|
|
1388
|
-
// this.graph.addCell(g);
|
|
1389
|
-
// g = new MyGroup();
|
|
1390
|
-
// geo = new mx.mxGeometry(300, 100, 200, 100);
|
|
1391
|
-
// g.setGeometry(geo);
|
|
1392
|
-
// this.graph.addCell(g);
|
|
1393
|
-
// let cell = this.graph.insertVertex(null, null, null, 10, 10, 100, 200);
|
|
1394
|
-
// (<any>cell).foo = true;
|
|
1395
1345
|
}
|
|
1396
1346
|
createGraph(options) {
|
|
1397
1347
|
return new BpmnGraph(options);
|
|
@@ -1403,7 +1353,6 @@ class BpmnEditor extends editor.Editor {
|
|
|
1403
1353
|
if (editor.Utils.cellOfType(cell, CellTypes.EMBEDDED_SUB_PROCESS)) {
|
|
1404
1354
|
for (let child of cell.children) {
|
|
1405
1355
|
if (editor.Utils.cellOfType(child, CellTypes.SUB_PROCESS_CHILDREN_SLOT)) {
|
|
1406
|
-
// child.setVisible(true);
|
|
1407
1356
|
this.graph.enterGroup(child);
|
|
1408
1357
|
this.graph.zoomActual();
|
|
1409
1358
|
this.fireEvent(new editor.mx.mxEventObject(BpmnEditor.EVENT_ROOT_CHANGED));
|
|
@@ -1418,8 +1367,6 @@ class BpmnEditor extends editor.Editor {
|
|
|
1418
1367
|
}
|
|
1419
1368
|
exitGroup(goHome) {
|
|
1420
1369
|
let root = this.graph.getCurrentRoot();
|
|
1421
|
-
// if (Utils.cellOfType(root, CellTypes.SUB_PROCESS_CHILDREN_SLOT))
|
|
1422
|
-
// root.visible = false;
|
|
1423
1370
|
if (this.undoManager)
|
|
1424
1371
|
this.undoManager.enabled = false;
|
|
1425
1372
|
if (!goHome)
|
|
@@ -1517,9 +1464,7 @@ const BpmnEditorComponent = class {
|
|
|
1517
1464
|
}
|
|
1518
1465
|
render() {
|
|
1519
1466
|
let styles = {};
|
|
1520
|
-
return (index.h("div", { class: "gx-diagram-editor-root", style: { position: 'relative', height: '100%', width: '100%' } }, index.h("div", { tabindex: "-1", class: "bpmn-editor", style: styles, ref: (el) => this.container = el }), index.h("div", { style: { display: 'none' }, class: "diagram-outline", ref: (el) => this.outlineContainer = el }), index.h("div", { class: "diagram-bottom-pad", ref: (el) => this.bottomPad = el }, index.h("div", null, index.h("img", { class: "pad-image", style: { display: 'none' }, src: index.getAssetPath(`./assets/images/home.svg`), onClick: () => this.editor.exitGroup(true), ref: (el) => this.homeBtn = el })), index.h("div", null, index.h("img", { class: "pad-image", style: { display: 'none' }, src: index.getAssetPath(`./assets/images/up.svg`), onClick: () => this.editor.exitGroup(), ref: (el) => this.upBtn = el })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/map.svg`), onClick: () => this._toggleOutline() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-reset.svg`), onClick: () => this.editor.graph.zoomActual() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-in.svg`), onClick: () => this.editor.graph.zoomIn() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-out.svg`), onClick: () => this.editor.graph.zoomOut() }))))
|
|
1521
|
-
//{/* <img src={getAssetPath(`./assets/images/warning.gif`)} /> */}
|
|
1522
|
-
);
|
|
1467
|
+
return (index.h("div", { class: "gx-diagram-editor-root", style: { position: 'relative', height: '100%', width: '100%' } }, index.h("div", { tabindex: "-1", class: "bpmn-editor", style: styles, ref: (el) => this.container = el }), index.h("div", { style: { display: 'none' }, class: "diagram-outline", ref: (el) => this.outlineContainer = el }), index.h("div", { class: "diagram-bottom-pad", ref: (el) => this.bottomPad = el }, index.h("div", null, index.h("img", { class: "pad-image", style: { display: 'none' }, src: index.getAssetPath(`./assets/images/home.svg`), onClick: () => this.editor.exitGroup(true), ref: (el) => this.homeBtn = el })), index.h("div", null, index.h("img", { class: "pad-image", style: { display: 'none' }, src: index.getAssetPath(`./assets/images/up.svg`), onClick: () => this.editor.exitGroup(), ref: (el) => this.upBtn = el })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/map.svg`), onClick: () => this._toggleOutline() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-reset.svg`), onClick: () => this.editor.graph.zoomActual() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-in.svg`), onClick: () => this.editor.graph.zoomIn() })), index.h("div", null, index.h("img", { class: "pad-image", src: index.getAssetPath(`./assets/images/zoom-out.svg`), onClick: () => this.editor.graph.zoomOut() })))));
|
|
1523
1468
|
}
|
|
1524
1469
|
_toggleOutline() {
|
|
1525
1470
|
if (this.outlineContainer.style.display === 'none') {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
const index = require('./index-e8fa91cf.js');
|
|
6
|
-
const editor = require('./editor-
|
|
6
|
+
const editor = require('./editor-386996a2.js');
|
|
7
7
|
|
|
8
8
|
const CellTypes = {
|
|
9
9
|
PRINT_BLOCK: 'PrintBlock',
|
|
@@ -116,7 +116,6 @@ class ReportGraph extends editor.Graph {
|
|
|
116
116
|
break;
|
|
117
117
|
case ReportElementProperties.IMAGE:
|
|
118
118
|
extraStyles[editor.mx.mxConstants.STYLE_IMAGE] = this.editorHelper.getImageUri(propValue);
|
|
119
|
-
//style += `;${mx.mxConstants.STYLE_IMAGE}=https://images.pexels.com/photos/46710/pexels-photo-46710.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500`;
|
|
120
119
|
break;
|
|
121
120
|
}
|
|
122
121
|
}
|
|
@@ -286,7 +285,6 @@ class ReportGraph extends editor.Graph {
|
|
|
286
285
|
var _a;
|
|
287
286
|
this._paperProps = (_a = state.paperProperties) !== null && _a !== void 0 ? _a : ReportGraph.DEFAULT_PAGE_PROPERTIES;
|
|
288
287
|
super.setState(state);
|
|
289
|
-
//this.resizePrintBlocks();
|
|
290
288
|
}
|
|
291
289
|
}
|
|
292
290
|
ReportGraph.DEFAULT_PAGE_WIDTH = 827;
|
|
@@ -379,7 +377,6 @@ class RectangleShape extends editor.mx.mxShape {
|
|
|
379
377
|
let radTopRight = Math.min(parseInt(value[ReportElementProperties.CORNER_RADIUS_TOPRIGHT]), maxRad);
|
|
380
378
|
let radBottomLeft = Math.min(parseInt(value[ReportElementProperties.CORNER_RADIUS_BOTTOMLEFT]), maxRad);
|
|
381
379
|
let radBottomRight = Math.min(parseInt(value[ReportElementProperties.CORNER_RADIUS_BOTTOMRIGHT]), maxRad);
|
|
382
|
-
/////// Paint background fill
|
|
383
380
|
let backColor = value[ReportElementProperties.BACK_COLOR];
|
|
384
381
|
if (backColor && backColor !== 'Transparent') {
|
|
385
382
|
c.setStrokeColor('transparent');
|
|
@@ -401,7 +398,6 @@ class RectangleShape extends editor.mx.mxShape {
|
|
|
401
398
|
c.close();
|
|
402
399
|
c.fillAndStroke();
|
|
403
400
|
}
|
|
404
|
-
///
|
|
405
401
|
c.setStrokeColor(value[ReportElementProperties.BORDER_COLOR]);
|
|
406
402
|
let topBorder = value[ReportElementProperties.STYLE_TOP];
|
|
407
403
|
if (topBorder && topBorder !== ReportBorderStyle.NONE) {
|
|
@@ -553,7 +549,6 @@ class ReportEditor extends editor.Editor {
|
|
|
553
549
|
isVertex: true,
|
|
554
550
|
size: { width: 0, height: 0 },
|
|
555
551
|
shape: TextBlockShape,
|
|
556
|
-
//style: `defaultVertex;html=1;${mx.mxConstants.STYLE_LABEL_BORDERCOLOR}=red;${mx.mxConstants.STYLE_FONTSTYLE}=${mx.mxConstants.FONT_ITALIC};${mx.mxConstants.STYLE_VERTICAL_ALIGN}=${mx.mxConstants.ALIGN_BOTTOM};${mx.mxConstants.STYLE_ALIGN}=${mx.mxConstants.ALIGN_RIGHT}`,
|
|
557
552
|
style: `defaultVertex;html=1;`,
|
|
558
553
|
}),
|
|
559
554
|
new editor.CellDescriptor({
|
|
@@ -595,8 +590,6 @@ class ReportEditor extends editor.Editor {
|
|
|
595
590
|
isVertex: true,
|
|
596
591
|
size: { width: 50, height: 50 },
|
|
597
592
|
shape: editor.mx.mxImageShape,
|
|
598
|
-
//style: `defaultVertex;${mx.mxConstants.STYLE_NOLABEL}=1;${mx.mxConstants.STYLE_EDITABLE}=0${mx.mxConstants.STYLE_IMAGE}=${getAssetPath(`./assets/delete.png`)}`,
|
|
599
|
-
//style: `defaultVertex;${mx.mxConstants.STYLE_NOLABEL}=1;${mx.mxConstants.STYLE_EDITABLE}=0;${mx.mxConstants.STYLE_IMAGE}=https://images.pexels.com/photos/46710/pexels-photo-46710.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500`,
|
|
600
593
|
style: `defaultVertex;${editor.mx.mxConstants.STYLE_NOLABEL}=1;${editor.mx.mxConstants.STYLE_EDITABLE}=0;`,
|
|
601
594
|
}),
|
|
602
595
|
],
|
|
@@ -660,23 +653,15 @@ class ReportEditor extends editor.Editor {
|
|
|
660
653
|
return !this.graph.isSwimlane(vertex);
|
|
661
654
|
};
|
|
662
655
|
this.layout.isVertexMovable = (cell) => {
|
|
663
|
-
return true;
|
|
656
|
+
return true;
|
|
664
657
|
};
|
|
665
658
|
this.layoutMgr = new editor.mx.mxLayoutManager(this.graph);
|
|
666
659
|
this.layoutMgr.getLayout = (cell) => {
|
|
667
660
|
return this.layout;
|
|
668
|
-
// if (!model.isEdge(cell) && graph.getModel().getChildCount(cell) > 0 &&
|
|
669
|
-
// (model.getParent(cell) == model.getRoot() || graph.isPool(cell)))
|
|
670
|
-
// {
|
|
671
|
-
// layout.fill = graph.isPool(cell);
|
|
672
|
-
// return layout;
|
|
673
|
-
// }
|
|
674
|
-
// return null;
|
|
675
661
|
};
|
|
676
662
|
}
|
|
677
663
|
getDropTarget(x, y) {
|
|
678
664
|
let parent = this.graph.getCellAt(x, y, null, true, false, (cell) => this.graph.isSwimlane(cell));
|
|
679
|
-
//let parent = this.graph.getCellAt(x, y);
|
|
680
665
|
return parent;
|
|
681
666
|
}
|
|
682
667
|
getParentForPaste() {
|
|
@@ -837,7 +822,7 @@ const ReportEditorComponent = class {
|
|
|
837
822
|
}
|
|
838
823
|
totalHeight += pb;
|
|
839
824
|
}
|
|
840
|
-
totalHeight += 5;
|
|
825
|
+
totalHeight += 5;
|
|
841
826
|
return (index.h("div", { style: {
|
|
842
827
|
minWidth: `${RULER_WIDTH}px`,
|
|
843
828
|
backgroundImage: `url(${index.getAssetPath('./assets/images/grid.gif')}`,
|
|
@@ -59,9 +59,7 @@ export class BpmnEditorComponent {
|
|
|
59
59
|
h("div", null,
|
|
60
60
|
h("img", { class: "pad-image", src: getAssetPath(`./assets/images/zoom-in.svg`), onClick: () => this.editor.graph.zoomIn() })),
|
|
61
61
|
h("div", null,
|
|
62
|
-
h("img", { class: "pad-image", src: getAssetPath(`./assets/images/zoom-out.svg`), onClick: () => this.editor.graph.zoomOut() }))))
|
|
63
|
-
//{/* <img src={getAssetPath(`./assets/images/warning.gif`)} /> */}
|
|
64
|
-
);
|
|
62
|
+
h("img", { class: "pad-image", src: getAssetPath(`./assets/images/zoom-out.svg`), onClick: () => this.editor.graph.zoomOut() })))));
|
|
65
63
|
}
|
|
66
64
|
_toggleOutline() {
|
|
67
65
|
if (this.outlineContainer.style.display === 'none') {
|
|
@@ -229,7 +229,7 @@ export default class BpmnEditor extends Editor {
|
|
|
229
229
|
slotId: _SLOT_ACTIVITY_EVENTS,
|
|
230
230
|
labelAttribute: ActivityProperties.Name,
|
|
231
231
|
isVertex: true,
|
|
232
|
-
size:
|
|
232
|
+
size: StyleTokens.ACTIVITY_SIZE,
|
|
233
233
|
shape: ActivityShape,
|
|
234
234
|
radialMenu: {
|
|
235
235
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
@@ -266,7 +266,7 @@ export default class BpmnEditor extends Editor {
|
|
|
266
266
|
slotId: _SLOT_ACTIVITY_EVENTS,
|
|
267
267
|
labelAttribute: ActivityProperties.Name,
|
|
268
268
|
isVertex: true,
|
|
269
|
-
size:
|
|
269
|
+
size: StyleTokens.ACTIVITY_SIZE,
|
|
270
270
|
shape: ActivityShape,
|
|
271
271
|
radialMenu: {
|
|
272
272
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
@@ -300,7 +300,6 @@ export default class BpmnEditor extends Editor {
|
|
|
300
300
|
slotCell.style = `${mx.mxConstants.STYLE_RESIZABLE}=0;${mx.mxConstants.STYLE_FILLCOLOR}=transparent;${mx.mxConstants.STYLE_STROKECOLOR}=transparent`;
|
|
301
301
|
slotCell.setConnectable(false);
|
|
302
302
|
slotCell.setCollapsed(true);
|
|
303
|
-
//slotCell.visible = false;
|
|
304
303
|
cell.insert(slotCell);
|
|
305
304
|
return cell;
|
|
306
305
|
}
|
|
@@ -351,11 +350,11 @@ export default class BpmnEditor extends Editor {
|
|
|
351
350
|
labelAttribute: EventProperties.Name,
|
|
352
351
|
icon: 'bpmn-icon-start-event-none',
|
|
353
352
|
isVertex: true,
|
|
354
|
-
size:
|
|
353
|
+
size: StyleTokens.EVENT_SIZE,
|
|
355
354
|
labelOffset: { width: 0, height: 30 },
|
|
356
355
|
shape: EventShape,
|
|
357
356
|
resizable: false,
|
|
358
|
-
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE}
|
|
357
|
+
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE};${mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
359
358
|
radialMenu: {
|
|
360
359
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
361
360
|
customTools: {
|
|
@@ -374,11 +373,11 @@ export default class BpmnEditor extends Editor {
|
|
|
374
373
|
labelAttribute: EventProperties.Name,
|
|
375
374
|
icon: 'bpmn-icon-intermediate-event-none',
|
|
376
375
|
isVertex: true,
|
|
377
|
-
size:
|
|
376
|
+
size: StyleTokens.EVENT_SIZE,
|
|
378
377
|
labelOffset: { width: 0, height: 30 },
|
|
379
378
|
shape: EventShape,
|
|
380
379
|
resizable: false,
|
|
381
|
-
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE}`,
|
|
380
|
+
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE};${mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
382
381
|
radialMenu: {
|
|
383
382
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
384
383
|
customTools: {
|
|
@@ -406,11 +405,11 @@ export default class BpmnEditor extends Editor {
|
|
|
406
405
|
labelAttribute: EventProperties.Name,
|
|
407
406
|
icon: 'bpmn-icon-end-event-none',
|
|
408
407
|
isVertex: true,
|
|
409
|
-
size:
|
|
408
|
+
size: StyleTokens.EVENT_SIZE,
|
|
410
409
|
labelOffset: { width: 0, height: 30 },
|
|
411
410
|
shape: EventShape,
|
|
412
411
|
resizable: false,
|
|
413
|
-
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE}`,
|
|
412
|
+
style: `defaultVertex;${mx.mxConstants.STYLE_PERIMETER}=${mx.mxConstants.PERIMETER_ELLIPSE};${mx.mxConstants.STYLE_NOLABEL}=1`,
|
|
414
413
|
radialMenu: {
|
|
415
414
|
newVertexTypes: NEW_VERTEX_TYPES,
|
|
416
415
|
customTools: {
|
|
@@ -431,7 +430,7 @@ export default class BpmnEditor extends Editor {
|
|
|
431
430
|
icon: 'bpmn-icon-gateway-none',
|
|
432
431
|
labelAttribute: GatewayProperties.Name,
|
|
433
432
|
isVertex: true,
|
|
434
|
-
size:
|
|
433
|
+
size: StyleTokens.GATEWAY_SIZE,
|
|
435
434
|
labelOffset: { width: 0, height: 35 },
|
|
436
435
|
shape: GatewayShape,
|
|
437
436
|
resizable: false,
|
|
@@ -502,9 +501,7 @@ export default class BpmnEditor extends Editor {
|
|
|
502
501
|
name: 'defaultEdge',
|
|
503
502
|
value: {
|
|
504
503
|
[mx.mxConstants.STYLE_SHAPE]: mx.mxConstants.SHAPE_CONNECTOR,
|
|
505
|
-
//[mx.mxConstants.STYLE_STARTARROW]: mx.mxConstants.ARROW_OVAL,
|
|
506
504
|
[mx.mxConstants.STYLE_ENDARROW]: mx.mxConstants.ARROW_BLOCK,
|
|
507
|
-
//[mx.mxConstants.STYLE_EDGE]: mx.mxConstants.STYLE_NOEDGESTYLE,
|
|
508
505
|
[mx.mxConstants.STYLE_EDGE]: mx.mxConstants.EDGESTYLE_ORTHOGONAL,
|
|
509
506
|
[mx.mxConstants.STYLE_ROUNDED]: '1',
|
|
510
507
|
[mx.mxConstants.STYLE_ARCSIZE]: 10,
|
|
@@ -512,22 +509,11 @@ export default class BpmnEditor extends Editor {
|
|
|
512
509
|
[mx.mxConstants.STYLE_ALIGN]: mx.mxConstants.ALIGN_CENTER,
|
|
513
510
|
[mx.mxConstants.STYLE_STROKECOLOR]: StyleTokens.CONNECTOR_STROKE_COLOR,
|
|
514
511
|
[mx.mxConstants.STYLE_FONTCOLOR]: StyleTokens.DEFAULT_FONT_COLOR,
|
|
515
|
-
[mx.mxConstants.STYLE_STROKEWIDTH]: StyleTokens.DEFAULT_STROKE_WIDTH
|
|
512
|
+
[mx.mxConstants.STYLE_STROKEWIDTH]: StyleTokens.DEFAULT_STROKE_WIDTH,
|
|
516
513
|
}
|
|
517
514
|
}
|
|
518
515
|
]
|
|
519
516
|
});
|
|
520
|
-
//this.graph.recursiveResize = true;
|
|
521
|
-
// let g = new MyGroup();
|
|
522
|
-
// let geo = new mx.mxGeometry(100, 100, 200, 100);
|
|
523
|
-
// g.setGeometry(geo);
|
|
524
|
-
// this.graph.addCell(g);
|
|
525
|
-
// g = new MyGroup();
|
|
526
|
-
// geo = new mx.mxGeometry(300, 100, 200, 100);
|
|
527
|
-
// g.setGeometry(geo);
|
|
528
|
-
// this.graph.addCell(g);
|
|
529
|
-
// let cell = this.graph.insertVertex(null, null, null, 10, 10, 100, 200);
|
|
530
|
-
// (<any>cell).foo = true;
|
|
531
517
|
}
|
|
532
518
|
createGraph(options) {
|
|
533
519
|
return new BpmnGraph(options);
|
|
@@ -539,7 +525,6 @@ export default class BpmnEditor extends Editor {
|
|
|
539
525
|
if (Utils.cellOfType(cell, CellTypes.EMBEDDED_SUB_PROCESS)) {
|
|
540
526
|
for (let child of cell.children) {
|
|
541
527
|
if (Utils.cellOfType(child, CellTypes.SUB_PROCESS_CHILDREN_SLOT)) {
|
|
542
|
-
// child.setVisible(true);
|
|
543
528
|
this.graph.enterGroup(child);
|
|
544
529
|
this.graph.zoomActual();
|
|
545
530
|
this.fireEvent(new mx.mxEventObject(BpmnEditor.EVENT_ROOT_CHANGED));
|
|
@@ -554,8 +539,6 @@ export default class BpmnEditor extends Editor {
|
|
|
554
539
|
}
|
|
555
540
|
exitGroup(goHome) {
|
|
556
541
|
let root = this.graph.getCurrentRoot();
|
|
557
|
-
// if (Utils.cellOfType(root, CellTypes.SUB_PROCESS_CHILDREN_SLOT))
|
|
558
|
-
// root.visible = false;
|
|
559
542
|
if (this.undoManager)
|
|
560
543
|
this.undoManager.enabled = false;
|
|
561
544
|
if (!goHome)
|