From b045261f1641b8503cd8f9225abbb948e1b879a9 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Tue, 24 Oct 2023 22:27:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8A=9F=E8=83=BD=20(#2661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/1364
Refs https://github.com/1Panel-dev/1Panel/issues/2053
---
 backend/app/api/v1/file.go                    |   7 +-
 frontend/src/lang/modules/en.ts               |   1 +
 frontend/src/lang/modules/tw.ts               |   1 +
 frontend/src/lang/modules/zh.ts               |   1 +
 .../host/file-management/delete/index.vue     |   1 +
 .../host/file-management/upload/index.vue     | 127 +++++++++++++++++-
 6 files changed, 131 insertions(+), 7 deletions(-)

diff --git a/backend/app/api/v1/file.go b/backend/app/api/v1/file.go
index aaa5a320a..8bc879051 100644
--- a/backend/app/api/v1/file.go
+++ b/backend/app/api/v1/file.go
@@ -568,12 +568,13 @@ func (b *BaseApi) Size(c *gin.Context) {
 }
 
 func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int) error {
-	if _, err := os.Stat(path.Dir(dstDir)); err != nil && os.IsNotExist(err) {
-		if err = os.MkdirAll(path.Dir(dstDir), os.ModePerm); err != nil {
+	op := files.NewFileOp()
+	dstDir = strings.TrimSpace(dstDir)
+	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
+		if err = op.CreateDir(dstDir, os.ModePerm); err != nil {
 			return err
 		}
 	}
-
 	targetFile, err := os.Create(filepath.Join(dstDir, fileName))
 	if err != nil {
 		return err
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 1faf98f01..e2f94d340 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -975,6 +975,7 @@ const message = {
         favorite: 'favorites',
         removeFavorite: 'Remove from favorites?',
         addFavorite: 'Add to favorites',
+        clearList: 'Clear list',
     },
     ssh: {
         autoStart: 'Auto Start',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 703a3793b..89eb6f1cb 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -936,6 +936,7 @@ const message = {
         favorite: '收藏夾',
         removeFavorite: '是否從收藏夾移出？',
         addFavorite: '加入收藏夾',
+        clearList: '清空列表',
     },
     ssh: {
         autoStart: '開機自啟',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index d5b26b91f..9cb12b729 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -937,6 +937,7 @@ const message = {
         favorite: '收藏夹',
         removeFavorite: '是否从收藏夹移出？',
         addFavorite: '加入收藏夹子',
+        clearList: '清空列表',
     },
     ssh: {
         autoStart: '开机自启',
diff --git a/frontend/src/views/host/file-management/delete/index.vue b/frontend/src/views/host/file-management/delete/index.vue
index 663329898..bf5dc61c7 100644
--- a/frontend/src/views/host/file-management/delete/index.vue
+++ b/frontend/src/views/host/file-management/delete/index.vue
@@ -53,6 +53,7 @@ const forceDelete = ref(false);
 const acceptParams = (props: File.File[]) => {
     files.value = props;
     open.value = true;
+    forceDelete.value = false;
 };
 
 const onConfirm = () => {
diff --git a/frontend/src/views/host/file-management/upload/index.vue b/frontend/src/views/host/file-management/upload/index.vue
index f2101192e..67f8513a4 100644
--- a/frontend/src/views/host/file-management/upload/index.vue
+++ b/frontend/src/views/host/file-management/upload/index.vue
@@ -9,6 +9,26 @@
         <template #header>
             <DrawerHeader :header="$t('file.upload')" :back="handleClose" />
         </template>
+        <div class="button-container">
+            <el-dropdown @command="upload">
+                <el-button type="primary">
+                    {{ $t('file.upload') }}
+                    <el-icon><arrow-down /></el-icon>
+                </el-button>
+                <template #dropdown>
+                    <el-dropdown-menu>
+                        <el-dropdown-item command="file">
+                            {{ $t('file.file') }}
+                        </el-dropdown-item>
+                        <el-dropdown-item command="dir">
+                            {{ $t('file.dir') }}
+                        </el-dropdown-item>
+                    </el-dropdown-menu>
+                </template>
+            </el-dropdown>
+            <el-button @click="clearFiles">{{ $t('file.clearList') }}</el-button>
+        </div>
+
         <el-upload
             action="#"
             drag
@@ -17,8 +37,9 @@
             :on-change="fileOnChange"
             :on-exceed="handleExceed"
             :on-success="hadleSuccess"
-            show-file-list
+            :show-file-list="false"
             multiple
+            v-model:file-list="uploaderFiles"
         >
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
@@ -30,6 +51,31 @@
                 <el-progress v-if="loading" text-inside :stroke-width="20" :percentage="uploadPrecent"></el-progress>
             </template>
         </el-upload>
+        <div>
+            <p
+                v-for="(item, index) in uploaderFiles"
+                :key="index"
+                class="file-item"
+                @mouseover="hoverIndex = index"
+                @mouseout="hoverIndex = null"
+            >
+                <el-icon class="file-icon"><Document /></el-icon>
+                <span v-if="item.raw.webkitRelativePath != ''">{{ item.raw.webkitRelativePath }}</span>
+                <span v-else>{{ item.name }}</span>
+                <span v-if="item.status === 'success'" class="success-icon">
+                    <el-icon><Select /></el-icon>
+                </span>
+                <span v-else>
+                    <el-button
+                        class="delete-button"
+                        type="primary"
+                        link
+                        @click="removeFile(index)"
+                        :icon="Close"
+                    ></el-button>
+                </span>
+            </p>
+        </div>
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
@@ -42,12 +88,13 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { nextTick, reactive, ref } from 'vue';
 import { UploadFile, UploadFiles, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
 import { ChunkUploadFileData, UploadFileData } from '@/api/modules/files';
 import i18n from '@/lang';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { MsgSuccess } from '@/utils/message';
+import { Close } from '@element-plus/icons-vue';
 
 interface UploadFileProps {
     path: string;
@@ -66,13 +113,35 @@ const handleClose = () => {
     uploadRef.value!.clearFiles();
     em('close', false);
 };
-
+const state = reactive({
+    uploadEle: null,
+});
 const uploaderFiles = ref<UploadFiles>([]);
+const isUploadFolder = ref(false);
+const hoverIndex = ref(null);
+
+const upload = (commnad: string) => {
+    if (commnad == 'dir') {
+        state.uploadEle.webkitdirectory = true;
+    } else {
+        state.uploadEle.webkitdirectory = false;
+    }
+    isUploadFolder.value = true;
+    uploadRef.value.$el.querySelector('input').click();
+};
+
+const removeFile = (index: number) => {
+    uploaderFiles.value.splice(index, 1);
+};
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
     uploaderFiles.value = uploadFiles;
 };
 
+const clearFiles = () => {
+    uploadRef.value!.clearFiles();
+};
+
 const handleExceed: UploadProps['onExceed'] = (files) => {
     uploadRef.value!.clearFiles();
     for (let i = 0; i < files.length; i++) {
@@ -111,7 +180,11 @@ const submit = async () => {
             const formData = new FormData();
 
             formData.append('filename', file.name);
-            formData.append('path', path.value);
+            if (file.raw.webkitRelativePath != '') {
+                formData.append('path', path.value + '/' + getPathWithoutFilename(file.raw.webkitRelativePath));
+            } else {
+                formData.append('path', path.value);
+            }
             formData.append('chunk', chunk);
             formData.append('chunkIndex', c.toString());
             formData.append('chunkCount', chunkCount.toString());
@@ -149,12 +222,58 @@ const submit = async () => {
     }
 };
 
+const getPathWithoutFilename = (path: string) => {
+    return path ? path.split('/').slice(0, -1).join('/') : path;
+};
+
 const acceptParams = (props: UploadFileProps) => {
     path.value = props.path;
     open.value = true;
     uploadPrecent.value = 0;
     uploadHelper.value = '';
+
+    nextTick(() => {
+        const uploadEle = document.querySelector('.el-upload__input');
+        state.uploadEle = uploadEle;
+    });
 };
 
 defineExpose({ acceptParams });
 </script>
+
+<style lang="scss" scoped>
+.button-container {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 10px;
+}
+
+.file-item {
+    font-size: 12px;
+    color: #888;
+    position: relative;
+    display: flex;
+    align-items: center;
+}
+
+.file-item:hover {
+    background-color: #f5f5f5;
+}
+
+.file-icon {
+    margin-right: 8px;
+}
+
+.delete-button {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.success-icon {
+    color: green;
+    position: absolute;
+    right: 0;
+}
+</style>