From 965895de5c33acc79a7e4919236775dedb0bad54 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 26 May 2022 17:49:54 +0800
Subject: [PATCH] no message

---
 resources/assets/js/pages/manage.vue             |  4 +++-
 .../pages/manage/components/ChatInput/index.vue  | 16 +++++++++++-----
 .../js/pages/manage/components/DialogView.vue    |  6 +++---
 .../js/pages/manage/components/DialogWrapper.vue | 12 +++++++++---
 .../js/pages/manage/components/FileHistory.vue   |  2 +-
 .../js/pages/manage/components/TaskDetail.vue    |  2 +-
 resources/assets/sass/dark.scss                  |  3 +--
 .../assets/sass/pages/components/chat-input.scss |  8 ++++----
 .../sass/pages/components/project-panel.scss     |  1 +
 .../sass/pages/components/task-detail.scss       |  4 +++-
 10 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index b6cc4b93c..5548916fd 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -361,7 +361,9 @@
         </DragBallComponent>
 
         <!--移动端选项卡-->
-        <MobileTabbar v-if="showMobileTabbar" @on-click="onTabbarClick"/>
+        <transition name="mobile-slide">
+            <MobileTabbar v-if="showMobileTabbar" @on-click="onTabbarClick"/>
+        </transition>
         <MobileBack :showTabbar="showMobileTabbar"/>
         <MobileNotification ref="mobileNotification"/>
     </div>
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index dd5ab35a2..bf5291dcf 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -6,7 +6,7 @@
                 <slot name="toolbarBefore"/>
 
                 <EPopover
-                    v-if="$isDesktop"
+                    v-if="!emojiBottom"
                     v-model="showEmoji"
                     :visibleArrow="false"
                     placement="top"
@@ -55,7 +55,7 @@
                 <slot name="toolbarAfter"/>
             </div>
         </div>
-        <template v-if="!$isDesktop">
+        <template v-if="emojiBottom">
             <ChatEmoji v-if="showEmoji" @on-select="onSelectEmoji"/>
         </template>
     </div>
@@ -103,6 +103,10 @@ export default {
                 return $A.isDesktop
             }
         },
+        emojiBottom: {
+            type: Boolean,
+            default: false
+        },
         options: {
             type: Object,
             default: () => ({})
@@ -339,9 +343,11 @@ export default {
                         // ios11.0-11.3 对scrollTop及scrolIntoView解释有bug
                         // 直接执行会导致输入框滚到底部被遮挡
                     } else {
-                        setTimeout(() => {
-                            $A.scrollToView(this.$refs.editor, true)
-                        }, 300);
+                        for (let i = 1; i <= 5; i++) {
+                            setTimeout(() => {
+                                $A.scrollToView(this.$refs.editor, true)
+                            }, 200 * i);
+                        }
                     }
                 }
             })
diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index 3af17884e..863c055f0 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -50,7 +50,7 @@
             <div v-if="timeShow" class="time" @click="timeShow=false">{{msgData.created_at}}</div>
             <div v-else class="time" :title="msgData.created_at" @click="timeShow=true">{{$A.formatTime(msgData.created_at)}}</div>
 
-            <template v-if="!hiddenPercentage">
+            <template v-if="!hidePercentage">
                 <div v-if="msgData.send > 1 || dialogType === 'group'" class="percent" @click="openReadPercentage">
                     <EPopover
                         v-model="popperShow"
@@ -103,7 +103,7 @@ export default {
             type: String,
             default: ''
         },
-        hiddenPercentage: {
+        hidePercentage: {
             type: Boolean,
             default: false
         },
@@ -339,7 +339,7 @@ export default {
                     pageType: 'web',
                     pageTitle: `${this.msgData.msg.name} (${$A.bytesToSize(this.msgData.msg.size)})`,
                     statusBarStyle: false,
-                    url: $A.apiUrl(`../#/token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`../#${uri}`))}`)
+                    url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
                 }, _ => {});
             } else {
                 window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 4a59e425e..836110c21 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -57,7 +57,7 @@
                         <i class="taskfont dialog-create" @click="groupInfoShow = true">&#xe6e9;</i>
                     </ETooltip>
                 </template>
-                <ETooltip v-else-if="dialogData.type === 'user'" placement="top" :disabled="!$isDesktop" :content="$L('创建群组')">
+                <ETooltip v-else-if="dialogData.type === 'user' && !isMyDialog" placement="top" :disabled="!$isDesktop" :content="$L('创建群组')">
                     <i class="taskfont dialog-create" @click="openCreateGroup">&#xe646;</i>
                 </ETooltip>
             </div>
@@ -92,7 +92,7 @@
                     <div class="dialog-avatar">
                         <UserAvatar :userid="item.userid" :tooltipDisabled="item.userid == userId" :size="30"/>
                     </div>
-                    <DialogView :msg-data="item" :dialog-type="dialogData.type" :hidden-percentage="dialogData.dialog_user && dialogData.dialog_user.userid == userId"/>
+                    <DialogView :msg-data="item" :dialog-type="dialogData.type" :hide-percentage="isMyDialog"/>
                 </DynamicScrollerItem>
             </template>
         </DynamicScroller>
@@ -102,8 +102,9 @@
                 <slot name="inputBefore"/>
                 <ChatInput
                     ref="input"
-                    :dialog-id="dialogId"
                     v-model="msgText"
+                    :dialog-id="dialogId"
+                    :emoji-bottom="!$isDesktop"
                     :maxlength="20000"
                     @on-focus="onEventFocus"
                     @on-blur="onEventBlur"
@@ -312,6 +313,11 @@ export default {
             }
             return String(num);
         },
+
+        isMyDialog() {
+            const {dialogData, userId} = this;
+            return dialogData.dialog_user && dialogData.dialog_user.userid == userId
+        }
     },
 
     watch: {
diff --git a/resources/assets/js/pages/manage/components/FileHistory.vue b/resources/assets/js/pages/manage/components/FileHistory.vue
index cfaf4fdac..3527b8b5a 100644
--- a/resources/assets/js/pages/manage/components/FileHistory.vue
+++ b/resources/assets/js/pages/manage/components/FileHistory.vue
@@ -206,7 +206,7 @@ export default {
                             pageType: 'web',
                             pageTitle: $A.getFileName(this.file) + ` [${row.created_at}]`,
                             statusBarStyle: false,
-                            url: $A.apiUrl(`../#/token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`../#${uri}`))}`)
+                            url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
                         }, _ => {});
                     } else {
                         window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 3eaeae0d4..daef7ea19 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -1278,7 +1278,7 @@ export default {
                     pageType: 'web',
                     pageTitle: `${file.name} (${$A.bytesToSize(file.size)})`,
                     statusBarStyle: false,
-                    url: $A.apiUrl(`../#/token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`../#${uri}`))}`)
+                    url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
                 }, _ => {});
             } else {
                 window.open($A.apiUrl(`..${uri}`))
diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss
index 18b86311b..cb4b5fda6 100644
--- a/resources/assets/sass/dark.scss
+++ b/resources/assets/sass/dark.scss
@@ -48,8 +48,7 @@ body.dark-mode-reverse {
         }
     }
 
-    .drawer-overlay {
-        background: rgba(230, 230, 230, 0.6);
+    .common-drawer-overlay {
         .overlay-body {
             .overlay-close {
                 > a {
diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss
index 55652b471..903c23d01 100755
--- a/resources/assets/sass/pages/components/chat-input.scss
+++ b/resources/assets/sass/pages/components/chat-input.scss
@@ -85,7 +85,7 @@
             .ql-mention-list-container {
                 width: auto;
                 min-width: 220px;
-                max-width: 350px;
+                max-width: 280px;
                 max-height: 360px;
                 overflow-y: overlay;
 
@@ -317,9 +317,6 @@
         .chat-emoji-box {
             width: auto;
             padding: 8px 2px;
-            display: flex;
-            justify-content: space-around;
-            flex-wrap: wrap;
             &::after {
                 content: "";
                 flex: auto;
@@ -403,6 +400,9 @@
         width: 360px;
         height: 280px;
         padding: 8px;
+        display: flex;
+        justify-content: space-around;
+        flex-wrap: wrap;
         overflow-x: hidden;
         word-break: break-all;
         box-sizing: content-box;
diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss
index d5abf534e..90383ad15 100644
--- a/resources/assets/sass/pages/components/project-panel.scss
+++ b/resources/assets/sass/pages/components/project-panel.scss
@@ -1071,6 +1071,7 @@
             }
             > ul {
                 > li {
+                    width: 320px;
                     &:first-child {
                         margin-left: 10px;
                     }
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 7f8b0a7ec..7d6fc4ccb 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -219,13 +219,15 @@
                         .picker-time {
                             display: flex;
                             align-items: center;
+                            flex-wrap: wrap;
                             line-height: 26px;
                             .time {
                                 cursor: pointer;
+                                margin-right: 10px;
                             }
                             .ivu-tag {
                                 flex-shrink: 0;
-                                margin-left: 10px;
+                                margin-right: 10px;
                                 padding: 0 4px;
                                 height: 20px;
                                 line-height: 18px;