From 5ec89bddaba2a2f64b9ad0f680fb1539372a799e Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Wed, 15 Jan 2020 20:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/File/FileList.vue | 69 +++++++++++++++++++----
 frontend/src/i18n/zh.js                   |  5 ++
 2 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/File/FileList.vue b/frontend/src/components/File/FileList.vue
index eae2b4a0..5723418b 100644
--- a/frontend/src/components/File/FileList.vue
+++ b/frontend/src/components/File/FileList.vue
@@ -1,5 +1,35 @@
 <template>
   <div class="file-list-container">
+    <el-dialog
+      :title="$t('New Directory')"
+      :visible.sync="dirDialogVisible"
+      width="30%">
+      <el-form>
+        <el-form-item :label="$t('Enter new directory name')">
+          <el-input v-model="name" :placeholder="$t('New directory name')"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dirDialogVisible = false">{{$t('Cancel')}}</el-button>
+        <el-button type="primary" @click="onAddDir">{{$t('Confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      :title="$t('New File')"
+      :visible.sync="fileDialogVisible"
+      width="30%">
+      <el-form>
+        <el-form-item :label="$t('Enter new file name')">
+          <el-input v-model="name" :placeholder="$t('New file name')"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="fileDialogVisible = false">{{$t('Cancel')}}</el-button>
+        <el-button type="primary" @click="onAddFile">{{$t('Confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
     <div class="file-tree-wrapper">
       <el-tree
         :data="computedFileTree"
@@ -18,11 +48,11 @@
               <span class="create-item-text">{{$t('Create')}}</span>
             </div>
             <ul class="create-item-list">
-              <li class="create-item">
+              <li class="create-item" @click="dirDialogVisible = true">
                 <font-awesome-icon :icon="['fa', 'folder']" color="rgba(3,47,98,.5)"/>
                 <span class="create-item-text">{{$t('Directory')}}</span>
               </li>
-              <li class="create-item">
+              <li class="create-item" @click="fileDialogVisible = true">
                 <font-awesome-icon icon="file-alt" color="rgba(3,47,98,.5)"/>
                 <span class="create-item-text">{{$t('File')}}</span>
               </li>
@@ -134,7 +164,10 @@ export default {
         '__pycache__',
         'md5.txt',
         '.pyc'
-      ]
+      ],
+      activeFileNode: {},
+      dirDialogVisible: false,
+      fileDialogVisible: false
     }
   },
   computed: {
@@ -181,19 +214,22 @@ export default {
       this.$message.success(this.$t('Saved file successfully'))
       this.$st.sendEv('爬虫详情', '文件', '保存')
     },
-    onHideAdd () {
-      this.name = ''
-    },
     async onAddFile () {
       if (!this.name) {
         this.$message.error(this.$t('Name cannot be empty'))
         return
       }
-      const path = this.currentPath + '/' + this.name
+      const arr = this.activeFileNode.path.split('/')
+      if (this.activeFileNode.is_dir) {
+        arr.push(this.name)
+      } else {
+        arr[arr.length - 1] = this.name
+      }
+      const path = arr.join('/')
       await this.$store.dispatch('file/addFile', { path })
-      await this.$store.dispatch('file/getFileList', { path: this.currentPath })
+      await this.$store.dispatch('spider/getFileTree')
       this.isShowAdd = false
-
+      this.fileDialogVisible = false
       this.showFile = true
       this.$store.commit('file/SET_FILE_CONTENT', '')
       this.$store.commit('file/SET_CURRENT_PATH', path)
@@ -205,9 +241,17 @@ export default {
         this.$message.error(this.$t('Name cannot be empty'))
         return
       }
-      await this.$store.dispatch('file/addDir', { path: this.currentPath + '/' + this.name })
-      await this.$store.dispatch('file/getFileList', { path: this.currentPath })
+      const arr = this.activeFileNode.path.split('/')
+      if (this.activeFileNode.is_dir) {
+        arr.push(this.name)
+      } else {
+        arr[arr.length - 1] = this.name
+      }
+      const path = arr.join('/')
+      await this.$store.dispatch('file/addDir', { path })
+      await this.$store.dispatch('spider/getFileTree')
       this.isShowAdd = false
+      this.dirDialogVisible = false
       this.$st.sendEv('爬虫详情', '文件', '添加')
     },
     async onFileDelete () {
@@ -280,9 +324,11 @@ export default {
     onFileRightClick (ev, data) {
       this.isShowCreatePopoverDict = {}
       this.$set(this.isShowCreatePopoverDict, data.path, true)
+      this.activeFileNode = data
     },
     onHideCreate (data) {
       this.$set(this.isShowCreatePopoverDict, data.path, false)
+      this.name = ''
     }
   },
   async created () {
@@ -413,6 +459,7 @@ export default {
     float: left;
     width: 240px;
     height: calc(100vh - 200px);
+    overflow: auto;
   }
 
   .file-tree-wrapper >>> .el-tree-node__content {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 27f32d61..a5dddfcc 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -326,6 +326,11 @@ export default {
   'The schedule has been saved': '已保存定时任务',
   'Email format invalid': '邮箱地址格式不正确',
   'Please select a file on the left.': '请在左侧选择一个文件.',
+  'New Directory': '新建目录',
+  'Enter new directory name': '输入新目录名称',
+  'New directory name': '新目录名称',
+  'Enter new file name': '输入新文件名称',
+  'New file name': '新文件名称',
 
   // 登录
   'Sign in': '登录',