@electerm/electerm-react 1.34.48 → 1.34.50

package/client/common/new-terminal.js

@@ -16,7 +16,7 @@ export function updateCount (tab) {
   window.et.tabCount++
 }
 
-export default (removeTitle) => {
+export default (removeTitle, noUpdateCount) => {
   const res = {
     id: generate(),
     status: 'processing',
@@ -26,6 +26,8 @@ export default (removeTitle) => {
   if (removeTitle) {
     delete res.title
   }
-  updateCount(res)
+  if (!noUpdateCount) {
+    updateCount(res)
+  }
   return res
 }

package/client/components/bookmark-form/ssh-form.jsx

@@ -303,7 +303,7 @@ export default class BookmarkForm extends PureComponent {
     if (evt !== 'save' && evt !== 'saveAndCreateNew') {
       this.props.store.addTab({
         ...copy(obj),
-        ...newTerm(true)
+        ...newTerm(true, true)
       })
       this.props.hide()
     }

package/client/components/main/upgrade.jsx

@@ -134,7 +134,7 @@ export default class Upgrade extends PureComponent {
     if (!isMac && !isWin && installSrc === 'npm') {
       return window.store.addTab(
         {
-          ...newTerm(),
+          ...newTerm(undefined, true),
           loginScript: 'npm i -g electerm'
         }
       )

package/client/components/session/session.jsx

@@ -80,7 +80,7 @@ export default class SessionWrapper extends Component {
       key: Math.random(),
       sessionOptions: null,
       sessionId: generate(),
-      terminals,
+      terminals: terminals.slice(0, 1),
       showInfo: false,
       infoPanelProps: {}
     }
@@ -437,8 +437,10 @@ export default class SessionWrapper extends Component {
                   key={type + '_' + i}
                   onClick={() => this.onChangePane(types[i])}
                 >
-                  {e(type)}
-                  <span className='type-tab-line' />
+                  <span className='type-tab-txt'>
+                    {e(type)}
+                    <span className='type-tab-line' />
+                  </span>
                 </span>
               )
             })

package/client/components/session/session.styl

@@ -12,14 +12,17 @@
   height 1px
   background text-dark
   display none
+.type-tab-txt
+  position relative
+  display inline-block
 
 .type-tab
-  position relative
   display inline-block
   vertical-align middle
   line-height 30px
   color text-dark
-  margin-right 20px
+  padding 0 20px 0 0
+  margin-right 0px
   font-size 14px
   cursor pointer
   &:hover

package/client/components/terminal/index.jsx

@@ -932,7 +932,7 @@ export default class Term extends Component {
     })
     const { cols, rows } = term
     const { config } = this.props
-    const { host, port, tokenElecterm } = config
+    const { host, port, tokenElecterm, server = '' } = config
     const { sessionId, terminalIndex, id, logName } = this.props
     const tab = deepCopy(this.props.tab || {})
     const {
@@ -1013,7 +1013,11 @@ export default class Term extends Component {
     this.setState({
       pid
     })
-    const wsUrl = `ws://${host}:${port}/terminals/${pid}?sessionId=${sessionId}&token=${tokenElecterm}`
+    const hs = server
+      ? server.replace(/https?:\/\//, '')
+      : `${host}:${port}`
+    const pre = server.startsWith('https') ? 'wss' : 'ws'
+    const wsUrl = `${pre}://${hs}/terminals/${pid}?sessionId=${sessionId}&token=${tokenElecterm}`
     const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket

package/client/store/setting.js

@@ -79,7 +79,7 @@ export default Store => {
       ...copy(item),
       from: 'history',
       srcId: item.id,
-      ...newTerm(true)
+      ...newTerm(true, true)
     })
   }
 
@@ -98,7 +98,7 @@ export default Store => {
       ...item,
       from: 'bookmarks',
       srcId: item.id,
-      ...newTerm(true)
+      ...newTerm(true, true)
     })
     item.id = generate()
     if (store.config.disableSshHistory) {

package/package.json

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