From 45f231d2910bc37ae1c47dec08d5dc9a25200918 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Tue, 5 Jan 2021 21:28:33 +0300 Subject: [PATCH] dynamic option is upgraded on akaunting select and akaunting select remote --- resources/assets/js/components/AkauntingSelect.vue | 9 ++++++++- resources/assets/js/components/AkauntingSelectRemote.vue | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index d7674045c..29c3058ce 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -689,7 +689,11 @@ export default { watch: { selected: function (selected) { if (!this.multiple) { - this.selected = selected.toString(); + if (typeof selected != 'string' && selected !== undefined) { + this.selected = selected.toString(); + } else { + this.selected = selected; + } } else { if (Array.isArray(this.selected) && !this.selected.length) { this.selected = selected; @@ -760,6 +764,9 @@ export default { }, dynamicOptions: function(options) { + this.sort_options = []; + this.selected = ''; + if (this.group) { // Option set sort_option data if (!Array.isArray(options)) { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index 31960a352..95468bd4a 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -900,7 +900,11 @@ export default { watch: { selected: function (selected) { if (!this.multiple) { - this.selected = selected.toString(); + if (typeof selected != 'string' && selected !== undefined) { + this.selected = selected.toString(); + } else { + this.selected = selected; + } } else { if (Array.isArray(this.selected) && !this.selected.length) { this.selected = selected; @@ -971,6 +975,9 @@ export default { }, dynamicOptions: function(options) { + this.sort_options = []; + this.selected = ''; + if (this.group) { // Option set sort_option data if (!Array.isArray(options)) {