From 8e9ba7a2d22f7d2a998d65f0a699e12ae4946f3a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 6 Mar 2022 16:10:47 +0800
Subject: [PATCH] no msg

---
 .../js/pages/manage/components/TaskDetail.vue |  6 ++---
 .../js/pages/manage/components/TaskMenu.vue   |  5 ++++
 .../assets/js/pages/manage/dashboard.vue      |  2 +-
 .../assets/sass/pages/page-dashboard.scss     | 26 ++++++++-----------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 9516c3100..3ffe092d3 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -3,8 +3,8 @@
     <li v-if="ready && taskDetail.parent_id > 0">
         <div class="subtask-icon">
             <TaskMenu
-                v-if="taskId > 0"
                 :ref="`taskMenu_${taskDetail.id}`"
+                :disabled="taskId === 0"
                 :task="taskDetail"
                 :load-status="taskDetail.loading === true"
                 @on-update="getLogLists"/>
@@ -73,8 +73,8 @@
         <div v-show="taskDetail.id > 0" class="task-info">
             <div class="head">
                 <TaskMenu
-                    v-if="taskId > 0"
                     :ref="`taskMenu_${taskDetail.id}`"
+                    :disabled="taskId === 0"
                     :task="taskDetail"
                     class="icon"
                     size="medium"
@@ -123,7 +123,7 @@
                     </ETooltip>
                     <div class="menu">
                         <TaskMenu
-                            v-if="taskId > 0"
+                            :disabled="taskId === 0"
                             :task="taskDetail"
                             icon="ios-more"
                             completed-icon="ios-more"
diff --git a/resources/assets/js/pages/manage/components/TaskMenu.vue b/resources/assets/js/pages/manage/components/TaskMenu.vue
index 2402168ed..7e1a7da00 100644
--- a/resources/assets/js/pages/manage/components/TaskMenu.vue
+++ b/resources/assets/js/pages/manage/components/TaskMenu.vue
@@ -2,6 +2,7 @@
     <EDropdown
         ref="dropdown"
         trigger="click"
+        :disabled="disabled"
         :size="size"
         placement="bottom"
         @command="dropTask"
@@ -99,6 +100,10 @@ export default {
             type: Boolean,
             default: false
         },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
         size: {
             type: String,
             default: 'small'
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index 8ccd7e4ce..b71a0dc69 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -34,7 +34,7 @@
                     v-if="column.list.length > 0"
                     :key="index">
                     <div class="dashboard-title">{{column.title}}</div>
-                    <ul class="dashboard-li">
+                    <ul class="dashboard-ul">
                         <li
                             v-for="(item, index) in column.list"
                             :key="index"
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index fbd8dfb1f..3d4acdd85 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -16,7 +16,7 @@
         .dashboard-desc ,
         .dashboard-block ,
         .dashboard-list .dashboard-title,
-        .dashboard-list .dashboard-li {
+        .dashboard-list .dashboard-ul {
             width: 660px;
             max-width: 80%;
             margin: 0 auto;
@@ -50,7 +50,7 @@
                 flex-direction: column;
                 justify-content: center;
                 cursor: pointer;
-                transition: transform 0.5s ease-out 0s, box-shadow 0.3s ease-out 0s;
+                transition: transform 0.3s ease-out 0s, box-shadow 0.3s ease-out 0s;
                 &:first-child {
                     background-color: #6f9ef6;
                 }
@@ -106,8 +106,8 @@
                 font-size: 15px;
                 background-color: #ffffff;
             }
-            .dashboard-li {
-                margin: 0 auto;
+            .dashboard-ul {
+                margin: 0 auto 18px;
                 padding: 0 12px;
                 overflow: hidden;
                 > li {
@@ -117,8 +117,8 @@
                     background: #F9FAFB;
                     padding: 12px;
                     cursor: pointer;
-                    transition: box-shadow 0.3s,transform 0.2s;
-                    border-bottom: 1px solid #f1f2f4;
+                    transition: transform 0.3s ease-out 0s;
+                    border-bottom: 1px solid #f1f2f3;
                     &:hover {
                         transform: translateX(-2px);
                     }
@@ -162,6 +162,9 @@
                         flex: 1;
                         padding-left: 6px;
                         line-height: 22px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
                         > span {
                             font-size: 12px;
                             height: 18px;
@@ -254,7 +257,7 @@
             .dashboard-desc ,
             .dashboard-block ,
             .dashboard-list .dashboard-title,
-            .dashboard-list .dashboard-li {
+            .dashboard-list .dashboard-ul {
                 max-width: 86%;
             }
             .dashboard-block {
@@ -268,15 +271,8 @@
             .dashboard-list {
                 overflow: visible !important;
                 padding-bottom: 2px;
-                > ul {
+                .dashboard-ul {
                     margin-bottom: 36px;
-                    > li {
-                        .item-title {
-                            overflow: hidden;
-                            text-overflow: ellipsis;
-                            white-space: nowrap
-                        }
-                    }
                 }
             }
         }