Merge pull request moreta#31 from Eder87rh/master

moreta · web-flow · commit 36e8701aee70 · 2017-05-11T12:13:08.000+09:00
improves MultiSelect
diff --git a/src/components/lib/MultiSelect.vue b/src/components/lib/MultiSelect.vue
@@ -59,6 +59,10 @@
         type: Boolean,
         default: false
       },
+      cleanSearch:{
+        type: Boolean,
+        default: true
+      },
       placeholder: {
         type: String,
         default: ''
@@ -114,7 +118,12 @@
       filteredOptions () {
         if (this.searchText) {
           return this.nonSelectOptions.filter(option => {
-            return option.text.match(new RegExp(this.searchText, 'i'))
+            if(this.cleanSearch){
+                var cleanedText = this.accentsTidy(option.text)
+                return cleanedText.match(new RegExp(this.searchText, 'i'))
+            }else{
+                return option.text.match(new RegExp(this.searchText, 'i'))
+            }
           })
         } else {
           return this.nonSelectOptions
@@ -138,9 +147,13 @@
       },
       prevItem () {
         common.prevItem(this)
+        this.closeOptions();
+        this.openOptions();
       },
       nextItem () {
         common.nextItem(this)
+        this.closeOptions();
+        this.openOptions();
       },
       enterItem () {
         common.enterItem(this)
@@ -156,13 +169,29 @@
       },
       selectItem (option) {
         const selectedOptions = _.unionWith(this.selectedOptions, [option], _.isEqual)
-        this.closeOptions()
-        this.$emit('select', selectedOptions, option)
+        this.closeOptions();
+        this.openOptions();
+        this.searchText='';
+        this.$emit('select', selectedOptions,option,'insert')
       },
       deleteItem (option) {
         const selectedOptions = _.reject(this.selectedOptions, option)
-        this.$emit('select', selectedOptions, option)
-      }
+        this.$emit('select', selectedOptions,option,'delete')
+      },
+      accentsTidy(s){
+            var r=s.toString().toLowerCase();
+            r = r.replace(new RegExp("[àáâãäå]", 'g'),"a");
+            r = r.replace(new RegExp("æ", 'g'),"ae");
+            r = r.replace(new RegExp("ç", 'g'),"c");
+            r = r.replace(new RegExp("[èéêë]", 'g'),"e");
+            r = r.replace(new RegExp("[ìíîï]", 'g'),"i");
+            r = r.replace(new RegExp("ñ", 'g'),"n");
+            r = r.replace(new RegExp("[òóôõö]", 'g'),"o");
+            r = r.replace(new RegExp("œ", 'g'),"oe");
+            r = r.replace(new RegExp("[ùúûü]", 'g'),"u");
+            r = r.replace(new RegExp("[ýÿ]", 'g'),"y");
+            return r;
+        }
     }
   }
 </script>
