From 4c2b88a13fabacb85dbcd7024e2647ff35bad35b Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 20 May 2022 10:23:30 +0800
Subject: [PATCH] no message

---
 resources/assets/js/pages/login.vue           |  9 ++
 .../js/pages/manage/components/DialogView.vue |  6 +-
 resources/assets/sass/pages/common.scss       |  4 +-
 .../sass/pages/components/dialog-wrapper.scss | 85 +++++++++++--------
 resources/assets/sass/pages/page-manage.scss  | 42 ++++++++-
 resources/assets/sass/pages/page-project.scss | 18 ++--
 6 files changed, 113 insertions(+), 51 deletions(-)

diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index fa5e11165..061297445 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -21,6 +21,7 @@
 
                     <Input
                         v-model="email"
+                        ref="email"
                         prefix="ios-mail-outline"
                         :placeholder="$L('输入您的电子邮件')"
                         type="email"
@@ -31,6 +32,7 @@
 
                     <Input
                         v-model="password"
+                        ref="password"
                         prefix="ios-lock-outline"
                         :placeholder="$L('输入您的密码')"
                         type="password"
@@ -41,6 +43,7 @@
                     <Input
                         v-if="loginType=='reg'"
                         v-model="password2"
+                        ref="password2"
                         prefix="ios-lock-outline"
                         :placeholder="$L('输入确认密码')"
                         type="password"
@@ -50,6 +53,7 @@
                     <Input
                         v-if="loginType=='reg' && needInvite"
                         v-model="invite"
+                        ref="invite"
                         class="login-code"
                         :placeholder="$L('请输入注册邀请码')"
                         type="text"
@@ -60,6 +64,7 @@
                     <Input
                         v-if="loginType=='login' && codeNeed"
                         v-model="code"
+                        ref="code"
                         class="login-code"
                         :placeholder="$L('输入图形验证码')"
                         type="text"
@@ -402,15 +407,18 @@ export default {
                 //
                 if (!$A.isEmail(this.email)) {
                     $A.messageWarning("请输入正确的邮箱地址");
+                    this.$refs.email.focus();
                     return;
                 }
                 if (!this.password) {
                     $A.messageWarning("请输入密码");
+                    this.$refs.password.focus();
                     return;
                 }
                 if (this.loginType == 'reg') {
                     if (this.password != this.password2) {
                         $A.messageWarning("确认密码输入不一致");
+                        this.$refs.password2.focus();
                         return;
                     }
                 }
@@ -441,6 +449,7 @@ export default {
                     if (data.code === 'need') {
                         this.reCode();
                         this.codeNeed = true;
+                        this.$refs.code.focus();
                     }
                 }).finally(_ => {
                     this.loadIng--;
diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index 5ef923d78..eee7ff5fa 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -53,9 +53,9 @@
                 <EPopover
                     v-model="popperShow"
                     ref="percent"
-                    placement="left-end"
-                    :width="360">
-                    <div class="dialog-wrapper-read-poptip-content">
+                    popper-class="dialog-wrapper-read-poptip"
+                    placement="left-end">
+                    <div class="read-poptip-content">
                         <ul class="read overlay-y">
                             <li class="read-title"><em>{{ readList.length }}</em>{{ $L('已读') }}</li>
                             <li v-for="item in readList">
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 3839b4cde..049bc489c 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -245,9 +245,9 @@ body {
 
             .ivu-modal-body {
                 padding: 16px 32px 2px;
-                overscroll-behavior: none;
 
-                * {
+                .ivu-table-body,
+                .project-log {
                     overscroll-behavior: none;
                 }
             }
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 80bb7ea8e..3d73223e6 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -735,56 +735,67 @@
     }
 }
 
-.dialog-wrapper-read-poptip-content {
-    display: flex;
-    position: relative;
+.dialog-wrapper-read-poptip {
+    width: 360px;
+    max-width: 72%;
 
-    .read,
-    .unread {
-        flex: 1;
-        max-height: 300px;
-        overflow: auto;
+    .read-poptip-content {
+        display: flex;
+        position: relative;
 
-        > li {
-            list-style: none;
-            margin-bottom: 12px;
+        .read,
+        .unread {
+            flex: 1;
+            max-height: 300px;
+            overflow: auto;
 
-            .common-avatar {
-                width: 100%;
-            }
+            > li {
+                min-height: 26px;
+                list-style: none;
+                margin-bottom: 12px;
 
-            &:last-child {
-                margin-bottom: 6px;
-            }
+                .common-avatar {
+                    width: 100%;
+                    .avatar-name {
+                        padding-right: 6px;
+                    }
+                }
 
-            &.read-title {
-                > em {
-                    font-size: 18px;
-                    font-weight: 600;
-                    font-style: normal;
-                    padding-right: 6px;
+                &:last-child {
+                    margin-bottom: 6px;
+                }
+
+                &.read-title {
+                    min-height: auto;
+                    > em {
+                        font-size: 18px;
+                        font-weight: 600;
+                        font-style: normal;
+                        padding-right: 6px;
+                    }
                 }
             }
         }
-    }
 
-    .unread {
-        > li {
-            padding-left: 16px;
+        .unread {
+            > li {
+                padding-left: 16px;
+            }
+        }
+
+        &:before {
+            content: "";
+            position: absolute;
+            left: 50%;
+            top: 0;
+            bottom: 0;
+            width: 1px;
+            background-color: #F4F4F5;
         }
     }
-
-    &:before {
-        content: "";
-        position: absolute;
-        left: 50%;
-        top: 0;
-        bottom: 0;
-        width: 1px;
-        background-color: #F4F4F5;
-    }
 }
 
+
 .dialog-wrapper-paste {
     display: flex;
     flex-direction: column;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 60ab1505d..3f4c62f96 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -343,8 +343,46 @@
 
     .task-title {
         max-width: 600px;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        display: flex;
+        align-items: center;
+        > span {
+            flex-shrink: 0;
+            font-size: 12px;
+            height: 18px;
+            min-width: 20px;
+            line-height: 16px;
+            padding: 0 2px;
+            border-radius: 3px;
+            color: #8bcf70;
+            border: 1px solid #8bcf70;
+            margin-right: 6px;
+            &.start {
+                background-color: rgba($flow-status-start-color, 0.1);
+                border-color: rgba($flow-status-start-color, 0.1);
+                color: $flow-status-start-color;
+            }
+            &.progress {
+                background-color: rgba($flow-status-progress-color, 0.1);;
+                border-color: rgba($flow-status-progress-color, 0.1);;
+                color: $flow-status-progress-color;
+            }
+            &.test {
+                background-color: rgba($flow-status-test-color, 0.1);;
+                border-color: rgba($flow-status-test-color, 0.1);;
+                color: $flow-status-test-color;
+            }
+            &.end {
+                background-color: rgba($flow-status-end-color, 0.1);;
+                border-color: rgba($flow-status-end-color, 0.1);;
+                color: $flow-status-end-color;
+            }
+        }
+        .task-title-text {
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     }
 }
 
diff --git a/resources/assets/sass/pages/page-project.scss b/resources/assets/sass/pages/page-project.scss
index 1dc54705f..28c1632d6 100644
--- a/resources/assets/sass/pages/page-project.scss
+++ b/resources/assets/sass/pages/page-project.scss
@@ -20,13 +20,6 @@
 
 @media (max-width: 768px) {
     .page-project {
-        .project-panel {
-            height: auto;
-            min-height: 100%;
-            &.gantt {
-                height: 100%;
-            }
-        }
         .project-dialog {
             position: fixed;
             top: 0;
@@ -37,3 +30,14 @@
         }
     }
 }
+@media (max-height: 700px) {
+    .page-project {
+        .project-panel {
+            height: auto;
+            min-height: 100%;
+            &.gantt {
+                height: 100%;
+            }
+        }
+    }
+}