Skip to content

Commit

Permalink
fix: [Bug] Alert ignoring initial v-model value. #1019
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Oct 20, 2017
1 parent 9a40c5a commit e0579d4
Show file tree
Hide file tree
Showing 3 changed files with 188 additions and 3 deletions.
3 changes: 2 additions & 1 deletion dev/components/components/alert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
Lorem ipsum dolor sit amet.
</q-alert>

<q-btn @click="visible2 = !visible2" label="Toggle HERE" />
<q-alert
type="negative"
ref="destroyableAlert"
Expand Down Expand Up @@ -76,7 +77,7 @@ export default {
data () {
return {
visible: true,
visible2: true,
visible2: false,
diss: true,
actions: [{
label: 'Snooze',
Expand Down
181 changes: 181 additions & 0 deletions dev/components/web-tests/fast-table-test.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<template>
<div class="layout-padding">
<!--
This is for fast tests.
Use this page but don't add it into your commits (leave it outside
of your commit).
For some test that you think it should be persistent,
make a new *.vue file here or in another folder under /dev/components.
-->
<q-table
:data="xxl"
:columns="columns"
:filter="filter"
:color="color"
row-key="name"
:selection="selection"
:selected.sync="selected"
:loader="loader"
:visible-columns="visibleColumns"
:title="title"
table-style="max-height: 500px;"
/>
</div>
</template>

<script>
export default {
data () {
return {
selectionToggle: false,
loader: false,
color: 'amber',
visibleColumns: ['desc', 'fat', 'carbs', 'protein', 'sodium', 'calcium', 'iron'],
separator: 'horizontal',
selected: [],
selection: 'multiple',
serverPagination: {
page: 1,
rowsNumber: 10
},
serverData: [],
title: 'QDataTable',
filter: '',
columns: [
{
name: 'desc',
required: true,
label: 'Dessert (100g serving)',
align: 'left',
field: row => row.name,
format: val => `~${val}`,
sortable: true
},
{ name: 'calories', align: 'center', label: 'Calories', field: 'calories', sortable: true },
{ name: 'fat', label: 'Fat (g)', field: 'fat', sortable: true },
{ name: 'carbs', label: 'Carbs (g)', field: 'carbs' },
{ name: 'protein', label: 'Protein (g)', field: 'protein' },
{ name: 'sodium', label: 'Sodium (mg)', field: 'sodium' },
{ name: 'calcium', label: 'Calcium (%)', field: 'calcium', sortable: true, sort: (a, b) => parseInt(a, 10) - parseInt(b, 10) },
{ name: 'iron', label: 'Iron (%)', field: 'iron', sortable: true, sort: (a, b) => parseInt(a, 10) - parseInt(b, 10) }
],
data: [
{
name: '1Frozen Yogurt',
calories: 159,
fat: 6.0,
carbs: 24,
protein: 4.0,
sodium: 87,
calcium: '14%',
iron: '1%'
},
{
name: '2Ice cream sandwich',
calories: 237,
fat: 9.0,
carbs: 37,
protein: 4.3,
sodium: 129,
calcium: '8%',
iron: '1%'
},
{
name: '3Eclair',
calories: 262,
fat: 16.0,
carbs: 23,
protein: 6.0,
sodium: 337,
calcium: '6%',
iron: '7%'
},
{
name: '4Cupcake',
calories: 305,
fat: 3.7,
carbs: 67,
protein: 4.3,
sodium: 413,
calcium: '3%',
iron: '8%'
},
{
name: '5Gingerbread',
calories: 356,
fat: 16.0,
carbs: 49,
protein: 3.9,
sodium: 327,
calcium: '7%',
iron: '16%'
},
{
name: '6Jelly bean',
calories: 375,
fat: 0.0,
carbs: 94,
protein: 0.0,
sodium: 50,
calcium: '0%',
iron: '0%'
},
{
name: '7Lollipop',
calories: 392,
fat: 0.2,
carbs: 98,
protein: 0,
sodium: 38,
calcium: '0%',
iron: '2%'
},
{
name: '8Honeycomb',
calories: 408,
fat: 3.2,
carbs: 87,
protein: 6.5,
sodium: 562,
calcium: '0%',
iron: '45%'
},
{
name: '9Donut',
calories: 452,
fat: 25.0,
carbs: 51,
protein: 4.9,
sodium: 326,
calcium: '2%',
iron: '22%'
},
{
name: '10KitKat',
calories: 518,
fat: 26.0,
carbs: 65,
protein: 7,
sodium: 54,
calcium: '12%',
iron: '6%'
}
]
}
},
computed: {
xxl () {
let data = this.data
for (let i = 0; i < 50; i++) {
data = data.concat(this.data)
}
return data
}
},
methods: {
}
}
</script>
7 changes: 5 additions & 2 deletions src/components/alert/QAlert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ export default {
QTransition
},
props: {
value: Boolean,
value: {
type: Boolean,
default: true
},
duration: Number,
name: String,
enter: String,
Expand All @@ -83,7 +86,7 @@ export default {
},
data () {
return {
active: true
active: this.value
}
},
watch: {
Expand Down

0 comments on commit e0579d4

Please sign in to comment.