From f6efefbc10b7d84c48b195304466d9b742d86468 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 15 Apr 2020 16:59:18 +0800
Subject: [PATCH 1/7] =?UTF-8?q?[update]=E6=8A=BD=E8=B1=A1Ztree=20+3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue        | 76 ++++++++++++++++---
 .../DataZTree/components/ZTree/index.vue      |  1 +
 src/components/DataZTree/index.vue            | 18 ++---
 src/i18n/langs/cn.js                          |  5 ++
 src/views/assets/AssetList.vue                |  2 +-
 5 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index f1715200c..70687d871 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -1,9 +1,9 @@
 <template>
   <DataZTree ref="dataztree" :setting="treeSetting">
     <slot slot="rMenu">
-      <li id="m_create" class="rmenu" tabindex="-1"><a><i class="fa fa-plus-square-o" /> 添加资产到节点 </a></li>
-      <li id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode"><a><i class="fa fa-pencil-square-o" /> 重命名节点 </a></li>
-      <li id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode"><a><i class="fa fa-minus-square" /> 删除节点 </a></li>
+      <li id="m_create" class="rmenu" tabindex="-1" @click="addTreeNode"><a><i class="fa fa-plus-square-o" /> {{ this.$t('tree.AddNode') }} </a></li>
+      <li id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode"><a><i class="fa fa-pencil-square-o" /> {{ this.$t('tree.RenameNode') }} </a></li>
+      <li id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode"><a><i class="fa fa-minus-square" /> {{ this.$t('tree.DeleteNode') }} </a></li>
       <slot name="rMenu" />
     </slot>
   </DataZTree>
@@ -29,22 +29,32 @@ export default {
       defaultSetting: {
         async: {
           enable: true,
-          url: this.setting.showAssets ? process.env.VUE_APP_BASE_API + this.setting.treeUrl : process.env.VUE_APP_BASE_API + this.setUrlParam(this.setting.treeUrl, 'assets', '1'),
+          url: this.treeSetting.showAssets
+            ? `${process.env.VUE_APP_BASE_API}${this.setting.treeUrl}`
+            : `${process.env.VUE_APP_BASE_API}${this.setUrlParam(this.setting.treeUrl, 'assets', '0')}`,
           autoParam: ['id=key', 'name=n', 'level=lv'],
           type: 'get'
         },
         callback: {
           onRightClick: this.onRightClick.bind(this),
-          onRename: this.onRename.bind(this)
-
+          onRename: this.onRename.bind(this),
+          onSelected: this.onSelected.bind(this),
+          beforeDrop: this.beforeDrop.bind(this),
+          onDrop: this.onDrop.bind(this)
+          // 尚未定义的函数
+          // beforeClick
+          // beforeDrag
+          // onDrag
+          // beforeAsync: this.defaultCallback.bind(this, 'beforeAsync')
         }
-      }
+      },
+      current_node: '',
+      current_node_id: ''
     }
   },
   computed: {
     treeSetting() {
       const treeSetting = merge(this.defaultSetting, this.setting)
-      console.log(treeSetting)
       return treeSetting
     },
     zTree() {
@@ -91,21 +101,38 @@ export default {
       if (this.rMenu) this.rMenu.css({ 'visibility': 'hidden' })
       $('body').unbind('mousedown', this.onBodyMouseDown)
     },
+    onSelected: function(event, treeNode) {
+      this.current_node = treeNode
+      this.current_node_id = treeNode.meta.node.id
+    },
     removeTreeNode: function() {
       this.hideRMenu()
       var currentNode = this.zTree.getSelectedNodes()[0]
-      console.log(currentNode)
       if (!currentNode) {
         return
       }
       this.$axios.delete(
-        `${this.nodeUrl}${currentNode.meta.node.id}/`,
+        `${this.treeSetting.nodeUrl}${currentNode.meta.node.id}/`,
       ).then(
         this.zTree.removeNode(currentNode)
       )
     },
     onRename: function(event, treeId, treeNode, isCancel) {
-      console.log(event, treeId, treeNode, isCancel)
+      var url = `${this.treeSetting.nodeUrl}${this.current_node_id}/`
+      if (isCancel) {
+        return
+      }
+      this.$axios.patch(
+        url,
+        { 'value': treeNode.name }
+      ).then(res => {
+        var assets_amount = treeNode.meta.node.assets_amount
+        if (!assets_amount) {
+          assets_amount = 0
+        }
+        treeNode.name = treeNode.name + ' (' + assets_amount + ')'
+        this.zTree.updateNode(treeNode)
+      })
     },
     onBodyMouseDown: function(event) {
       if (!(event.target.id === 'rMenu' || $(event.target).parents('#rMenu').length > 0)) {
@@ -134,6 +161,33 @@ export default {
         this.zTree.selectNode(treeNode)
         this.showRMenu('node', event.clientX, event.clientY)
       }
+    },
+    beforeDrop: function(treeId, treeNodes, targetNode, moveType) {
+      var treeNodesNames = []
+      $.each(treeNodes, function(index, value) {
+        treeNodesNames.push(value.name)
+      })
+
+      // TODO 修改默认确认框
+      var msg = '你想移动节点: `' + treeNodesNames.join(',') + '` 到 `' + targetNode.name + '` 下吗?'
+      return confirm(msg)
+    },
+    onDrop: function(event, treeId, treeNodes, targetNode, moveType) {
+      var treeNodesIds = []
+      $.each(treeNodes, function(index, value) {
+        treeNodesIds.push(value.meta.node.id)
+      })
+      var the_url = `${this.treeSetting.nodeUrl}${targetNode.meta.node.id}/children/add/`
+      this.$axios.put(
+        the_url, {
+          nodes: treeNodesIds
+        }
+      ).then((res) => {
+        console.log(res)
+      })
+    },
+    addTreeNode: function() {
+      alert('添加资产到节点')
     }
   }
 }
diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index ba085d99c..ca667846e 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -55,6 +55,7 @@ export default {
   },
   methods: {
     initTree: function() {
+      console.log(this.treeSetting)
       this.$axios.get(this.treeSetting.treeUrl).then(res => {
         this.zTree = $.fn.zTree.init($('#ztree'), this.treeSetting, res)
         if (this.treeSetting.showRefresh) {
diff --git a/src/components/DataZTree/index.vue b/src/components/DataZTree/index.vue
index 9d65e56c7..d88e8ea10 100644
--- a/src/components/DataZTree/index.vue
+++ b/src/components/DataZTree/index.vue
@@ -43,15 +43,15 @@ export default {
           }
         },
         callback: {
-          onRightClick: this.defaultCallback('onRightClick'),
-          onRename: this.defaultCallback('Rename'),
-          beforeClick: this.defaultCallback('beforeClick'),
-          onSelected: this.defaultCallback('onSelected'),
-          beforeDrag: this.defaultCallback('beforeDrag'),
-          onDrag: this.defaultCallback('onDrag'),
-          beforeDrop: this.defaultCallback('beforeDrop'),
-          onDrop: this.defaultCallback('onDrop'),
-          beforeAsync: this.defaultCallback('beforeAsync')
+          onRightClick: this.defaultCallback.bind(this, 'onRightClick'),
+          onRename: this.defaultCallback.bind(this, 'onRename'),
+          beforeClick: this.defaultCallback.bind(this, 'beforeClick'),
+          onSelected: this.defaultCallback.bind(this, 'onSelected'),
+          beforeDrag: this.defaultCallback.bind(this, 'beforeDrag'),
+          onDrag: this.defaultCallback.bind(this, 'onDrag'),
+          beforeDrop: this.defaultCallback.bind(this, 'beforeDrop'),
+          onDrop: this.defaultCallback.bind(this, 'onDrop'),
+          beforeAsync: this.defaultCallback.bind(this, 'beforeAsync')
         }
       }
     }
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 63019d979..07290c620 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -403,6 +403,11 @@ const cn = {
     'MyTickets': '我的工单',
     'AssignedMe': '待处理'
   },
+  tree: {
+    'AddNode': '添加资产到节点',
+    'RenameNode': '重命名节点',
+    'DeleteNode': '删除节点'
+  },
   setting: {
     'setting': '系统设置',
     'basicsetting': '基本设置'
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index 2d96e762a..eaceef7d0 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -17,9 +17,9 @@ export default {
         treeSetting: {
           showMenu: true,
           showRefresh: true,
+          showAssets: false,
           nodeUrl: '/api/v1/assets/nodes/',
           treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'
-
         },
         columns: [
           {

From c0a193a8a1c31590db292ad74576ba02e3bf47d0 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Apr 2020 15:15:12 +0800
Subject: [PATCH 2/7] =?UTF-8?q?[update]=E4=BF=AE=E5=A4=8DUrl=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=AF=BC=E8=87=B4=E6=B6=88=E6=81=AF=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=88=B0=E5=AD=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 4 +---
 src/views/assets/AssetList.vue         | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 70687d871..0a1d09011 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -29,9 +29,7 @@ export default {
       defaultSetting: {
         async: {
           enable: true,
-          url: this.treeSetting.showAssets
-            ? `${process.env.VUE_APP_BASE_API}${this.setting.treeUrl}`
-            : `${process.env.VUE_APP_BASE_API}${this.setUrlParam(this.setting.treeUrl, 'assets', '0')}`,
+          url: `${process.env.VUE_APP_BASE_API}${this.setting.treeUrl}`,
           autoParam: ['id=key', 'name=n', 'level=lv'],
           type: 'get'
         },
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index eaceef7d0..e06f99223 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -19,6 +19,7 @@ export default {
           showRefresh: true,
           showAssets: false,
           nodeUrl: '/api/v1/assets/nodes/',
+          // ?assets=0不显示资产. =1显示资产
           treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'
         },
         columns: [

From 5ac1d6ac375911605b3101e4357ba3cfbdac6064 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Apr 2020 15:42:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 25 ++++++++++++++++++++++++-
 src/i18n/langs/cn.js                   |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 0a1d09011..d8bfec88d 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -173,6 +173,7 @@ export default {
     onDrop: function(event, treeId, treeNodes, targetNode, moveType) {
       var treeNodesIds = []
       $.each(treeNodes, function(index, value) {
+        console.log(value)
         treeNodesIds.push(value.meta.node.id)
       })
       var the_url = `${this.treeSetting.nodeUrl}${targetNode.meta.node.id}/children/add/`
@@ -185,7 +186,29 @@ export default {
       })
     },
     addTreeNode: function() {
-      alert('添加资产到节点')
+      this.hideRMenu()
+      var parentNode = this.zTree.getSelectedNodes()[0]
+      if (!parentNode) {
+        return
+      }
+      // http://localhost/api/v1/assets/nodes/85aa4ee2-0bd9-41db-9079-aa3646448d0c/children/
+      var url = `${this.treeSetting.nodeUrl}${parentNode.meta.node.id}/children/`
+      this.$axios.post(
+        url, {}
+      ).then(data => {
+        var newNode = {
+          id: data['key'],
+          name: data['value'],
+          pId: parentNode.id,
+          meta: {
+            'node': data
+          }
+        }
+        newNode.checked = this.zTree.getSelectedNodes()[0].checked
+        this.zTree.addNodes(parentNode, 0, newNode)
+        var node = this.zTree.getNodeByParam('id', newNode.id, parentNode)
+        this.zTree.editName(node)
+      })
     }
   }
 }
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 4b1e0f06e..ef2e47b00 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -427,7 +427,7 @@ const cn = {
     'AssignedMe': '待处理'
   },
   tree: {
-    'AddNode': '添加资产到节点',
+    'AddNode': '添加节点',
     'RenameNode': '重命名节点',
     'DeleteNode': '删除节点'
   },

From 2aa2e2d96a27fdf0c44a8780ab0868b1475654c0 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Apr 2020 15:58:05 +0800
Subject: [PATCH 4/7] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84ZTree=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataZTree/components/ZTree/index.vue      |   2 +-
 src/styles/loading.gif                        | Bin 0 -> 381 bytes
 src/styles/ztree.css                          | 412 ++++++++++++++++++
 3 files changed, 413 insertions(+), 1 deletion(-)
 create mode 100644 src/styles/loading.gif
 create mode 100644 src/styles/ztree.css

diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index ca667846e..d9fd486bf 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -17,7 +17,7 @@
 // eslint-disable-next-line no-unused-vars
 import $ from '@/utils/jquery-vendor.js'
 import 'ztree'
-import 'ztree/css/metroStyle/metroStyle.css'
+import '@/styles/ztree.css'
 const merge = require('deepmerge')
 
 const defaultObject = {
diff --git a/src/styles/loading.gif b/src/styles/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8c289293b11c889703d83dce6631fce90da4630
GIT binary patch
literal 381
zcmZ?wbhEHb6krfwSj5I~=*GvEjZcb~Jveda^Z5r~o`3lD|Nnmm1_s6d+<vYh!Oo5W
zu10zW%#0wRpDe6g3~UTKKsHdb00RTFLB=lEtp-v?9We?Fm*e^y1ze`Erb>T_)p@)n
z{^qIIq1(T$e$~zMQ}6t1w^a|Cj;Amo3}FHq!p^`7G=x7ROJIXqM}S9S9}m;(SWbi*
zHiVjpkZW$u7K<e~64(Tvu_CGAVqgNA!VWY?AR;8qWQpdrELO%X3QmU|kSqf^8>%QH
zEX1o><JlA@#uW;O&Uzs!Vq@S!xX5*D8xIpxf?fv$ii?;KYB(6Li78nuj!;aU<oHY%
b$wdqZ%QzU*6c++rq`Sn#$m6gp6N5DXy8K|j

literal 0
HcmV?d00001

diff --git a/src/styles/ztree.css b/src/styles/ztree.css
new file mode 100644
index 000000000..ca36ad533
--- /dev/null
+++ b/src/styles/ztree.css
@@ -0,0 +1,412 @@
+/*-------------------------------------
+zTree Style using fontawesome instead of images
+
+version:    1.1
+author:     Mike King
+email:      mikkelking @ hotmail . com
+website:    http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+/* Definitions ----------------------*/
+/* End of Definitions ---------------*/
+/* Imports  -------------------------*/
+/* End of Imports  ------------------*/
+.ztree * {
+  padding: 0;
+  margin: 0;
+  font-size: 12px;
+  font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
+  background-color: #f3f3f3;
+}
+.ztree {
+  margin: 0;
+  padding: 5px;
+  color: #676a6c;
+  background-color: #f3f3f3;
+}
+.ztree li {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+  line-height: 17px;
+  text-align: left;
+  white-space: nowrap;
+  outline: 0;
+}
+.ztree li ul {
+  margin: 0px;
+  padding: 0 0 0 18px;
+}
+.ztree li a {
+  padding-right: 3px;
+  margin: 0;
+  cursor: pointer;
+  height: 20px;
+  color: #676a6c;
+  background-color: transparent;
+  text-decoration: none;
+  vertical-align: top;
+  display: inline-block;
+}
+.ztree li a input.rename {
+  height: 14px;
+  width: 80px;
+  padding: 0;
+  margin: 0;
+  color: #f3f3f3;
+  background-color: #676a6c;
+  font-size: 12px;
+  border: 1px #585956 solid;
+  *border: 0px;
+}
+.ztree li a:hover {
+  background: #e7f4f9;
+  border-radius: 2px;
+  box-shadow: inset 0 0 1px #cccccc;
+}
+.ztree li a.curSelectedNode {
+  padding-top: 0px;
+  background-color: #beebff;
+  color: #676a6c;
+  height: 20px;
+  opacity: 0.8;
+}
+.ztree li a.curSelectedNode_Edit {
+  padding-top: 0px;
+  background-color: #f3f3f3;
+  color: red;
+  height: 20px;
+  border: 1px #676a6c solid;
+  opacity: 0.8;
+}
+.ztree li a.tmpTargetNode_inner {
+  padding-top: 0px;
+  background-color: #f3f3f3;
+  color: #676a6c;
+  height: 20px;
+  border: 1px #666 solid;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.ztree li span {
+  line-height: 20px;
+  margin-right: 2px;
+  background-color: transparent;
+}
+.ztree li span.button {
+  line-height: 0;
+  margin: 0;
+  padding: 0;
+  width: 18px;
+  height: 20px;
+  display: inline-block;
+  vertical-align: top;
+  border: 0px solid;
+  cursor: pointer;
+  outline: none;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-attachment: scroll;
+}
+.ztree li span.button::before {
+  color: #676a6c;
+  font-family: FontAwesome;
+  padding-top: 10px;
+}
+.ztree li span.button.chk {
+  margin: 0px;
+  cursor: auto;
+  width: 12px;
+  display: inline-block;
+  padding-top: 10px;
+  padding-left: 2px;
+}
+.ztree li span.button.chk.checkbox_false_full::before {
+  content: "\f096";
+}
+.ztree li span.button.chk.checkbox_false_full_focus::before {
+  content: "\f096";
+  color: #676a6c;
+}
+.ztree li span.button.chk.checkbox_false_part::before {
+  content: "\f096";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.checkbox_false_part_focus::before {
+  content: "\f096";
+  color: #cad96c;
+}
+.ztree li span.button.chk.checkbox_false_disable::before {
+  content: "\f096";
+  color: #808080;
+}
+.ztree li span.button.chk.checkbox_true_full::before {
+  content: "\f046";
+}
+.ztree li span.button.chk.checkbox_true_full_focus::before {
+  content: "\f046";
+}
+.ztree li span.button.chk.checkbox_true_part::before {
+  content: "\f14a";
+}
+.ztree li span.button.chk.checkbox_true_part_focus::before {
+  content: "\f14a";
+  color: #676a6c;
+}
+.ztree li span.button.chk.checkbox_true_full_focus::before {
+  content: "\f046";
+  color: #676a6c;
+}
+.ztree li span.button.chk.checkbox_true_part::before {
+  content: "\f046";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.checkbox_true_part_focus::before {
+  content: "\f046";
+  color: #cad96c;
+}
+.ztree li span.button.chk.checkbox_true_disable::before {
+  content: "\f046";
+  color: #808080;
+}
+.ztree li span.button.chk.radio_false_full::before {
+  content: "\f10c";
+}
+.ztree li span.button.chk.radio_false_full_focus::before {
+  content: "\f10c";
+  color: #676a6c;
+}
+.ztree li span.button.chk.radio_false_part::before {
+  content: "\f10c";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_false_part_focus::before {
+  content: "\f10c";
+  color: #676a6c;
+}
+.ztree li span.button.chk.radio_false_disable::before {
+  content: "\f1db";
+  color: #808080;
+}
+.ztree li span.button.chk.radio_true_full::before {
+  content: "\f192";
+}
+.ztree li span.button.chk.radio_true_full_focus::before {
+  content: "\f192";
+  color: #676a6c;
+}
+.ztree li span.button.chk.radio_true_part::before {
+  content: "\f192";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_true_part_focus::before {
+  content: "\f192";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_true_disable::before {
+  content: "\f1db";
+  color: #808080;
+}
+.ztree li span.button.switch {
+  width: 18px;
+  height: 20px;
+}
+.ztree li span.button.root_open::before {
+  content: "\f107";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.root_close::before {
+  content: "\f105";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.roots_open::before {
+  content: "\f107";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.roots_close::before {
+  content: "\f105";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.center_open::before {
+  content: "\f107";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.center_close::before {
+  content: "\f105";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.bottom_open::before {
+  content: "\f107";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.bottom_close::before {
+  content: "\f105";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.root_docu {
+  background: none;
+}
+.ztree li span.button.roots_docu::before {
+  content: "\f114";
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.center_docu::before {
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.bottom_docu::before {
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.noline_docu {
+  background: none;
+}
+.ztree li span.button.ico_open::before {
+  content: "\f07c";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.ico_close::before {
+  content: "\f07b";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.ico_docu::before {
+  content: "\f07b";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.file_ico_docu::before {
+  content: "\f022";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.linux_ico_docu::before {
+  content: "\f17c";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.windows_ico_docu::before {
+  content: "\f17a";
+  font-family: FontAwesome;
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #676a6c;
+}
+.ztree li span.button.edit {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  *vertical-align: middle;
+  padding-top: 10px;
+}
+.ztree li span.button.edit::before {
+  content: "\f044";
+  font-family: FontAwesome;
+}
+.ztree li span.button.remove {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  *vertical-align: middle;
+  padding-top: 10px;
+}
+.ztree li span.button.remove::before {
+  content: "\f1f8";
+  font-family: FontAwesome;
+}
+.ztree li span.button.add {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  *vertical-align: middle;
+  padding-top: 10px;
+}
+.ztree li span.button.add::before {
+  content: "\f067";
+  font-family: FontAwesome;
+}
+.ztree li span.button.ico_loading {
+  margin-right: 2px;
+  background: url(./loading.gif) no-repeat scroll 0 0 transparent;
+  vertical-align: top;
+  *vertical-align: middle;
+}
+ul.tmpTargetzTree {
+  background-color: #FFE6B0;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+span.tmpzTreeMove_arrow {
+  width: 16px;
+  height: 20px;
+  display: inline-block;
+  padding: 0;
+  margin: 2px 0 0 1px;
+  border: 0 none;
+  position: absolute;
+  background-color: transparent;
+  background-attachment: scroll;
+}
+span.tmpzTreeMove_arrow::before {
+  content: "\f04b";
+  font-family: FontAwesome;
+  color: #676a6c;
+}
+ul.ztree.zTreeDragUL {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  width: auto;
+  height: auto;
+  overflow: hidden;
+  background-color: #cfcfcf;
+  border: 1px #676a6c dotted;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.ztreeMask {
+  z-index: 10000;
+  background-color: #cfcfcf;
+  opacity: 0.0;
+  filter: alpha(opacity=0);
+  position: absolute;
+}

From 3b887c49e17a1ad2e834d4ac6ebd6543987f09ef Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Apr 2020 16:42:48 +0800
Subject: [PATCH 5/7] =?UTF-8?q?[update]=E5=AE=8C=E6=88=90=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 3 +++
 src/components/TreeTable/index.vue     | 2 +-
 src/views/assets/AssetList.vue         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index d8bfec88d..4b3b081f3 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -99,9 +99,12 @@ export default {
       if (this.rMenu) this.rMenu.css({ 'visibility': 'hidden' })
       $('body').unbind('mousedown', this.onBodyMouseDown)
     },
+    // Request URL: http://localhost/api/v1/assets/assets/?node_id=d8212328-538d-41a6-bcfd-1e8cc7e3aed4&show_current_asset=null&draw=2&limit=15&offset=0&_=1587022917769
+
     onSelected: function(event, treeNode) {
       this.current_node = treeNode
       this.current_node_id = treeNode.meta.node.id
+      this.$emit('urlChange', `${this.setting.url}?node_id=${treeNode.meta.node.id}&show_current_asset=null`)
     },
     removeTreeNode: function() {
       this.hideRMenu()
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 1d000aec2..7556307b4 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -4,7 +4,7 @@
     <el-collapse-transition>
       <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
         <div v-show="ShowTree" :style="ShowTree?('width:250px;'):('width:0;')" class="transition-box">
-          <AutoDataZTree :setting="treeSetting" />
+          <AutoDataZTree :setting="treeSetting" @urlChange="handleUrlChange" />
         </div>
         <div :style="ShowTree?('display: flex;width: calc(100% - 250px);'):('display: flex;width:100%;')">
           <div class="mini">
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index e06f99223..3f05688d1 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -18,6 +18,7 @@ export default {
           showMenu: true,
           showRefresh: true,
           showAssets: false,
+          url: '/api/v1/assets/assets/',
           nodeUrl: '/api/v1/assets/nodes/',
           // ?assets=0不显示资产. =1显示资产
           treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'

From fdb3195fd78b3ce386e833fa0908dacec231ed4f Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Apr 2020 18:57:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84Assets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/GatewayList.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index bd32f6e73..d30fc8c4d 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -69,6 +69,10 @@ export default {
         ]
       },
       headerActions: {
+        hasRightActions: false,
+        hasExport: false,
+        hasImport: false,
+        hasRefresh: false,
         hasBulkDelete: false,
         createRoute: 'GatewayCreate'
       }

From 15c29a460229ea7a102ae6f7b1a6d0c20127e399 Mon Sep 17 00:00:00 2001
From: Eric_Lee <xplzv@126.com>
Date: Mon, 20 Apr 2020 13:02:01 +0800
Subject: [PATCH 7/7] terminal detail page (#22)

---
 src/api/sessions.js                   |  7 +++
 src/i18n/langs/cn.js                  |  8 ++-
 src/i18n/langs/en.js                  |  8 ++-
 src/router/index.js                   | 14 +++++
 src/views/sessions/TerminalDetail.vue | 83 +++++++++++++++++++++++++++
 src/views/sessions/TerminalList.vue   | 58 ++++++++-----------
 6 files changed, 143 insertions(+), 35 deletions(-)
 create mode 100644 src/views/sessions/TerminalDetail.vue

diff --git a/src/api/sessions.js b/src/api/sessions.js
index e53880518..4d4981fcb 100644
--- a/src/api/sessions.js
+++ b/src/api/sessions.js
@@ -21,3 +21,10 @@ export function getSessionCommands(id) {
     method: 'get'
   })
 }
+
+export function getTerminalDetail(id) {
+  return request({
+    url: `/api/v1/terminal/terminals/${id}/`,
+    method: 'get'
+  })
+}
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index ef2e47b00..c3081f5ed 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -407,7 +407,13 @@ const cn = {
     'quickModify': '快速修改',
     'replaySession': '回放会话:',
     'downloadReplay': '下载录像:',
-    'go': '执行'
+    'go': '执行',
+    'terminalDetail': '终端详情',
+    'name': '名称:',
+    'sshPort': 'SSH端口:',
+    'httpPort': 'HTTP端口:',
+    'comment': '备注:',
+    'dateCreated': '创建日期:'
   },
   jobcenter: {
     'RunTimes': '执行次数',
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index 44f3a82af..cb2026226 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -301,7 +301,13 @@ const en = {
     'quickModify': 'Quick Modify',
     'replaySession': 'Replay session:',
     'downloadReplay': 'Download replay:',
-    'go': 'Go'
+    'go': 'Go',
+    'terminalDetail': 'terminalDetail',
+    'name': 'Name:',
+    'sshPort': 'SSH port:',
+    'httpPort': 'Http port:',
+    'comment': 'Comment:',
+    'dateCreated': 'Date created:'
   },
   setting: {
     'setting': 'System Setting',
diff --git a/src/router/index.js b/src/router/index.js
index 60be72062..211beeb84 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -346,6 +346,20 @@ export const constantRoutes = [
         name: 'TerminalList',
         component: () => import('@/views/sessions/TerminalList'),
         meta: { title: 'Terminal' }
+      },
+      {
+        path: 'terminal/:id',
+        name: 'TerminalDetail',
+        component: () => import('@/views/sessions/TerminalDetail'),
+        meta: { title: 'TerminalDetail' },
+        hidden: true
+      },
+      {
+        path: 'terminal/:id/update',
+        name: 'TerminalUpdate',
+        component: () => import('@/views/tree/index'),
+        meta: { title: 'TerminalUpdate' },
+        hidden: true
       }
     ]
   },
diff --git a/src/views/sessions/TerminalDetail.vue b/src/views/sessions/TerminalDetail.vue
new file mode 100644
index 000000000..29651b853
--- /dev/null
+++ b/src/views/sessions/TerminalDetail.vue
@@ -0,0 +1,83 @@
+<template>
+  <GenericDetailPage :submenu="submenu" :active-menu="activeSubMenu" :title="title">
+    <div slot="detail">
+      <el-row :gutter="20">
+        <el-col :span="14">
+          <DetailCard :title="cardTitle" :items="detailItems" />
+        </el-col>
+      </el-row>
+    </div>
+  </GenericDetailPage>
+
+</template>
+
+<script>
+import { GenericDetailPage } from '@/layout/components'
+import DetailCard from '@/components/DetailCard/index'
+import { getTerminalDetail } from '@/api/sessions'
+
+export default {
+  name: 'TerminalDetail',
+  components: {
+    GenericDetailPage,
+    DetailCard
+  },
+  data() {
+    return {
+      terminalData: {},
+      activeSubMenu: 'detail',
+      submenu: [
+        {
+          title: this.$t('sessions.terminalDetail'),
+          name: 'detail'
+        }
+      ]
+    }
+  },
+  computed: {
+    title() {
+      return this.$t('sessions.terminalDetail')
+    },
+    cardTitle() {
+      return this.terminalData.name
+    },
+    detailItems() {
+      return [
+        {
+          key: this.$t('sessions.name'),
+          value: this.terminalData.name
+        },
+        {
+          key: this.$t('sessions.remoteAddr'),
+          value: this.terminalData.remote_addr
+        },
+        {
+          key: this.$t('sessions.sshPort'),
+          value: this.terminalData.ssh_port
+        },
+        {
+          key: this.$t('sessions.httpPort'),
+          value: this.terminalData.http_port
+        },
+        {
+          key: this.$t('sessions.dateCreated'),
+          value: this.terminalData.date_created
+        },
+        {
+          key: this.$t('sessions.comment'),
+          value: this.terminalData.comment
+        }
+      ]
+    }
+  },
+  mounted() {
+    getTerminalDetail(this.$route.params.id).then(data => {
+      this.terminalData = data
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index aa8da38f6..c1f8ad974 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/ListTable/formatters/index'
+import { ActionsFormatter, BooleanFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -13,47 +13,39 @@ export default {
   data() {
     return {
       tableConfig: {
-        axiosConfig: {
-          raw: 1,
-          params: {
-            display: 1,
-            is_finished: 0
-          }
-        },
         url: '/api/v1/terminal/terminals/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$tc('Name'),
-            key: 'name',
-            formatter: DetailFormatter,
-            sortable: true,
-            route: 'TerminalDetail'
-          },
-          {
-            prop: 'remote_addr',
-            label: this.$t('sessions.addr'),
+        columns: ['name', 'remote_addr', 'session_online', 'is_active', 'is_alive', 'actions'],
+        columnsMeta: {
+          name: {
             sortable: 'custom'
           },
-          {
-            prop: 'session_online',
-            label: this.$t('sessions.session'),
-            sortable: true
-          },
-          {
-            prop: 'is_active',
-            label: this.$t('sessions.active')
-          },
-          {
-            prop: 'is_alive',
-            label: this.$t('sessions.alive'),
+          remote_addr: {
             sortable: 'custom'
+          },
+          is_active: {
+            label: this.$t('sessions.active'),
+            formatter: BooleanFormatter
+          },
+          is_alive: {
+            label: this.$t('sessions.alive')
+          },
+          session_online: {
+            label: this.$t('sessions.session')
+          },
+          actions: {
+            prop: 'id',
+            formatter: ActionsFormatter
           }
-        ]
+        }
       },
       headerActions: {
         hasCreate: false,
         hasBulkDelete: false,
+        hasUpload: false,
+        hasExport: false,
+        hasImport: false,
+        hasUpdate: false,
+        hasRefresh: false,
         extraActions: [
           {
             name: 'StorageConfiguration',