mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
Hide the process list when starting and after started new process (#1470)
- Ensures that the newly-started process is *always* shown - No need to reload the list any more as not shown - Filter component shows no selected filter when starting process - User can exit Start Process by clicking a filter again Refs #1332, #1307
This commit is contained in:
@@ -68,7 +68,7 @@
|
|||||||
(filterClick)="onProcessFilterClick($event)"
|
(filterClick)="onProcessFilterClick($event)"
|
||||||
(onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters>
|
(onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters>
|
||||||
</div>
|
</div>
|
||||||
<div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp">
|
<div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp" *ngIf="processFilter && !isStartProcessMode()">
|
||||||
<span><h5>Process List</h5></span>
|
<span><h5>Process List</h5></span>
|
||||||
<hr>
|
<hr>
|
||||||
<activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
|
<activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
|
||||||
@@ -80,7 +80,9 @@
|
|||||||
(rowClick)="onProcessRowClick($event)"
|
(rowClick)="onProcessRowClick($event)"
|
||||||
(onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list>
|
(onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list>
|
||||||
</div>
|
</div>
|
||||||
<div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp" *ngIf="!isStartProcessMode()">
|
<div class="mdl-cell task-column mdl-shadow--2dp" *ngIf="!isStartProcessMode()"
|
||||||
|
[class.mdl-cell--7-col]="processFilter && !isStartProcessMode()"
|
||||||
|
[class.mdl-cell--10-col]="!processFilter || isStartProcessMode()">
|
||||||
<span><h5>Process Details</h5></span>
|
<span><h5>Process Details</h5></span>
|
||||||
<hr>
|
<hr>
|
||||||
<activiti-process-instance-details
|
<activiti-process-instance-details
|
||||||
@@ -89,8 +91,8 @@
|
|||||||
(taskClick)="onProcessDetailsTaskClick($event)">
|
(taskClick)="onProcessDetailsTaskClick($event)">
|
||||||
</activiti-process-instance-details>
|
</activiti-process-instance-details>
|
||||||
</div>
|
</div>
|
||||||
<div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()">
|
<div class="mdl-cell mdl-cell--10-col task-column mdl-shadow--2dp" *ngIf="isStartProcessMode()">
|
||||||
<span>Start Process</span>
|
<span><h5>Start Process</h5></span>
|
||||||
<hr>
|
<hr>
|
||||||
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
|
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -166,6 +166,7 @@ export class ActivitiDemoComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onProcessFilterClick(event: FilterProcessRepresentationModel) {
|
onProcessFilterClick(event: FilterProcessRepresentationModel) {
|
||||||
|
this.currentProcessInstanceId = null;
|
||||||
this.processFilter = event;
|
this.processFilter = event;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,13 +191,16 @@ export class ActivitiDemoComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
navigateStartProcess() {
|
navigateStartProcess() {
|
||||||
|
this.processFilter = null;
|
||||||
|
this.activitiprocessfilter.selectFilter(null);
|
||||||
this.currentProcessInstanceId = currentProcessIdNew;
|
this.currentProcessInstanceId = currentProcessIdNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
onStartProcessInstance(instance: ProcessInstance) {
|
onStartProcessInstance(instance: ProcessInstance) {
|
||||||
this.currentProcessInstanceId = instance.id;
|
this.currentProcessInstanceId = instance.id;
|
||||||
this.activitiStartProcess.reset();
|
this.activitiStartProcess.reset();
|
||||||
this.activitiprocesslist.reload();
|
this.processFilter = null;
|
||||||
|
this.activitiprocessfilter.selectFilter(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
isStartProcessMode() {
|
isStartProcessMode() {
|
||||||
|
Reference in New Issue
Block a user