swcs/mixtape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

okay cool

Browse Source
This commit is contained in:
Tobias Klika
2022-01-11 12:29:53 +01:00
parent c51e8eb227
commit 90e16ec079
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zero.Backoffice.UI/app/components/ui-select.vue
+6 -5
View File
@@ -1,6 +1,6 @@
<template>
<div class="ui-native-select" :disabled="disabled">
<select :value="modelValue" @input="onChange" :disabled="disabled">
<select :value="value" @input="onChange" :disabled="disabled">
<option v-if="emptyOption"></option>
<option v-for="option in options" :value="option.key" v-localize="option.value"></option>
</select>
@@ -13,7 +13,7 @@
name: 'uiSelect',
props: {
modelValue: [String, Number, Object],
value: [String, Number, Object],
items: [Array, Function],
entity: Object,
disabled: Boolean,
@@ -38,7 +38,7 @@
handler()
{
this.rebuild();
this.onChange({ target: { value: this.modelValue } });
this.onChange({ target: { value: this.value } });
}
},
entity: {
@@ -46,7 +46,7 @@
handler()
{
this.rebuild();
this.onChange({ target: { value: this.modelValue } });
this.onChange({ target: { value: this.value } });
}
}
},
@@ -70,7 +70,8 @@
onChange(ev)
{
this.$emit('update:modelValue', ev.target.value ? ev.target.value : null);
this.$emit('update:value', ev.target.value ? ev.target.value : null);
this.$emit('input', ev.target.value ? ev.target.value : null);
}
}
}
zero.Core/Utils/ObjectTraverser.cs
+1 -1
View File
@@ -220,7 +220,7 @@ public class ObjectTraverser
}
// check if our property is a primitive type
if (value == null || value.GetType().IsPrimitive || value is string || value is DateTime || value is DateTimeOffset || value is Uri)
if (value == null || value.GetType().IsPrimitive || value is string || value is DateTime || value is DateTimeOffset || value is Uri || value is System.Text.Json.JsonElement)
{
return;
}