remove testing code, close branch

This commit is contained in:
Yubing325 2020-06-17 11:46:22 -05:00
parent 96be2876b8
commit 5472316cd1
5 changed files with 11 additions and 11 deletions

View File

@ -5,7 +5,7 @@ import { CommandModalDemoRoutingModule } from './command-modal-demo-routing.modu
import { DataGridModule } from '@poweredsoft/ngx-cdk-ui'; import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import { CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-bootstrap'; import { CommandModalModule, psbxPaginationModule, ConfirmModalModule } from '@poweredsoft/ngx-bootstrap';
@NgModule({ @NgModule({
declarations: [CommandModalDemoComponent], declarations: [CommandModalDemoComponent],
imports: [ imports: [
@ -14,7 +14,8 @@ import { CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-boots
DataGridModule, DataGridModule,
CommandModalModule, CommandModalModule,
FormsModule, FormsModule,
psbxPaginationModule psbxPaginationModule,
ConfirmModalModule
] ]
}) })
export class CommandModalDemoModule { } export class CommandModalDemoModule { }

View File

@ -27,8 +27,8 @@
<button class="btn-primary btn" psbxCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update" <button class="btn-primary btn" psbxCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
[dataSource]="merchantDataSource" command="changeMerchant" [model]="model" [template]="changeName">Change</button> [dataSource]="merchantDataSource" command="changeMerchant" [model]="model" [template]="changeName">Change</button>
<button class="btn-danger btn" psbxCommandModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove" <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
[dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button> [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >RemoveIt</button>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container *psDataGridFooter> <ng-container *psDataGridFooter>

View File

@ -5,6 +5,7 @@ import { FormGroupModalDemoRoutingModule } from './form-group-modal-demo-routing
import { DataGridModule } from '@poweredsoft/ngx-cdk-ui'; import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
import { FormGroupCommandModalModule,CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-bootstrap'; import { FormGroupCommandModalModule,CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-bootstrap';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { ConfirmModalModule } from 'projects/poweredsoft/ngx-bootstrap/src/public-api';
@ -16,7 +17,8 @@ import { ReactiveFormsModule } from '@angular/forms';
DataGridModule, DataGridModule,
FormGroupCommandModalModule, FormGroupCommandModalModule,
ReactiveFormsModule, ReactiveFormsModule,
psbxPaginationModule psbxPaginationModule,
ConfirmModalModule,
] ]
}) })

View File

@ -24,10 +24,8 @@
<button class="btn-success btn" psbxFormGroupCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update" <button class="btn-success btn" psbxFormGroupCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
[dataSource]="merchantDataSource" command="changeMerchant" (formCreate)="onFormCreate($event)" [model]="model" [template]="theModal">Change</button> [dataSource]="merchantDataSource" command="changeMerchant" (formCreate)="onFormCreate($event)" [model]="model" [template]="theModal">Change</button>
<button class="btn-danger btn" psbxFormGroupCommandModal <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
[commandTitle]="'remove ' + model.name + ' name'" commandText="delete" [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Delete!</button>
[dataSource]="merchantDataSource" command="removeMerchant"
[model]="model" (formCreate)="onFormCreate($event)">Remove</button>
<!-- <button class="btn-danger btn" psbxExecuteCommand [dataSource]="merchantDataSource" [command]="removeMerchant" <!-- <button class="btn-danger btn" psbxExecuteCommand [dataSource]="merchantDataSource" [command]="removeMerchant"
[model]="model" [confirm]="true" [confirmMessage]="do you wish to delete the merchant `' + model.name + '`" [refresh]="false">Delete</button> --> [model]="model" [confirm]="true" [confirmMessage]="do you wish to delete the merchant `' + model.name + '`" [refresh]="false">Delete</button> -->

View File

@ -44,7 +44,6 @@
<ng-container *psDataGridCell="let model"> <ng-container *psDataGridCell="let model">
<button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove" <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
[dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button> [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button>
<!-- <button class="btn-danger btn" (click)="removeMerchant(model.id)">Remove</button> -->
</ng-container> </ng-container>
</ng-container> </ng-container>
@ -52,7 +51,7 @@
<psbx-ds-pagination [dataSource]="merchantDataSource"></psbx-ds-pagination> <psbx-ds-pagination [dataSource]="merchantDataSource"></psbx-ds-pagination>
</ng-container> </ng-container>
</ps-data-grid> </ps-data-grid>
<!-- <button (click)="testService()">Test confirm</button> -->
<ng-template #confirm> <ng-template #confirm>