fix(ui/select): fix bug of select blur event can't trigger

affects: @varlet/ui
varletjs · May 13, 2021 · b9918fc · b9918fc
1 parent 6bc64e9
commit b9918fc
Show file tree

Hide file tree

Showing 5 changed files with 693 additions and 2 deletions.
diff --git a/packages/varlet-ui/src/input/__tests__/index.spec.js b/packages/varlet-ui/src/input/__tests__/index.spec.js
@@ -34,6 +34,8 @@ test('test input focus & blur', async () => {
   wrapper.vm.blur()
   await wrapper.find('.var-input__input').trigger('blur')
   expect(wrapper.html()).toMatchSnapshot()
+
+  wrapper.unmount()
 })
 
 test('test input onInput & onChange & onClick', async () => {
@@ -64,6 +66,8 @@ test('test input onInput & onChange & onClick', async () => {
 
   await wrapper.find('.var-input__input').trigger('change')
   expect(onChange).lastCalledWith('t', new Event('input'))
+
+  wrapper.unmount()
 })
 
 test('test input maxlength', () => {
@@ -87,6 +91,8 @@ test('test input hint to be false', () => {
   })
 
   expect(wrapper.html()).toMatchSnapshot()
+
+  wrapper.unmount()
 })
 
 test('test input clear', async () => {
@@ -108,6 +114,8 @@ test('test input clear', async () => {
   expect(onUpdateModelValue).lastCalledWith('')
   expect(onClear).lastCalledWith('')
   expect(wrapper.props('modelValue')).toBe('')
+
+  wrapper.unmount()
 })
 
 test('test input disabled', async () => {
@@ -140,6 +148,8 @@ test('test input disabled', async () => {
   expect(onClick).toHaveBeenCalledTimes(0)
   expect(onChange).toHaveBeenCalledTimes(0)
   expect(onUpdateModelValue).toHaveBeenCalledTimes(0)
+
+  wrapper.unmount()
 })
 
 test('test input validation', async () => {
@@ -169,6 +179,8 @@ test('test input validation', async () => {
   await delay(16)
   expect(wrapper.find('.var-form-details__message').exists()).toBeFalsy()
   expect(wrapper.html()).toMatchSnapshot()
+
+  wrapper.unmount()
 })
 
 test('test input number value', async () => {
@@ -186,4 +198,6 @@ test('test input number value', async () => {
 
   expect(onUpdateModelValue).lastCalledWith(1)
   expect(wrapper.props('modelValue')).toBe(1)
+
+  wrapper.unmount()
 })
diff --git a/packages/varlet-ui/src/option/Option.vue b/packages/varlet-ui/src/option/Option.vue
@@ -78,7 +78,7 @@ export default defineComponent({
     watch(
       [() => props.label, () => props.value],
       () => {
-        if (props.label == null && props.value === null) {
+        if (props.label == null && props.value == null) {
           throw Error("Props label and value can't both be undefined\n")
         }
       },

diff --git a/packages/varlet-ui/src/select/Select.vue b/packages/varlet-ui/src/select/Select.vue
@@ -20,7 +20,13 @@
         <slot name="prepend-icon" />
       </div>
 
-      <var-menu class="var-select__menu" var-select-cover :offset-y="offsetY" v-model:show="isFocus" @blur="handleBlur">
+      <var-menu
+        class="var-select__menu"
+        var-select-cover
+        :offset-y="offsetY"
+        v-model:show="isFocus"
+        @close="handleBlur"
+      >
         <div
           class="var-select__wrap"
           :class="[!hint ? 'var-select--non-hint' : null]"