From 392c6cf7c01e53f4e29b48b20313a7387dd97add Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Tue, 28 Jan 2020 10:31:19 +0800
Subject: [PATCH] re-order file create items

---
 frontend/src/components/File/FileList.vue | 18 +++++++--------
 frontend/src/i18n/zh.js                   |  2 +-
 frontend/src/views/node/NodeList.vue      | 27 +++++++++++++++--------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/File/FileList.vue b/frontend/src/components/File/FileList.vue
index fc03b0da..620481ca 100644
--- a/frontend/src/components/File/FileList.vue
+++ b/frontend/src/components/File/FileList.vue
@@ -48,14 +48,14 @@
           <el-popover v-model="isShowCreatePopoverDict[data.path]" trigger="manual" placement="right"
                       popper-class="create-item-popover" :visible-arrow="false" @hide="onHideCreate(data)">
             <ul class="action-item-list">
-              <li class="action-item" @click="dirDialogVisible = true">
-                <font-awesome-icon :icon="['fa', 'folder']" color="rgba(3,47,98,.5)"/>
-                <span class="action-item-text">{{$t('Create Directory')}}</span>
-              </li>
               <li class="action-item" @click="fileDialogVisible = true">
                 <font-awesome-icon icon="file-alt" color="rgba(3,47,98,.5)"/>
                 <span class="action-item-text">{{$t('Create File')}}</span>
               </li>
+              <li class="action-item" @click="dirDialogVisible = true">
+                <font-awesome-icon :icon="['fa', 'folder']" color="rgba(3,47,98,.5)"/>
+                <span class="action-item-text">{{$t('Create Directory')}}</span>
+              </li>
             </ul>
             <ul class="action-item-list">
               <li class="action-item" @click="onClickRemoveNav(data)">
@@ -90,14 +90,14 @@
       <el-popover trigger="click" placement="right"
                   popper-class="create-item-popover" :visible-arrow="false">
         <ul class="action-item-list">
-          <li class="action-item" @click="dirDialogVisible = true">
-            <font-awesome-icon :icon="['fa', 'folder']" color="rgba(3,47,98,.5)"/>
-            <span class="action-item-text">{{$t('Create Directory')}}</span>
-          </li>
           <li class="action-item" @click="fileDialogVisible = true">
             <font-awesome-icon icon="file-alt" color="rgba(3,47,98,.5)"/>
             <span class="action-item-text">{{$t('Create File')}}</span>
           </li>
+          <li class="action-item" @click="dirDialogVisible = true">
+            <font-awesome-icon :icon="['fa', 'folder']" color="rgba(3,47,98,.5)"/>
+            <span class="action-item-text">{{$t('Create Directory')}}</span>
+          </li>
         </ul>
         <div
           class="add-btn-wrapper"
@@ -118,7 +118,7 @@
 
     <div class="main-content">
       <div v-if="!showFile" class="file-list">
-        {{$t('Please select a file on the left.')}}
+        {{$t('Please select a file or click the add button on the left.')}}
       </div>
       <template v-else>
         <div class="top-part">
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 59604098..2255473c 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -328,7 +328,7 @@ export default {
   'The schedule has been added': '已添加定时任务',
   'The schedule has been saved': '已保存定时任务',
   'Email format invalid': '邮箱地址格式不正确',
-  'Please select a file on the left.': '请在左侧选择一个文件.',
+  'Please select a file or click the add button on the left.': '请在左侧选择一个文件或点击添加按钮.',
   'New Directory': '新建目录',
   'Enter new directory name': '输入新目录名称',
   'New directory name': '新目录名称',
diff --git a/frontend/src/views/node/NodeList.vue b/frontend/src/views/node/NodeList.vue
index 931905d8..3842c6ef 100644
--- a/frontend/src/views/node/NodeList.vue
+++ b/frontend/src/views/node/NodeList.vue
@@ -9,12 +9,19 @@
                 @change="onSearch">
       </el-input>
       <div class="right">
-        <el-button type="success"
-                   icon="el-icon-refresh"
-                   class="refresh"
-                   @click="onRefresh">
-          {{$t('Refresh')}}
+        <el-button
+          type="success"
+          icon="el-icon-plus"
+          @click="onAddNode"
+        >
+          {{$t('Add Node')}}
         </el-button>
+<!--        <el-button type="success"-->
+<!--                   icon="el-icon-refresh"-->
+<!--                   class="refresh"-->
+<!--                   @click="onRefresh">-->
+<!--          {{$t('Refresh')}}-->
+<!--        </el-button>-->
       </div>
     </div>
     <!--./filter-->
@@ -198,11 +205,13 @@ export default {
   methods: {
     onSearch () {
     },
-    onAdd () {
-      this.$store.commit('node/SET_NODE_FORM', [])
-      this.isEditMode = false
-      this.dialogVisible = true
+    onAddNode () {
     },
+    // onAdd () {
+    //   this.$store.commit('node/SET_NODE_FORM', [])
+    //   this.isEditMode = false
+    //   this.dialogVisible = true
+    // },
     onRefresh () {
       this.$store.dispatch('node/getNodeList')
       this.$st.sendEv('节点列表', '刷新')