@electerm/electerm-react 1.39.35 → 1.39.46

package/client/components/{setting-panel → tree-list}/tree-list.styl

@@ -1,7 +1,3 @@
-.tree-list
-    .ant-tree-child-tree
-      span.ant-tree-switcher.ant-tree-switcher-noop
-        display none
 
 .tree-control-btn
   display none
@@ -11,20 +7,33 @@
   height 20px
 .tree-item
   display flex
+  line-height 26px
+  padding-left 5px
+  border-radius 3px
   &.is-category
     .tree-item-title
       font-weight bold
+      font-size 14px
+  &.selected
+  &.item-dragover
+  &:hover
+    background #000
+    color #eee
+    cursor pointer
   &:hover
     .tree-control-btn
       display inline-block
       vertical-align middle
+  &.item-dragover-top
+    border-top 1px solid #18d551
 .tree-item-title
   flex-grow 1
-  height 20px
+  line-height 26px
   max-width 300px
   overflow hidden
   white-space nowrap
   text-overflow ellipsis
+
 .sidebar-panel .tree-item-title
   max-width 180px
 .with-plus
@@ -46,4 +55,15 @@
     right 0
     top 0
   .open-all-icon.tree-control-btn
-    right 20px
+    right 20px
+.group-container
+  padding-left 12px
+  position relative
+  line-height 30px
+.tree-expander
+  position absolute
+  left 0
+  top 0
+  width 12px
+  font-size 11px
+  line-height 30px

package/client/store/common.js

@@ -4,7 +4,7 @@
 
 import handleError from '../common/error-handler'
 import { Modal } from 'antd'
-import { debounce } from 'lodash-es'
+import { debounce, some } from 'lodash-es'
 import postMessage from '../common/post-msg'
 import {
   commonActions,
@@ -227,9 +227,23 @@ export default Store => {
     // delete tab.password
     // delete tab.privateKey
     // delete tab.passphrase
+    delete p.name
+    delete p.id
     return {
       ...tab,
       ...p
     }
   }
+  Store.prototype.applyProfileToTabs = function (tab) {
+    if (
+      tab.connectionHoppings &&
+      tab.connectionHoppings.length &&
+      some(tab.connectionHoppings, s => s.profile)
+    ) {
+      tab.connectionHoppings = tab.connectionHoppings.map(s => {
+        return window.store.applyProfile(s)
+      })
+    }
+    return window.store.applyProfile(tab)
+  }
 }

package/client/store/index.js

@@ -270,6 +270,30 @@ class Store {
       algorithm: isColorDark(themeConf.main) ? theme.darkAlgorithm : theme.defaultAlgorithm
     }
   }
+
+  get bookmarkTree () {
+    const {
+      bookmarks
+    } = window.store
+    return bookmarks.reduce((p, v) => {
+      return {
+        ...p,
+        [v.id]: v
+      }
+    }, {})
+  }
+
+  get bookmarkGroupTree () {
+    const {
+      bookmarkGroups
+    } = window.store
+    return bookmarkGroups.reduce((p, v) => {
+      return {
+        ...p,
+        [v.id]: v
+      }
+    }, {})
+  }
 }
 
 const getterProps = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.39.35",
+  "version": "1.39.46",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",