From 966b10fbb519f5c20eaaaeeb4d33788fe116312d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Thu, 4 Jul 2024 22:30:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=BB=A5=E5=8F=8A=E6=96=87=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20(#5680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/file-list/index.vue | 103 +++++++++++++-------
 frontend/src/lang/modules/en.ts             |   3 +
 frontend/src/lang/modules/tw.ts             |   3 +
 frontend/src/lang/modules/zh.ts             |   3 +
 4 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/file-list/index.vue b/frontend/src/components/file-list/index.vue
index 2b1f7dc93..34e8fbd0b 100644
--- a/frontend/src/components/file-list/index.vue
+++ b/frontend/src/components/file-list/index.vue
@@ -51,6 +51,14 @@
                 </template>
             </BreadCrumbs>
         </div>
+        <div class="mt-4">
+            <el-button link @click="onAddItem(true)" type="primary" size="small">
+                {{ $t('commons.button.createNewFolder') }}
+            </el-button>
+            <el-button link @click="onAddItem(false)" type="primary" size="small">
+                {{ $t('commons.button.createNewFile') }}
+            </el-button>
+        </div>
         <div>
             <el-table :data="data" highlight-current-row height="40vh">
                 <el-table-column width="40" fix>
@@ -65,21 +73,34 @@
                 </el-table-column>
                 <el-table-column show-overflow-tooltip fix>
                     <template #default="{ row }">
-                        <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>
-                        <el-link v-if="!row.isCreate" :underline="false" @click="open(row)">{{ row.name }}</el-link>
-                        <el-input
-                            v-else
-                            ref="rowRefs"
-                            v-model="newFlower"
-                            style="width: 240px"
-                            placeholder="new flower"
-                            @input="handleChange(newFlower, row)"
-                        >
-                            <template #append>
-                                <el-button :icon="Check" @click="createFlower(row)" />
+                        <div>
+                            <svg-icon
+                                :class="'table-icon'"
+                                :iconName="row.isDir ? 'p-file-folder' : 'p-file-normal'"
+                            ></svg-icon>
+
+                            <template v-if="!row.isCreate">
+                                <el-link :underline="false" @click="open(row)">
+                                    {{ row.name }}
+                                </el-link>
                             </template>
-                        </el-input>
+
+                            <template v-else>
+                                <el-input
+                                    ref="rowRefs"
+                                    v-model="newFolder"
+                                    style="width: 200px"
+                                    placeholder="new folder"
+                                    @input="handleChange(newFolder, row)"
+                                ></el-input>
+                                <el-button link @click="createFolder(row)" type="primary" size="small" class="ml-2">
+                                    {{ $t('commons.button.save') }}
+                                </el-button>
+                                <el-button link @click="cancelFolder(row)" type="primary" size="small" class="!ml-2">
+                                    {{ $t('commons.button.cancel') }}
+                                </el-button>
+                            </template>
+                        </div>
                     </template>
                 </el-table-column>
             </el-table>
@@ -95,16 +116,11 @@
                     </el-tag>
                 </el-tooltip>
             </div>
-            <div class="flex items-center justify-between">
-                <el-button link @click="onAddRow" type="primary">
-                    {{ $t('commons.button.create') }}
+            <div class="button">
+                <el-button @click="closePage">{{ $t('commons.button.cancel') }}</el-button>
+                <el-button type="primary" @click="selectFile" :disabled="disBtn">
+                    {{ $t('commons.button.confirm') }}
                 </el-button>
-                <div class="button">
-                    <el-button @click="closePage">{{ $t('commons.button.cancel') }}</el-button>
-                    <el-button type="primary" @click="selectFile" :disabled="disBtn">
-                        {{ $t('commons.button.confirm') }}
-                    </el-button>
-                </div>
             </div>
         </div>
     </el-popover>
@@ -113,7 +129,7 @@
 <script lang="ts" setup>
 import { File } from '@/api/interface/file';
 import { CreateFile, GetFilesList } from '@/api/modules/files';
-import { Folder, Check, HomeFilled, Close } from '@element-plus/icons-vue';
+import { Folder, HomeFilled, Close } from '@element-plus/icons-vue';
 import BreadCrumbs from '@/components/bread-crumbs/index.vue';
 import BreadCrumbItem from '@/components/bread-crumbs/bread-crumbs-item.vue';
 import { onMounted, onUpdated, reactive, ref, nextTick } from 'vue';
@@ -128,7 +144,7 @@ const req = reactive({ path: '/', expand: true, page: 1, pageSize: 300, showHidd
 const selectRow = ref();
 const rowRefs = ref();
 const popoverVisible = ref(false);
-const newFlower = ref();
+const newFolder = ref();
 const disBtn = ref(false);
 
 const props = defineProps({
@@ -180,6 +196,9 @@ const disabledDir = (row: File.File) => {
     if (props.isAll) {
         return false;
     }
+    if (props.dir !== row.isDir) {
+        return true;
+    }
     if (!props.dir) {
         return row.isDir;
     }
@@ -239,28 +258,39 @@ const search = async (req: File.ReqFile) => {
 
 let addForm = reactive({ path: '', name: '', isDir: true, mode: 0o755, isLink: false, isSymlink: true, linkPath: '' });
 
-const onAddRow = async () => {
+const onAddItem = async (isDir: boolean) => {
     const createRow = data.value?.find((row: { isCreate: any }) => row.isCreate);
     if (createRow) {
         MsgWarning(i18n.global.t('commons.msg.creatingInfo'));
         return;
     }
-    newFlower.value = i18n.global.t('file.noNameFolder');
-    rowName.value = newFlower.value;
-    selectRow.value.name = newFlower.value;
-    const basePath = req.path === '/' ? req.path : `${req.path}/`;
-    selectRow.value.path = `${basePath}${newFlower.value}`;
+    newFolder.value = isDir ? i18n.global.t('file.noNameFolder') : i18n.global.t('file.noNameFile');
+    if (props.dir === isDir) {
+        rowName.value = newFolder.value;
+        selectRow.value.name = newFolder.value;
+        const basePath = req.path === '/' ? req.path : `${req.path}/`;
+        selectRow.value.path = `${basePath}${newFolder.value}`;
+    }
     data.value?.unshift({
         path: selectRow.value.path,
         isCreate: true,
-        isDir: true,
-        name: newFlower.value,
+        isDir: isDir,
+        name: newFolder.value,
     });
     disBtn.value = true;
     await nextTick();
     rowRefs.value.focus();
 };
 
+const cancelFolder = (row: any) => {
+    data.value.shift();
+    row.isCreate = false;
+    disBtn.value = false;
+    selectRow.value = {};
+    rowName.value = '';
+    newFolder.value = '';
+};
+
 const handleChange = (value: string, row: any) => {
     if (rowName.value === row.name) {
         selectRow.value.name = value;
@@ -271,14 +301,15 @@ const handleChange = (value: string, row: any) => {
     }
 };
 
-const createFlower = async (row: any) => {
+const createFolder = async (row: any) => {
     const basePath = req.path === '/' ? req.path : `${req.path}/`;
-    addForm.path = `${basePath}${newFlower.value}`;
+    addForm.path = `${basePath}${newFolder.value}`;
     if (addForm.path.indexOf('.1panel_clash') > -1) {
         MsgWarning(i18n.global.t('file.clashDitNotSupport'));
         return;
     }
-    addForm.name = newFlower.value;
+    addForm.isDir = row.isDir;
+    addForm.name = newFolder.value;
     let addItem = {};
     Object.assign(addItem, addForm);
     loading.value = true;
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index ace369cce..b80c4efef 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -66,6 +66,8 @@ const message = {
             preview: 'Preview',
             open: 'Open',
             notSave: 'Not Save',
+            createNewFolder: 'Create new folder',
+            createNewFile: 'Create new file',
         },
         search: {
             timeStart: 'Time start',
@@ -1252,6 +1254,7 @@ const message = {
         saveAndOpenNewFile: 'The file has been modified, do you want to save and open the new file?',
         noEdit: 'The file has not been modified, no need to do this!',
         noNameFolder: 'Untitled Folder',
+        noNameFile: 'Untitled File',
     },
     ssh: {
         autoStart: 'Auto Start',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index ca7d728c3..540a9dee7 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -65,6 +65,8 @@ const message = {
             preview: '預覽',
             open: '打開',
             notSave: '不保存',
+            createNewFolder: '新建資料夾',
+            createNewFile: '新建檔案',
         },
         search: {
             timeStart: '開始時間',
@@ -1189,6 +1191,7 @@ const message = {
         saveAndOpenNewFile: '檔案已被修改，是否保存並打開新檔案？',
         noEdit: '檔案未修改，無需此操作！',
         noNameFolder: '未命名資料夾',
+        noNameFile: '未命名檔案',
     },
     ssh: {
         autoStart: '開機自啟',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 2d98b03e5..373ead7cb 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -65,6 +65,8 @@ const message = {
             preview: '预览',
             open: '打开',
             notSave: '不保存',
+            createNewFolder: '新建文件夹',
+            createNewFile: '新建文件',
         },
         search: {
             timeStart: '开始时间',
@@ -1190,6 +1192,7 @@ const message = {
         saveAndOpenNewFile: '文件已被修改，是否保存并打开新文件？',
         noEdit: '文件未修改,无需此操作！',
         noNameFolder: '未命名文件夹',
+        noNameFile: '未命名文件',
     },
     ssh: {
         autoStart: '开机自启',