Skip to content

Commit

Permalink
Merge pull request #10 from acampagnaro/master
Browse files Browse the repository at this point in the history
Vue 2.5
  • Loading branch information
wxs77577 committed Jul 14, 2018
2 parents 9390c16 + fdb3520 commit a37365b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
build/*.js
config/*.js
/dist/
/*.js
/test/unit/coverage/
13 changes: 13 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"esversion": 6,
"esnext": false,
"moz": true,
"boss": true,
"node": true,
"validthis": true,
"globals": {
"EventEmitter": true,
"Promise": true
},
"asi": true
}
2 changes: 1 addition & 1 deletion src/components/Grid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<v-card >
<v-data-table v-bind:headers="columns" v-model="data.data" hide-actions>
<template slot="items" scope="props">
<template slot="items" slot-scope="props">
<td :class="column.left? '': 'text-xs-right'" v-for="column in columns">
{{getColumnData(props.item, column.value)}}
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/CrudGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ div()
v-btn(router,fab,absolute,top,right,dark,class="green", :to="{name: 'create', params: {resource}}",v-if="options.create !== false")
v-icon add
v-data-table(:headers='columns', :items='items',:total-items="pagination.totalItems",hide-actions, :pagination.sync="pagination", :loading="loading")
template(slot='items', scope='props')
template(slot='items', slot-scope='props')
tr
td(:class="column.left? '': 'text-xs-right'", v-for='column in columns', v-html="getColumnData(props.item, column)")
td(v-if='actions !== false', width='160')
Expand Down

0 comments on commit a37365b

Please sign in to comment.