add canvas component and add property edit panel, this panel will display while a workflow node is double clicked.
Issue-ID: SDC-260
Change-Id: I0f150b0a480f986e0a8ab3bb67cf89f3e2267155
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
{
- "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
- "project": {
- "name": "workflowmodeler"
- },
- "apps": [
- {
- "root": "src",
- "outDir": "dist",
- "assets": [
- "assets",
- "favicon.ico"
- ],
- "index": "index.html",
- "main": "main.ts",
- "polyfills": "polyfills.ts",
- "test": "test.ts",
- "tsconfig": "tsconfig.app.json",
- "testTsconfig": "tsconfig.spec.json",
- "prefix": "app",
- "styles": [
- "styles.css"
- ],
- "scripts": [],
- "environmentSource": "environments/environment.ts",
- "environments": {
- "dev": "environments/environment.ts",
- "prod": "environments/environment.prod.ts"
- }
- }
- ],
- "e2e": {
- "protractor": {
- "config": "./protractor.conf.js"
- }
- },
- "lint": [
- {
- "project": "src/tsconfig.app.json",
- "exclude": "**/node_modules/**"
+ "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+ "project": {
+ "name": "workflowmodeler"
},
- {
- "project": "src/tsconfig.spec.json",
- "exclude": "**/node_modules/**"
+ "apps": [
+ {
+ "root": "src",
+ "outDir": "dist",
+ "assets": [
+ "assets",
+ "favicon.ico"
+ ],
+ "index": "index.html",
+ "main": "main.ts",
+ "polyfills": "polyfills.ts",
+ "test": "test.ts",
+ "tsconfig": "tsconfig.app.json",
+ "testTsconfig": "tsconfig.spec.json",
+ "prefix": "app",
+ "styles": [
+ "./../node_modules/bootstrap/dist/css/bootstrap.min.css",
+ "./../node_modules/font-awesome/css/font-awesome.min.css",
+ "styles.css"
+ ],
+ "scripts": [],
+ "environmentSource": "environments/environment.ts",
+ "environments": {
+ "dev": "environments/environment.ts",
+ "prod": "environments/environment.prod.ts"
+ }
+ }
+ ],
+ "e2e": {
+ "protractor": {
+ "config": "./protractor.conf.js"
+ }
},
- {
- "project": "e2e/tsconfig.e2e.json",
- "exclude": "**/node_modules/**"
- }
- ],
- "test": {
- "karma": {
- "config": "./karma.conf.js"
+ "lint": [
+ {
+ "project": "src/tsconfig.app.json",
+ "exclude": "**/node_modules/**"
+ },
+ {
+ "project": "src/tsconfig.spec.json",
+ "exclude": "**/node_modules/**"
+ },
+ {
+ "project": "e2e/tsconfig.e2e.json",
+ "exclude": "**/node_modules/**"
+ }
+ ],
+ "test": {
+ "karma": {
+ "config": "./karma.conf.js"
+ }
+ },
+ "defaults": {
+ "styleExt": "css",
+ "component": {}
}
- },
- "defaults": {
- "styleExt": "css",
- "component": {}
- }
}
"hoek": "2.16.3"
}
},
+ "bootstrap": {
+ "version": "4.0.0-alpha.6",
+ "resolved": "http://10.75.8.148/repository/npm-pub/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz",
+ "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=",
+ "requires": {
+ "jquery": "3.2.1",
+ "tether": "1.4.0"
+ }
+ },
"brace-expansion": {
"version": "1.1.8",
"resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.8.tgz",
"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
"dev": true
},
+ "font-awesome": {
+ "version": "4.7.0",
+ "resolved": "http://10.75.8.148/repository/npm-pub/font-awesome/-/font-awesome-4.7.0.tgz",
+ "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+ },
"for-in": {
"version": "1.0.2",
"resolved": "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz",
"integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=",
"dev": true
},
+ "jquery": {
+ "version": "3.2.1",
+ "resolved": "http://10.75.8.148/repository/npm-pub/jquery/-/jquery-3.2.1.tgz",
+ "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+ },
"js-base64": {
"version": "2.1.9",
"resolved": "http://registry.npm.taobao.org/js-base64/download/js-base64-2.1.9.tgz",
}
}
},
+ "tether": {
+ "version": "1.4.0",
+ "resolved": "http://10.75.8.148/repository/npm-pub/tether/-/tether-1.4.0.tgz",
+ "integrity": "sha1-D5+hcfdb9YSF2BSelHmdeudNHBo="
+ },
"through": {
"version": "2.3.8",
"resolved": "http://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"angular-in-memory-web-api": "^0.3.2",
+ "bootstrap": "^4.0.0-alpha.6",
"core-js": "^2.4.1",
+ "font-awesome": "^4.7.0",
"jsplumb": "2.5.0",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
*/
-->
-<!--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>
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();
- }
}
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: [
SharedModule,
],
providers: [
+ BroadcastService,
DataAccessService,
HttpService,
JsPlumbService,
--- /dev/null
+/**
+ * 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;
+}
--- /dev/null
+<!--
+/**
+ * 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>
--- /dev/null
+/**
+ * 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;
+ }
+}
* ZTE - initial API and implementation and/or initial documentation\r
*/\r
-->\r
-<div class="node" [style.top]="node.top + 'px'" [style.left]="node.left + 'px'">\r
-
<div>{{node.name}}</div>
\r+<div class="node" id="{{node.id}}" (dblclick)="showProperties()" [style.top]="node.top + 'px'" [style.left]="node.left + 'px'">\r
+ <div>{{node.name}}</div>\r
<div class="anchor anchors anchor-left">\r
<span class="left">\r
<i class="left-arrow1"></i>\r
import { Component, AfterViewInit, Input } from '@angular/core';\r
\r
import { JsPlumbService } from '../../services/jsplumb.service';\r
+import { BroadcastService } from "../../services/broadcast.service";\r
+import { WorkflowNode } from "../../model/workflow-node";\r
\r
/**\r
* workflow node component\r
})\r
export class NodeComponent implements AfterViewInit {\r
\r
- @Input() public node: Node;\r
+ @Input() public node: WorkflowNode;\r
@Input() public last: boolean;\r
\r
- constructor(private jsPlumbService: JsPlumbService) {\r
+ constructor(private broadcastService: BroadcastService,\r
+ private jsPlumbService: JsPlumbService) {\r
\r
}\r
\r
}\r
}\r
\r
+ public showProperties() {\r
+ this.broadcastService.broadcast(this.broadcastService.nodeProperty, this.node);\r
+ this.broadcastService.broadcast(this.broadcastService.showProperty, true);\r
+ }\r
+\r
}\r
--- /dev/null
+/**
+ * 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;
+}
--- /dev/null
+<!--
+/**
+ * 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>
--- /dev/null
+/**
+ * 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);
+ }
+}
--- /dev/null
+/**
+ * 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);
+ }
+ }
+}
*/\r
@Injectable()\r
export class JsPlumbService {\r
- private jsplumbInstance;\r
+ public jsplumbInstance;\r
\r
constructor(private workflowService: WorkflowService) {\r
this.initJsPlumbInstance();\r
\r
public initJsPlumbInstance() {\r
this.jsplumbInstance = jsp.jsPlumb.getInstance({\r
- Container: 'container'\r
+ Container: 'canvas'\r
});\r
\r
this.jsplumbInstance.importDefaults({\r
\r
}\r
\r
+ public remove(nodeId: string) {\r
+ this.jsplumbInstance.remove(nodeId);\r
+ }\r
+\r
public buttonDraggable() {\r
const selector = this.jsplumbInstance.getSelector('.toolbar .item');\r
this.jsplumbInstance.draggable(selector,\r
}\r
\r
public buttonDroppable() {\r
- const selector = this.jsplumbInstance.getSelector('.container');\r
+ console.log('buttonDroppable');\r
+ const selector = this.jsplumbInstance.getSelector('.canvas');\r
this.jsplumbInstance.droppable(selector, {\r
scope: 'btn',\r
drop: event => {\r
Code Review / sdc / sdc-workflow-designer.git / commitdiff