From 5a64cb23236c0886f40d395dc2f49a27b7289754 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 7 Jan 2022 18:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2Tooltip=E6=94=B9=E6=88=90EToo?=
 =?UTF-8?q?ltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/ProjectList.vue   | 20 ++++++++++++++-----
 .../assets/js/pages/manage/setting/system.vue | 12 ++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 58de2d18..98bb1027 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -35,12 +35,12 @@
                         </ETooltip>
                     </li>
                     <li :class="['project-icon', searchText!='' ? 'active' : '']">
-                        <Tooltip :always="searchText!=''" theme="light">
+                        <ETooltip v-model="searchShow" :manual="searchText!=''" effect="light">
                             <Icon class="menu-icon" type="ios-search" />
                             <div slot="content">
-                                <Input v-model="searchText" :placeholder="$L('名称、描述...')" class="search-input" clearable autofocus/>
+                                <Input v-model="searchText" ref="searchInput" :placeholder="$L('名称、描述...')" class="search-input" clearable/>
                             </div>
-                        </Tooltip>
+                        </ETooltip>
                     </li>
                     <li :class="['project-icon', projectParameter('chat') ? 'active' : '']" @click="$store.dispatch('toggleProjectParameter', 'chat')">
                         <Icon class="menu-icon" type="ios-chatbubbles" />
@@ -328,9 +328,9 @@
                     <Col span="3"></Col>
                     <Col span="3"></Col>
                     <Col span="3"></Col>
-                    <Col span="3"></Col>
+                    <Col span="3">{{$L('完成时间')}}</Col>
                 </Row>
-                <TaskRow v-if="projectParameter('showCompleted')" :list="completedList" open-key="completed" @command="dropTask" @on-priority="addTaskOpen"/>
+                <TaskRow v-if="projectParameter('showCompleted')" :list="completedList" open-key="completed" @command="dropTask" @on-priority="addTaskOpen" showCompleteAt/>
             </div>
         </div>
 
@@ -485,6 +485,7 @@ export default {
             sortField: 'end_at',
             sortType: 'desc',
 
+            searchShow: false,
             searchText: '',
 
             addColumnShow: false,
@@ -756,6 +757,15 @@ export default {
         },
         '$route'() {
             this.tempShowTasks = [];
+        },
+        searchShow(val) {
+            if (val) {
+                this.$nextTick(() => {
+                    this.$refs.searchInput.focus({
+                        cursor: "end"
+                    });
+                })
+            }
         }
     },
 
diff --git a/resources/assets/js/pages/manage/setting/system.vue b/resources/assets/js/pages/manage/setting/system.vue
index 66af9fcc..1f905a8d 100644
--- a/resources/assets/js/pages/manage/setting/system.vue
+++ b/resources/assets/js/pages/manage/setting/system.vue
@@ -50,12 +50,14 @@
                     <Radio label="open">{{$L('开启')}}</Radio>
                     <Radio label="close">{{$L('关闭')}}</Radio>
                 </RadioGroup>
-                <Tooltip v-if="formDatum.auto_archived=='open'" class="setting-auto-day" placement="right">
-                    <Input v-model="formDatum.archived_day" type="number">
-                        <span slot="append">{{$L('天')}}</span>
-                    </Input>
+                <ETooltip v-if="formDatum.auto_archived=='open'" placement="right">
+                    <div class="setting-auto-day">
+                        <Input v-model="formDatum.archived_day" type="number">
+                            <span slot="append">{{$L('天')}}</span>
+                        </Input>
+                    </div>
                     <div slot="content">{{$L('任务完成 % 天后自动归档。', formDatum.archived_day)}}</div>
-                </Tooltip>
+                </ETooltip>
             </FormItem>
         </Form>
         <div class="setting-footer">