From d3120ed3613d63d46d7efb2396c45f663c6c6590 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 4 Jun 2020 17:07:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9xpack=E5=92=8Caud?=
 =?UTF-8?q?its=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  3 +++
 src/i18n/langs/en.json                        |  3 +++
 src/views/audits/CommandExecutionList.vue     | 24 ++++++++++++++++++-
 .../xpack/GatheredUser/TaskCreateUpdate.vue   |  4 ++++
 src/views/xpack/router.js                     |  6 ++---
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index a52cacf50..71fbb6659 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -650,6 +650,9 @@
     "DeleteNode": "删除节点",
     "RenameNode": "重命名节点"
   },
+  "audits": {
+    "View": "查看"
+  },
   "users": {
     "SSHKey": "SSH公钥",
     "TermsAndConditions": "条款和条件",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ef71c1ab6..1bbd92ef4 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -272,6 +272,9 @@
     "Weekly": "Weekly",
     "TimesWeekUnit": "times/week"
   },
+  "audits": {
+    "View": "查看"
+  },
   "ops": {
     "ID": "ID",
     "No": "No",
diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue
index df96a8bb3..85a8a8239 100644
--- a/src/views/audits/CommandExecutionList.vue
+++ b/src/views/audits/CommandExecutionList.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
 import { getDaysAgo } from '@/utils/common'
+import { DetailFormatter, DisplayFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -12,7 +13,7 @@ export default {
   },
   data() {
     const now = new Date()
-    const dateFrom = getDaysAgo(1, now)
+    const dateFrom = getDaysAgo(7, now).toISOString()
     const dateTo = now.toISOString()
     return {
       tableConfig: {
@@ -22,12 +23,33 @@ export default {
           'is_success', 'date_start'
         ],
         columnsMeta: {
+          hosts: {
+            formatter: DetailFormatter,
+            formatterArgs: {
+              getTitle: ({ cellValue }) => {
+                return cellValue.length
+              }
+            }
+          },
+          user: {
+            formatter: DisplayFormatter
+          },
+          run_as: {
+            formatter: DisplayFormatter
+          },
           is_finished: {
             width: '100px'
           },
           is_success: {
             width: '100px'
           },
+          result: {
+            width: '80px',
+            formatter: (row) => {
+              const label = this.$t('audits.View')
+              return <el-link Type='success'>{ label }</el-link>
+            }
+          },
           date_start: {
             width: '160px'
           }
diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
index f99112e7c..c2d29a761 100644
--- a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
+++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
@@ -17,6 +17,10 @@ export default {
         [this.$t('common.Others'), ['comment']]
       ],
       url: '/api/v1/xpack/gathered-user/tasks/',
+      initial: {
+        is_periodic: true,
+        interval: 24
+      },
       fieldsMeta: {
         crontab: {
           helpTips: this.$t('common.CrontabHelpTips')
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index ceea5ec33..7db5457ab 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -45,14 +45,14 @@ export default {
           path: 'gathered-users/tasks/create',
           component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
           name: 'GatherUserTaskCreate',
-          meta: { title: i18n.t('xpack.GatherUserTaskCreate') },
+          meta: { title: i18n.t('xpack.GatherUserTaskCreate'), activeMenu: '/xpack/gather-users' },
           hidden: true
         },
         {
-          path: 'gathered-users/tasks/update',
+          path: 'gathered-users/tasks/:id/update',
           component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
           name: 'GatherUserTaskUpdate',
-          meta: { title: i18n.t('xpack.GatherUserTaskUpdate'), action: 'update' },
+          meta: { title: i18n.t('xpack.GatherUserTaskUpdate'), action: 'update', activeMenu: '/xpack/gather-users' },
           hidden: true
         }
       ]

From 8d5be175073fc1cba490fc512e5132ff213e1046 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 4 Jun 2020 17:10:39 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9support=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/Help.vue | 2 +-
 src/views/settings/License.vue           | 4 ++--
 src/views/xpack/License.vue              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/NavHeader/Help.vue b/src/layout/components/NavHeader/Help.vue
index 95ef7de28..e86bf884a 100644
--- a/src/layout/components/NavHeader/Help.vue
+++ b/src/layout/components/NavHeader/Help.vue
@@ -17,7 +17,7 @@ export default {
     handleCommand(command) {
       switch (command) {
         case 'support':
-          window.open('https://jinshuju.net/f/sQ91MK', '_blank')
+          window.open('http://www.jumpserver.org/support/', '_blank')
           break
         default:
           window.open('http://docs.jumpserver.org', '_blank')
diff --git a/src/views/settings/License.vue b/src/views/settings/License.vue
index e2ab15873..3e1b8560b 100644
--- a/src/views/settings/License.vue
+++ b/src/views/settings/License.vue
@@ -138,8 +138,8 @@ export default {
       this.dialogLicenseImport = true
     },
     consultAction: function() {
-      const url = 'https://jinshuju.net/f/sQ91MK'
-      window.open(url)
+      const url = 'http://www.jumpserver.org/support/'
+      window.open(url, '_blank')
     },
     importLicense() {
       if (this.licenseFile['file'] === undefined) {
diff --git a/src/views/xpack/License.vue b/src/views/xpack/License.vue
index ca9eb6187..f23d9e22c 100644
--- a/src/views/xpack/License.vue
+++ b/src/views/xpack/License.vue
@@ -136,7 +136,7 @@ export default {
       this.dialogLicenseImport = true
     },
     consultAction: function() {
-      const url = 'https://jinshuju.net/f/sQ91MK'
+      const url = 'http://www.jumpserver.org/support/'
       window.open(url)
     },
     importLicense() {

From 7cf2aca5da5692b9d9bc28239be77d49bd26c90f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 4 Jun 2020 17:15:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat=EF=BC=9A=E5=88=A0=E6=8E=89cloudcenter,?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0vault?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/{CloudCenter.vue => Vault/index.vue} | 4 ++--
 src/views/xpack/{ => index}/Vault.vue                | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/views/xpack/{CloudCenter.vue => Vault/index.vue} (72%)
 rename src/views/xpack/{ => index}/Vault.vue (100%)

diff --git a/src/views/xpack/CloudCenter.vue b/src/views/xpack/Vault/index.vue
similarity index 72%
rename from src/views/xpack/CloudCenter.vue
rename to src/views/xpack/Vault/index.vue
index 1698b18d4..4b15380b0 100644
--- a/src/views/xpack/CloudCenter.vue
+++ b/src/views/xpack/Vault/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <h1 />
+  <h2>hello</h2>
 </template>
 
 <script>
 export default {
-  name: 'CloudCenter'
+  name: 'Vault'
 }
 </script>
 
diff --git a/src/views/xpack/Vault.vue b/src/views/xpack/index/Vault.vue
similarity index 100%
rename from src/views/xpack/Vault.vue
rename to src/views/xpack/index/Vault.vue

From a6ed8333f449731ed9c5c05b322588f96b788eca Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 4 Jun 2020 17:23:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[Fix]=20Xpack/=E6=94=B6=E9=9B=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/GatheredUser/TaskCreateUpdate.vue | 2 +-
 src/views/xpack/router.js                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
index c2d29a761..1b217f7bc 100644
--- a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
+++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
@@ -19,7 +19,7 @@ export default {
       url: '/api/v1/xpack/gathered-user/tasks/',
       initial: {
         is_periodic: true,
-        interval: 24
+        interval: null
       },
       fieldsMeta: {
         crontab: {
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 7db5457ab..d2c6dea54 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -32,27 +32,27 @@ export default {
           path: '',
           component: () => import('@/views/xpack/GatheredUser/GatheredUserList'),
           name: 'GatherUserList',
-          meta: { title: i18n.t('xpack.GatherUserList') }
+          meta: { title: i18n.t('xpack.GatherUserList'), activeMenu: '/xpack/gathered-users' }
         },
         {
           path: 'gathered-users/tasks',
           component: () => import('@/views/xpack/GatheredUser/TaskList'),
           name: 'GatherUserTaskList',
-          meta: { title: i18n.t('xpack.GatherUserTaskList') },
+          meta: { title: i18n.t('xpack.GatherUserTaskList'), activeMenu: '/xpack/gathered-users' },
           hidden: true
         },
         {
           path: 'gathered-users/tasks/create',
           component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
           name: 'GatherUserTaskCreate',
-          meta: { title: i18n.t('xpack.GatherUserTaskCreate'), activeMenu: '/xpack/gather-users' },
+          meta: { title: i18n.t('xpack.GatherUserTaskCreate'), activeMenu: '/xpack/gathered-users' },
           hidden: true
         },
         {
           path: 'gathered-users/tasks/:id/update',
           component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
           name: 'GatherUserTaskUpdate',
-          meta: { title: i18n.t('xpack.GatherUserTaskUpdate'), action: 'update', activeMenu: '/xpack/gather-users' },
+          meta: { title: i18n.t('xpack.GatherUserTaskUpdate'), action: 'update', activeMenu: '/xpack/gathered-users' },
           hidden: true
         }
       ]

From da70f1cba736add2d545a21c4ddf352b7f4f198a Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 4 Jun 2020 17:30:41 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[Fix]=20Xpack/=E7=BB=84=E7=BB=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/Org/OrganizationCreateUpdate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xpack/Org/OrganizationCreateUpdate.vue b/src/views/xpack/Org/OrganizationCreateUpdate.vue
index 9900c779a..147d650bb 100644
--- a/src/views/xpack/Org/OrganizationCreateUpdate.vue
+++ b/src/views/xpack/Org/OrganizationCreateUpdate.vue
@@ -42,7 +42,7 @@ export default {
             }
           },
           users: {
-            label: this.$t('xpack.USER'),
+            label: this.$t('xpack.User'),
             el: {
               value: [],
               ajax: {

From 8268862b52e8deaae6248b1a89c222016b81f38f Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 4 Jun 2020 17:58:10 +0800
Subject: [PATCH 6/6] add dialogDetailformatter

---
 .../formatters/DialogDetailFormatter.vue      | 63 +++++++++++++++++++
 src/components/ListTable/formatters/index.js  |  7 ++-
 src/userviews/assets/index.vue                | 33 +++++++++-
 3 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 src/components/ListTable/formatters/DialogDetailFormatter.vue

diff --git a/src/components/ListTable/formatters/DialogDetailFormatter.vue b/src/components/ListTable/formatters/DialogDetailFormatter.vue
new file mode 100644
index 000000000..3a8ab0600
--- /dev/null
+++ b/src/components/ListTable/formatters/DialogDetailFormatter.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <el-link class="detail" :type="col.type || 'success'" @click="dialogVisible=true">{{ iTitle }}</el-link>
+    <Dialog width="60%" :visible.sync="dialogVisible" :title="dialogTitle" :show-cancel="true" :show-confirm="false" @cancel="onCancel">
+      <DetailCard :items="detailCardItems" :title="detailTitle" />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import DetailCard from '@/components/DetailCard'
+import Dialog from '@/components/Dialog'
+import BaseFormatter from './base'
+export default {
+  name: 'DialogDetailFormatter',
+  components: {
+    DetailCard,
+    Dialog
+  },
+  extends: BaseFormatter,
+  props: {
+    formatterArgsDefault: {
+      type: Object,
+      default() {
+        return {
+          getDetailItems({ col, row, cellValue }) {
+            return []
+          },
+          getTitle({ col, row, cellValue }) {
+            return cellValue
+          },
+          getDetailTitle({ col, row, cellValue }) {
+            return ''
+          },
+          getDialogTile({ col, row, cellValue }) {
+            return cellValue
+          }
+        }
+      }
+    }
+  },
+  data() {
+    const formatterArgs = Object.assign(this.formatterArgsDefault, this.col.formatterArgs)
+    return {
+      formatterArgs: formatterArgs,
+      iTitle: formatterArgs.getTitle({ col: this.col, row: this.row, cellValue: this.cellValue }),
+      dialogTitle: formatterArgs.getDialogTile({ col: this.col, row: this.row, cellValue: this.cellValue }),
+      dialogVisible: false,
+      detailCardItems: formatterArgs.getDetailItems({ col: this.col, row: this.row, cellValue: this.cellValue }),
+      detailTitle: formatterArgs.getDetailTitle({ col: this.col, row: this.row, cellValue: this.cellValue })
+    }
+  },
+  methods: {
+    onCancel() {
+      this.dialogVisible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js
index 0071ac161..ccc164ade 100644
--- a/src/components/ListTable/formatters/index.js
+++ b/src/components/ListTable/formatters/index.js
@@ -7,6 +7,7 @@ import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
 import SystemUserFormatter from './GrantedSystemUsersShowFormatter'
 import ShowKeyFormatter from '@/components/ListTable/formatters/ShowKeyFormatter'
+import DialogDetailFormatter from './DialogDetailFormatter'
 
 export default {
   DetailFormatter,
@@ -17,7 +18,8 @@ export default {
   DeleteActionFormatter,
   DateFormatter,
   SystemUserFormatter,
-  ShowKeyFormatter
+  ShowKeyFormatter,
+  DialogDetailFormatter
 }
 
 export {
@@ -29,5 +31,6 @@ export {
   DeleteActionFormatter,
   DateFormatter,
   SystemUserFormatter,
-  ShowKeyFormatter
+  ShowKeyFormatter,
+  DialogDetailFormatter
 }
diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index 4223c1e4d..f06e573a5 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, SystemUserFormatter } from '@/components/ListTable/formatters'
+import { ActionsFormatter, SystemUserFormatter, DialogDetailFormatter } from '@/components/ListTable/formatters'
 export default {
   components: {
     GenericTreeListPage
@@ -36,7 +36,36 @@ export default {
           {
             prop: 'hostname',
             label: this.$t('assets.Hostname'),
-            formatter: DetailFormatter,
+            formatter: DialogDetailFormatter,
+            formatterArgs: {
+              getDialogTile: function({ col, row, cellValue }) {
+                return this.$t('assets.AssetDetail')
+              }.bind(this),
+              getDetailItems: function({ col, row, cellValue }) {
+                return [
+                  {
+                    key: this.$t('assets.Hostname'),
+                    value: row.hostname
+                  },
+                  {
+                    key: this.$t('assets.ip'),
+                    value: row.ip
+                  },
+                  {
+                    key: this.$t('assets.Protocols'),
+                    value: row.protocols.join(', ')
+                  },
+                  {
+                    key: this.$t('assets.Platform'),
+                    value: row.platform
+                  },
+                  {
+                    key: this.$t('assets.Domain'),
+                    value: row.domain
+                  }
+                ]
+              }.bind(this)
+            },
             sortable: true,
             align: 'center'
           },