Skip to content
This repository was archived by the owner on Apr 30, 2024. It is now read-only.

Commit 2de49ce

Browse files
jamesdordoyjamesdordoy
committed
0.5.14 Release for transforming column values using callback function.
1 parent d193a90 commit 2de49ce

12 files changed

+61
-67
lines changed

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
);
1414
}
1515
}
16-
}(window.location))</script><link href=/laravel-vue-datatable/css/app.8e7df856.css rel=preload as=style><link href=/laravel-vue-datatable/css/chunk-vendors.a4bf0c2c.css rel=preload as=style><link href=/laravel-vue-datatable/js/app.e5a28b77.js rel=preload as=script><link href=/laravel-vue-datatable/js/chunk-vendors.893613cb.js rel=preload as=script><link href=/laravel-vue-datatable/css/chunk-vendors.a4bf0c2c.css rel=stylesheet><link href=/laravel-vue-datatable/css/app.8e7df856.css rel=stylesheet></head><body><noscript><strong>We're sorry but laravel-vue-datatable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/laravel-vue-datatable/js/chunk-vendors.893613cb.js></script><script src=/laravel-vue-datatable/js/app.e5a28b77.js></script></body></html>
16+
}(window.location))</script><link href=/laravel-vue-datatable/css/app.8e7df856.css rel=preload as=style><link href=/laravel-vue-datatable/css/chunk-vendors.a4bf0c2c.css rel=preload as=style><link href=/laravel-vue-datatable/js/app.400b5185.js rel=preload as=script><link href=/laravel-vue-datatable/js/chunk-vendors.893613cb.js rel=preload as=script><link href=/laravel-vue-datatable/css/chunk-vendors.a4bf0c2c.css rel=stylesheet><link href=/laravel-vue-datatable/css/app.8e7df856.css rel=stylesheet></head><body><noscript><strong>We're sorry but laravel-vue-datatable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/laravel-vue-datatable/js/chunk-vendors.893613cb.js></script><script src=/laravel-vue-datatable/js/app.400b5185.js></script></body></html>

‎docs/js/app.400b5185.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.400b5185.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.e5a28b77.js

-2
This file was deleted.

‎docs/js/app.e5a28b77.js.map

-1
This file was deleted.

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-vue-datatable",
3-
"version": "0.5.13",
3+
"version": "0.5.14",
44
"description": "Vue.js datatable made with Laravel and Bootstrap in mind",
55
"author": "James Dordoy <[email protected]>",
66
"homepage": "https://jamesdordoy.github.io/laravel-vue-datatable/",
@@ -85,7 +85,9 @@
8585
"plugin:vue/essential",
8686
"eslint:recommended"
8787
],
88-
"rules": {},
88+
"rules": {
89+
"no-console": "off"
90+
},
8991
"parserOptions": {
9092
"parser": "babel-eslint"
9193
}

‎src/components/DataTable.vue

+17-30
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
<slot
55
:url="url"
66
name="filters"
7-
v-if="filtersSlot"
87
:per-page="perPage"
98
:table-data="tableProps">
9+
<laravel-vue-data-table-filters
10+
:per-page="perPage"
11+
:table-data="tableProps"
12+
:placeholder-search="translate.placeholderSearch">
13+
</laravel-vue-data-table-filters>
1014
</slot>
11-
<laravel-vue-data-table-filters
12-
v-else
13-
:per-page="perPage"
14-
:table-data="tableProps"
15-
:placeholder-search="translate.placeholderSearch">
16-
</laravel-vue-data-table-filters>
15+
1716
<!-- Table component -->
1817
<laravel-vue-table
1918
@sort="sortBy"
@@ -77,24 +76,24 @@
7776
</tbody>
7877
</template>
7978
</laravel-vue-table>
79+
8080
<!-- Bottom Filters -->
8181
<slot
8282
:page="page"
8383
name="pagination"
84-
v-if="paginationSlot"
8584
:meta="tableData.meta"
8685
:links="tableData.links">
86+
<laravel-pagination
87+
:data="tableData"
88+
:size="pagination.size"
89+
:limit="pagination.limit"
90+
:align="pagination.align"
91+
@pagination-change-page="paginationChangePage">
92+
<span slot="prev-nav">{{ translate.previousButton }}</span>
93+
<span slot="next-nav">{{ translate.nextButton }}</span>
94+
</laravel-pagination>
8795
</slot>
88-
<laravel-pagination
89-
v-else
90-
:data="tableData"
91-
:size="pagination.size"
92-
:limit="pagination.limit"
93-
:align="pagination.align"
94-
@pagination-change-page="paginationChangePage">
95-
<span slot="prev-nav">{{ translate.previousButton }}</span>
96-
<span slot="next-nav">{{ translate.nextButton }}</span>
97-
</laravel-pagination>
96+
9897
</div>
9998
</template>
10099

@@ -248,18 +247,6 @@ export default {
248247
'laravel-vue-data-table-filters': DataTableFilters,
249248
},
250249
computed: {
251-
paginationSlot() {
252-
if (this.$scopedSlots) {
253-
return this.$scopedSlots.pagination;
254-
}
255-
return null;
256-
},
257-
filtersSlot() {
258-
if (this.$scopedSlots) {
259-
return this.$scopedSlots.filters;
260-
}
261-
return null;
262-
},
263250
bodySlot() {
264251
if (this.$scopedSlots) {
265252
return this.$scopedSlots.body;

‎src/components/DataTableTh.vue

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
:style="{borderTop: column.orderable && column.name == currentSort && dir == 'desc' ? '5px solid #a3a3a3' : '5px solid #ccc' }">
3333
</div>
3434
</div>
35-
<span v-html="column.label"></span>
35+
<span v-html="`&nbsp;${column.label}`"></span>
3636
</th>
3737
</template>
3838

@@ -64,9 +64,12 @@ export default {
6464
return classes;
6565
},
6666
sort(column) {
67-
this.currentSort = column.name;
67+
this.setCurrentColumnSort(column.name);
6868
this.$emit('sort', column);
6969
},
70-
}
70+
setCurrentColumnSort(columnName) {
71+
this.currentSort = columnName;
72+
}
73+
},
7174
}
7275
</script>

‎src/components/Table.vue

+15-25
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@
22
<div :class="tableContainerClasses">
33
<table :class="tableClasses" class="laravel-vue-datatable">
44
<slot
5-
name="header"
6-
v-if="headerSlot">
5+
name="header">
6+
<thead
7+
:class="tableHeaderClasses"
8+
class="laravel-vue-datatable-thead">
9+
<tr :class="tableRowClasses" class="laravel-vue-datatable-thead-tr">
10+
<laravel-vue-data-table-th
11+
:dir="dir"
12+
@sort="sort"
13+
:column="column"
14+
:key="column.name"
15+
v-for="column in columns"
16+
:classes="tableHeadClasses">
17+
</laravel-vue-data-table-th>
18+
</tr>
19+
</thead>
720
</slot>
8-
<thead
9-
v-else
10-
:class="tableHeaderClasses"
11-
class="laravel-vue-datatable-thead">
12-
<tr :class="tableRowClasses" class="laravel-vue-datatable-thead-tr">
13-
<laravel-vue-data-table-th
14-
:dir="dir"
15-
@sort="sort"
16-
:column="column"
17-
:key="column.name"
18-
v-for="column in columns"
19-
:classes="tableHeadClasses">
20-
</laravel-vue-data-table-th>
21-
</tr>
22-
</thead>
2321
<slot name="body">
2422
</slot>
2523
</table>
@@ -78,13 +76,5 @@ export default {
7876
this.$emit('sort', column.name, column.columnName);
7977
},
8078
},
81-
computed: {
82-
headerSlot() {
83-
if (this.$scopedSlots) {
84-
return this.$scopedSlots.header;
85-
}
86-
return null;
87-
},
88-
}
8979
}
9080
</script>

‎src/exceptions/ColumnNotFoundException.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default class ColumnNotFoundException extends Error {
22
constructor(message) {
3-
super(message)
4-
this.name = 'Column Not Found Exception'
5-
this.message = message
3+
super(message);
4+
this.name = 'Column Not Found Exception';
5+
this.message = message;
66
}
77
}

‎src/markdown/examples/basic.md

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ export default {
2222
name: 'name',
2323
orderable: true,
2424
},
25+
{
26+
label: 'Cost (&pound;)',
27+
name: 'cost',
28+
orderable: true,
29+
transform: ({data, name}) => `&pound;${data[name]}`,
30+
},
2531
{
2632
label: 'Email',
2733
name: 'email',

‎src/views/examples/Basic.vue

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
name: 'name',
6161
orderable: true,
6262
},
63+
{
64+
label: 'Cost (&pound;)',
65+
name: 'cost',
66+
orderable: true,
67+
transform: ({data, name}) => `&pound;${data[name]}`,
68+
},
6369
{
6470
label: 'Email',
6571
name: 'email',

0 commit comments

Comments
 (0)