@electerm/electerm-react 1.35.0 → 1.35.6

package/client/components/session/session.jsx

@@ -359,7 +359,7 @@ export default class SessionWrapper extends Component {
     return (
       <Tooltip title={title}>
         <FullscreenOutlined
-          className='mg1r icon-info font16 iblock pointer spliter term-fullscreen-control'
+          className='mg1r icon-info font16 iblock pointer spliter term-fullscreen-control1'
           onClick={this.handleFullscreen}
         />
       </Tooltip>

package/client/components/shortcuts/shortcut-control.jsx

@@ -5,6 +5,7 @@
 
 import React from 'react'
 import { shortcutExtend } from './shortcut-handler.js'
+import { throttle } from 'lodash-es'
 
 class ShortcutControl extends React.PureComponent {
   componentDidMount () {
@@ -27,10 +28,18 @@ class ShortcutControl extends React.PureComponent {
     window.store.onNewSsh()
   }
 
-  togglefullscreenShortcut = (e) => {
+  togglefullscreenShortcut = throttle((e) => {
     e.stopPropagation()
-    document.querySelector('.term-fullscreen-control').click()
-  }
+    const x = document.querySelector('.term-fullscreen-control') ||
+    document.querySelector('.term-fullscreen-control1')
+    x && x.click()
+  }, 300)
+
+  splitShortcut = throttle((e) => {
+    e.stopPropagation()
+    const x = document.querySelector('.icon-split')
+    x && x.click()
+  }, 300)
 
   zoominShortcut = (e) => {
     e.stopPropagation()

package/client/components/shortcuts/shortcut-editor.jsx

@@ -9,7 +9,7 @@ import {
   CheckOutlined,
   CloseOutlined
 } from '@ant-design/icons'
-import { debounce } from 'lodash-es'
+import { throttle } from 'lodash-es'
 import { getKeyCharacter } from './get-key-char.js'
 
 export default class ShortcutEdit extends PureComponent {
@@ -83,14 +83,14 @@ export default class ShortcutEdit extends PureComponent {
     return 'shortcut-control-' + index
   }
 
-  warnCtrolKey = debounce(() => {
+  warnCtrolKey = throttle(() => {
     message.info(
       'Must have one of Ctrl or Shift or Alt or Meta key',
       undefined
     )
   }, 3000)
 
-  warnExist = debounce(() => {
+  warnExist = throttle(() => {
     message.info(
       'Shortcut already exists',
       undefined

package/client/components/shortcuts/shortcut-handler.js

@@ -24,7 +24,6 @@ function buildConfig (config) {
 
 export function shortcutExtend (Cls) {
   Cls.prototype.handleKeyboardEvent = function (event) {
-    // console.log('event', event)
     const {
       code,
       ctrlKey,

package/client/components/shortcuts/shortcuts-defaults.js

@@ -2,13 +2,13 @@ export default () => {
   return [
     {
       name: 'app_closeCurrentTab',
-      shortcut: 'ctrl+w',
-      shortcutMac: 'ctrl+w'
+      shortcut: 'alt+w',
+      shortcutMac: 'alt+w'
     },
     {
       name: 'app_newBookmark',
-      shortcut: 'ctrl+b',
-      shortcutMac: 'meta+b'
+      shortcut: 'ctrl+n',
+      shortcutMac: 'meta+n'
     },
     {
       name: 'app_togglefullscreen',
@@ -35,6 +35,11 @@ export default () => {
       shortcut: 'ctrl+tab',
       shortcutMac: 'ctrl+tab'
     },
+    {
+      name: 'terminal_split',
+      shortcut: 'ctrl+/',
+      shortcutMac: 'meta+/'
+    },
     {
       name: 'terminal_clear',
       shortcut: 'ctrl+l,ctrl+shift+l',

package/client/components/shortcuts/shortcuts.jsx

@@ -91,7 +91,7 @@ export default class Shortcuts extends Component {
           const pre = a === 'terminal' ? `[${ss('terminal')}] ` : ''
           if (
             [
-              'clear', 'selectAll', 'search'
+              'clear', 'selectAll', 'search', 'split'
             ].includes(b)
           ) {
             return pre + ss(b)

package/client/components/terminal/index.jsx

@@ -2,7 +2,7 @@ import { Component } from 'react'
 import ZmodemTransfer from './zmodem-transfer'
 import { handleErr } from '../../common/fetch'
 import generate from '../../common/uid'
-import { isEqual, pick, debounce } from 'lodash-es'
+import { isEqual, pick, debounce, throttle } from 'lodash-es'
 import postMessage from '../../common/post-msg'
 import clone from '../../common/to-simple-obj'
 import runIdle from '../../common/run-idle'
@@ -255,12 +255,12 @@ class Term extends Component {
     this.openNormalBuffer()
   }
 
-  prevTabShortcut = debounce((e) => {
+  prevTabShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.clickPrevTab()
   }, 300)
 
-  nextTabShortcut = debounce((e) => {
+  nextTabShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.clickNextTab()
   }, 300)
@@ -1065,7 +1065,7 @@ class Term extends Component {
     // log.log('onKey', key, e)
   }
 
-  onResize = debounce(() => {
+  onResize = throttle(() => {
     const cid = this.props.currentTabId
     const tid = this.props.tab?.id
     if (

package/package.json

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

package/client/common/shortcuts-defaults.js

@@ -1,51 +0,0 @@
-export default () => {
-  return [
-    {
-      name: 'app_closeCurrentTab',
-      shortcut: 'ctrl+w',
-      shortcutMac: 'ctrl+w'
-    },
-    {
-      name: 'app_prevTab',
-      shortcut: 'ctrl+shift+tab',
-      shortcutMac: 'ctrl+shift+tab'
-    },
-    {
-      name: 'app_nextTab',
-      shortcut: 'ctrl+tab',
-      shortcutMac: 'ctrl+tab'
-    },
-    {
-      name: 'terminal_clear',
-      shortcut: 'ctrl+l,ctrl+shift+l',
-      shortcutMac: 'meta+l'
-    },
-    {
-      name: 'terminal_selectAll',
-      shortcut: 'ctrl+a,ctrl+shift+a',
-      shortcutMac: 'meta+a',
-      readonly: true
-    },
-    {
-      name: 'terminal_copy',
-      shortcut: 'ctrl+c,ctrl+shift+c',
-      shortcutMac: 'meta+c',
-      readonly: true
-    },
-    {
-      name: 'terminal_search',
-      shortcut: 'ctrl+shift+f',
-      shortcutMac: 'meta+f'
-    },
-    {
-      name: 'terminal_pasteSelected',
-      shortcut: 'alt+insert',
-      shortcutMac: 'alt+insert'
-    },
-    {
-      name: 'terminal_showNormalBuffer',
-      shortcut: 'ctrl+ArrowUp',
-      shortcutMac: 'meta+ArrowUp'
-    }
-  ]
-}