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

Commit a0d1e85

Browse files
jamesdordoyjamesdordoy
committed
Tidying up.
1 parent 9559f31 commit a0d1e85

12 files changed

+107
-104
lines changed

‎docs/css/chunk-vendors.b053faf6.css

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/css/chunk-vendors.cc8308be.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/index.html

Lines changed: 1 addition & 1 deletion
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.123d4184.css rel=preload as=style><link href=/laravel-vue-datatable/css/chunk-vendors.cc8308be.css rel=preload as=style><link href=/laravel-vue-datatable/js/app.8cf5962f.js rel=preload as=script><link href=/laravel-vue-datatable/js/chunk-vendors.eb9e8c66.js rel=preload as=script><link href=/laravel-vue-datatable/css/chunk-vendors.cc8308be.css rel=stylesheet><link href=/laravel-vue-datatable/css/app.123d4184.css rel=stylesheet></head><body class=min-h-100><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.eb9e8c66.js></script><script src=/laravel-vue-datatable/js/app.8cf5962f.js></script></body></html>
16+
}(window.location))</script><link href=/laravel-vue-datatable/css/app.123d4184.css rel=preload as=style><link href=/laravel-vue-datatable/css/chunk-vendors.b053faf6.css rel=preload as=style><link href=/laravel-vue-datatable/js/app.689d7afb.js rel=preload as=script><link href=/laravel-vue-datatable/js/chunk-vendors.08ff090f.js rel=preload as=script><link href=/laravel-vue-datatable/css/chunk-vendors.b053faf6.css rel=stylesheet><link href=/laravel-vue-datatable/css/app.123d4184.css rel=stylesheet></head><body class=min-h-100><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.08ff090f.js></script><script src=/laravel-vue-datatable/js/app.689d7afb.js></script></body></html>

‎docs/js/app.8cf5962f.js renamed to ‎docs/js/app.689d7afb.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.689d7afb.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.8cf5962f.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/js/chunk-vendors.08ff090f.js

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/chunk-vendors.08ff090f.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/chunk-vendors.eb9e8c66.js

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎docs/js/chunk-vendors.eb9e8c66.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/components/DataTable.vue

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@ export default {
145145
type: Boolean,
146146
default: false,
147147
},
148-
perPage: {
149-
type: Array,
150-
default: () => ([
151-
'10',
152-
'25',
153-
'50'
154-
]),
155-
},
156148
columns: {
157149
type: Array,
158150
default: () => ([]),
@@ -165,11 +157,22 @@ export default {
165157
align: 'right',
166158
}),
167159
},
160+
perPage: {
161+
type: Array,
162+
default: () => ([
163+
'10',
164+
'25',
165+
'50'
166+
]),
167+
},
168168
orderDir: {
169169
type: String,
170170
default: "asc",
171171
validator: function (value) {
172-
return ['asc', 'desc'].indexOf(value) !== -1
172+
return [
173+
'asc',
174+
'desc'
175+
].indexOf(value) !== -1;
173176
}
174177
},
175178
classes: {

‎src/views/examples/Joins.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div v-show="code">
1212

1313
<information-alert>
14-
For more complex filtering, it is suggested to use the query builder as you are able to make cross table queries and searches in only a single call to the database. You can add your own joins to the default query provided by the package to add additional data but you will have to reselect the data you want and as previous filters have been applied by the default searching, please use the <code>orWhere</code> method to apply additional filters as using <code>where</code> will clear the previously set search filters.
14+
For more complex filtering, it is suggested to use the query builder as you are able to make cross table queries and searches in only a single call to the database. You can add your own joins to the default query but you will have to reselect the data you want. As previous filters have been applied by the default searching, please use the <code>orWhere</code> method to apply additional filters as using <code>where</code> will clear the previously set search filters.
1515

1616
There is a default method for setting up the datatable query using the builder which can be seen below:
1717
</information-alert>

0 commit comments

Comments
 (0)