From 769c5bbcea4ad88ccf3b76c508f1416bd8dd552d Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Mon, 20 Apr 2020 18:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EmptyFile/index.vue            |  3 +
 src/components/ShowFile/ShowFile.vue          | 71 ++++++++++++++++---
 .../SimpleUploader/globalUploader.vue         | 11 ++-
 src/utils/request.js                          |  2 +
 4 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/components/EmptyFile/index.vue b/src/components/EmptyFile/index.vue
index 19529ce..30a288e 100644
--- a/src/components/EmptyFile/index.vue
+++ b/src/components/EmptyFile/index.vue
@@ -29,6 +29,9 @@
         default: false
       }
     },
+    created(){
+      console.log('emptyFile - created')
+    },
     data() {
       return {
         // sourceImg: this.emptyImgUrl,
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 3bbce6f..89f4009 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -123,7 +123,7 @@
       >
       </el-tree>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogMoveOrCopyVisible = false"><i class="el-icon-folder-add"></i>&nbsp;&nbsp;新建文件夹</el-button>
+        <el-button @click="fileTreeAndNewFolder"><i class="el-icon-folder-add"></i>&nbsp;&nbsp;新建文件夹</el-button>
         <el-button type="primary" @click="moveFileTree">移 动</el-button>
         <el-button type="primary" @click="copyFileTree">复制</el-button>
         <el-button @click="dialogMoveOrCopyVisible = false">取 消</el-button>
@@ -641,7 +641,6 @@
       this.getFileList()
     },
     mounted() {
-
       Bus.$on('fileSuccess', () => {
         this.getFileList()
       })
@@ -1244,17 +1243,21 @@
         this.$router.push(`/markdown/editor`)
       },
       newFolder() {
-        this.newFolderName = '新建文件夹'
+        this.newFolderName = this.getNewFolderName(this.fileList,'新建文件夹')
+        this.showNewFolder = true
+      },
+      getNewFolderName(fileList,newFolderName){
         let append = 0
         let filenameList = []
-        this.fileList.forEach(file => {
-          filenameList.push(file.name)
+        fileList.forEach(file => {
+          filenameList.push(file.name || file.label)
         })
-        while(filenameList.includes(this.newFolderName)){
+        console.log(filenameList)
+        while(filenameList.includes(newFolderName)){
           append += 1
-          this.newFolderName = '新建文件夹' + append
+          newFolderName = '新建文件夹' + append
         }
-        this.showNewFolder = true
+        return newFolderName
       },
       hideNewFolderName() {
         this.showNewFolder = false
@@ -1941,12 +1944,41 @@
       },
       // 点击文件树
       treeNodeClick(row,node,event) {
+        console.log('treeNodeClick',node)
         this.selectTreeNode = row
         this.selectTreeNode.showName = ' "' + row.name + '"'
       },
       // 节点被展开时触发
       treeNodeExpand(row,node,event) {
       },
+      // 文件树里新建文件夹
+      fileTreeAndNewFolder() {
+        let newNodeId = 'newFolderNodeKey'
+        let node = this.$refs.directoryTree.getNode(newNodeId)
+        if(node !== null){
+          this.$refs.directoryTree.remove(node)
+        }
+
+        let childNodes = this.$refs.directoryTree.store.currentNode.childNodes
+        let newFolderName = this.getNewFolderName(childNodes,'新建文件夹')
+        let newNode = {
+          id: newNodeId,
+          newFolder: true,
+          name: newFolderName,
+          showName: newFolderName,
+          isLeaf: true
+        }
+        this.$refs.directoryTree.append(newNode,this.selectTreeNode)
+        const that = this
+        setTimeout(function (){
+          let treeInput = document.getElementById("treeInput")
+          if(treeInput){
+            treeInput.value = newFolderName
+            treeInput.focus()
+            treeInput.select()
+          }
+        },100)
+      },
       // 移动文件
       moveFileTree() {
         this.copyOrMove('move');
@@ -2043,6 +2075,23 @@
         })
       },
       renderContent(h, { node, data, store }) {
+        if(data.newFolder){
+          return (
+            <span class="custom-tree-node">
+            <span><svg-icon icon-class="folder" /></span>
+            <span>
+            <div class="el-input el-input--mini el-input-tree">
+              <input type="text" autocomplete="on" value="新建文件夹" id="treeInput" class="el-input__inner"></input>
+            </div>
+            <button type="button" on-click={() => {}} class="el-button el-icon-check el-button--mini el-input-tree-button" element-loading-spinner="el-icon-loading" element-loading-background="#f6f7fa88"></button>
+            <button type="button" on-click={() => {
+            this.$refs.directoryTree.remove(node)
+            window.event.preventDefault()
+            window.event.stopPropagation()
+          }} class="el-button el-icon-close el-button--mini el-input-tree-button" element-loading-spinner="el-icon-loading" element-loading-background="#f6f7fa88"></button>
+            </span>
+            </span>);
+        }
         if(node.expanded){
           return (
             <span class="custom-tree-node">
@@ -2336,5 +2385,11 @@
       color: #666;
     }
   }
+  /deep/.el-input-tree {
+    width: 50% !important;
+  }
+  /deep/.el-input-tree-button {
+    margin-left: 5px!important;
+  }
 </style>
 
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 6e4fec0..b5cdab1 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -166,14 +166,12 @@ export default {
 
     let that = this
     let dropbox = document.body
-    dropbox.addEventListener("dragenter", function(e){
-      e.stopPropagation();
-      e.preventDefault();
-    }, false);
     dropbox.addEventListener("dragover", function(e){
       e.stopPropagation();
       e.preventDefault();
-      that.dragover = true
+      if(e.dataTransfer.files.length > 0){
+        that.dragover = true
+      }
     }, false);
     dropbox.addEventListener("drop", function(e){
       e.stopPropagation();
@@ -212,8 +210,7 @@ export default {
     Bus.$off('uploadFileListBack')
   },
   methods: {
-    onDragenter(e) {
-      console.log('onDragenter')
+    onDragenter() {
       this.params = {
         currentDirectory: this.$route.query.path || '/',
         username: this.$store.state.user.name,
diff --git a/src/utils/request.js b/src/utils/request.js
index 3da468d..866fa97 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -60,6 +60,8 @@ service.interceptors.response.use(
         })
       }
 
+      console.log(res.message)
+
       if (res.code === 5) {
         // to re-login
         MessageBox.confirm('您已注销，可以取消停留在此页面上，或者再次登录', '确认登出', {