From 3cab2fee8bfa18d05f5c2b969ab70ded72daf12c Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 6 Oct 2022 12:35:06 +0300 Subject: [PATCH] refactoring --- .../assets/js/components/AkauntingSelect.vue | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 5cfd6e5cd..61f344968 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -107,7 +107,7 @@ {{ addNew.new_text }} - @@ -355,7 +355,6 @@ export default { } else { this.sorted_options.sort(this.sortBy(this.option_sortable)); } - return this.sorted_options; }, }, @@ -959,7 +958,7 @@ export default { if (this.group) { // Option set sort_option data - if (!Array.isArray(options)) { + if (! Array.isArray(options)) { for (const [index, _options] of Object.entries(options)) { let values = []; @@ -997,7 +996,7 @@ export default { } } else { // Option set sort_option data - if (!Array.isArray(options)) { + if (! Array.isArray(options)) { for (const [key, value] of Object.entries(options)) { this.sorted_options.push({ key: key.toString(), @@ -1025,31 +1024,26 @@ export default { }, this); } - if (this.selectedControl) { if (this.multiple) { - let selected = this.selected; + let selected = this.selected; this.selected = []; - - if (selected !== undefined) { - selected.forEach(function (select, index) { - if (this.sorted_options.find(option => option.key == select)) { - this.selected.push(select); - } else { - this.selected = []; - } - }, this); - } + + selected.forEach(function (select, index) { + if (this.sorted_options.find(option => option.key == select)) { + this.selected.push(select); + } + }, this); } else { if (! options.find(option => option == this.selected)) { - this.selected = []; + this.selected = null; } } } else { if (this.multiple) { this.selected = []; } else { - this.selected = ''; + this.selected = null; } } }