From 1c4bae2d91dfcea1347473c15fe742c01808337e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 23 Sep 2025 09:50:39 +0800
Subject: [PATCH] no message

---
 ...25_09_22_102000_create_user_favorites_table.php |  2 +-
 language/original-api.txt                          |  6 ++++++
 language/original-web.txt                          | 14 ++++++++++++++
 .../js/pages/manage/components/ProjectPanel.vue    |  3 ---
 .../js/pages/manage/components/TaskOperation.vue   |  4 ++--
 resources/assets/js/pages/manage/file.vue          |  5 -----
 .../sass/pages/components/general-operation.scss   |  8 --------
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/database/migrations/2025_09_22_102000_create_user_favorites_table.php b/database/migrations/2025_09_22_102000_create_user_favorites_table.php
index 21c88446e..c1b54eaec 100644
--- a/database/migrations/2025_09_22_102000_create_user_favorites_table.php
+++ b/database/migrations/2025_09_22_102000_create_user_favorites_table.php
@@ -19,7 +19,7 @@ class CreateUserFavoritesTable extends Migration
         Schema::create('user_favorites', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->bigInteger('userid')->index()->nullable()->default(0)->comment('用户ID');
-            $table->string('favoritable_type', 50)->index()->nullable()->default('')->comment('收藏类型(task/project/file)');
+            $table->string('favoritable_type', 50)->index()->nullable()->default('')->comment('收藏类型(比如：task/project/file/message)');
             $table->bigInteger('favoritable_id')->index()->nullable()->default(0)->comment('收藏对象ID');
             $table->timestamps();
 
diff --git a/language/original-api.txt b/language/original-api.txt
index f2839f5cc..f5c27257c 100644
--- a/language/original-api.txt
+++ b/language/original-api.txt
@@ -892,3 +892,9 @@ URL格式不正确
 同步完成，子部门中没有成员需要同步
 同步完成，共同步(*)个成员
 同步完成，共同步(*)个成员，其中(*)个成员已在当前部门
+
+无效的收藏类型
+收藏成功
+取消收藏成功
+清理(*)收藏成功
+清理全部收藏成功
\ No newline at end of file
diff --git a/language/original-web.txt b/language/original-web.txt
index d2ffe7d85..7f2f67c6e 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -2165,3 +2165,17 @@ API URL
 当前部门没有子部门，无需同步
 你确定要同步部门成员吗？
 注：此操作会同步子部门成员到当前部门
+
+我的收藏
+收藏类型
+全部类型
+搜索收藏名称
+所属项目
+收藏时间
+确定要取消收藏"(*)"吗？
+取消收藏
+收藏
+没有相关的收藏
+取消收藏成功
+收藏项目
+操作失败
\ No newline at end of file
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 4fa1a7266..a0d269d1f 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -1070,7 +1070,6 @@ export default {
         },
         projectData(newData, oldData) {
             this.sortData = this.getSort();
-            // 当项目数据改变时，检查收藏状态（避免重复调用）
             if (newData && newData.id && (!oldData || newData.id !== oldData.id)) {
                 this.checkProjectFavoriteStatus();
             }
@@ -1898,7 +1897,6 @@ export default {
                 type: 'project',
                 id: this.projectData.id
             }).then(({data, msg}) => {
-                // 更新项目的收藏状态
                 this.$set(this.projectData, 'favorited', data.favorited);
                 $A.messageSuccess(msg);
             }).catch(({msg}) => {
@@ -1918,7 +1916,6 @@ export default {
             }).then(({data}) => {
                 this.$set(this.projectData, 'favorited', data.favorited || false);
             }).catch(() => {
-                // 出错时默认为未收藏状态
                 this.$set(this.projectData, 'favorited', false);
             });
         },
diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue
index 2e159fa11..0d42784fa 100644
--- a/resources/assets/js/pages/manage/components/TaskOperation.vue
+++ b/resources/assets/js/pages/manage/components/TaskOperation.vue
@@ -48,8 +48,8 @@
                         <template v-if="task.parent_id === 0">
                             <template v-if="operationShow">
                                 <EDropdownItem command="favorite" :divided="turns.length > 0">
-                                    <div class="item" :class="{'favorited': isFavorited}">
-                                        <Icon :type="isFavorited ? 'ios-star' : 'ios-star-outline'" />{{$L(isFavorited ? '取消收藏' : '收藏')}}
+                                    <div class="item">
+                                        <i class="taskfont movefont" v-html="isFavorited ? '&#xe683;' : '&#xe679;'"></i>{{$L(isFavorited ? '取消收藏' : '收藏')}}
                                     </div>
                                 </EDropdownItem>
                                 <EDropdownItem command="send">
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 12d0b063e..211e1bafb 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -2092,12 +2092,10 @@ export default {
                 type: 'file',
                 id: item.id
             }).then(({data, msg}) => {
-                // 更新文件的收藏状态
                 const fileIndex = this.fileList.findIndex(file => file.id === item.id);
                 if (fileIndex > -1) {
                     this.$set(this.fileList[fileIndex], 'favorited', data.favorited);
                 }
-                // 同时更新上下文菜单项的状态
                 if (this.contextMenuItem.id === item.id) {
                     this.$set(this.contextMenuItem, 'favorited', data.favorited);
                 }
@@ -2117,15 +2115,12 @@ export default {
                 type: 'file',
                 id: file.id
             }).then(({data}) => {
-                // 更新上下文菜单项的收藏状态
                 this.$set(this.contextMenuItem, 'favorited', data.favorited || false);
-                // 同时更新文件列表中对应文件的收藏状态
                 const fileIndex = this.fileList.findIndex(f => f.id === file.id);
                 if (fileIndex > -1) {
                     this.$set(this.fileList[fileIndex], 'favorited', data.favorited || false);
                 }
             }).catch(() => {
-                // 出错时默认为未收藏状态
                 this.$set(this.contextMenuItem, 'favorited', false);
                 const fileIndex = this.fileList.findIndex(f => f.id === file.id);
                 if (fileIndex > -1) {
diff --git a/resources/assets/sass/pages/components/general-operation.scss b/resources/assets/sass/pages/components/general-operation.scss
index 6fec0cae0..dee633866 100644
--- a/resources/assets/sass/pages/components/general-operation.scss
+++ b/resources/assets/sass/pages/components/general-operation.scss
@@ -61,14 +61,6 @@
                         text-overflow: ellipsis;
                         white-space: nowrap;
 
-                        &.favorited {
-                            color: #faad14;
-                            
-                            .ivu-icon {
-                                color: #faad14;
-                            }
-                        }
-
                         .item-prefix {
                             display: flex;
                             align-items: center;