Fix check indexItem for select2 directive

g3w-suite · Feb 26, 2024 · fbf67ff · fbf67ff
1 parent 8a85e56
commit fbf67ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/components/WMSLayersPanel.vue b/src/components/WMSLayersPanel.vue
@@ -23,7 +23,7 @@
     </label>
     <select
       id        = "g3w-wms-layers"
-      multiple  = "multiple"
+      :multiple  = "true"
       clear     = "true"
       v-select2 = "'selectedlayers'"
     >

diff --git a/src/directives/v-select2.js b/src/directives/v-select2.js
@@ -13,7 +13,9 @@ export default {
       select2_value,
       indexItem, /** @since 3.9.1 */
     } = vnode.data.attrs || {};
-    const isArray = binding.value && Array.isArray(vnode.context[binding.value]); //check if is an array
+    const isArrayWithIndex = binding.value
+      && Array.isArray(vnode.context[binding.value]) //check if is an array
+      && undefined !== indexItem //check if indexItem is defined /** @since 3.10.0 **/
     $(el)
       .select2({
         width: '100%',
@@ -24,19 +26,21 @@ export default {
       })
       .on('select2:select', (e) => {
         if (binding.value) {
+          //get value
           const value = e.params.data.id;
+          //check is can have multiple value
           if (multiple && (
-            (isArray
+            (isArrayWithIndex
               ? vnode.context[binding.value][indexItem].value
               : vnode.context[binding.value]
             ).filter(d => value === d).length === 0)
           ) {
-            (isArray
+            (isArrayWithIndex
               ? vnode.context[binding.value][indexItem].value
               : vnode.context[binding.value]
             ).push(value);
           } else {
-            if (isArray) {
+            if (isArrayWithIndex) {
               vnode.context[binding.value][indexItem].value = value;
             } else {
               vnode.context[binding.value] = value;
@@ -46,7 +50,7 @@ export default {
       })
       .on('select2:unselect', (e) => {
         if (binding.value && multiple) {
-          if (isArray) {
+          if (isArrayWithIndex) {
             vnode.context[binding.value][indexItem].value = vnode.context[binding.value][indexItem].value.filter(d => e.params.data.id !== d);
           } else {
             vnode.context[binding.value] = vnode.context[binding.value].filter(d => e.params.data.id !== d);