From 9702024611f7ed2583613e882235c539d65f0132 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sat, 20 Jun 2020 18:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RegionSelector/Tab/index.vue   | 13 ++++--
 .../components/RegionSelector/Tab/style.scss  | 43 +------------------
 vue/src/components/UploadFile/index.vue       |  7 ++-
 3 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/vue/src/components/RegionSelector/Tab/index.vue b/vue/src/components/RegionSelector/Tab/index.vue
index 18a92cc..0227a5e 100644
--- a/vue/src/components/RegionSelector/Tab/index.vue
+++ b/vue/src/components/RegionSelector/Tab/index.vue
@@ -4,13 +4,14 @@
             :value="value"
             :disabled="readonly"
             :size="size"
+            popper-append-to-body
             clearable
             @clear="() => $emit('clear')"
             @visible-change="visibleChange"
     >
         <template slot="empty">
             <div class="rg-header">
-                <span>行政区划选择器</span>
+                <h3>行政区划选择</h3>
                 <button class="rg-removeall-button" type="button" title="清除已选" @click="removeAll">
                     <i class="el-icon-delete"/>
                 </button>
@@ -24,8 +25,8 @@
                         v-model="searchText"
                         class="rg-input"
                         type="text"
-                        placeholder="输入地区id或名称，回车搜索"
-                        @keyup.enter="search"
+                        placeholder="输入地区id或名称搜索"
+                        @input="search"
                 >
             </div>
             <div class="rg-level-tabs">
@@ -53,6 +54,7 @@
 </template>
 
 <script>
+    import {debounce} from "@/utils"
     import {createLimitTree, getNodeId} from "@/utils/tree"
     import common from '../mixin'
 
@@ -185,7 +187,9 @@
                         parent = result[i - 1] || {children: this.treeData}
 
                     const node = parent.children.find(predicate(str))
+                    //只要有一次不满足就退出，保留之前的查找结果
                     if (!node) break
+
                     result.push(node)
                 }
 
@@ -196,6 +200,8 @@
                 this.maxLevel = DEFAULT_MAX_LEVEL
                 this.selected = JSON.parse(JSON.stringify(DEFAULT_TABS))
                 this.currentLevel = 1
+                this.searchText = ''
+                this.setItems(this.currentLevel)
             },
 
             done() {
@@ -236,6 +242,7 @@
         },
 
         created() {
+            this.search = debounce(this.search, 200)
             this.selected = JSON.parse(JSON.stringify(DEFAULT_TABS))
         },
 
diff --git a/vue/src/components/RegionSelector/Tab/style.scss b/vue/src/components/RegionSelector/Tab/style.scss
index 56ca779..71fab23 100644
--- a/vue/src/components/RegionSelector/Tab/style.scss
+++ b/vue/src/components/RegionSelector/Tab/style.scss
@@ -5,22 +5,10 @@
 
 .rg-header {
     h3 {
-        line-height: normal;
-        padding: 6px 80px 10px 10px;
+        padding: 6px;
         margin: 0;
-        text-align: left;
         color: #24292e;
         font-size: 16px;
-        white-space: nowrap;
-
-        .rg-header-selected {
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            font-size: 14px;
-            max-width: 310px;
-            display: inline-block;
-        }
     }
 
     button {
@@ -98,41 +86,21 @@
 }
 
 .rg-results-container {
-    background-color: #fff;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    position: relative;
-    width: 100%;
-    overflow-y: auto;
-    overflow-x: hidden;
-    clear: both;
-    border-bottom-left-radius: 2px;
-    border-bottom-right-radius: 2px;
-
     .rg-results {
-        background-color: #fff;
-        list-style: none;
         margin: 0;
         padding: 5px;
         width: 364px;
         line-height: 1.5;
 
         li {
-            margin: 0;
             overflow: hidden;
             padding: 3px 10px;
-            position: relative;
-            text-align: left;
-            white-space: nowrap;
             font-size: 14px;
             color: black;
             cursor: pointer;
 
             &.rg-item {
                 display: inline-block;
-                border-radius: 2px;
-                margin-right: 5px;
                 color: #777;
 
                 &:hover {
@@ -150,8 +118,6 @@
                 height: 30px;
                 line-height: 30px;
                 text-align: center;
-                box-sizing: content-box;
-                font-size: 14px;
                 cursor: default;
             }
         }
@@ -159,16 +125,11 @@
 }
 
 .rg-input {
-    display: block;
     background-color: #f5f5f5;
-    margin: 0 !important;
     border: 0;
     width: 100%;
     font-size: 14px;
-    line-height: 1.42;
-    padding: 4px 6px;
-    vertical-align: middle;
-    box-sizing: border-box;
+    padding: 6px;
     outline: none !important;
     border-radius: 2px;
 
diff --git a/vue/src/components/UploadFile/index.vue b/vue/src/components/UploadFile/index.vue
index 0009726..73417c8 100644
--- a/vue/src/components/UploadFile/index.vue
+++ b/vue/src/components/UploadFile/index.vue
@@ -13,7 +13,7 @@
             action=""
             list-type="picture-card"
     >
-        <i class="el-icon-plus" slot="default"/>
+        <i slot="default" class="el-icon-plus"/>
 
         <template v-slot:file="{file}">
             <span
@@ -157,6 +157,9 @@
 
             //附件移除时，仅当非本次上传时触发remove事件
             remove(file) {
+                //删除上传文件时隐藏tooltip
+                this.handleBlockMouseLeave()
+
                 //区分是否为本次新上传，以及是否上传成功
                 //若不是新上传的
                 if (!file.raw) this.$emit('remove', {url: file.downloadUrl.replace(attachmentPrefix, '')})
@@ -234,7 +237,7 @@
         },
 
         created() {
-            this.activateTooltip = debounce(tooltip => tooltip.handleShowPopper(), 100)
+            this.activateTooltip = debounce(tooltip => tooltip.handleShowPopper(), 200)
         }
     }
 </script>