From 891057941243780bac97d0441418fe2d27c31445 Mon Sep 17 00:00:00 2001
From: 刘汉宸 <liuhanchen@zeyihuoyun.com>
Date: Tue, 6 Apr 2021 16:43:15 +0800
Subject: [PATCH] fix: 修复SchemaSelect清空及placeholder逻辑

---
 packages/schema-select/index.vue | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/packages/schema-select/index.vue b/packages/schema-select/index.vue
index c9f3a46..ee365a2 100644
--- a/packages/schema-select/index.vue
+++ b/packages/schema-select/index.vue
@@ -15,6 +15,7 @@
   <el-popover class="z-schema-select" popper-class="z-schema-select__popper" v-model="visible" trigger="manual" placement="bottom-start" transition="el-zoom-in-top" @show="onTriggerShow">
     <template #reference>
       <el-input
+        ref="input"
         v-model="model"
         :size="selectSize"
         :disabled="selectDisabled"
@@ -27,7 +28,7 @@
         @mouseleave.native="inputHovering = false"
       >
         <template #suffix>
-          <i v-if="showClose" class="el-input__icon el-icon-circle-close" @click="onClear"></i>
+          <i v-if="showClose" class="el-input__icon el-icon-circle-close" @click="onClear" @mouseenter="clearHovering = true" @mouseleave="clearHovering = false"></i>
           <i v-else class="el-input__icon"></i>
         </template>
       </el-input>
@@ -156,6 +157,7 @@ export default {
       loading: false,
       loaded: false,
       inFocus: false,
+      clearHovering: false,
     };
   },
   created() {
@@ -289,40 +291,49 @@ export default {
       }
     },
     onInputFocus() {
-      this.visible = true;
-      this.inFocus = true;
-      if (!this.allowCreate) {
-        this.model = '';
+      if (!this.clearHovering) {
+        this.visible = true;
+        this.inFocus = true;
+        this.query = this.model;
+        if (!this.allowCreate) {
+          this.model = '';
+        }
       }
     },
     onInputBlur() {
       this.inFocus = false;
-      if (!this.visible) {
-        this.model = this.selectedLabel;
-      }
+      this.$nextTick(() => {
+        if (!this.visible) {
+          this.query = '';
+          if (!this.allowCreate) {
+            this.model = this.selectedLabel;
+          }
+        }
+      });
     },
     onClickoutside() {
       if (!this.inFocus) {
         this.visible = false;
-      }
-      if (this.visible) {
         this.model = this.selectedLabel;
-        this.query = '';
+        this.query = this.selectedLabel;
       }
     },
     // 点击表格行
     onTableRowClick(row) {
-      this.query = '';
       this.model = this.selectedLabel;
+      this.$nextTick(() => {
+        this.query = this.selectedLabel;
+      });
       this.visible = false;
       this.$emit('input', row[this.valueKey]);
       this.$emit('change', row);
     },
     // 清空
-    onClear(event) {
-      event.stopPropagation();
+    onClear() {
       this.query = '';
       this.model = '';
+      this.clearHovering = false;
+      this.$refs.input.blur();
       this.$emit('input', '');
       this.$emit('clear');
       this.$emit('change', '');
--
libgit2 0.21.0