fix: 过滤功能不能正常运转

hug-sun · Sep 12, 2020 · a108c89 · a108c89
1 parent 007c402
commit a108c89
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 23 deletions.
diff --git a/packages/option-group/OptionGroup.vue b/packages/option-group/OptionGroup.vue
@@ -41,7 +41,7 @@ export default {
     const { ctx } = getCurrentInstance()
 
     watch(disabled, (val) => {
-      broadcast('ElOption', 'handleGroupDisabled', val)
+      broadcast('handleGroupDisabled', val)
     })
 
     function queryChange() {
@@ -52,12 +52,12 @@ export default {
     }
 
     onBeforeMount(() => {
-      on('queryChange', queryChange)
+      on('optionGroup.queryChange', queryChange)
     })
 
     onMounted(() => {
       if (unref(disabled)) {
-        broadcast('ElOption', 'handleGroupDisabled', unref(disabled))
+        broadcast('handleGroupDisabled', unref(disabled))
       }
     })
 

diff --git a/packages/option/Option.vue b/packages/option/Option.vue
@@ -134,21 +134,21 @@ export default {
 
     function selectOptionClick() {
       if (disabled.value !== true && data.groupDisabled !== true) {
-        dispatch('ElSelect', 'handleOptionClick', this, true)
+        dispatch('handleOptionClick', { option: this, byClick: true })
       }
     }
 
     function queryChange(query) {
       data.visible =
-        new RegExp(escapeRegexpString(query), 'i').test(currentLabel) ||
+        new RegExp(escapeRegexpString(query), 'i').test(unref(currentLabel)) ||
         created.value
       if (!data.visible) {
         select.filteredOptionsCount--
       }
     }
 
     watch(currentLabel, () => {
-      if (!created.value && !select.remote) dispatch('ElSelect', 'setSelected')
+      if (!created.value && !select.remote) dispatch('setSelected')
     })
     watch(value, (val, oldVal) => {
       const { remote, valueKey } = select
@@ -161,7 +161,7 @@ export default {
         ) {
           return
         }
-        dispatch('ElSelect', 'setSelected')
+        dispatch('setSelected')
       }
     })
     onBeforeMount(() => {

diff --git a/packages/select/Select.vue b/packages/select/Select.vue
@@ -97,7 +97,7 @@
       :tabindex="multiple && filterable ? '-1' : null"
       @focus="handleFocus"
       @blur="handleBlur"
-      @keyup.native="debouncedOnInputChange"
+      @keyup="debouncedOnInputChange"
       @keydown.native.down.stop.prevent="navigateOptions('next')"
       @keydown.native.up.stop.prevent="navigateOptions('prev')"
       @keydown.native.enter.prevent="selectOption"
@@ -372,7 +372,6 @@ export default {
     'clear',
     'visible-change',
     'remove-tag',
-    'handleOptionClick',
     'setSelected'
   ],
 
@@ -440,13 +439,13 @@ export default {
         this.inputLength = 20
       }
       if (!valueEquals(val, oldVal)) {
-        this.dispatch('ElFormItem', 'el.form.change', val)
+        this.dispatch('el.form.change', val)
       }
     },
 
     visible(val) {
       if (!val) {
-        this.broadcast('ElSelectDropdown', 'destroyPopper')
+        this.broadcast('destroyPopper')
         if (this.$refs.input) {
           this.$refs.input.blur()
         }
@@ -485,16 +484,16 @@ export default {
           }
         }
       } else {
-        this.broadcast('ElSelectDropdown', 'updatePopper')
+        this.broadcast('updatePopper')
         if (this.filterable) {
           this.query = this.remote ? '' : this.selectedLabel
           this.handleQueryChange(this.query)
           if (this.multiple) {
             this.$refs.input.focus()
           } else {
             if (!this.remote) {
-              this.broadcast('ElOption', 'queryChange', '')
-              this.broadcast('ElOptionGroup', 'queryChange')
+              this.broadcast('queryChange', '')
+              this.broadcast('optionGroup.queryChange')
             }
 
             if (this.selectedLabel) {
@@ -510,7 +509,7 @@ export default {
     options() {
       if (this.$isServer) return
       this.$nextTick(() => {
-        this.broadcast('ElSelectDropdown', 'updatePopper')
+        this.broadcast('updatePopper')
       })
       if (this.multiple) {
         this.resetInputHeight()
@@ -552,7 +551,9 @@ export default {
       }
       this.previousQuery = val
       this.$nextTick(() => {
-        if (this.visible) this.broadcast('ElSelectDropdown', 'updatePopper')
+        if (this.visible) {
+          this.broadcast('updatePopper')
+        }
       })
       this.hoverIndex = -1
       if (this.multiple && this.filterable) {
@@ -568,11 +569,11 @@ export default {
         this.remoteMethod(val)
       } else if (typeof this.filterMethod === 'function') {
         this.filterMethod(val)
-        this.broadcast('ElOptionGroup', 'queryChange')
+        this.broadcast('optionGroup.queryChange')
       } else {
         this.filteredOptionsCount = this.optionsCount
-        this.broadcast('ElOption', 'queryChange', val)
-        this.broadcast('ElOptionGroup', 'queryChange')
+        this.broadcast('queryChange', val)
+        this.broadcast('optionGroup.queryChange')
       }
       if (
         this.defaultFirstOption &&
@@ -765,7 +766,7 @@ export default {
                 sizeInMap
               ) + 'px'
         if (this.visible && this.emptyText !== false) {
-          this.broadcast('ElSelectDropdown', 'updatePopper')
+          this.broadcast('updatePopper')
         }
       })
     },
@@ -787,7 +788,7 @@ export default {
       }, 300)
     },
 
-    handleOptionSelect(option, byClick) {
+    handleOptionSelect({ option, byClick }) {
       if (this.multiple) {
         const value = (this.modelValue || []).slice()
         const optionIndex = this.getValueIndex(value, option.value)
@@ -958,6 +959,10 @@ export default {
       } else {
         return getValueByPath(item.value, this.valueKey)
       }
+    },
+
+    search() {
+      console.log('aaaaa')
     }
   },
 

diff --git a/packages/select/SelectDropdown.vue b/packages/select/SelectDropdown.vue
@@ -58,10 +58,12 @@ export default {
   setup(props, ctx) {
     const elSelect = inject('select')
     const { referenceElm, popperElm } = usePopperElm(elSelect)
-    const popper = usePopper(referenceElm, props, ctx)
+    const popper = usePopper(referenceElm, popperElm, props, ctx)
 
     usePopperUpdate(() => {
-      if (elSelect.visible) popper.updatePopper()
+      if (elSelect.visible) {
+        popper.updatePopper()
+      }
     }, popper.destroyPopper)
 
     const popperClass = computed(() => {