From ca65eb907d6ee0c8f636e42ba7be3e5e67981fd9 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 22 Apr 2025 21:04:17 +0800
Subject: [PATCH] no message

---
 language/original-web.txt                     |  7 ++--
 language/translate.json                       | 38 +------------------
 resources/assets/js/pages/manage.vue          |  9 +++++
 .../pages/manage/components/ProjectList.vue   |  9 +++++
 .../js/pages/manage/components/TaskDetail.vue |  6 +--
 .../manage/components/TeamManagement.vue      |  2 +-
 .../pages/components/dialog-group-info.scss   |  1 +
 7 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/language/original-web.txt b/language/original-web.txt
index 41eaf3bf1..af0a4878b 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -274,7 +274,6 @@ html转markdown
 任务不存在
 任务优先级
 任务已完成
-任务聊天室
 任务负责人
 会员不存在
 会议创建人
@@ -947,7 +946,9 @@ Pro版
 标题(*)
 (*)天
 (*)日
-任务聊天
+讨论
+任务讨论
+项目讨论
 项目描述
 标记已读
 允许消息通知
@@ -1958,7 +1959,7 @@ API请求的URL路径
 获取本地模型列表
 
 任务超期未完成
-打开部门群
+部门交流群
 群组 ID
 最多选择(*)个部门
 已共享
diff --git a/language/translate.json b/language/translate.json
index a33049863..d100c4ef8 100644
--- a/language/translate.json
+++ b/language/translate.json
@@ -3995,18 +3995,6 @@
         "id": "Tugas selesai",
         "ru": "Задача выполнена"
     },
-    {
-        "key": "任务聊天室",
-        "zh": "",
-        "zh-CHT": "任務聊天室",
-        "en": "Task chat room",
-        "ko": "작업 채팅방",
-        "ja": "タスクチャットルーム",
-        "de": "Aufgaben-Chatroom",
-        "fr": "Salle de discussion de tâche",
-        "id": "Ruang obrolan tugas",
-        "ru": "Чат-комната задачи"
-    },
     {
         "key": "任务负责人",
         "zh": "",
@@ -11471,18 +11459,6 @@
         "id": "Tidak dalam waktu yang valid, waktu yang valid adalah: (%T1)",
         "ru": "Не в пределах допустимого времени, допустимое время: (%T1)"
     },
-    {
-        "key": "任务聊天",
-        "zh": "",
-        "zh-CHT": "任務聊天",
-        "en": "Task Chat",
-        "ko": "작업 채팅",
-        "ja": "タスクチャット",
-        "de": "Aufgaben-Chat",
-        "fr": "Chat de tâche",
-        "id": "Obrolan Tugas",
-        "ru": "Чат задачи"
-    },
     {
         "key": "项目描述",
         "zh": "",
@@ -28367,18 +28343,6 @@
         "id": "Tugas terlambat dan belum selesai",
         "ru": "Задача просрочена и не завершена"
     },
-    {
-        "key": "打开部门群",
-        "zh": "",
-        "zh-CHT": "打開部門群",
-        "en": "Open department group",
-        "ko": "부서 그룹 열기",
-        "ja": "部門グループを開く",
-        "de": "Abteilungsgruppe öffnen",
-        "fr": "Ouvrir le groupe de département",
-        "id": "Buka grup departemen",
-        "ru": "Открыть группу отдела"
-    },
     {
         "key": "群组 ID",
         "zh": "",
@@ -29723,4 +29687,4 @@
         "id": "Hapus lampiran: (%T1)",
         "ru": "Удалить вложение: (%T1)"
     }
-]
\ No newline at end of file
+]
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 1d4a47b42..7a77ae1e7 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -172,6 +172,9 @@
                         <DropdownItem @click.native="handleTopClick">
                             {{ $L(operateItem.top_at ? '取消置顶' : '置顶该项目') }}
                         </DropdownItem>
+                        <DropdownItem @click.native="handleChatClick">
+                            {{ $L('项目讨论') }}
+                        </DropdownItem>
                     </DropdownMenu>
                 </Dropdown>
             </div>
@@ -1194,6 +1197,12 @@ export default {
             });
         },
 
+        handleChatClick() {
+            this.$store.dispatch("openDialog", this.operateItem.dialog_id).catch(({msg}) => {
+                $A.modalError(msg || this.$L('打开会话失败'))
+            })
+        },
+
         onTabbarClick(act) {
             switch (act) {
                 case 'addTask':
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 9879a62b0..5284b4f22 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -73,6 +73,9 @@
                     <DropdownItem @click.native="handleTopClick">
                         {{ $L(operateItem.top_at ? '取消置顶' : '置顶该项目') }}
                     </DropdownItem>
+                    <DropdownItem @click.native="handleChatClick">
+                        {{ $L('项目讨论') }}
+                    </DropdownItem>
                 </DropdownMenu>
             </Dropdown>
         </div>
@@ -228,6 +231,12 @@ export default {
                 $A.modalError(msg);
             });
         },
+
+        handleChatClick() {
+            this.$store.dispatch("openDialog", this.operateItem.dialog_id).catch(({msg}) => {
+                $A.modalError(msg || this.$L('打开会话失败'))
+            })
+        }
     }
 }
 </script>
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 9e8684498..9cd025d79 100755
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -363,7 +363,7 @@
                         <Icon class="icon" type="ios-chatbubbles-outline" />
                         <div class="nav">
                             <div class="nav-item nav-chat" :class="{active:navActive=='dialog'}" @click="navActive='dialog'">
-                                {{$L('聊天')}}
+                                {{$L('讨论')}}
                                 <span v-if="msgTypes.length > 1" class="msg-type" @click.stop="openTypeClick">
                                     <i class="taskfont">&#xe740;</i>
                                     <em v-if="msgType">{{getTypeLabel(msgType)}}</em>
@@ -383,7 +383,7 @@
                 <div class="head">
                     <Icon class="icon" type="ios-chatbubbles-outline" />
                     <div class="nav">
-                        <div class="nav-item" :class="{active:navActive=='dialog'}" @click="navActive='dialog'">{{$L('聊天')}}</div>
+                        <div class="nav-item" :class="{active:navActive=='dialog'}" @click="navActive='dialog'">{{$L('讨论')}}</div>
                         <div class="nav-item" :class="{active:navActive=='log'}" @click="navActive='log'">{{$L('动态')}}</div>
                         <div v-if="navActive=='log'" class="refresh">
                             <Loading v-if="logLoadIng"/>
@@ -393,7 +393,7 @@
                     <div class="menu">
                         <div v-if="navActive=='dialog' && taskDetail.msg_num > 0" class="menu-item" @click.stop="onOpen">
                             <div v-if="openLoad > 0" class="menu-load"><Loading/></div>
-                            {{$L('任务聊天')}}
+                            {{$L('任务讨论')}}
                             <em>({{taskDetail.msg_num > 999 ? '999+' : taskDetail.msg_num}})</em>
                             <i class="taskfont">&#xe703;</i>
                         </div>
diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue
index a0c95806e..30d8ff13c 100644
--- a/resources/assets/js/pages/manage/components/TeamManagement.vue
+++ b/resources/assets/js/pages/manage/components/TeamManagement.vue
@@ -48,7 +48,7 @@
                                     <div>{{$L('添加子部门')}}</div>
                                 </EDropdownItem>
                                 <EDropdownItem v-if="item.dialog_id" :command="`dialog_${item.dialog_id}`">
-                                    <div>{{$L('打开部门群')}}</div>
+                                    <div>{{$L('部门交流群')}}</div>
                                 </EDropdownItem>
                                 <EDropdownItem :command="`edit_${item.id}`">
                                     <div>{{$L('编辑')}}</div>
diff --git a/resources/assets/sass/pages/components/dialog-group-info.scss b/resources/assets/sass/pages/components/dialog-group-info.scss
index 146fff3f2..a583fcf2b 100644
--- a/resources/assets/sass/pages/components/dialog-group-info.scss
+++ b/resources/assets/sass/pages/components/dialog-group-info.scss
@@ -15,6 +15,7 @@
         margin-bottom: -8px;
         padding-bottom: 8px;
         background: #fff;
+        border-radius: 8px 8px 0 0;
     }
 
     .group-info-title {