Merge pull request #4550 from iview/revert-4403-fix-select

Revert "Fix select"

src/components/select/functional-options.vue

@@ -19,16 +19,10 @@
         },
         functional: true,
         render(h, {props, parent}){
-            // In order to response data changes,i do this hack. #4372
+            // to detect changes in the $slot children/options we do this hack
-            if(props.slotOptions.length > 0) {
+            // so we can trigger the parents computed properties and have everything reactive
-                for(let i in props.slotOptions) {
+            // although $slot.default is not
-                    if(props.slotOptions[i].key !== parent.$slots.default[i].key) {
+            if (props.slotOptions !== parent.$slots.default) props.slotUpdateHook();
-                        props.slotUpdateHook();
-                        break;
-                    }
-                }
-            }
-            if(props.slotOptions && parent.$slots.default && props.slotOptions.length !== parent.$slots.default.length) props.slotUpdateHook();
             return props.options;
         }
     };

src/components/select/select.vue

@@ -356,12 +356,14 @@
                         });
                     });
                 }
+                let hasDefaultSelected = slotOptions.some(option => this.query === option.key);
                 for (let option of slotOptions) {
 
                     const cOptions = option.componentOptions;
                     if (!cOptions) continue;
                     if (cOptions.tag.match(optionGroupRegexp)){
                         let children = cOptions.children;
+
                         // remove filtered children
                         if (this.filterable){
                             children = children.filter(
@@ -378,8 +380,11 @@
                         if (cOptions.children.length > 0) selectOptions.push({...option});
                     } else {
                         // ignore option if not passing filter
+                        if (!hasDefaultSelected) {
                             const optionPassesFilter = this.filterable ? this.validateOption(cOptions) : option;
                             if (!optionPassesFilter) continue;
+                        }
+
                         optionCounter = optionCounter + 1;
                         selectOptions.push(this.processOption(option, selectedValues, optionCounter === currentIndex));
                     }
@@ -636,9 +641,6 @@
             },
             updateSlotOptions(){
                 this.slotOptions = this.$slots.default;
-                // #4372 issue, i find that this.query's value affects the judgment of the validateOption method.
-                this.query = '';
-                this.focusIndex = -1;
             },
             checkUpdateStatus() {
                 if (this.getInitialValue().length > 0 && this.selectOptions.length === 0) {