From 36b9ea77903dcfdf5adb4ae23b290b4c216d2e0b Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Fri, 14 Feb 2020 18:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9input?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 57 ++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5fef2b8..17eab5c 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -26,10 +26,10 @@
                     <svg-icon icon-class="folder-upload" /><span class="menuitem text">上传文件夹</span>
                   </label>
                 </li>
-                <li>
-                  <a href="#" class="menuitem" @click.prevent="newFolder"><svg-icon icon-class="folder-add" /><span class="menuitem text">新建文件夹</span>
-                    <form v-show="showNewFolder" class="folder-name-form">
-                      <el-input v-model="newFolderName" placeholder="请输入内容">
+                <li @click.prevent="newFolder">
+                  <a href="#" class="menuitem"><svg-icon icon-class="folder-add" /><span class="menuitem text">新建文件夹</span>
+                    <div v-show="showNewFolder" class="folder-name-form">
+                      <el-input v-model="newFolderName" placeholder="请输入文件夹名称" :clearable="true" @change="newFolderNameClick">
                         <el-button
                           slot="append"
                           v-loading="newFolderLoading"
@@ -40,7 +40,7 @@
                         >
                         </el-button>
                       </el-input>
-                    </form>
+                    </div>
                   </a>
                 </li>
               </ul>
@@ -200,6 +200,7 @@
 </template>
 
 <script>
+/* eslint-disable */
 // import MenuPopover from '@/components/popover/MenuPopover'
 import { mapGetters } from 'vuex'
 // import defaultSettings from '@/settings'
@@ -378,6 +379,7 @@ export default {
     },
     // 新建文件夹
     newFolderNameClick() {
+      console.log(68790)
       this.newFolderLoading = true
       api.uploadFolder({
         isFolder: true,
@@ -396,7 +398,7 @@ export default {
           type: 'success',
           duration: 1000
         })
-      }).catch(e => {})
+      })
     },
     getFileList() {
       this.tableLoading = true
@@ -507,11 +509,13 @@ export default {
       // this.$set(this.tableHead, 2, item_name)
       // this.$set(this.tableHead, 2, item_more)
       // this.$set(this.tableHead, 5, item_size)
+      console.log('selectRowData', this.selectRowData)
+      console.log('rowContextData', this.rowContextData)
     },
     // cell-style通过返回值可以实现样式变换利用传递过来的数组index循环改变样式
     rowRed({ row, column, rowIndex, columnIndex }) {
       if (this.indexList.length < 1 && columnIndex === 2 && this.cellMouseIndex === rowIndex) {
-        return { cursor: 'pointer', color: '#19acff' }
+        return { cursor: 'pointer', color: "#19ACF9" }
       }
       for (let i = 0; i < this.indexList.length; i++) {
         if (rowIndex === this.indexList[i]) {
@@ -694,7 +698,7 @@ export default {
           break
         case 'open':
           console.log('open', '打开')
-          this.fileClick(this.selectRowData[0])
+          this.fileClick(this.rowContextData)
           break
         case 'deselect':
           console.log('deselect', '取消选定')
@@ -713,15 +717,16 @@ export default {
           break
         case 'rename':
           console.log('重命名')
-          if (!this.rowContextData.isFolder) {
-            this.editingIndex = this.rowContextData.index
-          } else {
-            this.$notify({
-              title: '暂不支持文件夹重命名',
-              type: 'warning',
-              duration: 2000
-            })
-          }
+          this.editingIndex = this.rowContextData.index
+          // if (!this.rowContextData.isFolder) {
+          //   this.editingIndex = this.rowContextData.index
+          // } else {
+          //   this.$notify({
+          //     title: '暂不支持文件夹重命名',
+          //     type: 'warning',
+          //     duration: 2000
+          //   })
+          // }
           break
         case 'copy':
           console.log('移动或复制')
@@ -734,7 +739,7 @@ export default {
               fileIds.push(value.id)
             })
           } else {
-            fileIds.push(this.selectRowData[0].id)
+            fileIds.push(this.rowContextData.id)
           }
           window.open(process.env.VUE_APP_BASE_FILE_API + 'download?jmal-token=' + this.$store.state.user.token + '&fileIds=' + fileIds, '_self')
           break
@@ -801,10 +806,10 @@ export default {
       console.log(row)
       if (row.isFolder) {
         // 打开文件
-        this.path += '/' + row.name
+        this.path += '/' + row.pathname
 
         const item1 = {}
-        item1['folder'] = row.name
+        item1['folder'] = row.pathname
         item1['index'] = this.pathList.length - 1
 
         const item2 = {}
@@ -827,6 +832,7 @@ export default {
 <style lang="scss" scoped>
   .dashboard {
     &-container {
+      min-width:500px;
       margin: 10px 10px 10px 15px;
     }
     &-text {
@@ -878,15 +884,17 @@ export default {
     margin: 0;
     padding: 0;
     font-size: 16px;
+    min-width: 136px;
   }
   .newFileMenu li:hover {
     cursor: pointer;
     border-radius: 5px;
-    background-color: #409eff14;
+    /*background-color: #409eff14;*/
+    background-color: #409eff30;
   }
   .newFileMenu li > .menuitem {
     cursor: pointer;
-    line-height: 44px;
+    line-height: 38px;
     margin-left: 10%;
   }
   .newFileMenu li > .menuitem > .text {
@@ -899,7 +907,7 @@ export default {
   }
   .menuitem /deep/ .el-loading-spinner {
     top: 0;
-    margin-top: 0;
+    margin-top: 0.75rem;
     width: 100%;
     text-align: center;
     position: absolute;
@@ -949,9 +957,6 @@ export default {
     height: 35px;
     line-height: 35px;
   }
-  >>>.el-popover {
-    padding: 5px;
-  }
 
   /deep/ .ctx-menu-container {
     border: 0 solid rgba(0, 0, 0, 0);