diff options
Diffstat (limited to 'sdc-workflow-designer-ui/src')
13 files changed, 327 insertions, 33 deletions
diff --git a/sdc-workflow-designer-ui/src/app/app.component.html b/sdc-workflow-designer-ui/src/app/app.component.html index f666c1b7..08b57b81 100644 --- a/sdc-workflow-designer-ui/src/app/app.component.html +++ b/sdc-workflow-designer-ui/src/app/app.component.html @@ -12,11 +12,10 @@ */ --> -<!--The content below is only a placeholder and can be replaced.--> <b4t-toolbar></b4t-toolbar> -<div id="container" class="container"> - <b4t-node *ngFor="let node of getWorkflow()?.nodes; let last = last;" [node]="node" [last]="last"></b4t-node> -</div> +<b4t-canvas></b4t-canvas> + +<b4t-properties></b4t-properties> diff --git a/sdc-workflow-designer-ui/src/app/app.component.ts b/sdc-workflow-designer-ui/src/app/app.component.ts index 29c4d06f..931e7354 100644 --- a/sdc-workflow-designer-ui/src/app/app.component.ts +++ b/sdc-workflow-designer-ui/src/app/app.component.ts @@ -23,27 +23,6 @@ import { ActivatedRoute } from "@angular/router"; templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) -export class AppComponent implements AfterViewInit, OnInit { - constructor(private jsplumbService: JsPlumbService, - private dataAccessService: DataAccessService, - private route: ActivatedRoute, - private workflowService: WorkflowService) {} +export class AppComponent { - ngOnInit(): void { - this.route.queryParams.subscribe(params => { - if(params.id) { - this.dataAccessService.catalogService.loadWorkflow(params.id).subscribe(workflow => { - this.workflowService.workflow = workflow; - }); - } - }); - } - - public getWorkflow(): Workflow { - return this.workflowService.workflow; - } - - ngAfterViewInit(): void { - this.jsplumbService.buttonDroppable(); - } } diff --git a/sdc-workflow-designer-ui/src/app/app.module.ts b/sdc-workflow-designer-ui/src/app/app.module.ts index 8d92d0ae..4b6a3a96 100644 --- a/sdc-workflow-designer-ui/src/app/app.module.ts +++ b/sdc-workflow-designer-ui/src/app/app.module.ts @@ -25,11 +25,16 @@ import { InMemoryWebApiModule } from "angular-in-memory-web-api"; import { InMemoryDataService } from "./services/data-access/in-memory-data.service"; import { HttpModule } from "@angular/http"; import { RouterModule } from "@angular/router"; +import { BroadcastService } from "./services/broadcast.service"; +import { PropertiesComponent } from "./components/property/properties.component"; +import { CanvasComponent } from "./components/canvas/canvas.component"; @NgModule({ declarations: [ AppComponent, + CanvasComponent, NodeComponent, + PropertiesComponent, ToolbarComponent, ], imports: [ @@ -40,6 +45,7 @@ import { RouterModule } from "@angular/router"; SharedModule, ], providers: [ + BroadcastService, DataAccessService, HttpService, JsPlumbService, diff --git a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.css b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.css new file mode 100644 index 00000000..fec14a47 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.css @@ -0,0 +1,26 @@ +/** + * 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 + */ + +.canvas { + -webkit-overflow-scrolling: touch; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + height: 100%; + position: relative; + overflow: scroll; + z-index: 0; + background-color: #84acb3; +} diff --git a/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.html b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.html new file mode 100644 index 00000000..97fe3a67 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.html @@ -0,0 +1,16 @@ +<!-- +/** + * 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 + */ +--> +<div id="canvas" class="canvas" (click)="canvasClick()"> + <b4t-node *ngFor="let node of getWorkflow()?.nodes; let last = last;" [node]="node" [last]="last"></b4t-node> +</div> 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 new file mode 100644 index 00000000..e1a40297 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/canvas/canvas.component.ts @@ -0,0 +1,62 @@ +/** + * 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 { BroadcastService } from '../../services/broadcast.service'; +import { JsPlumbService } from '../../services/jsplumb.service'; +import { ActivatedRoute } from "@angular/router"; +import { DataAccessService } from "../../services/data-access/data-access.service"; +import { WorkflowService } from "../../services/workflow.service"; +import { Workflow } from "../../model/workflow"; + +/** + * main canvas, it contains two parts: canvas and node property component + * bpmn task nodes can be dropped into this canvas, and then the workflow can be edit + */ +@Component({ + selector: 'b4t-canvas', + styleUrls: ['./canvas.component.css'], + templateUrl: 'canvas.component.html', +}) +export class CanvasComponent implements AfterViewInit { + + constructor(private broadcastService: BroadcastService, + private dataAccessService: DataAccessService, + private jsPlumbService: JsPlumbService, + private route: ActivatedRoute, + private workflowService: WorkflowService) { + } + + ngOnInit(): void { + this.route.queryParams.subscribe(params => { + if (params.id) { + this.dataAccessService.catalogService.loadWorkflow(params.id).subscribe(workflow => { + this.workflowService.workflow = workflow; + }); + } + }); + } + + public ngAfterViewInit() { + this.jsPlumbService.buttonDroppable(); + } + + public canvasClick() { + this.broadcastService.broadcast(this.broadcastService.showProperty, false); + } + + + public getWorkflow(): Workflow { + return this.workflowService.workflow; + } +} diff --git a/sdc-workflow-designer-ui/src/app/components/node/node.component.html b/sdc-workflow-designer-ui/src/app/components/node/node.component.html index a178e6f5..f875718d 100644 --- a/sdc-workflow-designer-ui/src/app/components/node/node.component.html +++ b/sdc-workflow-designer-ui/src/app/components/node/node.component.html @@ -11,8 +11,8 @@ * ZTE - initial API and implementation and/or initial documentation
*/
-->
-<div class="node" [style.top]="node.top + 'px'" [style.left]="node.left + 'px'">
- <div>{{node.name}}</div>
+<div class="node" id="{{node.id}}" (dblclick)="showProperties()" [style.top]="node.top + 'px'" [style.left]="node.left + 'px'">
+ <div>{{node.name}}</div>
<div class="anchor anchors anchor-left">
<span class="left">
<i class="left-arrow1"></i>
diff --git a/sdc-workflow-designer-ui/src/app/components/node/node.component.ts b/sdc-workflow-designer-ui/src/app/components/node/node.component.ts index c2686fbb..24b784fe 100644 --- a/sdc-workflow-designer-ui/src/app/components/node/node.component.ts +++ b/sdc-workflow-designer-ui/src/app/components/node/node.component.ts @@ -13,6 +13,8 @@ import { Component, AfterViewInit, Input } from '@angular/core';
import { JsPlumbService } from '../../services/jsplumb.service';
+import { BroadcastService } from "../../services/broadcast.service";
+import { WorkflowNode } from "../../model/workflow-node";
/**
* workflow node component
@@ -24,10 +26,11 @@ import { JsPlumbService } from '../../services/jsplumb.service'; })
export class NodeComponent implements AfterViewInit {
- @Input() public node: Node;
+ @Input() public node: WorkflowNode;
@Input() public last: boolean;
- constructor(private jsPlumbService: JsPlumbService) {
+ constructor(private broadcastService: BroadcastService,
+ private jsPlumbService: JsPlumbService) {
}
@@ -37,4 +40,9 @@ export class NodeComponent implements AfterViewInit { }
}
+ public showProperties() {
+ this.broadcastService.broadcast(this.broadcastService.nodeProperty, this.node);
+ this.broadcastService.broadcast(this.broadcastService.showProperty, true);
+ }
+
}
diff --git a/sdc-workflow-designer-ui/src/app/components/property/properties.component.css b/sdc-workflow-designer-ui/src/app/components/property/properties.component.css new file mode 100644 index 00000000..b5c07531 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/properties.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-properties-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/property/properties.component.html b/sdc-workflow-designer-ui/src/app/components/property/properties.component.html new file mode 100644 index 00000000..00aea176 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/properties.component.html @@ -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 + */ + --> + +<div class="wm-properties-wrapper" *ngIf="show"> + <div class="form-group row"> + <div *ngIf="!titleEditing" class="view col-md-10" (dblclick)="titleEditing = !titleEditing"> + <h4>{{node.name}}</h4> + </div> + <div class="col-md-10" *ngIf="titleEditing"> + <input class="form-control" (blur)="nodeNameChanged()" type="text" [(ngModel)]="node.name"/> + </div> + + <div class="col-md-2"> + <button (click)="deleteNode()" type="button" class="btn btn-danger"> + <i class="fa fa-trash" style="margin-right: 5px;"></i> + </button> + </div> + + </div> + <hr> + + <div class="form-group row"> + <label class="col-md-2 form-control-label text-md-right" for="nodeType">Type</label> + <div class="col-md-10"> + <input class="form-control" name="nodeType" disabled type="text" value="{{node.type}}"/> + </div> + </div> + + <!-- TODO add property for different node types --> + <span>TODO: property for different node types</span> + +</div> diff --git a/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts b/sdc-workflow-designer-ui/src/app/components/property/properties.component.ts new file mode 100644 index 00000000..bedf682f --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/properties.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 { WorkflowNode } from '../../model/workflow-node'; +import { BroadcastService } from '../../services/broadcast.service'; +import { JsPlumbService } from '../../services/jsplumb.service'; +import { WorkflowService } from '../../services/workflow.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-properties', + styleUrls: ['./properties.component.css'], + templateUrl: 'properties.component.html', +}) +export class PropertiesComponent implements AfterViewInit { + public node: WorkflowNode; + public show = false; + public titleEditing = false; + + constructor(private broadcastService: BroadcastService, + private jsPlumnService: JsPlumbService, + private workflowService: WorkflowService) { + + } + + public ngAfterViewInit() { + this.broadcastService.showProperty$.subscribe(show => this.show = show); + this.broadcastService.nodeProperty$.subscribe(node => this.node = node); + } + + public nodeNameChanged() { + this.titleEditing = !this.titleEditing; + this.jsPlumnService.jsplumbInstance.repaintEverything(); + } + + public deleteNode() { + this.show = false; + + this.jsPlumnService.remove(this.node.id); + this.workflowService.deleteNode(this.node.id); + } +} diff --git a/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts b/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts new file mode 100644 index 00000000..82e4cbbb --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/services/broadcast.service.ts @@ -0,0 +1,50 @@ +/** + * 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 { Injectable } from '@angular/core'; +import { Subject } from 'rxjs/Subject'; + +import { WorkflowNode } from '../model/workflow-node'; + +/** + * BroadcastService + * All of the observable subject should be registered to this service. + * It provider a broadcast method to broadcast data. the broadcast method would catch error while broadcasting. + */ +@Injectable() +export class BroadcastService { + + public jsPlumbInstance = new Subject<any>(); + public jsPlumbInstance$ = this.jsPlumbInstance.asObservable(); + + public showProperty = new Subject<boolean>(); + public showProperty$ = this.showProperty.asObservable(); + + public saveEvent = new Subject<string>(); + public saveEvent$ = this.saveEvent.asObservable(); + + public nodeProperty = new Subject<WorkflowNode>(); + public nodeProperty$ = this.nodeProperty.asObservable(); + + /** + * broadcast datas + * this method will catch the exceptions for the broadcast + * @param subject will broadcast data + * @param data will be broadcated + */ + public broadcast(subject: Subject<any>, data: any) { + try { + subject.next(data); + } catch (err) { + console.error(err); + } + } +} 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 33c88d4f..d192a82d 100644 --- a/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts +++ b/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts @@ -20,7 +20,7 @@ import { WorkflowService } from "./workflow.service"; */
@Injectable()
export class JsPlumbService {
- private jsplumbInstance;
+ public jsplumbInstance;
constructor(private workflowService: WorkflowService) {
this.initJsPlumbInstance();
@@ -29,7 +29,7 @@ export class JsPlumbService { public initJsPlumbInstance() {
this.jsplumbInstance = jsp.jsPlumb.getInstance({
- Container: 'container'
+ Container: 'canvas'
});
this.jsplumbInstance.importDefaults({
@@ -90,6 +90,10 @@ export class JsPlumbService { }
+ public remove(nodeId: string) {
+ this.jsplumbInstance.remove(nodeId);
+ }
+
public buttonDraggable() {
const selector = this.jsplumbInstance.getSelector('.toolbar .item');
this.jsplumbInstance.draggable(selector,
@@ -100,7 +104,8 @@ export class JsPlumbService { }
public buttonDroppable() {
- const selector = this.jsplumbInstance.getSelector('.container');
+ console.log('buttonDroppable');
+ const selector = this.jsplumbInstance.getSelector('.canvas');
this.jsplumbInstance.droppable(selector, {
scope: 'btn',
drop: event => {
|