commit
d99e42520d
@ -64,6 +64,7 @@ import AkauntingRecurring from './AkauntingRecurring';
|
||||
|
||||
import Form from './../plugins/form';
|
||||
import { Alert, ColorPicker } from 'element-ui';
|
||||
import Global from './../mixins/global';
|
||||
|
||||
export default {
|
||||
name: 'akaunting-modal-add-new',
|
||||
@ -150,7 +151,7 @@ export default {
|
||||
this.component = Vue.component('add-new-component', (resolve, reject) => {
|
||||
resolve({
|
||||
template : '<div id="modal-add-new-form-' + form_prefix + '">' + this.message + '</div>',
|
||||
|
||||
mixins: [Global],
|
||||
components: {
|
||||
AkauntingRadioGroup,
|
||||
AkauntingSelect,
|
||||
|
@ -318,11 +318,16 @@ export default {
|
||||
this.selected = this.value;
|
||||
|
||||
if (this.model.length) {
|
||||
if (eval(this.model) !== undefined) {
|
||||
this.selected = eval(this.model);
|
||||
} else {
|
||||
try {
|
||||
if (eval(this.model) !== undefined) {
|
||||
this.selected = eval(this.model);
|
||||
} else {
|
||||
this.selected = this.model;
|
||||
}
|
||||
} catch (e) {
|
||||
this.selected = this.model;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (this.multiple && !this.selected.length) {
|
||||
|
@ -430,11 +430,16 @@ export default {
|
||||
this.selected = this.value;
|
||||
|
||||
if (this.model.length) {
|
||||
if (eval(this.model) !== undefined) {
|
||||
this.selected = eval(this.model);
|
||||
} else {
|
||||
try {
|
||||
if (eval(this.model) !== undefined) {
|
||||
this.selected = eval(this.model);
|
||||
} else {
|
||||
this.selected = this.model;
|
||||
}
|
||||
} catch (e) {
|
||||
this.selected = this.model;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (this.multiple && !this.selected.length) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user