From 833a3e1a4fb80597dc1190c7572e5bdbf696140a Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:53:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=A4=B9=E5=A2=9E=E5=8A=A0=E5=BF=AB=E9=80=9F=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=20(#2642)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/file.go                   |  5 +-
 frontend/src/api/interface/file.ts            |  1 +
 frontend/src/components/compose-log/index.vue |  2 +-
 .../src/views/host/file-management/index.vue  | 75 ++++++++++++++++---
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/backend/app/service/file.go b/backend/app/service/file.go
index 2d7b20264..ecefd04c8 100644
--- a/backend/app/service/file.go
+++ b/backend/app/service/file.go
@@ -140,7 +140,10 @@ func (f *FileService) Delete(op request.FileDelete) error {
 			return fo.DeleteFile(op.Path)
 		}
 	}
-	return NewIRecycleBinService().Create(request.RecycleBinCreate{SourcePath: op.Path})
+	if err := NewIRecycleBinService().Create(request.RecycleBinCreate{SourcePath: op.Path}); err != nil {
+		return err
+	}
+	return favoriteRepo.Delete(favoriteRepo.WithByPath(op.Path))
 }
 
 func (f *FileService) BatchDelete(op request.FileBatchDelete) error {
diff --git a/frontend/src/api/interface/file.ts b/frontend/src/api/interface/file.ts
index e22d73ae0..768ce5e34 100644
--- a/frontend/src/api/interface/file.ts
+++ b/frontend/src/api/interface/file.ts
@@ -168,5 +168,6 @@ export namespace File {
         path: string;
         isDir: boolean;
         isTxt: boolean;
+        name: string;
     }
 }
diff --git a/frontend/src/components/compose-log/index.vue b/frontend/src/components/compose-log/index.vue
index be2541b96..b4dc6d141 100644
--- a/frontend/src/components/compose-log/index.vue
+++ b/frontend/src/components/compose-log/index.vue
@@ -37,7 +37,7 @@
             :placeholder="$t('commons.msg.noneData')"
             :indent-with-tab="true"
             :tabSize="4"
-            style="margin-top: 10px; height: calc(100vh - 375px)"
+            style="margin-top: 10px; height: calc(100vh - 200px)"
             :lineWrapping="true"
             :matchBrackets="true"
             theme="cobalt"
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index b40c4c807..81e28ebfe 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -98,9 +98,35 @@
                     </div>
 
                     <div class="right-section">
-                        <el-button @click="openFavorite" :icon="Star">
-                            {{ $t('file.favorite') }}
-                        </el-button>
+                        <el-popover placement="bottom" :width="200" trigger="hover" @before-enter="getFavoriates">
+                            <template #reference>
+                                <el-button @click="openFavorite" :icon="Star">
+                                    {{ $t('file.favorite') }}
+                                </el-button>
+                            </template>
+                            <div class="favorite-item">
+                                <el-table :data="favorites">
+                                    <el-table-column prop="name">
+                                        <template #default="{ row }">
+                                            <span class="table-link" @click="toFavorite(row)" type="primary">
+                                                <svg-icon
+                                                    v-if="row.isDir"
+                                                    className="table-icon"
+                                                    iconName="p-file-folder"
+                                                ></svg-icon>
+                                                <svg-icon
+                                                    v-else
+                                                    className="table-icon"
+                                                    iconName="p-file-normal"
+                                                ></svg-icon>
+                                                {{ row.name }}
+                                            </span>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </div>
+                        </el-popover>
+
                         <el-button class="btn" @click="openRecycleBin" :icon="Delete">
                             {{ $t('file.recycleBin') }}
                         </el-button>
@@ -254,7 +280,14 @@
 
 <script setup lang="ts">
 import { nextTick, onMounted, reactive, ref, computed } from '@vue/runtime-core';
-import { GetFilesList, GetFileContent, ComputeDirSize, AddFavorite, RemoveFavorite } from '@/api/modules/files';
+import {
+    GetFilesList,
+    GetFileContent,
+    ComputeDirSize,
+    AddFavorite,
+    RemoveFavorite,
+    SearchFavorite,
+} from '@/api/modules/files';
 import { computeSize, dateFormat, downloadFile, getIcon, getRandomStr } from '@/utils/util';
 import { Delete, Star } from '@element-plus/icons-vue';
 import { File } from '@/api/interface/file';
@@ -343,6 +376,7 @@ const deleteRef = ref();
 const recycleBinRef = ref();
 const favoriteRef = ref();
 const hoveredRowIndex = ref(-1);
+const favorites = ref([]);
 
 // editablePath
 const { searchableStatus, searchablePath, searchableInputRef, searchableInputBlur } = useSearchable(paths);
@@ -408,7 +442,7 @@ const open = async (row: File.File) => {
 
         jump(req.path);
     } else {
-        openCodeEditor(row);
+        openCodeEditor(row.path, row.extension);
     }
 };
 
@@ -557,7 +591,6 @@ const openCompress = (items: File.File[]) => {
 };
 
 const openDeCompress = (item: File.File) => {
-    console.log(item.mimeType);
     if (Mimetypes.get(item.mimeType) == undefined) {
         MsgWarning(i18n.global.t('file.canNotDeCompress'));
         return;
@@ -571,13 +604,13 @@ const openDeCompress = (item: File.File) => {
     deCompressRef.value.acceptParams(fileDeCompress);
 };
 
-const openCodeEditor = (row: File.File) => {
-    codeReq.path = row.path;
+const openCodeEditor = (path: string, extension: string) => {
+    codeReq.path = path;
     codeReq.expand = true;
 
-    if (row.extension != '') {
+    if (extension != '') {
         Languages.forEach((language) => {
-            const ext = row.extension.substring(1);
+            const ext = extension.substring(1);
             if (language.value.indexOf(ext) > -1) {
                 fileEdit.language = language.label;
             }
@@ -708,6 +741,23 @@ const removeFavorite = async (id: number) => {
     });
 };
 
+const getFavoriates = async () => {
+    try {
+        const res = await SearchFavorite(req);
+        favorites.value = res.data.items;
+    } catch (error) {}
+};
+
+const toFavorite = (row: File.Favorite) => {
+    if (row.isDir) {
+        jump(row.path);
+    } else if (row.isTxt) {
+        openCodeEditor(row.path, '.' + row.name.split('.').pop());
+    } else {
+        jump(row.path.substring(0, row.path.lastIndexOf('/')));
+    }
+};
+
 const buttons = [
     {
         label: i18n.global.t('file.open'),
@@ -835,4 +885,9 @@ onMounted(() => {
         margin-right: 10px;
     }
 }
+
+.favorite-item {
+    max-height: 650px;
+    overflow: auto;
+}
 </style>