@electerm/electerm-react 1.37.58 → 1.37.60

package/client/common/create-title.js

@@ -9,7 +9,10 @@ import {
 const { prefix } = window
 const p = prefix('sftp')
 
-export default (res = {}) => {
+export default (res) => {
+  if (!res) {
+    return ''
+  }
   const {
     host, port, username, title, type,
     path, connectionHoppings

package/client/components/quick-commands/quick-commands-list.jsx

@@ -34,6 +34,9 @@ export default class QuickCommandsList extends List {
   }
 
   renderItem = (item, i) => {
+    if (!item) {
+      return null
+    }
     const { activeItemId } = this.props
     const { name, id } = item
     const cls = classnames(

package/client/components/sidebar/side-panel.jsx

@@ -3,8 +3,8 @@ export default class SidePanel extends PureComponent {
   handleMousedown = (e) => {
     this.dragStart = true
     this.clientX = e.clientX
-    document.body.addEventListener('mouseup', this.handleMouseup)
-    document.body.addEventListener('mousemove', this.handleMousemove)
+    window.addEventListener('mouseup', this.handleMouseup)
+    window.addEventListener('mousemove', this.handleMousemove)
   }
 
   handleMouseup = (e) => {
@@ -12,15 +12,15 @@ export default class SidePanel extends PureComponent {
     const {
       clientX
     } = e
-    let nw = clientX - this.clientX + 300
+    let nw = clientX - this.clientX + this.props.leftSidebarWidth
     if (nw < 343) {
       nw = 343
     } else if (nw > 600) {
       nw = 600
     }
     this.props.setLeftSidePanelWidth(nw)
-    document.body.removeEventListener('mouseup', this.handleMouseup)
-    document.body.removeEventListener('mousemove', this.handleMousemove)
+    window.removeEventListener('mouseup', this.handleMouseup)
+    window.removeEventListener('mousemove', this.handleMousemove)
   }
 
   handleMousemove = (e) => {
@@ -28,8 +28,17 @@ export default class SidePanel extends PureComponent {
       clientX
     } = e
     const el = document.getElementById('side-panel')
-    const nw = clientX - this.clientX + this.props.leftSidebarWidth
+    let nw = clientX - this.clientX + this.props.leftSidebarWidth
+    if (nw < 343) {
+      nw = 343
+    } else if (nw > 600) {
+      nw = 600
+    }
     el.style.width = nw + 'px'
+    const el1 = document.querySelector('.sessions')
+    if (el1) {
+      el1.style.marginLeft = (nw + 43) + 'px'
+    }
   }
 
   render () {

package/client/components/sidebar/sidebar.styl

@@ -9,7 +9,7 @@
   z-index 200
   width 0
   overflow-y scroll
-  background main-light
+  background main
   color text
   .item-list-unit:hover
     .list-item-remove
@@ -51,14 +51,12 @@
   position absolute
   left 43px
   top 45px
-  bottom 36px
+  bottom 0
   z-index 200
   width 0
-  border-top 5px solid main
+  border-right 1px solid darken(main, 30%)
 
 .pinned
-  .sidebar-list
-    bottom 0
   .drag-handle
     display block
   .sidebar-panel .pinned

package/client/components/terminal-info/content.jsx

@@ -67,8 +67,12 @@ export default class TerminalInfoContent extends PureComponent {
       clientX
     } = e
     const el = document.getElementById('info-panel-wrap')
-    const nw = this.clientX - clientX + this.props.rightSidebarWidth
-    console.log(nw, this.clientX, clientX, this.props.rightSidebarWidth)
+    let nw = this.clientX - clientX + this.props.rightSidebarWidth
+    if (nw < 400) {
+      nw = 400
+    } else if (nw > 1000) {
+      nw = 1000
+    }
     el.style.width = nw + 'px'
   }
 

package/client/components/terminal-info/terminal-info.styl

@@ -9,7 +9,10 @@
   top 100px
   bottom 0
   width 500px
-  background main-light
+  background main
+  border 1px solid darken(main, 30%)
+  border-radius 5px 0 0 5px
+  border-right none
   color text
   z-index 100
   overflow-y scroll

package/client/store/load-data.js

@@ -154,7 +154,7 @@ export default (Store) => {
       globs.langs
     )
     store.zoom(store.config.zoom, false, true)
-    initWsCommon()
+    await initWsCommon()
   }
   Store.prototype.initData = async function () {
     const { store } = window

package/client/store/watch.js

@@ -14,7 +14,7 @@ import {
 } from '../common/constants'
 import postMsg from '../common/post-msg'
 import * as ls from '../common/safe-local-storage'
-import { debounce } from 'lodash-es'
+import { debounce, isEmpty } from 'lodash-es'
 
 export default store => {
   autoRun(store, () => {
@@ -65,7 +65,7 @@ export default store => {
   }).start()
 
   autoRun(store, () => {
-    if (store.config) {
+    if (!isEmpty(store.config)) {
       window.pre.runGlobalAsync('saveUserConfig', store.config)
     }
     return store._config

package/package.json

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