From 00e255a4a81d2c140fc8e37801bbe3a7da086a2d Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Thu, 10 Aug 2023 07:46:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/TaskExistTips.vue    | 13 ++++++++++---
 .../sass/pages/components/task-exist-tips.scss      | 13 +++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskExistTips.vue b/resources/assets/js/pages/manage/components/TaskExistTips.vue
index 2a30dec16..38f2564db 100644
--- a/resources/assets/js/pages/manage/components/TaskExistTips.vue
+++ b/resources/assets/js/pages/manage/components/TaskExistTips.vue
@@ -1,13 +1,20 @@
 <template>
-    <Modal v-model="show" :title="$L('计划时间冲突提示')" class="task-exist-tips">
+    <Modal
+        v-model="show"
+        :title="$L('计划时间冲突提示')"
+        :styles="{
+            width: '90%',
+            maxWidth: '550px'
+        }"
+        class="task-exist-tips">
         <List :split="false" size="small">
             <ListItem v-for="(items, userid) in tipsTask" :key="userid">
                 <div class="list-content">
                     <UserAvatar :userid="userid" :size="28" :show-icon="true" :show-name="true" tooltipDisabled />
-                    <div class="list-task clearfix" v-for="(item, key) in items" :key="key">
+                    <div class="list-task" v-for="(item, key) in items" :key="key">
                         <div class="list-task-info">
                             <span>[{{ item.project_name }}] </span>
-                            <span>{{ item.name }}</span>
+                            <span :title="item.name">{{ item.name }}</span>
                         </div>
                         <div class="list-task-date">{{ getCutTime(item) }}</div>
                     </div>
diff --git a/resources/assets/sass/pages/components/task-exist-tips.scss b/resources/assets/sass/pages/components/task-exist-tips.scss
index 6f4bf7001..4166ed447 100644
--- a/resources/assets/sass/pages/components/task-exist-tips.scss
+++ b/resources/assets/sass/pages/components/task-exist-tips.scss
@@ -12,19 +12,24 @@
     }
 
     .list-task {
-        margin-left: 22px;
+        display: flex;
+        margin-left: 34px;
+        margin-right: 6px;
         margin-top: 10px;
     }
 
     .list-task-info {
-        float: left;
-        padding: 0 12px;
+        flex: 1;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        padding-right: 12px;
         span:first-child {
             color: #A7ABB5;
         }
     }
 
     .list-task-date {
-        float: right;
+        //float: right;
     }
 }