Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-17 07:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/ng2-smart-table-int' into development

Browse source
This commit is contained in:
nixa 2016-08-23 14:11:37 +03:00
commit 949403cbef
4 changed files with 15 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -41,7 +41,7 @@
"ng2-bootstrap": "^1.0.20",
"ng2-branchy": "^0.0.2-5",
"ng2-ckeditor": "^1.0.4",
"ng2-smart-table": "^0.1.5",
"ng2-smart-table": "^0.1.6",
"ng2-uploader": "0.5.6",
"normalize.css": "^4.1.1",
"rxjs": "5.0.0-beta.6",

29
src/app/pages/tables/components/smartTables/smartTables.component.ts
View file

@ -66,33 +66,4 @@ export class SmartTables {
this.source.load(data);
});
}
onSearch(): void {
this.source.setFilter([
{
field: 'id',
search: this.query
},
{
field: 'firstName',
search: this.query
},
{
field: 'lastName',
search: this.query
},
{
field: 'username',
search: this.query
},
{
field: 'email',
search: this.query
},
{
field: 'age',
search: this.query
}
], false);
}
}

7
src/app/pages/tables/components/smartTables/smartTables.html
View file

@ -2,13 +2,6 @@
<div class="row">
<ba-card title="Basic Example" baCardClass="with-scroll">
<div class="row">
<div class="form-group col-sm-3 col-xs-6">
<input type="text" class="form-control" placeholder="Search" [(ngModel)]="query" (keydown.enter)="onSearch()">
</div>
<button type="submit" class="btn btn-primary" (click)="onSearch()">Search</button>
</div>
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</ba-card>
</div>

19
src/app/pages/tables/components/smartTables/smartTables.scss
View file

@ -2,14 +2,21 @@
.ng2-smart-table-container table.ng2-smart-table {
th, td {
border: 1px solid $border;
border: 1px solid $border-light !important;
line-height: 35px;
vertical-align: middle;
}
color: $default-text;
input {
line-height: 1.5!important;
line-height: 1.5 !important;
}
tbody {
tr:hover {
background: rgba(0, 0, 0, 0.03);
}
}
a.ng2-smart-sort-link {
@ -18,6 +25,10 @@
font-weight: $font-bolder;
&.sort {
font-weight: $font-bolder !important;
&::after {
border-bottom-color: $default-text !important;
}
}
}
@ -27,9 +38,6 @@
.actions {
float: none;
text-align: center;
a + a {
padding-left: 10px;
}
}
}
@ -37,6 +45,7 @@
font-size: 14px !important;
color: $default-text;
padding: 0 5px;
display: inline-block;
&.ng2-smart-action-add-add {
font-size: 25px !important;