From 54fe95f938a53ea94855ad529361a877557b6f60 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 20 May 2020 12:03:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E7=9A=84RunInfoCa?=
 =?UTF-8?q?rd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskDetail/AdhocDetail/AdhocDetail.vue    | 23 ++++++---------
 .../HistoryExecutionDetail.vue                | 23 ++++++---------
 src/views/jobcenter/TaskDetail/TaskDetail.vue | 21 ++++++--------
 .../jobcenter/runinfocard/RunInfoCard.vue     | 28 +++++++++++--------
 4 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue
index bb6e745d0..1cd86f045 100644
--- a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue
+++ b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue
@@ -5,7 +5,7 @@
     </el-col>
     <el-col :span="10">
       <RunInfoCard type="primary" v-bind="RunSuccessConfig" />
-      <RunInfoCard type="info" style="margin-top: 15px" v-bind="RunFailedConfig" />
+      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
     </el-col>
   </el-row>
 </template>
@@ -32,23 +32,18 @@ export default {
       RunSuccessConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunSuccessHosts'),
-        content: [
-          {
-            hostname: 'linux',
-            result: 'api没有该数据，api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'linux',
+          result: 'api没有该数据，api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       },
       RunFailedConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunFailedHosts'),
-        headerColor: 'danger',
-        content: [
-          {
-            hostname: 'window',
-            result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'window',
+          result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       }
     }
   },
diff --git a/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index 9d5c4dd1b..47ef8e14d 100644
--- a/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -5,7 +5,7 @@
     </el-col>
     <el-col :span="10">
       <RunInfoCard type="primary" v-bind="RunSuccessConfig" />
-      <RunInfoCard type="info" style="margin-top: 15px" v-bind="RunFailedConfig" />
+      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
     </el-col>
   </el-row>
 </template>
@@ -32,23 +32,18 @@ export default {
       RunSuccessConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunSuccessHosts'),
-        content: [
-          {
-            hostname: 'linux',
-            result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'linux',
+          result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       },
       RunFailedConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunFailedHosts'),
-        headerColor: 'danger',
-        content: [
-          {
-            hostname: 'window',
-            result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'linux',
+          result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       }
     }
   },
diff --git a/src/views/jobcenter/TaskDetail/TaskDetail.vue b/src/views/jobcenter/TaskDetail/TaskDetail.vue
index 3dd6f8f6a..81fc81251 100644
--- a/src/views/jobcenter/TaskDetail/TaskDetail.vue
+++ b/src/views/jobcenter/TaskDetail/TaskDetail.vue
@@ -32,23 +32,18 @@ export default {
       RunSuccessConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunSuccessHosts'),
-        content: [
-          {
-            hostname: 'linux',
-            result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'linux',
+          result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       },
       RunFailedConfig: {
         icon: 'fa-info',
         title: this.$t('jobcenter.lastRunFailedHosts'),
-        headerColor: 'danger',
-        content: [
-          {
-            hostname: 'window',
-            result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
-          }
-        ]
+        content: {
+          hostname: 'window',
+          result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据'
+        }
       },
       taskData: {}
     }
diff --git a/src/views/jobcenter/runinfocard/RunInfoCard.vue b/src/views/jobcenter/runinfocard/RunInfoCard.vue
index 49f14bbc5..3f4ed9bb0 100644
--- a/src/views/jobcenter/runinfocard/RunInfoCard.vue
+++ b/src/views/jobcenter/runinfocard/RunInfoCard.vue
@@ -1,13 +1,11 @@
 <template>
   <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
-    <el-table class="el-table" style="width: 100%" :data="content" :show-header="false">
-      <el-table-column width="150px" prop="hostname" />
-      <el-table-column prop="result">
-        <template slot-scope="scope">
-          <span>{{ scope.row.result }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
+    <table class="run-info">
+      <tr>
+        <td>{{ content.hostname }}</td>
+        <td>{{ content.result }}</td>
+      </tr>
+    </table>
   </IBox>
 </template>
 
@@ -29,8 +27,8 @@ export default {
       default: ''
     },
     content: {
-      type: Array,
-      default: () => []
+      type: Object,
+      default: () => ({})
     },
     url: {
       type: String,
@@ -45,5 +43,13 @@ export default {
 </script>
 
 <style scoped>
-
+.run-info {
+  line-height: 1.43;
+  padding: 8px;
+  vertical-align: top;
+  font-size: 13px;
+}
+.run-info > tr:first-child > td:first-child {
+  width: 150px;
+}
 </style>

From b895af5cfea31557f9827e46b7df4aa6c9ed9c7c Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 20 May 2020 16:40:53 +0800
Subject: [PATCH 2/6] [Add] gathered user task

---
 .../GatheredUserList.vue}                     | 23 +++++++++-
 .../xpack/GatheredUser/TaskCreateUpdate.vue   | 46 +++++++++++++++++++
 src/views/xpack/GatheredUser/TaskList.vue     | 35 ++++++++++++++
 src/views/xpack/router.js                     | 27 +++++++++--
 4 files changed, 127 insertions(+), 4 deletions(-)
 rename src/views/xpack/{GatherUser.vue => GatheredUser/GatheredUserList.vue} (61%)
 create mode 100644 src/views/xpack/GatheredUser/TaskCreateUpdate.vue
 create mode 100644 src/views/xpack/GatheredUser/TaskList.vue

diff --git a/src/views/xpack/GatherUser.vue b/src/views/xpack/GatheredUser/GatheredUserList.vue
similarity index 61%
rename from src/views/xpack/GatherUser.vue
rename to src/views/xpack/GatheredUser/GatheredUserList.vue
index cc24229c5..77db4c940 100644
--- a/src/views/xpack/GatherUser.vue
+++ b/src/views/xpack/GatheredUser/GatheredUserList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericTreeListPage :table-config="tableConfig" :tree-setting="treeSetting" />
+  <GenericTreeListPage :table-config="tableConfig" :tree-setting="treeSetting" :header-actions="headerActions" />
 </template>
 
 <script>
@@ -28,8 +28,29 @@ export default {
         ],
         columnsMeta: {
         }
+      },
+      headerActions: {
+        hasCreate: false,
+        hasBulkDelete: false,
+        hasImport: false,
+        hasRefresh: false,
+        extraActions: [
+          {
+            name: 'gather-user-tasks',
+            title: '收集用户任务',
+            type: 'primary',
+            has: true,
+            can: true,
+            callback: this.onGatherUserTasks
+          }
+        ]
       }
     }
+  },
+  methods: {
+    onGatherUserTasks() {
+      this.$router.push({ name: 'GatherUserTaskList' })
+    }
   }
 }
 </script>
diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
new file mode 100644
index 000000000..bc124141e
--- /dev/null
+++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
@@ -0,0 +1,46 @@
+<template>
+  <GenericCreateUpdatePage v-bind="$data" />
+</template>
+
+<script>
+import { GenericCreateUpdatePage } from '@/layout/components'
+
+export default {
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    return {
+      fields: [
+        ['收集用户任务', ['name', 'nodes', 'is_periodic', 'crontab', 'interval', 'comment']]
+      ],
+      url: '/api/v1/xpack/gathered-user/tasks/',
+      fieldsMeta: {
+        nodes: {
+          el: {
+            multiple: true,
+            value: [],
+            ajax: {
+              url: '/api/v1/assets/nodes/',
+              processResults(data) {
+                const results = data.results.map((item) => {
+                  return { label: item.name, value: item.id }
+                })
+                const more = !!data.next
+                return { results: results, pagination: more, total: data.count }
+              }
+            }
+          }
+        },
+        'is_periodic': {
+          type: 'switch'
+        }
+      }
+    }
+  }
+}
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/xpack/GatheredUser/TaskList.vue b/src/views/xpack/GatheredUser/TaskList.vue
new file mode 100644
index 000000000..e0b8a33f8
--- /dev/null
+++ b/src/views/xpack/GatheredUser/TaskList.vue
@@ -0,0 +1,35 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import GenericListPage from '@/layout/components/GenericListPage'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/xpack/gathered-user/tasks/',
+        columns: [
+          'name', 'nodes', 'periodic_display', 'executed_times', 'actions'
+        ],
+        columnsMeta: {}
+      },
+      headerActions: {
+        hasBulkDelete: false,
+        hasImport: false,
+        hasRefresh: false,
+        hasExport: false,
+        createRoute: 'GatherUserTaskCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 70a305604..0f340bb5f 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -21,9 +21,30 @@ export default {
     },
     {
       path: 'gathered-users',
-      component: () => import('@/views/xpack/GatherUser'),
-      name: 'GatherUser',
-      meta: { title: 'GatherUser' }
+      component: () => import('@/views/xpack/GatheredUser/GatheredUserList'),
+      name: 'GatherUserList',
+      meta: { title: 'GatherUserList' }
+    },
+    {
+      path: 'gathered-users/tasks',
+      component: () => import('@/views/xpack/GatheredUser/TaskList'),
+      name: 'GatherUserTaskList',
+      meta: { title: 'GatherUserTask' },
+      hidden: true
+    },
+    {
+      path: 'gathered-users/tasks/create',
+      component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
+      name: 'GatherUserTaskCreate',
+      meta: { title: 'GatherUserTaskCreate', action: 'create' },
+      hidden: true
+    },
+    {
+      path: 'gathered-users/tasks/update',
+      component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
+      name: 'GatherUserTaskUpdate',
+      meta: { title: 'GatherUserTaskUpdate', action: 'update' },
+      hidden: true
     }
   ]
 }

From 049db348c61b8137a2848149c6866a8bd66ad9be Mon Sep 17 00:00:00 2001
From: Eric_Lee <xplzv@126.com>
Date: Wed, 20 May 2020 17:25:25 +0800
Subject: [PATCH 3/6] [Update] interface view (#55)

---
 src/components/UploadField/index.vue  |  31 ++++---
 src/i18n/langs/cn.json                |   9 ++
 src/views/xpack/InterfaceSettings.vue | 124 +++++++++++++++++++++-----
 src/views/xpack/api.js                |  25 ++++++
 src/views/xpack/router.js             |   3 +-
 5 files changed, 158 insertions(+), 34 deletions(-)
 create mode 100644 src/views/xpack/api.js

diff --git a/src/components/UploadField/index.vue b/src/components/UploadField/index.vue
index f87f907ec..d18184e77 100644
--- a/src/components/UploadField/index.vue
+++ b/src/components/UploadField/index.vue
@@ -1,12 +1,11 @@
 <template>
-  <el-upload
-    v-bind="$attrs"
-    @input="onInput"
-    v-on="$listeners"
-  >
-    <el-button size="small" type="primary">点击上传</el-button>
-    <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-  </el-upload>
+  <div>
+    <input type="file" @change="Onchange">
+    <div v-if="tip !== ''">{{ tip }}</div>
+    <div>
+      <img :src="src" v-bind="$attrs">
+    </div>
+  </div>
 </template>
 
 <script>
@@ -15,16 +14,28 @@ export default {
     value: {
       type: String,
       default: () => ''
+    },
+    tip: {
+      type: String,
+      default: () => ''
+    }
+  },
+  computed: {
+    src() {
+      return `${process.env.VUE_APP_BASE_API}${this.value}`
     }
   },
   watch: {
     value(value) {
-      this.$emit('customEvent', value, 'message')
+      this.$emit('customEvent', value)
     }
   },
   methods: {
     onInput(val) {
-      this.$emit('input', 'my-input: ' + val)
+      this.$emit('input', 'upload-field: ' + val)
+    },
+    Onchange(e) {
+      this.$emit('fileChange', e.target.files[0])
     }
   }
 }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 11b2932dc..c8726885e 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -743,5 +743,14 @@
     "AssetsTotal": "资产总数",
     "OnlineUsers": "在线用户",
     "OnlineSessions": "在线会话"
+  },
+  "xpack": {
+    "InterfaceSettings": "界面设置",
+    "loginTitle": "登录页面标题",
+    "loginImage": "登录页面图片",
+    "favicon": "网站图标",
+    "logoIndex": "管理页面logo",
+    "logoLogout": "退出页面logo",
+    "RestoreButton": "恢复默认"
   }
 }
diff --git a/src/views/xpack/InterfaceSettings.vue b/src/views/xpack/InterfaceSettings.vue
index eceedeaa8..34f08a655 100644
--- a/src/views/xpack/InterfaceSettings.vue
+++ b/src/views/xpack/InterfaceSettings.vue
@@ -1,11 +1,14 @@
 <template>
-  <TabPage :submenu="submenu" :active-menu="activemenu">
-    <IBox>
+  <TabPage :submenu="submenu" :active-menu="activeMenu">
+    <IBox v-if="!loading">
       <GenericCreateUpdateForm
         :fields="fields"
         :url="url"
+        :initial="interfaceInfo"
         :update-success-next-route="successUrl"
         :fields-meta="fieldsMeta"
+        :on-submit="submitForm"
+        :more-buttons="moreButtons"
       />
     </IBox>
   </TabPage>
@@ -13,9 +16,9 @@
 
 <script>
 import { TabPage } from '@/layout/components'
-import { IBox } from '@/components'
+import { IBox, UploadField } from '@/components'
 import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
-import { UploadField } from '@/components'
+import { getInterfaceInfo, postInterface, restoreInterface } from '@/views/xpack/api'
 
 export default {
   name: 'InterfaceSettings',
@@ -26,10 +29,13 @@ export default {
   },
   data() {
     return {
-      activemenu: 'interface',
+      loading: true,
+      files: {},
+      interfaceInfo: {},
+      activeMenu: 'interface',
       submenu: [
         {
-          title: 'interface-settings',
+          title: this.$t('xpack.InterfaceSettings'),
           name: 'interface'
         }
       ],
@@ -43,40 +49,112 @@ export default {
       ],
       fieldsMeta: {
         login_title: {
-          label: 'login_title'
+          label: this.$t('xpack.loginTitle'),
+          helpText: '提示：将会显示在企业版用户登录页面（eg: 欢迎使用JumpServer开源堡垒机)'
         },
         login_image: {
-          label: 'login_image'
+          component: UploadField,
+          label: this.$t('xpack.loginImage'),
+          el: {
+            width: '10%',
+            height: '10%',
+            tip: '提示：将会显示在企业版用户登录页面（建议图片大小为: 492*472px）'
+          },
+          on: {
+            fileChange: ([value], updateForm) => {
+              console.log(value)
+              this.files['login_image'] = value
+            }
+          }
         },
         favicon: {
-          label: 'favicon'
+          component: UploadField,
+          label: this.$t('xpack.favicon'),
+          el: {
+            width: '5%',
+            height: '5%',
+            tip: '提示：网站图标（建议图片大小为: 16px*16px）'
+          },
+          on: {
+            fileChange: ([value], updateForm) => {
+              this.files['favicon'] = value
+            }
+          }
         },
         logo_index: {
-          label: 'logo_index'
+          component: UploadField,
+          label: this.$t('xpack.logoIndex'),
+          el: {
+            width: '10%',
+            height: '10%',
+            tip: '提示：将会显示在管理页面左上方（建议图片大小为: 185px*55px）'
+          },
+          on: {
+            fileChange: ([value], updateForm) => {
+              this.files['logo_index'] = value
+            }
+          }
         },
         logo_logout: {
           component: UploadField,
-          label: 'logo_logout',
+          label: this.$t('xpack.logoLogout'),
           el: {
-            action: '/api/v1/xpack/interface/setting/',
-            autoUpload: false,
-            name: 'logo_logout',
-            onChange: function(file, fileList) {
-              console.log(file, fileList)
-            }
+            width: '5%',
+            height: '5%',
+            tip: '提示：将会显示在企业版用户退出页面（建议图片大小为：82px*82px）'
           },
           on: {
-            focus: ([event], updateForm) => {
-              console.log(event.target.value) // output: input value
-            },
-            customEvent: ([value, msg], updateForm) => {
-              console.log(msg) // output: 'message'
+            fileChange: ([value], updateForm) => {
+              this.files['logo_logout'] = value
             }
           }
         }
       },
-      url: '/api/v1/xpack/interface/setting'
+      url: '/api/v1/xpack/interface/setting',
+      moreButtons: [
+        {
+          title: this.$t('xpack.RestoreButton'),
+          callback: function(value, form) {
+            this.$confirm('您确定要恢复默认初始化吗？', '你确认吗?', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              restoreInterface().then(res => {
+                this.$message.success(res.success)
+                location.reload()
+              }).catch(errMsg => {
+                this.$message.error(errMsg.response.data.error)
+              })
+            })
+          }.bind(this)
+        }
+      ]
     }
+  },
+  mounted() {
+    getInterfaceInfo().then(data => {
+      this.interfaceInfo = data
+      this.loading = false
+    })
+  },
+  methods: {
+    submitForm(values) {
+      const form = new FormData()
+      const ImageKeys = ['favicon', 'login_image', 'logo_logout', 'logo_index']
+      ImageKeys.forEach((value, index) => {
+        if (this.files[value] !== undefined) {
+          form.append(value, this.files[value])
+        }
+      })
+      if (values['login_title'] !== undefined) {
+        form.append('login_title', values['login_title'])
+      }
+      postInterface(form).then(res => {
+        location.reload()
+      })
+    }
+
   }
 }
 </script>
diff --git a/src/views/xpack/api.js b/src/views/xpack/api.js
new file mode 100644
index 000000000..25d386ca6
--- /dev/null
+++ b/src/views/xpack/api.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function postInterface(formData) {
+  return request({
+    url: '/api/v1/xpack/interface/setting',
+    method: 'put',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data: formData
+  })
+}
+export function getInterfaceInfo() {
+  return request({
+    url: '/api/v1/xpack/interface/setting',
+    method: 'get'
+  })
+}
+
+export function restoreInterface() {
+  return request({
+    url: '/xpack/interface/restore/default',
+    method: 'get'
+  })
+}
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 0f340bb5f..aa7d43865 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -1,4 +1,5 @@
 import Layout from '@/layout/index'
+import i18n from '@/i18n/i18n'
 
 export default {
   path: '/xpack',
@@ -11,7 +12,7 @@ export default {
       path: 'interface-setting',
       component: () => import('@/views/xpack/InterfaceSettings.vue'),
       name: 'InterfaceSetting',
-      meta: { title: 'InterfaceSetting' }
+      meta: { title: i18n.t('xpack.InterfaceSettings') }
     },
     {
       path: 'license',

From 2bfd6f2045c28ce7ea26646adc7cda67dcd2d84d Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 20 May 2020 17:27:29 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ListTable/formatters/ConnectFormatter.vue | 146 ++++++++++++++++++
 src/components/ListTable/formatters/index.js  |  10 +-
 src/userviews/assets/index.vue                |  24 ++-
 3 files changed, 170 insertions(+), 10 deletions(-)
 create mode 100644 src/components/ListTable/formatters/ConnectFormatter.vue

diff --git a/src/components/ListTable/formatters/ConnectFormatter.vue b/src/components/ListTable/formatters/ConnectFormatter.vue
new file mode 100644
index 000000000..b4fe27906
--- /dev/null
+++ b/src/components/ListTable/formatters/ConnectFormatter.vue
@@ -0,0 +1,146 @@
+<template>
+  <ActionsGroup :size="'mini'" :actions="actions" :more-actions="moreActions" />
+</template>
+
+<script>
+import ActionsGroup from '@/components/ActionsGroup/index'
+import BaseFormatter from './base'
+
+const defaultPerformDelete = function({ row, col }) {
+  const id = row.id
+  const url = `${this.url}${id}/`
+  return this.$axios.delete(url)
+}
+const defaultUpdateCallback = function({ row, col }) {
+  const id = row.id
+  const routeName = this.colActions.updateRoute
+  this.$router.push({ name: routeName, params: { id: id }})
+}
+
+const defaultDeleteCallback = function({ row, col, cellValue, reload }) {
+  const msg = this.$t('common.deleteWarningMsg') + ' "' + row.name + '"'
+  const title = this.$t('common.Info')
+  const performDelete = this.colActions.performDelete
+  this.$alert(msg, title, {
+    type: 'warning',
+    confirmButtonClass: 'el-button--danger',
+    showCancelButton: true,
+    beforeClose: async(action, instance, done) => {
+      if (action !== 'confirm') return done()
+      instance.confirmButtonLoading = true
+      try {
+        await performDelete.bind(this)({ row: row, col: col })
+        done()
+        reload()
+        this.$message.success(this.$t('common.deleteSuccessMsg'))
+      } catch (error) {
+        this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error))
+      } finally {
+        instance.confirmButtonLoading = false
+      }
+    }
+  }).catch(() => {
+    /* 取消*/
+  })
+}
+
+export default {
+  name: 'ActionsFormatter',
+  components: { ActionsGroup },
+  extends: BaseFormatter,
+  props: {
+    actionsDefault: {
+      type: Object,
+      default: function() {
+        return {
+          hasUpdate: true, // can set function(row, value)
+          canUpdate: true, // can set function(row, value)
+          hasDelete: true, // can set function(row, value)
+          canDelete: true,
+          updateRoute: this.$route.name.replace('List', 'Update'),
+          performDelete: defaultPerformDelete,
+          onUpdate: defaultUpdateCallback,
+          onDelete: defaultDeleteCallback,
+          extraActions: [] // format see defaultActions
+        }
+      }
+    }
+  },
+  data() {
+    const colActions = Object.assign(this.actionsDefault, this.col, this.col.actions)
+    const defaultActions = [
+      {
+        name: 'update',
+        fa: 'fa-terminal',
+        type: 'primary',
+        has: colActions.hasUpdate,
+        can: colActions.canUpdate,
+        callback: colActions.onUpdate
+      },
+      {
+        name: 'delete',
+        type: 'info',
+        fa: 'fa-star-o',
+        has: colActions.hasDelete,
+        can: colActions.canDelete,
+        callback: colActions.onDelete
+      }
+    ]
+    return {
+      colActions: colActions,
+      defaultActions: defaultActions,
+      extraActions: colActions.extraActions
+    }
+  },
+  computed: {
+    cleanedActions() {
+      let actions = [...this.defaultActions, ...this.extraActions]
+      actions = _.cloneDeep(actions)
+      actions = actions.map((v) => {
+        v.has = this.cleanBoolean(v, 'has')
+        v.can = this.cleanBoolean(v, 'can')
+        v.callback = this.cleanCallback(v)
+        return v
+      })
+      actions = actions.filter((v) => v.has)
+      return actions
+    },
+    actions() {
+      if (this.cleanedActions.length <= 3) {
+        return this.cleanedActions
+      }
+      return this.cleanedActions.slice(0, 2)
+    },
+    moreActions() {
+      if (this.cleanedActions.length <= 3) {
+        return []
+      }
+      return this.cleanedActions.slice(2, this.cleanedActions.length)
+    }
+  },
+  methods: {
+    cleanBoolean(item, attr) {
+      const ok = item[attr]
+      if (typeof ok !== 'function') {
+        return ok === undefined ? true : ok
+      }
+      return ok(this.row, this.cellValue)
+    },
+    cleanCallback(item) {
+      const callback = item.callback
+      const attrs = {
+        reload: this.reload,
+        row: this.row,
+        col: this.col,
+        cellValue: this.cellValue,
+        tableData: this.tableData
+      }
+      return () => { return callback.bind(this)(attrs) }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js
index d39e2e37d..9b6922bcf 100644
--- a/src/components/ListTable/formatters/index.js
+++ b/src/components/ListTable/formatters/index.js
@@ -11,6 +11,8 @@ import ExpandAssetPermissionFormatter from './ExpandAssetPermissionFormatter'
 import CustomActionsFormatter from './CustomActionsFormatter'
 import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
+import ConnectFormatter from './ConnectFormatter'
+import SystemUserFormatter from './SystemUserFormatter'
 
 export default {
   DetailFormatter,
@@ -25,7 +27,9 @@ export default {
   ExpandAssetPermissionFormatter,
   CustomActionsFormatter,
   DeleteActionFormatter,
-  DateFormatter
+  DateFormatter,
+  ConnectFormatter,
+  SystemUserFormatter
 }
 
 export {
@@ -41,5 +45,7 @@ export {
   ExpandAssetPermissionFormatter,
   CustomActionsFormatter,
   DeleteActionFormatter,
-  DateFormatter
+  DateFormatter,
+  ConnectFormatter,
+  SystemUserFormatter
 }
diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index 3b43e480d..7cbc82a4b 100644
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage/index'
-import { DetailFormatter, ActionsFormatter, BooleanFormatter } from '@/components/ListTable/formatters'
+import { DetailFormatter, ConnectFormatter, SystemUserFormatter } from '@/components/ListTable/formatters'
 export default {
   components: {
     GenericTreeListPage
@@ -20,7 +20,13 @@ export default {
         // ?assets=0不显示资产. =1显示资产
         treeUrl: '/api/v1/perms/users/nodes/children/tree/?cache_policy=2',
         callback: {
-          refresh: () => {}
+          refresh: () => {},
+          onSelected: function(event, treeNode) {
+            if (treeNode.meta.type === 'node') {
+              const currentNodeId = treeNode.meta.node.id
+              this.tableConfig.url = `/api/v1/perms/users/nodes/${currentNodeId}/assets/?cache_policy=1`
+            }
+          }.bind(this)
         }
       },
       tableConfig: {
@@ -41,8 +47,9 @@ export default {
             sortable: 'custom'
           },
           {
-            prop: 'hardware_info',
+            prop: 'SystemUsers',
             align: 'center',
+            formatter: SystemUserFormatter,
             label: this.$t('assets.SystemUsers')
           },
           {
@@ -53,14 +60,15 @@ export default {
           {
             prop: 'id',
             align: 'center',
-            formatter: ActionsFormatter,
+            formatter: ConnectFormatter,
             width: '200px',
             label: this.$t('common.action'),
             actions: {
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/assets/${id}/`
-                return this.$axios.delete(url)
+              onDelete: function({ row, col, cellValue, reload }) {
+                alert('接口错误：获取不到对应的资产状态')
+              },
+              onUpdate: function({ row, col, cellValue, reload }) {
+                window.open(`/luna/?login_to=${cellValue}`, '_blank')
               }
             }
           }

From b1969f1f1115508bd285ae9baa1246bb8a1af0dc Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 20 May 2020 18:21:17 +0800
Subject: [PATCH 5/6] [fix]

---
 .../formatters/SystemUserFormatter.vue        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/components/ListTable/formatters/SystemUserFormatter.vue

diff --git a/src/components/ListTable/formatters/SystemUserFormatter.vue b/src/components/ListTable/formatters/SystemUserFormatter.vue
new file mode 100644
index 000000000..c56ba60ea
--- /dev/null
+++ b/src/components/ListTable/formatters/SystemUserFormatter.vue
@@ -0,0 +1,40 @@
+<template>
+  <span v-if="systemuser.length===0"><a style="color: #1c84c6;" @click="showSystemUser">{{ this.$t('显示') }}</a></span>
+  <span v-else>{{ this.systemuser.toString() }}</span>
+</template>
+
+<script>
+import BaseFormatter from './base'
+export default {
+  name: 'SystemUserFormatter',
+  extends: BaseFormatter,
+  data() {
+    return {
+      systemuser: []
+    }
+  },
+  computed: {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    showSystemUser() {
+      const id = (this.row.id)
+      this.$axios.get(
+        `/api/v1/perms/users/assets/${id}/system-users/?cache_policy=1`
+      ).then(res => {
+        res.forEach((v, i) => {
+          this.systemuser.push(v.name)
+        })
+        console.log(this.systemuser)
+      }
+      )
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

From bfb454957b5e0e948e30090f05ac03c6139ede9a Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 20 May 2020 18:53:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=20i18n=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                            | 7 ++++++-
 src/views/xpack/GatheredUser/TaskCreateUpdate.vue | 4 +++-
 src/views/xpack/router.js                         | 8 ++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index c8726885e..1c5c1506f 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -751,6 +751,11 @@
     "favicon": "网站图标",
     "logoIndex": "管理页面logo",
     "logoLogout": "退出页面logo",
-    "RestoreButton": "恢复默认"
+    "RestoreButton": "恢复默认",
+    "GatherUserList": "收集用户",
+    "GatherUserTaskList": "任务列表",
+    "GatherUserTaskCreate": "创建任务",
+    "Timer": "定时执行",
+    "GatherUserTaskUpdate": "更新任务"
   }
 }
diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
index bc124141e..eb1e211c2 100644
--- a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
+++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
@@ -12,7 +12,9 @@ export default {
   data() {
     return {
       fields: [
-        ['收集用户任务', ['name', 'nodes', 'is_periodic', 'crontab', 'interval', 'comment']]
+        [this.$t('common.Basic'), ['name', 'nodes']],
+        [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
+        [this.$t('common.Others'), ['comment']]
       ],
       url: '/api/v1/xpack/gathered-user/tasks/',
       fieldsMeta: {
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index aa7d43865..f6fd7cf93 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -24,27 +24,27 @@ export default {
       path: 'gathered-users',
       component: () => import('@/views/xpack/GatheredUser/GatheredUserList'),
       name: 'GatherUserList',
-      meta: { title: 'GatherUserList' }
+      meta: { title: i18n.t('xpack.GatherUserList') }
     },
     {
       path: 'gathered-users/tasks',
       component: () => import('@/views/xpack/GatheredUser/TaskList'),
       name: 'GatherUserTaskList',
-      meta: { title: 'GatherUserTask' },
+      meta: { title: i18n.t('xpack.GatherUserTaskList') },
       hidden: true
     },
     {
       path: 'gathered-users/tasks/create',
       component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
       name: 'GatherUserTaskCreate',
-      meta: { title: 'GatherUserTaskCreate', action: 'create' },
+      meta: { title: i18n.t('xpack.GatherUserTaskCreate') },
       hidden: true
     },
     {
       path: 'gathered-users/tasks/update',
       component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
       name: 'GatherUserTaskUpdate',
-      meta: { title: 'GatherUserTaskUpdate', action: 'update' },
+      meta: { title: i18n.t('xpack.GatherUserTaskUpdate'), action: 'update' },
       hidden: true
     }
   ]