Skip to content

Commit a3bcfcb

Browse files
Merge pull request lusaxweb#458 from NickSniper/master
Fix issues with null values
2 parents 7ba3dcc + 2abb594 commit a3bcfcb

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/components/vsSelect/vsSelect.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ export default {
227227
},
228228
watch:{
229229
value(event){
230+
this.valuex = this.value;
230231
this.$emit('change',event)
231232
},
232233
active(){

src/components/vsTable/vsTable.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export default {
297297
obj.forEach((item) => {
298298
getStrings(item)
299299
})
300-
} else if (typeof obj == 'object') {
300+
} else if (obj && typeof obj == 'object') {
301301
let subObj = Object.values(obj)
302302
strings = [...strings,...subObj]
303303
getStrings(subObj)
@@ -313,7 +313,7 @@ export default {
313313
getStrings(obj, valuesx) {
314314
let stringsx = Object.values(obj)
315315
valuesx.forEach((item) => {
316-
if (typeof item == 'object') {
316+
if (item && typeof item == 'object') {
317317
valuesx = [...valuesx,...Object.values(item)]
318318
}
319319
})

src/components/vsTextarea/vsTextarea.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template lang="html">
22
<div
3-
:class="{'textarea-danger': counter ? value.length > counter : false, 'focusx': focusx}"
3+
:class="{'textarea-danger': counter ? (value && value.length > counter) : false, 'focusx': focusx}"
44
:style="getStyle"
55
class="vs-component vs-con-textarea">
66

@@ -19,7 +19,7 @@
1919
<div
2020
v-if="counter"
2121
class="count vs-textarea--count">
22-
{{ value.length }} / {{ counter }}
22+
{{ value ? value.length : 0 }} / {{ counter }}
2323
</div>
2424

2525
</div>
@@ -85,7 +85,7 @@ export default {
8585
},
8686
watch:{
8787
value() {
88-
if(this.value.length > this.counter) {
88+
if(this.value && this.value.length > this.counter) {
8989
this.$emit('update:counterDanger', true)
9090
} else {
9191
this.$emit('update:counterDanger', false)

0 commit comments

Comments
 (0)