From 2904ed0edc52dfbec2c3b5dd684523ce8c7c6417 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Fri, 10 Mar 2023 11:44:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=92=8C=E7=A7=BB=E5=8A=A8=E5=88=B0=E8=87=AA=E8=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/file.go                                | 7 +++++--
 backend/constant/errs.go                                   | 3 ++-
 backend/i18n/lang/en.yaml                                  | 1 +
 backend/i18n/lang/zh.yaml                                  | 1 +
 frontend/src/components/file-list/index.vue                | 1 +
 frontend/src/views/host/file-management/create/index.vue   | 1 +
 frontend/src/views/host/file-management/index.vue          | 4 ++--
 .../views/website/website/config/log/log-fiile/index.vue   | 2 +-
 8 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/backend/app/service/file.go b/backend/app/service/file.go
index dd798257d..a9a6dc600 100644
--- a/backend/app/service/file.go
+++ b/backend/app/service/file.go
@@ -161,7 +161,6 @@ func (f FileService) GetContent(op request.FileOption) (response.FileInfo, error
 }
 
 func (f FileService) SaveContent(edit request.FileEdit) error {
-
 	info, err := files.NewFileInfo(files.FileOption{
 		Path:   edit.Path,
 		Expand: false,
@@ -190,7 +189,11 @@ func (f FileService) MvFile(m request.FileMove) error {
 	if !fo.Stat(m.NewPath) {
 		return buserr.New(constant.ErrPathNotFound)
 	}
-
+	for _, path := range m.OldPaths {
+		if path == m.NewPath || strings.Contains(m.NewPath, path) {
+			return buserr.New(constant.ErrMovePathFailed)
+		}
+	}
 	if m.Type == "cut" {
 		return fo.Cut(m.OldPaths, m.NewPath)
 	}
diff --git a/backend/constant/errs.go b/backend/constant/errs.go
index c76911822..d78af1791 100644
--- a/backend/constant/errs.go
+++ b/backend/constant/errs.go
@@ -79,7 +79,8 @@ var (
 
 //file
 var (
-	ErrPathNotFound = "ErrPathNotFound"
+	ErrPathNotFound   = "ErrPathNotFound"
+	ErrMovePathFailed = "ErrMovePathFailed"
 )
 
 //mysql
diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml
index f715dfc41..f67ec16f4 100644
--- a/backend/i18n/lang/en.yaml
+++ b/backend/i18n/lang/en.yaml
@@ -31,6 +31,7 @@ ErrUpdateBuWebsite: 'The application was updated successfully, but the modificat
 ErrFileCanNotRead: "File can not read"
 ErrFileToLarge: "file is too large"
 ErrPathNotFound: "Path is not found"
+ErrMovePathFailed: "The target path cannot contain the original path!"
 
 #website
 ErrDomainIsExist: "Domain is already exist"
diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml
index 682d34da6..e59bafd6d 100644
--- a/backend/i18n/lang/zh.yaml
+++ b/backend/i18n/lang/zh.yaml
@@ -31,6 +31,7 @@ ErrUpdateBuWebsite: '应用更新成功，但是网站配置文件修改失败
 ErrFileCanNotRead: "此文件不支持预览"
 ErrFileToLarge: "文件超过10M,无法打开"
 ErrPathNotFound: "目录不存在"
+ErrMovePathFailed: "目标路径不能包含原路径！"
 
 #website
 ErrDomainIsExist: "域名已存在"
diff --git a/frontend/src/components/file-list/index.vue b/frontend/src/components/file-list/index.vue
index 09ab96d98..485ef4c85 100644
--- a/frontend/src/components/file-list/index.vue
+++ b/frontend/src/components/file-list/index.vue
@@ -100,6 +100,7 @@ const props = defineProps({
 const em = defineEmits(['choose']);
 
 const checkFile = (row: any) => {
+    console.log(row.path);
     rowName.value = row.name;
     em('choose', row.path);
     popoverVisible.value = false;
diff --git a/frontend/src/views/host/file-management/create/index.vue b/frontend/src/views/host/file-management/create/index.vue
index ee9e7807f..281a81855 100644
--- a/frontend/src/views/host/file-management/create/index.vue
+++ b/frontend/src/views/host/file-management/create/index.vue
@@ -19,6 +19,7 @@
                     label-width="100px"
                     :rules="rules"
                     v-loading="loading"
+                    @submit.enter.prevent
                 >
                     <el-form-item :label="$t('file.name')" prop="name">
                         <el-input v-model="addForm.name" />
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 52ce62efe..fd92a42a8 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -68,11 +68,11 @@
                         @blur="search()"
                         :placeholder="$t('file.search')"
                     >
-                        <template #prepend>
+                        <!-- <template #prepend>
                             <el-checkbox :disabled="req.path == '/'" v-model="req.containSub">
                                 {{ $t('file.sub') }}
                             </el-checkbox>
-                        </template>
+                        </template> -->
                     </el-input>
                 </div>
             </template>
diff --git a/frontend/src/views/website/website/config/log/log-fiile/index.vue b/frontend/src/views/website/website/config/log/log-fiile/index.vue
index 354c60c52..1f3958a84 100644
--- a/frontend/src/views/website/website/config/log/log-fiile/index.vue
+++ b/frontend/src/views/website/website/config/log/log-fiile/index.vue
@@ -20,7 +20,7 @@
         </div>
         <br />
         <codemirror
-            style="max-height: 600px; width: 100%"
+            style="height: calc(100vh - 430px); width: 100%"
             :autofocus="true"
             :placeholder="$t('website.noLog')"
             :indent-with-tab="true"