From d154b20de76e02408d4a503224a8164e69e56e5e Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 29 Apr 2020 14:33:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[update]=E6=8A=BD=E5=87=BA=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=92=8C=E5=AF=BC=E5=85=A5=E7=9A=84Dialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DialogAction/index.vue         | 168 ++++++++++++++++++
 src/components/ListTable/TableAction.vue      |   4 +
 src/components/ListTable/index.vue            | 133 +-------------
 src/i18n/langs/cn.js                          |   3 +
 src/router/index.js                           |  10 +-
 src/views/assets/Label/LabelList.vue          |   5 +
 .../SystemUser/SystemUserCreateUpdate.vue     |  90 ++++++++++
 .../{ => SystemUser}/SystemUserList.vue       |   0
 8 files changed, 279 insertions(+), 134 deletions(-)
 create mode 100644 src/components/DialogAction/index.vue
 create mode 100644 src/views/assets/SystemUser/SystemUserCreateUpdate.vue
 rename src/views/assets/{ => SystemUser}/SystemUserList.vue (100%)

diff --git a/src/components/DialogAction/index.vue b/src/components/DialogAction/index.vue
new file mode 100644
index 000000000..525b3e35e
--- /dev/null
+++ b/src/components/DialogAction/index.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <Dialog :title="$tc('Export')" :visible.sync="showExportDialog" center @confirm="handleDialogConfirm('export')" @cancel="handleDialogCancel('export')">
+      <el-form>
+        <el-form-item :label="this.$t('action.ExportRange')" :label-width="'100px'">
+          <el-radio v-model="exportOption" class="export-item" label="1">{{ this.$t('action.ExportAll') }}</el-radio>
+          <el-radio v-model="exportOption" class="export-item" label="2">{{ this.$t('action.ExportOnlySelectedItems') }}</el-radio>
+          <!-- <el-radio v-model="exportOption" class="export-item" label="3">仅导出搜索项</el-radio> -->
+        </el-form-item>
+      </el-form>
+    </Dialog>
+    <Dialog :title="importTitle" :visible.sync="showImportDialog" center @confirm="handleDialogConfirm('import')" @cancel="handleDialogCancel('import')">
+      <el-form>
+        <el-form-item :label="importTitle" :label-width="'100px'">
+          <el-radio v-model="importOption" class="export-item" label="1">{{ this.$tc('Import') }}</el-radio>
+          <el-radio v-model="importOption" class="export-item" label="2">{{ this.$tc('Update') }}</el-radio>
+        </el-form-item>
+      </el-form>
+      <div v-if="importOption==='1'" style="margin-bottom:20px;margin-left: 55px;">{{ this.$t('action.DownloadTheImportedTemplateOrUseTheExportedCSVFormat') }} <a style="color: #428bca;" :href="downloadImportTempUrl">{{ this.$t('action.DownloadImportTemplate') }}</a></div>
+      <div v-else style="margin-bottom:20px;margin-left: 55px;">{{ this.$t('action.DownloadTheUpdatedTemplateOrUsTheExportedCSVFormat') }} <a style="color: #428bca;" @click="downloadUpdateTempUrl">{{ this.$t('action.DownloadUpdateTemplate') }}</a></div>
+
+      <div style="margin-left:55px;">
+        <el-upload
+          class="upload-card"
+          action="string"
+          :http-request="upload"
+          list-type="text/csv"
+          :limit="1"
+        >
+          <el-button size="small" type="primary">{{ this.$t('action.Upload') }}</el-button>
+          <div slot="tip" class="el-upload__tip">{{ this.$t('action.OnlyCSVFilesCanBeUploaded') }}</div>
+        </el-upload>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '../Dialog'
+import { createSourceIdCache } from '@/api/common'
+
+export default {
+  name: 'DialogAction',
+  components: {
+    Dialog
+  },
+  props: {
+    selectedRows: {
+      type: Array,
+      default: () => []
+    },
+    url: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      showExportDialog: false,
+      showImportDialog: false,
+      importOption: '1',
+      exportOption: '1',
+      meta: {}
+    }
+  },
+  computed: {
+    hasSelected() {
+      return this.selectedRows.length > 0
+    },
+    importTitle() {
+      if (this.importOption === '1') {
+        return this.$tc('Import')
+      } else {
+        return this.$tc('Update')
+      }
+    },
+    upLoadUrl() {
+      return this.url
+    },
+    downloadImportTempUrl() {
+      return process.env.VUE_APP_BASE_API + this.url + '?format=csv&template=import&limit=1'
+    }
+  },
+  mounted() {
+    this.$eventBus.$on('showExportDialog', (row) => {
+      this.showExportDialog = true
+    })
+    this.$eventBus.$on('showImportDialog', (row) => {
+      this.showImportDialog = true
+    })
+  },
+  methods: {
+    upload(item) {
+      this.$axios.put(
+        this.upLoadUrl,
+        item.file
+      ).then((res) => {
+        console.log('')
+      })
+    },
+    downloadCsv(url) {
+      const a = document.createElement('a')
+      a.href = url
+      a.click()
+      window.URL.revokeObjectURL(url)
+    },
+    async handleExport() {
+      let data
+      var resources = []
+      if (this.exportOption === '1') {
+        data = this.$parent.$parent.$refs.dataTable.$refs.dataTable.getData()
+      } else if (this.exportOption === '2') {
+        data = this.selectedRows
+      } else {
+        data = []
+      }
+      for (let index = 0; index < data.length; index++) {
+        resources.push(data[index].id)
+      }
+      const spm = await createSourceIdCache(resources)
+      const url = process.env.VUE_APP_BASE_API + `${this.url}?format=csv&?spm=` + spm.spm
+      return this.downloadCsv(url)
+    },
+    handleImport() {
+    },
+    async downloadUpdateTempUrl() {
+      var resources = []
+      const data = this.$parent.$parent.$refs.dataTable.$refs.dataTable.getData()
+      for (let index = 0; index < data.length; index++) {
+        resources.push(data[index].id)
+      }
+      const spm = await createSourceIdCache(resources)
+      const url = process.env.VUE_APP_BASE_API + `${this.url}?format=csv&template=update&spm=` + spm.spm
+      return this.downloadCsv(url)
+    },
+    async handleDialogConfirm(val) {
+      switch (val) {
+        case 'export':
+          await this.handleExport()
+          this.showExportDialog = false
+          break
+        case 'import':
+          await this.handleImport()
+          this.showImportDialog = false
+          break
+        default:
+          break
+      }
+    },
+    handleDialogCancel(val) {
+      switch (val) {
+        case 'export':
+          this.showExportDialog = false
+          break
+        case 'import':
+          this.showImportDialog = false
+          break
+        default:
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>
diff --git a/src/components/ListTable/TableAction.vue b/src/components/ListTable/TableAction.vue
index 75e9f68e5..762e95571 100644
--- a/src/components/ListTable/TableAction.vue
+++ b/src/components/ListTable/TableAction.vue
@@ -7,13 +7,16 @@
       <div class="table-action-right-side">
         <AutoDataSearch v-if="hasSearch" class="right-side-item action-search" :config="searchConfig" :url="tableUrl" @tagSearch="handleTagSearch" />
         <ActionsGroup :is-fa="true" :actions="rightSideActions" class="right-side-actions right-side-item" />
+        <DialogAction :selected-rows="selectedRows" :url="tableUrl" />
       </div>
+
     </slot>
   </div>
 </template>
 
 <script>
 import AutoDataSearch from '@/components/AutoDataSearch'
+import DialogAction from '@/components/DialogAction'
 import ActionsGroup from '@/components/ActionsGroup'
 import { createSourceIdCache } from '@/api/common'
 import _ from 'lodash'
@@ -25,6 +28,7 @@ export default {
   name: 'TableAction',
   components: {
     ActionsGroup,
+    DialogAction,
     AutoDataSearch
   },
   props: {
diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index b7400134d..e802cea9b 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -3,48 +3,14 @@
     <TableAction :table-url="tableConfig.url" :search-table="search" v-bind="headerActions" :selected-rows="selectedRows" :reload-table="reloadTable" />
     <IBox class="table-content">
       <AutoDataTable :key="tableConfig.url" ref="dataTable" :config="tableConfig" @selection-change="handleSelectionChange" />
-      <Dialog :title="$tc('Export')" :visible.sync="showExportDialog" center @confirm="handleDialogConfirm('export')" @cancel="handleDialogCancel('export')">
-        <el-form>
-          <el-form-item :label="this.$t('action.ExportRange')" :label-width="'100px'">
-            <el-radio v-model="exportOption" class="export-item" label="1">{{ this.$t('action.ExportAll') }}</el-radio>
-            <el-radio v-model="exportOption" class="export-item" label="2">{{ this.$t('action.ExportOnlySelectedItems') }}</el-radio>
-            <!-- <el-radio v-model="exportOption" class="export-item" label="3">仅导出搜索项</el-radio> -->
-          </el-form-item>
-        </el-form>
-      </Dialog>
-      <Dialog :title="importTitle" :visible.sync="showImportDialog" center @confirm="handleDialogConfirm('import')" @cancel="handleDialogCancel('import')">
-        <el-form>
-          <el-form-item :label="importTitle" :label-width="'100px'">
-            <el-radio v-model="importOption" class="export-item" label="1">{{ this.$tc('Import') }}</el-radio>
-            <el-radio v-model="importOption" class="export-item" label="2">{{ this.$tc('Update') }}</el-radio>
-          </el-form-item>
-        </el-form>
-        <div v-if="importOption==='1'" style="margin-bottom:20px;margin-left: 55px;">{{ this.$t('action.DownloadTheImportedTemplateOrUseTheExportedCSVFormat') }} <a style="color: #428bca;" :href="downloadImportTempUrl">{{ this.$t('action.DownloadImportTemplate') }}</a></div>
-        <div v-else style="margin-bottom:20px;margin-left: 55px;">{{ this.$t('action.DownloadTheUpdatedTemplateOrUsTheExportedCSVFormat') }} <a style="color: #428bca;" @click="downloadUpdateTempUrl">{{ this.$t('action.DownloadUpdateTemplate') }}</a></div>
-
-        <div style="margin-left:55px;">
-          <el-upload
-            class="upload-card"
-            action="string"
-            :http-request="upload"
-            list-type="text/csv"
-            :limit="1"
-          >
-            <el-button size="small" type="primary">{{ this.$t('action.Upload') }}</el-button>
-            <div slot="tip" class="el-upload__tip">{{ this.$t('action.OnlyCSVFilesCanBeUploaded') }}</div>
-          </el-upload>
-        </div>
-      </Dialog>
     </IBox>
   </div>
 </template>
 
 <script>
 import AutoDataTable from '../AutoDataTable'
-import Dialog from '../Dialog'
 import IBox from '../IBox'
 import TableAction from './TableAction'
-import { createSourceIdCache } from '@/api/common'
 import Emitter from '@/mixins/emitter'
 
 export default {
@@ -52,7 +18,6 @@ export default {
   components: {
     AutoDataTable,
     TableAction,
-    Dialog,
     IBox
   },
   mixins: [Emitter],
@@ -71,51 +36,10 @@ export default {
   },
   data() {
     return {
-      selectedRows: [],
-      showExportDialog: false,
-      showImportDialog: false,
-      importOption: '1',
-      exportOption: '1',
-      meta: {}
+      selectedRows: []
     }
   },
-  computed: {
-    hasSelected() {
-      return this.selectedRows.length > 0
-    },
-    upLoadUrl() {
-      return this.tableConfig.url
-    },
-    importTitle() {
-      if (this.importOption === '1') { return this.$tc('Import') } else { return this.$tc('Update') }
-    },
-    downloadImportTempUrl() {
-      return process.env.VUE_APP_BASE_API + this.tableConfig.url + '?format=csv&template=import&limit=1'
-    }
-  },
-  mounted() {
-    this.$eventBus.$on('showExportDialog', (row) => {
-      this.showExportDialog = true
-    })
-    this.$eventBus.$on('showImportDialog', (row) => {
-      this.showImportDialog = true
-    })
-  },
   methods: {
-    upload(item) {
-      this.$axios.put(
-        this.upLoadUrl,
-        item.file
-      ).then((res) => {
-        console.log('')
-      })
-    },
-    downloadCsv(url) {
-      const a = document.createElement('a')
-      a.href = url
-      a.click()
-      window.URL.revokeObjectURL(url)
-    },
     handleSelectionChange(val) {
       this.selectedRows = val
       var obj = {}
@@ -128,61 +52,6 @@ export default {
     },
     search(attrs) {
       return this.$refs.dataTable.$refs.dataTable.search(attrs)
-    },
-    async handleExport() {
-      let data
-      var resources = []
-      if (this.exportOption === '1') {
-        data = this.$refs.dataTable.$refs.dataTable.getData()
-      } else if (this.exportOption === '2') {
-        data = this.selectedRows
-      } else {
-        data = []
-      }
-      for (let index = 0; index < data.length; index++) {
-        resources.push(data[index].id)
-      }
-      const spm = await createSourceIdCache(resources)
-      const url = process.env.VUE_APP_BASE_API + `${this.tableConfig.url}?format=csv&?spm=` + spm.spm
-      return this.downloadCsv(url)
-    },
-    handleImport() {
-    },
-    async downloadUpdateTempUrl() {
-      var resources = []
-      const data = this.$refs.dataTable.$refs.dataTable.getData()
-      for (let index = 0; index < data.length; index++) {
-        resources.push(data[index].id)
-      }
-      const spm = await createSourceIdCache(resources)
-      const url = process.env.VUE_APP_BASE_API + `${this.tableConfig.url}?format=csv&template=update&spm=` + spm.spm
-      return this.downloadCsv(url)
-    },
-    async handleDialogConfirm(val) {
-      switch (val) {
-        case 'export':
-          await this.handleExport()
-          this.showExportDialog = false
-          break
-        case 'import':
-          await this.handleImport()
-          this.showImportDialog = false
-          break
-        default:
-          break
-      }
-    },
-    handleDialogCancel(val) {
-      switch (val) {
-        case 'export':
-          this.showExportDialog = false
-          break
-        case 'import':
-          this.showImportDialog = false
-          break
-        default:
-          break
-      }
     }
   }
 }
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index e37219624..7178f7754 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -76,7 +76,10 @@ const cn = {
     'Active selected': '激活所选',
     'rows': '行',
     'Basic Info': '基本信息',
+    'Command filter': '命令过滤器',
     'Add': '添加',
+    'Auth': '认证',
+    'Others': '其他',
     'Members': '成员'
   },
   route: {
diff --git a/src/router/index.js b/src/router/index.js
index e4c94a216..4e66202be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -210,11 +210,17 @@ export const constantRoutes = [
         meta: { title: 'AdminUserDetail' },
         hidden: true
       },
-
+      {
+        path: 'system-users/create',
+        name: 'SystemUserCreate',
+        component: () => import('@/views/assets/SystemUser/SystemUserCreateUpdate.vue'),
+        meta: { title: 'SystemUserCreate' },
+        hidden: true
+      },
       {
         path: 'system-users',
         name: 'SystemUserList',
-        component: () => import('@/views/assets/SystemUserList.vue'),
+        component: () => import('@/views/assets/SystemUser/SystemUserList.vue'),
         meta: { title: 'SystemUserList' }
       },
       {
diff --git a/src/views/assets/Label/LabelList.vue b/src/views/assets/Label/LabelList.vue
index 60afb4cf3..91a32e6d6 100644
--- a/src/views/assets/Label/LabelList.vue
+++ b/src/views/assets/Label/LabelList.vue
@@ -49,6 +49,11 @@ export default {
       },
       headerActions: {
         hasBulkDelete: false,
+        hasRightActions: false,
+        hasExport: false,
+        hasImport: false,
+        hasRefresh: true,
+        hasSearch: true,
         createRoute: 'LabelCreate'
       }
     }
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
new file mode 100644
index 000000000..88cd75ecb
--- /dev/null
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -0,0 +1,90 @@
+<template>
+  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" />
+</template>
+
+<script>
+import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+export default {
+  name: 'SystemUserCreateUpdate',
+  components: { GenericCreateUpdatePage },
+  data() {
+    return {
+      initial: {
+        login_mode: 'auto',
+        priority: '20',
+        protocol: 'ssh',
+        username_same_with_user: false,
+        auto_generate_key: true,
+        auto_push: true,
+        sftp_root: 'tmp',
+        sudo: '/bin/whoami',
+        shell: '/bin/bash'
+
+      },
+      fields: [
+        [this.$tc('Basic Info'), ['name', 'login_mode', 'username', 'username_same_with_user', 'priority', 'protocol']],
+        [this.$tc('Auth'), ['auto_generate_key', 'password', 'auto_push']],
+        [this.$tc('Command filter'), ['cmd_filters']],
+        [this.$tc('Others'), ['sftp_root', 'sudo', 'shell', 'comment']]
+      ],
+      fieldsMeta: {
+        login_mode: {
+          helpText: '如果选择手动登录模式，用户名和密码可以不填写'
+        },
+        username_same_with_user: {
+          type: 'switch',
+          helpText: '用户名是动态的，登录资产时使用当前用户的用户名登录'
+        },
+        auto_generate_key: {
+          type: 'switch'
+        },
+        protocol: {
+          rules: [
+            { required: true }
+          ]
+        },
+        cmd_filters: {
+          el: {
+            placeholder: '命令过滤器'
+          }
+        },
+        priority: {
+          rules: [
+            { required: true }
+          ],
+          helpText: '1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为默认登录用户'
+        },
+        auto_push: {
+          type: 'switch'
+        },
+        sftp_root: {
+          rules: [
+            { required: true }
+          ],
+          helpText: 'SFTP的起始路径，tmp目录, 用户home目录或者自定义'
+        },
+        sudo: {
+          rules: [
+            { required: true }
+          ],
+          helpText: '使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig'
+        },
+        password: {
+          helpText: '密码或密钥密码',
+          hidden: form => form.auto_generate_key === true
+        },
+        shell: {
+          rules: [
+            { required: true }
+          ]
+        }
+      },
+      url: '/api/v1/assets/system-users/'
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue
similarity index 100%
rename from src/views/assets/SystemUserList.vue
rename to src/views/assets/SystemUser/SystemUserList.vue

From 9ac47cef98d2fd26c47cfd0ef76d02b8181a27a9 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 29 Apr 2020 16:56:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemUser/SystemUserCreateUpdate.vue     | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
index 88cd75ecb..cdd77520e 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import select2 from '@/components/Select2'
 export default {
   name: 'SystemUserCreateUpdate',
   components: { GenericCreateUpdatePage },
@@ -31,19 +32,33 @@ export default {
         login_mode: {
           helpText: '如果选择手动登录模式，用户名和密码可以不填写'
         },
+        username: {
+          el: {
+            disabled: false
+          }
+        },
         username_same_with_user: {
           type: 'switch',
-          helpText: '用户名是动态的，登录资产时使用当前用户的用户名登录'
+          helpText: '用户名是动态的，登录资产时使用当前用户的用户名登录',
+          hidden: (form) => {
+            this.fieldsMeta.username.el.disabled = form.username_same_with_user
+            return false
+          }
         },
         auto_generate_key: {
-          type: 'switch'
+          type: 'switch',
+          hidden: form => form.login_mode !== 'auto'
         },
         protocol: {
           rules: [
             { required: true }
-          ]
+          ],
+          el: {
+            style: 'width:100%'
+          }
         },
         cmd_filters: {
+          component: select2,
           el: {
             placeholder: '命令过滤器'
           }
@@ -55,7 +70,8 @@ export default {
           helpText: '1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为默认登录用户'
         },
         auto_push: {
-          type: 'switch'
+          type: 'switch',
+          hidden: form => form.login_mode !== 'auto'
         },
         sftp_root: {
           rules: [
@@ -71,7 +87,7 @@ export default {
         },
         password: {
           helpText: '密码或密钥密码',
-          hidden: form => form.auto_generate_key === true
+          hidden: form => form.auto_generate_key === true || form.login_mode !== 'auto'
         },
         shell: {
           rules: [
@@ -79,8 +95,12 @@ export default {
           ]
         }
       },
-      url: '/api/v1/assets/system-users/'
+      url: '/api/v1/assets/system-users/',
+      authHiden: false
     }
+  },
+  computed: {
+
   }
 }
 </script>

From a4c7e299aa3f8b008e79e575cf669d268ac3c3c6 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 29 Apr 2020 19:47:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 16 +++++++++++++++-
 .../AdminUser/AdminUserCreateUpdate.vue       | 19 ++++++++++++++++++-
 src/views/assets/AdminUser/AdminUserList.vue  |  3 ++-
 .../SystemUser/SystemUserCreateUpdate.vue     |  4 +++-
 .../assets/SystemUser/SystemUserList.vue      |  1 +
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 4e66202be..24a50a082 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -157,10 +157,17 @@ export const constantRoutes = [
       {
         path: 'admin-users/create',
         component: () => import('@/views/assets/AdminUser/AdminUserCreateUpdate.vue'), // Parent router-view
-        name: 'AdminUserCreateUpdate',
+        name: 'AdminUserCreate',
         meta: { title: 'AdminUserCreate' },
         hidden: true
       },
+      {
+        path: 'admin-users/update/:id',
+        component: () => import('@/views/assets/AdminUser/AdminUserCreateUpdate.vue'), // Parent router-view
+        name: 'AdminUserUpdate',
+        meta: { title: 'AdminUserUpdate' },
+        hidden: true
+      },
       {
         path: 'platform/update/:id',
         component: () => import('@/views/assets/Platform/PlatformCreateUpdate.vue'), // Parent router-view
@@ -217,6 +224,13 @@ export const constantRoutes = [
         meta: { title: 'SystemUserCreate' },
         hidden: true
       },
+      {
+        path: 'system-users/update/:id',
+        name: 'SystemUserUpdate',
+        component: () => import('@/views/assets/SystemUser/SystemUserCreateUpdate.vue'),
+        meta: { title: 'SystemUserUpdate' },
+        hidden: true
+      },
       {
         path: 'system-users',
         name: 'SystemUserList',
diff --git a/src/views/assets/AdminUser/AdminUserCreateUpdate.vue b/src/views/assets/AdminUser/AdminUserCreateUpdate.vue
index 5da0a86d2..3ec8d63a6 100644
--- a/src/views/assets/AdminUser/AdminUserCreateUpdate.vue
+++ b/src/views/assets/AdminUser/AdminUserCreateUpdate.vue
@@ -16,10 +16,27 @@ export default {
 
       },
       fields: [
-        [this.$t('perms.' + 'Basic'), ['name', 'username', 'password', 'private_key', 'comment']]
+        ['', ['name', 'username', 'password', 'private_key', 'comment']]
       ],
       fieldsMeta: {
+        name: {
+          el: {
+            placeholder: this.$t('名称')
+          }
+        },
+        username: {
+          el: {
+            placeholder: this.$t('用户名')
+          }
+        },
+        password: {
+          helpText: this.$t('密码或密钥密码')
+        },
         private_key: {
+          type: 'upload',
+          el: {
+            url: 'http://baiddu.com'
+          }
         }
       },
       url: '/api/v1/assets/admin-users/'
diff --git a/src/views/assets/AdminUser/AdminUserList.vue b/src/views/assets/AdminUser/AdminUserList.vue
index 00dc7aa25..457326071 100644
--- a/src/views/assets/AdminUser/AdminUserList.vue
+++ b/src/views/assets/AdminUser/AdminUserList.vue
@@ -52,9 +52,10 @@ export default {
           }
         ]
       },
+      updateRoute: 'AdminUserUpdate',
       headerActions: {
         hasBulkDelete: false,
-        createRoute: 'AdminUserCreateUpdate'
+        createRoute: 'AdminUserCreate'
       }
     }
   }
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
index cdd77520e..5b3817941 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -47,7 +47,9 @@ export default {
         },
         auto_generate_key: {
           type: 'switch',
-          hidden: form => form.login_mode !== 'auto'
+          hidden: form => {
+            this.$router.params || form.login_mode !== 'auto'
+          }
         },
         protocol: {
           rules: [
diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue
index d23c6dec4..f64cd6768 100644
--- a/src/views/assets/SystemUser/SystemUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList.vue
@@ -53,6 +53,7 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
+            updateRoute: 'SystemUserUpdate',
             actions: {
               performDelete: ({ row, col }) => {
                 const id = row.id