From 8d12801a69ed4677569471a7220676ccd7b61e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=A1=82=E5=90=8D?= <2106139272@qq.com>
Date: Sat, 14 Jan 2023 13:54:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?TodoTask=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TodoTask.vue | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/views/TodoTask.vue b/src/views/TodoTask.vue
index f4a3711..a37898d 100644
--- a/src/views/TodoTask.vue
+++ b/src/views/TodoTask.vue
@@ -39,6 +39,7 @@
         v-for="(todo, idx) in todoList"
         :key="todo.execute_date + idx"
       >
+        <el-button type="primary" class="timeline-btn" icon="el-icon-edit"></el-button>
         <div class="task-container scroll-box" :id="todo.execute_date">
           <div
             v-for="task in todo.task_items"
@@ -48,7 +49,7 @@
           >
             <el-card>
               <div class="task-head head">
-                <el-dropdown>
+                <el-dropdown style="line-height: 24px;">
                   <span><i class="el-icon-edit"></i></span>
                   <template #dropdown>
                     <el-dropdown-menu>
@@ -97,8 +98,9 @@
                     effect="dark"
                     :content="task.content"
                     placement="top"
+                    popper-class="tool-tip"
                   >
-                    <p>
+                    <p style="max-height: 200px;overflow: auto;">
                       {{ task.content
                       }}<span v-if="task.finish_date == '0000-00-00'"
                         ><i
@@ -550,6 +552,7 @@ export default {
   min-height: 100px;
   max-height: 200px;
   white-space: pre-wrap;
+  word-break:break-all;
 }
 
 .task-content > .task-title {
@@ -589,6 +592,34 @@ export default {
   /* 滚动条手柄 */
   background-color: #c4c4c4;
 }
+.timeline-btn {
+	max-height: 17px;
+	min-height: 17px;
+	margin-left: 10px;
+}
+:deep(.timeline-btn i) {
+	display: block;
+	line-height: 1px;
+}
+:deep(.el-timeline-item__timestamp.is-top) {
+	margin-bottom: 18px;
+	float: left;
+}
+/*滚动条样式*/
+.box-item::-webkit-scrollbar {
+    width: 4px;    
+}
+.box-item::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.2);
+}
+.box-item::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius: 0;
+    background: rgba(0,0,0,0.1);
+
+}
 </style>
 <style>
 .el-timeline {
@@ -602,4 +633,7 @@ export default {
 .el-divider__text {
   background-color: #f2f2f2;
 }
+.tool-tip {
+  max-width: 600px;
+}
 </style>
-- 
Gitee


From 9fd12770620ed81ea16d46397a1f8d93156988be Mon Sep 17 00:00:00 2001
From: zzzz <2635464756@qq.com>
Date: Sun, 15 Jan 2023 20:06:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TodoTask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TodoTask.vue b/src/views/TodoTask.vue
index a37898d..f4497fb 100644
--- a/src/views/TodoTask.vue
+++ b/src/views/TodoTask.vue
@@ -39,7 +39,7 @@
         v-for="(todo, idx) in todoList"
         :key="todo.execute_date + idx"
       >
-        <el-button type="primary" class="timeline-btn" icon="el-icon-edit"></el-button>
+        <el-button class="timeline-btn" icon="el-icon-edit" circle ></el-button>
         <div class="task-container scroll-box" :id="todo.execute_date">
           <div
             v-for="task in todo.task_items"
-- 
Gitee