From c705c43cceafb81434d6eee4ced0da7024c9c008 Mon Sep 17 00:00:00 2001 From: Lvbo163 Date: Fri, 8 Sep 2017 11:36:53 +0800 Subject: support set condition for gateway support set condition for gateway(exclusive gateway) Issue-ID: SDC-119 Change-Id: I479ed99eb45928d90bf7361de0208eef4b113776 Signed-off-by: Lvbo163 --- .../src/app/app.component.html | 1 + sdc-workflow-designer-ui/src/app/app.module.ts | 2 + .../src/app/components/canvas/canvas.component.ts | 1 + .../sequence-flow/sequence-flow.component.css | 43 ++++++++++++++++ .../sequence-flow/sequence-flow.component.html | 53 ++++++++++++++++++++ .../sequence-flow/sequence-flow.component.ts | 57 ++++++++++++++++++++++ .../src/app/services/broadcast.service.ts | 7 +++ .../src/app/services/jsplumb.service.ts | 27 ++++++++-- .../src/app/services/workflow-process.service.ts | 10 ++++ 9 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.css create mode 100644 sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.html create mode 100644 sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts diff --git a/sdc-workflow-designer-ui/src/app/app.component.html b/sdc-workflow-designer-ui/src/app/app.component.html index 856e52bd..1917b835 100644 --- a/sdc-workflow-designer-ui/src/app/app.component.html +++ b/sdc-workflow-designer-ui/src/app/app.component.html @@ -19,4 +19,5 @@ + diff --git a/sdc-workflow-designer-ui/src/app/app.module.ts b/sdc-workflow-designer-ui/src/app/app.module.ts index 6fa65af3..e2d36a3a 100644 --- a/sdc-workflow-designer-ui/src/app/app.module.ts +++ b/sdc-workflow-designer-ui/src/app/app.module.ts @@ -44,6 +44,7 @@ import { EditablePropertyComponent } from "./components/editable-property/editab import { SwaggerTreeConverterService } from "./services/swagger-tree-converter.service"; import { WorkflowProcessService } from "./services/workflow-process.service"; import { IntermediateCatchEventComponent } from "./components/property/intermediate-catch-event/intermediate-catch-event.component"; +import { SequenceFlowComponent } from "./components/sequence-flow/sequence-flow.component"; @NgModule({ declarations: [ @@ -61,6 +62,7 @@ import { IntermediateCatchEventComponent } from "./components/property/intermedi PropertiesComponent, RestTaskComponent, RestTaskParametersComponent, + SequenceFlowComponent, StartEventParametersComponent, ToolbarComponent, ], diff --git a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts index ee002963..f4c0e214 100644 --- a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts @@ -53,6 +53,7 @@ export class CanvasComponent implements AfterViewInit { public canvasClick() { this.broadcastService.broadcast(this.broadcastService.showProperty, false); + this.broadcastService.broadcast(this.broadcastService.showSequenceFlow, false); } diff --git a/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.css b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.css new file mode 100644 index 00000000..a2d481d4 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.css @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2017 ZTE Corporation. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and the Apache License 2.0 which both accompany this distribution, + * and are available at http://www.eclipse.org/legal/epl-v10.html + * and http://www.apache.org/licenses/LICENSE-2.0 + * + * Contributors: + * ZTE - initial API and implementation and/or initial documentation + */ + +.wm-sequence-flow-wrapper { + background-color: white; + position: fixed; + width: 500px; + height: 100%; + border-left: 1px solid #00aaff; + z-index: 2000; + right: 0; + top: 0; + bottom: 0; + padding-left: 20px; + margin-bottom: 0; + padding-right: 20px; + padding-top: 40px; + -webkit-box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); + border-radius: 0; + overflow-y: scroll; +} + +.edit { + display: none; +} + +.editing .view { + display: none; +} + +.editing .edit { + display: block; +} diff --git a/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.html b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.html new file mode 100644 index 00000000..3a4c6635 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.html @@ -0,0 +1,53 @@ + + +
+
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts new file mode 100644 index 00000000..0109e273 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/sequence-flow/sequence-flow.component.ts @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2017 ZTE Corporation. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and the Apache License 2.0 which both accompany this distribution, + * and are available at http://www.eclipse.org/legal/epl-v10.html + * and http://www.apache.org/licenses/LICENSE-2.0 + * + * Contributors: + * ZTE - initial API and implementation and/or initial documentation + */ + +import { AfterViewInit, Component } from '@angular/core'; +import { TreeNode } from 'primeng/primeng'; + +import { SequenceFlow } from '../../model/workflow/sequence-flow'; +import { BroadcastService } from '../../services/broadcast.service'; +import { JsPlumbService } from '../../services/jsplumb.service'; +import { WorkflowProcessService } from '../../services/workflow-process.service'; + +/** + * property component presents information of a workflow node. + * the presented information can be edit in this component. + * it may load information dynamically. the content may be different for different node type. + */ +@Component({ + selector: 'b4t-sequence-flow', + styleUrls: ['./sequence-flow.component.css'], + templateUrl: 'sequence-flow.component.html', +}) +export class SequenceFlowComponent implements AfterViewInit { + public sequenceFlow: SequenceFlow; + public show = false; + + constructor(private broadcastService: BroadcastService, + private processService: WorkflowProcessService, + private jsPlumbService: JsPlumbService) { + + } + + public ngAfterViewInit() { + this.broadcastService.showSequenceFlow$.subscribe(show => this.show = show); + this.broadcastService.sequenceFlow$.subscribe(tmp => this.sequenceFlow = tmp); + } + + public conditionChanged(condition: string) { + this.sequenceFlow.condition = condition; + this.jsPlumbService.setLabel(this.sequenceFlow.sourceRef, this.sequenceFlow.targetRef, condition); + } + + public delete() { + this.show = false; + + this.processService.deleteSequenceFlow(this.sequenceFlow.sourceRef, this.sequenceFlow.targetRef); + this.jsPlumbService.deleteConnect(this.sequenceFlow.sourceRef, this.sequenceFlow.targetRef); + } +} diff --git a/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts b/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts index eb87ba09..7726eae2 100644 --- a/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts +++ b/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts @@ -13,6 +13,7 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { WorkflowNode } from '../model/workflow/workflow-node'; +import { SequenceFlow } from "../model/workflow/sequence-flow"; /** * BroadcastService @@ -37,6 +38,12 @@ export class BroadcastService { public nodeTaskChange = new Subject(); public nodeTaskChange$ = this.nodeTaskChange.asObservable(); + public showSequenceFlow = new Subject(); + public showSequenceFlow$ = this.showSequenceFlow.asObservable(); + + public sequenceFlow = new Subject(); + public sequenceFlow$ = this.sequenceFlow.asObservable(); + /** * broadcast datas * this method will catch the exceptions for the broadcast diff --git a/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts b/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts index 543b09f3..e4a9f38b 100644 --- a/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts +++ b/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts @@ -13,6 +13,7 @@ import { Injectable } from '@angular/core'; import * as jsp from 'jsplumb'; import { WorkflowProcessService } from "./workflow-process.service"; +import { BroadcastService } from "./broadcast.service"; /** * JsPlumbService @@ -22,7 +23,7 @@ import { WorkflowProcessService } from "./workflow-process.service"; export class JsPlumbService { public jsplumbInstance; - constructor(private processService: WorkflowProcessService) { + constructor(private processService: WorkflowProcessService, private broadcastService: BroadcastService) { this.initJsPlumbInstance(); } @@ -60,9 +61,15 @@ export class JsPlumbService { this.jsplumbInstance.bind('connection', info => { this.processService.addSequenceFlow(info.connection.sourceId, info.connection.targetId); - info.connection.bind('click', connection => { - this.jsplumbInstance.select({ connections: [connection] }).delete(); - this.processService.deleteSequenceFlow(connection.sourceId, connection.targetId); + // info.connection.bind('click', connection => { + // this.jsplumbInstance.select({ connections: [connection] }).delete(); + // this.processService.deleteSequenceFlow(connection.sourceId, connection.targetId); + // }); + + info.connection.bind('dblclick', connection => { + const sequenceFlow = this.processService.getSequenceFlow(connection.sourceId, connection.targetId); + this.broadcastService.broadcast(this.broadcastService.sequenceFlow, sequenceFlow); + this.broadcastService.broadcast(this.broadcastService.showSequenceFlow, true); }); }); @@ -93,6 +100,18 @@ export class JsPlumbService { } + public setLabel(sourceId: string, targetId: string, label: string) { + const sourceNode = this.processService.getNodeById(sourceId); + const connections = this.jsplumbInstance.select({ source: sourceId, target: targetId }); + connections.setLabel(label); + } + + public deleteConnect(sourceId: string, targetId: string) { + const sourceNode = this.processService.getNodeById(sourceId); + const connectionSelection = this.jsplumbInstance.select({ source: sourceId, target: targetId }); + connectionSelection.delete(); + } + public remove(nodeId: string) { this.jsplumbInstance.remove(nodeId); } diff --git a/sdc-workflow-designer-ui/src/app/services/workflow-process.service.ts b/sdc-workflow-designer-ui/src/app/services/workflow-process.service.ts index 963a10b3..7f56c4af 100644 --- a/sdc-workflow-designer-ui/src/app/services/workflow-process.service.ts +++ b/sdc-workflow-designer-ui/src/app/services/workflow-process.service.ts @@ -95,6 +95,16 @@ export class WorkflowProcessService { } } + public getSequenceFlow(sourceRef: string, targetRef: string): SequenceFlow { + const node = this.getNodeById(sourceRef); + if (node) { + const sequenceFlow = node.sequenceFlows.find(tmp => tmp.targetRef === targetRef); + return sequenceFlow; + } else { + return undefined; + } + } + public getPlanParameters(nodeId: string): PlanTreeviewItem[] { const preNodeList = new Array(); this.getPreNodes(nodeId, preNodeList); -- cgit 1.2.3-korg