From b00261475908d70167acf0ed60d746b397aead22 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Thu, 9 Feb 2023 14:31:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
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                      |  5 +++
 backend/i18n/lang/en.yaml                     |  2 +-
 backend/i18n/lang/zh.yaml                     |  1 +
 frontend/components.d.ts                      |  1 +
 .../app-store/installed/update/index.vue      |  2 +-
 .../views/container/compose/create/index.vue  |  3 +-
 .../container/container/reName/index.vue      |  2 +-
 .../src/views/container/image/build/index.vue |  2 +-
 .../src/views/container/image/load/index.vue  |  6 +--
 .../src/views/container/image/save/index.vue  |  4 +-
 frontend/src/views/cronjob/operate/index.vue  |  4 +-
 .../src/views/database/mysql/remote/index.vue |  2 +-
 .../database/mysql/root-password/index.vue    |  2 +-
 .../host/file-management/compress/index.vue   |  4 +-
 .../host/file-management/create/index.vue     |  2 +-
 .../host/file-management/decompress/index.vue | 40 ++++++++++---------
 .../host/file-management/download/index.vue   |  2 +-
 .../views/host/file-management/move/index.vue | 34 +++++++++-------
 .../host/file-management/rename/index.vue     |  2 +-
 .../views/host/file-management/wget/index.vue |  4 +-
 .../setting/backup-account/operate/index.vue  |  2 +-
 .../views/website/website/default/index.vue   |  2 +-
 23 files changed, 77 insertions(+), 58 deletions(-)

diff --git a/backend/app/service/file.go b/backend/app/service/file.go
index 2bbbd497d..4bdf2d9a7 100644
--- a/backend/app/service/file.go
+++ b/backend/app/service/file.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/response"
+	"github.com/1Panel-dev/1Panel/backend/buserr"
+	"github.com/1Panel-dev/1Panel/backend/constant"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -57,7 +59,6 @@ func (f FileService) GetFileTree(op request.FileOption) ([]response.FileTree, er
 }
 
 func (f FileService) Create(op request.FileCreate) error {
-
 	fo := files.NewFileOp()
 	if fo.Stat(op.Path) {
 		return errors.New("file is exist")
@@ -154,6 +155,10 @@ func (f FileService) Wget(w request.FileWget) (string, error) {
 
 func (f FileService) MvFile(m request.FileMove) error {
 	fo := files.NewFileOp()
+	if !fo.Stat(m.NewPath) {
+		return buserr.New(constant.ErrPathNotFound)
+	}
+
 	if m.Type == "cut" {
 		return fo.Cut(m.OldPaths, m.NewPath)
 	}
diff --git a/backend/constant/errs.go b/backend/constant/errs.go
index e4e08f99b..a4a58ce4b 100644
--- a/backend/constant/errs.go
+++ b/backend/constant/errs.go
@@ -70,3 +70,8 @@ var (
 	ErrAccountCannotDelete = "ErrAccountCannotDelete"
 	ErrSSLApply            = "ErrSSLApply"
 )
+
+//file
+var (
+	ErrPathNotFound = "ErrPathNotFound"
+)
diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml
index 827cb2613..0198e8eba 100644
--- a/backend/i18n/lang/en.yaml
+++ b/backend/i18n/lang/en.yaml
@@ -23,10 +23,10 @@ ErrAppRequired: "{{ .detail }} app is required"
 ErrNotInstall: "App not installed"
 ErrPortInOtherApp: "{{ .port }} port  already in use by  {{ .apps }}"
 
-
 #file
 ErrFileCanNotRead: "File can not read"
 ErrFileToLarge: "file is too large"
+ErrPathNotFound: "Path is not found"
 
 #website
 ErrDomainIsExist: "Domain is already exist"
diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml
index d8e4a3b4a..22ce0905a 100644
--- a/backend/i18n/lang/zh.yaml
+++ b/backend/i18n/lang/zh.yaml
@@ -26,6 +26,7 @@ ErrPortInOtherApp: "{{ .port }} 端口已被 {{ .apps }}占用！"
 #file
 ErrFileCanNotRead: "此文件不支持预览"
 ErrFileToLarge: "文件超过10M,无法打开"
+ErrPathNotFound: "目录不存在"
 
 #website
 ErrDomainIsExist: "域名已存在"
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index b987f0e7d..18da02c96 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -59,6 +59,7 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSpan: typeof import('element-plus/es')['ElSpan']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
diff --git a/frontend/src/views/app-store/installed/update/index.vue b/frontend/src/views/app-store/installed/update/index.vue
index 85ef2f666..c0dd53613 100644
--- a/frontend/src/views/app-store/installed/update/index.vue
+++ b/frontend/src/views/app-store/installed/update/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer :close-on-click-modal="false" v-model="open" size="30%">
+    <el-drawer :close-on-click-modal="false" v-model="open" size="40%">
         <template #header>
             <Header :header="$t('commons.msg.operate')" :resource="resourceName" :back="handleClose"></Header>
         </template>
diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue
index 4187d384f..15fd4f4f6 100644
--- a/frontend/src/views/container/compose/create/index.vue
+++ b/frontend/src/views/container/compose/create/index.vue
@@ -19,11 +19,10 @@
                         </el-form-item>
                         <el-form-item v-if="form.from === 'path'" prop="path">
                             <el-input
-                                disabled
                                 :placeholder="$t('commons.example') + '/tmp/docker-compose.yml'"
                                 v-model="form.path"
                             >
-                                <template #append>
+                                <template #prepend>
                                     <FileList @choose="loadDir" :dir="false"></FileList>
                                 </template>
                             </el-input>
diff --git a/frontend/src/views/container/container/reName/index.vue b/frontend/src/views/container/container/reName/index.vue
index 4a39c5ae8..8aa911260 100644
--- a/frontend/src/views/container/container/reName/index.vue
+++ b/frontend/src/views/container/container/reName/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="newNameVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
+    <el-drawer v-model="newNameVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
         <template #header>
             <DrawerHeader :header="$t('container.rename')" :back="handleClose" />
         </template>
diff --git a/frontend/src/views/container/image/build/index.vue b/frontend/src/views/container/image/build/index.vue
index a2951cc19..325f518b9 100644
--- a/frontend/src/views/container/image/build/index.vue
+++ b/frontend/src/views/container/image/build/index.vue
@@ -39,7 +39,7 @@
                     </el-form-item>
                     <el-form-item v-else :rules="Rules.requiredSelect" prop="dockerfile">
                         <el-input clearable v-model="form.dockerfile">
-                            <template #append>
+                            <template #prepend>
                                 <FileList @choose="loadBuildDir" :dir="true"></FileList>
                             </template>
                         </el-input>
diff --git a/frontend/src/views/container/image/load/index.vue b/frontend/src/views/container/image/load/index.vue
index 7ada6960e..82d565c44 100644
--- a/frontend/src/views/container/image/load/index.vue
+++ b/frontend/src/views/container/image/load/index.vue
@@ -1,12 +1,12 @@
 <template>
-    <el-drawer v-model="loadVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
+    <el-drawer v-model="loadVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
         <template #header>
             <DrawerHeader :header="$t('container.importImage')" :back="handleClose" />
         </template>
         <el-form v-loading="loading" ref="formRef" :model="form" label-position="top">
             <el-form-item :label="$t('container.path')" :rules="Rules.requiredSelect" prop="path">
-                <el-input disabled v-model="form.path">
-                    <template #append>
+                <el-input v-model="form.path">
+                    <template #prepend>
                         <FileList @choose="loadLoadDir" :dir="false"></FileList>
                     </template>
                 </el-input>
diff --git a/frontend/src/views/container/image/save/index.vue b/frontend/src/views/container/image/save/index.vue
index 13e18fac7..cbe19c5b0 100644
--- a/frontend/src/views/container/image/save/index.vue
+++ b/frontend/src/views/container/image/save/index.vue
@@ -18,8 +18,8 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item :label="$t('container.path')" :rules="Rules.requiredSelect" prop="path">
-                        <el-input disabled v-model="form.path">
-                            <template #append>
+                        <el-input v-model="form.path">
+                            <template #prepend>
                                 <FileList @choose="loadSaveDir" :dir="true"></FileList>
                             </template>
                         </el-input>
diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue
index d89ed9358..f6bf5b71b 100644
--- a/frontend/src/views/cronjob/operate/index.vue
+++ b/frontend/src/views/cronjob/operate/index.vue
@@ -93,8 +93,8 @@
                         :label="$t('cronjob.sourceDir')"
                         prop="sourceDir"
                     >
-                        <el-input style="width: 100%" disabled v-model="dialogData.rowData!.sourceDir">
-                            <template #append>
+                        <el-input style="width: 100%" v-model="dialogData.rowData!.sourceDir">
+                            <template #prepend>
                                 <FileList @choose="loadDir" :dir="true"></FileList>
                             </template>
                         </el-input>
diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue
index 505fa27bc..feda5d263 100644
--- a/frontend/src/views/database/mysql/remote/index.vue
+++ b/frontend/src/views/database/mysql/remote/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="dialogVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
+    <el-drawer v-model="dialogVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
         <template #header>
             <DrawerHeader :header="$t('database.remoteAccess')" :back="handleClose" />
         </template>
diff --git a/frontend/src/views/database/mysql/root-password/index.vue b/frontend/src/views/database/mysql/root-password/index.vue
index 5d5d1e799..f38fdaf95 100644
--- a/frontend/src/views/database/mysql/root-password/index.vue
+++ b/frontend/src/views/database/mysql/root-password/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="dialogVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="30%">
+    <el-drawer v-model="dialogVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
         <template #header>
             <DrawerHeader :header="$t('database.rootPassword')" :back="handleClose" />
         </template>
diff --git a/frontend/src/views/host/file-management/compress/index.vue b/frontend/src/views/host/file-management/compress/index.vue
index 989bf761a..12b07b70d 100644
--- a/frontend/src/views/host/file-management/compress/index.vue
+++ b/frontend/src/views/host/file-management/compress/index.vue
@@ -30,8 +30,8 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item :label="$t('file.compressDst')" prop="dst">
-                        <el-input v-model="form.dst" disabled>
-                            <template #append><FileList :path="form.dst" @choose="getLinkPath"></FileList></template>
+                        <el-input v-model="form.dst">
+                            <template #prepend><FileList :path="form.dst" @choose="getLinkPath"></FileList></template>
                         </el-input>
                     </el-form-item>
                     <el-form-item>
diff --git a/frontend/src/views/host/file-management/create/index.vue b/frontend/src/views/host/file-management/create/index.vue
index b6befa172..16700b74c 100644
--- a/frontend/src/views/host/file-management/create/index.vue
+++ b/frontend/src/views/host/file-management/create/index.vue
@@ -37,7 +37,7 @@
                     </el-form-item>
                     <el-form-item v-if="addForm.isLink" :label="$t('file.linkPath')" prop="linkPath">
                         <el-input v-model="addForm.linkPath">
-                            <template #append>
+                            <template #prepend>
                                 <FileList @choose="getLinkPath"></FileList>
                             </template>
                         </el-input>
diff --git a/frontend/src/views/host/file-management/decompress/index.vue b/frontend/src/views/host/file-management/decompress/index.vue
index e9d35d256..7f925ae1c 100644
--- a/frontend/src/views/host/file-management/decompress/index.vue
+++ b/frontend/src/views/host/file-management/decompress/index.vue
@@ -4,28 +4,32 @@
         :destroy-on-close="true"
         :close-on-click-modal="false"
         :before-close="handleClose"
-        size="30%"
+        size="40%"
     >
         <template #header>
             <DrawerHeader :header="$t('file.deCompress')" :back="handleClose" />
         </template>
-        <el-form
-            ref="fileForm"
-            label-position="left"
-            :model="form"
-            label-width="100px"
-            :rules="rules"
-            v-loading="loading"
-        >
-            <el-form-item :label="$t('file.name')">
-                <el-input v-model="name" disabled></el-input>
-            </el-form-item>
-            <el-form-item :label="$t('file.deCompressDst')" prop="dst">
-                <el-input v-model="form.dst" disabled>
-                    <template #append><FileList :path="form.dst" @choose="getLinkPath"></FileList></template>
-                </el-input>
-            </el-form-item>
-        </el-form>
+        <el-row>
+            <el-col :span="22" :offset="1">
+                <el-form
+                    ref="fileForm"
+                    label-position="top"
+                    :model="form"
+                    label-width="100px"
+                    :rules="rules"
+                    v-loading="loading"
+                >
+                    <el-form-item :label="$t('file.name')">
+                        <el-input v-model="name" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item :label="$t('file.deCompressDst')" prop="dst">
+                        <el-input v-model="form.dst">
+                            <template #prepend><FileList :path="form.dst" @choose="getLinkPath"></FileList></template>
+                        </el-input>
+                    </el-form-item>
+                </el-form>
+            </el-col>
+        </el-row>
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose">{{ $t('commons.button.cancel') }}</el-button>
diff --git a/frontend/src/views/host/file-management/download/index.vue b/frontend/src/views/host/file-management/download/index.vue
index 767be9ce5..927e80638 100644
--- a/frontend/src/views/host/file-management/download/index.vue
+++ b/frontend/src/views/host/file-management/download/index.vue
@@ -5,7 +5,7 @@
         :destroy-on-close="true"
         :close-on-click-modal="false"
         :before-close="handleClose"
-        size="30%"
+        size="40%"
     >
         <template #header>
             <DrawerHeader :header="$t('file.download')" :back="handleClose" />
diff --git a/frontend/src/views/host/file-management/move/index.vue b/frontend/src/views/host/file-management/move/index.vue
index aaaea89ff..92052c9de 100644
--- a/frontend/src/views/host/file-management/move/index.vue
+++ b/frontend/src/views/host/file-management/move/index.vue
@@ -4,25 +4,29 @@
         :destroy-on-close="true"
         :close-on-click-modal="false"
         :before-close="handleClose"
-        size="30%"
+        size="40%"
     >
         <template #header>
             <DrawerHeader :header="title" :back="handleClose" />
         </template>
-        <el-form
-            ref="fileForm"
-            label-position="left"
-            :model="addForm"
-            label-width="100px"
-            :rules="rules"
-            v-loading="loading"
-        >
-            <el-form-item :label="$t('file.path')" prop="newPath">
-                <el-input v-model="addForm.newPath" disabled>
-                    <template #append><FileList @choose="getPath" :dir="true"></FileList></template>
-                </el-input>
-            </el-form-item>
-        </el-form>
+        <el-row>
+            <el-col :span="22" :offset="1">
+                <el-form
+                    ref="fileForm"
+                    label-position="top"
+                    :model="addForm"
+                    label-width="100px"
+                    :rules="rules"
+                    v-loading="loading"
+                >
+                    <el-form-item :label="$t('file.path')" prop="newPath">
+                        <el-input v-model="addForm.newPath">
+                            <template #prepend><FileList @choose="getPath" :dir="true"></FileList></template>
+                        </el-input>
+                    </el-form-item>
+                </el-form>
+            </el-col>
+        </el-row>
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
diff --git a/frontend/src/views/host/file-management/rename/index.vue b/frontend/src/views/host/file-management/rename/index.vue
index 33303aa06..6561756e8 100644
--- a/frontend/src/views/host/file-management/rename/index.vue
+++ b/frontend/src/views/host/file-management/rename/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="open" :before-close="handleClose" :title="$t('file.rename')" size="30%">
+    <el-drawer v-model="open" :before-close="handleClose" :title="$t('file.rename')" size="40%">
         <el-row>
             <el-col :span="22" :offset="1">
                 <el-form
diff --git a/frontend/src/views/host/file-management/wget/index.vue b/frontend/src/views/host/file-management/wget/index.vue
index 3a6882f7e..d91330c75 100644
--- a/frontend/src/views/host/file-management/wget/index.vue
+++ b/frontend/src/views/host/file-management/wget/index.vue
@@ -17,8 +17,8 @@
                         <el-input v-model="addForm.url" @input="getFileName" />
                     </el-form-item>
                     <el-form-item :label="$t('file.path')" prop="path">
-                        <el-input v-model="addForm.path" disabled>
-                            <template #append><FileList :path="addForm.path" @choose="getPath"></FileList></template>
+                        <el-input v-model="addForm.path">
+                            <template #prepend><FileList :path="addForm.path" @choose="getPath"></FileList></template>
                         </el-input>
                     </el-form-item>
                     <el-form-item :label="$t('file.name')" prop="name">
diff --git a/frontend/src/views/setting/backup-account/operate/index.vue b/frontend/src/views/setting/backup-account/operate/index.vue
index fe9ea7ae7..dab1200d0 100644
--- a/frontend/src/views/setting/backup-account/operate/index.vue
+++ b/frontend/src/views/setting/backup-account/operate/index.vue
@@ -17,7 +17,7 @@
                         prop="varsJson['dir']"
                         :rules="Rules.requiredInput"
                     >
-                        <el-input disabled v-model="dialogData.rowData!.varsJson['dir']">
+                        <el-input v-model="dialogData.rowData!.varsJson['dir']">
                             <template #append>
                                 <FileList @choose="loadDir" :dir="true"></FileList>
                             </template>
diff --git a/frontend/src/views/website/website/default/index.vue b/frontend/src/views/website/website/default/index.vue
index 7259c4094..dc2a74234 100644
--- a/frontend/src/views/website/website/default/index.vue
+++ b/frontend/src/views/website/website/default/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer :close-on-click-modal="false" v-model="open" size="30%">
+    <el-drawer :close-on-click-modal="false" v-model="open" size="40%">
         <template #header>
             <DrawerHeader :header="$t('website.defaulServer')" :back="handleClose"></DrawerHeader>
         </template>