From 2b7482992a46550fdc51494730217b34c4a47024 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 11:51:40 +0300 Subject: [PATCH 1/8] multi select fixed --- resources/assets/js/components/AkauntingSelect.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index d78450d4d..b57947543 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -943,7 +943,7 @@ export default { this.selected = selected.toString(); } else { if (Array.isArray(this.selected) && !this.selected.length) { - this.selected = selected; + this.selected = []; } else { let is_string = false; let pre_value = []; @@ -954,10 +954,6 @@ export default { pre_value.push(item.toString()); } }); - - if (is_string) { - this.selected = pre_value; - } } } From 83dd72d20bed7d8c56c28d0608b484bde6b882ad Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 12:21:44 +0300 Subject: [PATCH 2/8] refactoring --- resources/assets/js/components/AkauntingSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index b57947543..a1398e44c 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -943,7 +943,7 @@ export default { this.selected = selected.toString(); } else { if (Array.isArray(this.selected) && !this.selected.length) { - this.selected = []; + this.selected = selected; } else { let is_string = false; let pre_value = []; From 308993526227b03dd432da32ee49ec7bb0f33d60 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 13:43:40 +0300 Subject: [PATCH 3/8] code refactoring --- resources/assets/js/components/AkauntingSelect.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index a1398e44c..b5ca4619c 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -327,6 +327,7 @@ export default { new_options: {}, loading: false, remote: false, + selected_is_compiled: false, } }, @@ -362,7 +363,6 @@ export default { mounted() { // Check Here.. this.selected = this.value; - if (this.model.length) { try { if (eval(this.model) !== undefined) { @@ -383,6 +383,7 @@ export default { setTimeout(function() { this.change(); + this.selected_is_compiled = true; }.bind(this), 800); }, @@ -943,7 +944,11 @@ export default { this.selected = selected.toString(); } else { if (Array.isArray(this.selected) && !this.selected.length) { - this.selected = selected; + if (! this.selected_is_compiled) { + this.selected = selected; + } else { + this.selected = []; + } } else { let is_string = false; let pre_value = []; From 827b41b5fad33961164055c841399a708705c9ed Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 13:44:51 +0300 Subject: [PATCH 4/8] spacing edited --- resources/assets/js/components/AkauntingSelect.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index b5ca4619c..7d6bd8ffc 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -363,6 +363,7 @@ export default { mounted() { // Check Here.. this.selected = this.value; + if (this.model.length) { try { if (eval(this.model) !== undefined) { From 2a6a0fafc2ae7504dc710a11d65e553279168f56 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 13:49:31 +0300 Subject: [PATCH 5/8] spacing removed --- resources/assets/js/components/AkauntingSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 7d6bd8ffc..044b73b7a 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -363,7 +363,7 @@ export default { mounted() { // Check Here.. this.selected = this.value; - + if (this.model.length) { try { if (eval(this.model) !== undefined) { From 8b357dfb01dc012a34396ce5ec99f6c6aad8ab35 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 14:25:06 +0300 Subject: [PATCH 6/8] console error fixed --- resources/assets/js/components/AkauntingSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index fdbd0efe5..8b115990e 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -304,7 +304,7 @@ export default { onInput(evt) { this.search = evt.target.value; - let option_url = this.selected_options.length > 0 ? this.selected_options[this.filter_index].url : ''; + let option_url = this.selected_options.length > 0 && this.selected_options[this.filter_index] !== undefined ? this.selected_options[this.filter_index].url : ''; if (this.search) { if (option_url.indexOf('?') === -1) { From 1e60201958ae6dc61eec61af4177761df15e6b51 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 17:03:07 +0300 Subject: [PATCH 7/8] value function refactored --- .../assets/js/components/AkauntingSelect.vue | 45 +++++++++---------- .../js/components/AkauntingSelectRemote.vue | 41 ++++++++--------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 044b73b7a..67b319193 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -327,7 +327,6 @@ export default { new_options: {}, loading: false, remote: false, - selected_is_compiled: false, } }, @@ -384,7 +383,6 @@ export default { setTimeout(function() { this.change(); - this.selected_is_compiled = true; }.bind(this), 800); }, @@ -941,29 +939,30 @@ export default { }, value: function (selected) { - if (!this.multiple) { - this.selected = selected.toString(); - } else { - if (Array.isArray(this.selected) && !this.selected.length) { - if (! this.selected_is_compiled) { - this.selected = selected; - } else { - this.selected = []; - } - } else { - let is_string = false; - let pre_value = []; + // we tested this function works with post a form and after the selected function so put in the comment line + // if (!this.multiple) { + // this.selected = selected.toString(); + // } else { + // if (Array.isArray(this.selected) && !this.selected.length) { + // this.selected = selected; + // } else { + // let is_string = false; + // let pre_value = []; - selected.forEach(item => { - if (typeof item != 'string') { - is_string = true; - pre_value.push(item.toString()); - } - }); - } - } + // selected.forEach(item => { + // if (typeof item != 'string') { + // is_string = true; + // pre_value.push(item.toString()); + // } + // }); - this.change(); + // if (is_string) { + // this.selected = pre_value; + // } + // } + // } + + // this.change(); }, model: function (selected) { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index 581d3fd96..3e43c045d 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -1147,29 +1147,30 @@ export default { }, value: function (selected) { - if (!this.multiple) { - this.selected = selected.toString(); - } else { - if (Array.isArray(this.selected) && !this.selected.length) { - this.selected = selected; - } else { - let is_string = false; - let pre_value = []; + // we tested this function works with post a form and after the selected function so put in the comment line + // if (!this.multiple) { + // this.selected = selected.toString(); + // } else { + // if (Array.isArray(this.selected) && !this.selected.length) { + // this.selected = selected; + // } else { + // let is_string = false; + // let pre_value = []; - selected.forEach(item => { - if (typeof item != 'string') { - is_string = true; - pre_value.push(item.toString()); - } - }); + // selected.forEach(item => { + // if (typeof item != 'string') { + // is_string = true; + // pre_value.push(item.toString()); + // } + // }); - if (is_string) { - this.selected = pre_value; - } - } - } + // if (is_string) { + // this.selected = pre_value; + // } + // } + // } - this.change(); + // this.change(); }, model: function (selected) { From 08267f76d25557961babcba84785849e5abd1cd3 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 15 Dec 2022 17:03:57 +0300 Subject: [PATCH 8/8] spacing removed --- resources/assets/js/components/AkauntingSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 67b319193..cf9482775 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -362,7 +362,7 @@ export default { mounted() { // Check Here.. this.selected = this.value; - + if (this.model.length) { try { if (eval(this.model) !== undefined) {