From 1a0c1e33063e28bae73e6b87b18f2e0a58e7361b Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 4 Dec 2024 13:24:48 +0800
Subject: [PATCH] no message

---
 package.json                                  |  2 +-
 .../pages/manage/components/ProjectPanel.vue  | 24 ++++---
 resources/assets/js/store/actions.js          |  3 +
 resources/assets/sass/pages/common.scss       |  6 ++
 .../sass/pages/components/dialog-wrapper.scss |  5 ++
 .../sass/pages/components/project-panel.scss  | 70 ++++++++++---------
 6 files changed, 68 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 6585a828f..8c8c09a48 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "vue-resize-observer": "^2.0.16",
         "vue-router": "^3.6.5",
         "vue-template-compiler": "~2.6.14",
-        "vue-virtual-scroll-list-hi": "^2.3.5-12",
+        "vue-virtual-scroll-list-hi": "^2.3.5-14",
         "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2"
     },
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 2209adf24..f3a1350f5 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -238,22 +238,28 @@
         <Scrollbar v-else-if="tabTypeActive === 'table'" class="project-table" enable-x>
             <div class="project-table-head">
                 <Row class="task-row">
-                    <Col span="12"><span class="head-title"># {{$L('任务名称')}}</span></Col>
-                    <Col span="3"><span class="head-title">{{$L('列表')}}</span></Col>
+                    <Col span="12">
+                        <div class="ellipsis"># {{$L('任务名称')}}</div>
+                    </Col>
+                    <Col span="3">
+                        <div class="ellipsis">{{$L('列表')}}</div>
+                    </Col>
                     <Col span="3">
                         <div class="sort" @click="onSort('level')">
-                            <span class="head-title">{{$L('优先级')}}</span>
-                            <div class="task-sort">
+                            <div class="head-title">{{$L('优先级')}}</div>
+                            <div class="head-sort">
                                 <Icon :class="{on:sortField=='level' && sortType=='asc'}" type="md-arrow-dropup" />
                                 <Icon :class="{on:sortField=='level' && sortType=='desc'}" type="md-arrow-dropdown" />
                             </div>
                         </div>
                     </Col>
-                    <Col span="3">{{$L('负责人')}}</Col>
+                    <Col span="3">
+                        <div class="ellipsis">{{$L('负责人')}}</div>
+                    </Col>
                     <Col span="3">
                         <div class="sort" @click="onSort('end_at')">
-                            <span class="head-title">{{$L('到期时间')}}</span>
-                            <div class="task-sort">
+                            <div class="head-title">{{$L('到期时间')}}</div>
+                            <div class="head-sort">
                                 <Icon :class="{on:sortField=='end_at' && sortType=='asc'}" type="md-arrow-dropup" />
                                 <Icon :class="{on:sortField=='end_at' && sortType=='desc'}" type="md-arrow-dropdown" />
                             </div>
@@ -317,7 +323,9 @@
                     <Col span="3"></Col>
                     <Col span="3"></Col>
                     <Col span="3"></Col>
-                    <Col span="3">{{projectData.task_num > 0 && projectData.cacheParameter.showCompleted ? $L('完成时间') : ''}}</Col>
+                    <Col span="3">
+                        <div class="ellipsis">{{projectData.task_num > 0 && projectData.cacheParameter.showCompleted ? $L('完成时间') : ''}}</div>
+                    </Col>
                 </Row>
                 <TaskRow v-if="projectData.cacheParameter.showCompleted" :list="completedList" open-key="completed" @on-priority="addTaskOpen" showCompleteAt/>
             </div>
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 6eacb2e43..795fab6fe 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -3092,6 +3092,9 @@ export default {
                 dispatch("saveDialogMsg", msg)
             });
         } else if ($A.isJson(data)) {
+            if (data.type == "notice") {
+                data.estimateSize = 42;
+            }
             const index = state.dialogMsgs.findIndex(({id}) => id == data.id);
             if (index > -1) {
                 const original = state.dialogMsgs[index]
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index d4182bbb7..b9aff5bd2 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -1,6 +1,12 @@
 body {
     overflow: hidden;
 
+    .ellipsis {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
     .form-tip {
         color: $primary-desc-color;
         line-height: 22px;
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index d8933d779..717a896f9 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1191,6 +1191,11 @@
                         .content-template {
                             color: $primary-title-color;
                             max-width: 100%;
+                            padding: 0 2px;
+                            min-height: 24px;
+                            display: flex;
+                            flex-direction: column;
+                            justify-content: center;
 
                             .warning-color {
                                 color: $flow-status-start-color;
diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss
index 3fa3af258..1b485d02e 100644
--- a/resources/assets/sass/pages/components/project-panel.scss
+++ b/resources/assets/sass/pages/components/project-panel.scss
@@ -658,40 +658,44 @@
                         display: flex;
                         align-items: center;
                         cursor: pointer;
-                    }
-                    .head-title{
-                        white-space: nowrap;
-                    }
-                    .task-sort {
-                        display: inline-block;
-                        width: 14px;
-                        height: 12px;
-                        margin-top: -1px;
-                        margin-left: 1px;
-                        vertical-align: middle;
-                        overflow: hidden;
-                        cursor: pointer;
-                        position: relative;
-                        > i {
-                            display: block;
-                            height: 6px;
-                            line-height: 6px;
+                        max-width: 100%;
+                        .head-title {
+                            max-width: calc(100% - 14px);
                             overflow: hidden;
-                            position: absolute;
-                            color: #c5c8ce;
-                            transition: color .2s ease-in-out;
-                            font-size: 16px;
-                            &.on {
-                                color: $primary-color
-                            }
-                            &:hover {
-                                color: inherit
-                            }
-                            &:first-child {
-                                top: 0
-                            }
-                            &:last-child {
-                                bottom: 0
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                        }
+                        .head-sort {
+                            display: inline-block;
+                            width: 14px;
+                            height: 12px;
+                            margin-top: -1px;
+                            margin-left: 1px;
+                            vertical-align: middle;
+                            overflow: hidden;
+                            cursor: pointer;
+                            position: relative;
+                            > i {
+                                display: block;
+                                height: 6px;
+                                line-height: 6px;
+                                overflow: hidden;
+                                position: absolute;
+                                color: #c5c8ce;
+                                transition: color .2s ease-in-out;
+                                font-size: 16px;
+                                &.on {
+                                    color: $primary-color
+                                }
+                                &:hover {
+                                    color: inherit
+                                }
+                                &:first-child {
+                                    top: 0
+                                }
+                                &:last-child {
+                                    bottom: 0
+                                }
                             }
                         }
                     }