@electerm/electerm-react 1.37.88 → 1.37.92

package/client/common/constants.js

@@ -42,7 +42,7 @@ export const maxHistory = 50
 export const maxTransport = 5
 export const maxSftpHistory = 20
 export const maxZoom = 8
-export const minZoom = 0.25
+export const minZoom = 0.5
 export const extraTabWidth = 113
 // export const maxTabs = 20
 

package/client/components/session/sessions.jsx

@@ -340,6 +340,8 @@ class Sessions extends Component {
         currentTabId,
         tab: toSimpleObj(tab),
         ...pick(store, [
+          'fileOperation',
+          'file',
           'height',
           'width',
           'activeTerminalId',
@@ -382,7 +384,6 @@ class Sessions extends Component {
       currentTabId,
       config,
       ...pick(store, [
-        'fileOperation',
         'height',
         'width',
         'activeTerminalId',

package/client/components/setting-panel/setting-common.jsx

@@ -320,23 +320,16 @@ export default class SettingCommon extends Component {
     const defaultValue = defaultSettings[name]
     const onChange = (e) => this.onChangeValue(e.target.value, name)
     const onChangeArgs = (v) => this.onChangeValue(v, agrsProp)
-    const style = {
-      style: {
-        width: '40%'
-      }
-    }
     const styleArg = {
       style: {
-        width: '40%',
-        marginLeft: '3px'
+        width: '40%'
       }
     }
     return (
       <div className='pd2b'>
-        <Space.Compact>
+        <Space.Compact block>
           <Input
             value={value}
-            {...style}
             onChange={onChange}
             placeholder={defaultValue}
           />

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 () {
@@ -40,33 +41,33 @@ class ShortcutControl extends React.PureComponent {
     x && x.click()
   }
 
-  zoominShortcut = (e) => {
+  zoominShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.zoom(0.25, true)
-  }
+  }, 1000)
 
-  zoomoutShortcut = (e) => {
+  zoomoutShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.zoom(-0.25, true)
-  }
+  }, 1000)
 
-  zoominTerminalShortcut = (event) => {
+  zoominTerminalShortcut = throttle((event) => {
     if (window.store.inActiveTerminal) {
       window.store.zoomTerminal(event.wheelDeltaY || 120)
     } else {
       const plus = 0.2
       window.store.zoom(plus, true)
     }
-  }
+  }, 1000)
 
-  zoomoutTerminalShortcut = (event) => {
+  zoomoutTerminalShortcut = throttle((event) => {
     if (window.store.inActiveTerminal) {
       window.store.zoomTerminal(event.wheelDeltaY || -120)
     } else {
       const plus = -0.2
       window.store.zoom(plus, true)
     }
-  }
+  }, 1000)
 
   render () {
     return null

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

@@ -58,12 +58,22 @@ export function shortcutExtend (Cls) {
       key
     } = event
     if (key === 'Backspace' && this.isTerm && type === 'keydown') {
+      const now = Date.now()
+      if (!this.lastTimePressDel) {
+        this.lastTimePressDel = now
+      }
+      const timer = now - this.lastTimePressDel
+      const count = Math.ceil(timer / 800)
+      let char = String.fromCharCode(
+        shiftKey ? 127 : 8
+      )
+      char = new Array(count).fill(char).join('')
       this.socket.send(
-        String.fromCharCode(
-          shiftKey ? 127 : 8
-        )
+        char
       )
       return false
+    } else if (key === 'Backspace' && this.isTerm && type === 'keyup') {
+      delete this.lastTimePressDel
     }
     const codeName = event instanceof window.WheelEvent
       ? (wheelDeltaY > 0 ? 'mouseWheelUp' : 'mouseWheelDown')

package/client/components/tabs/app-drag.jsx

@@ -1,3 +1,5 @@
+import { useEffect } from 'react'
+
 export default function AppDrag (props) {
   function canOperate (e) {
     const {
@@ -37,6 +39,10 @@ export default function AppDrag (props) {
       window.pre.runGlobalAsync('maximize')
     }
   }
+
+  useEffect(() => {
+    window.addEventListener('contextmenu', onMouseUp)
+  }, [])
   return (
     <div
       className='app-drag'

package/client/components/tabs/index.jsx

@@ -219,7 +219,19 @@ export default class Tabs extends React.Component {
     )
   }
 
-  render () {
+  renderContent () {
+    const { config } = this.props
+    if (config.useSystemTitleBar) {
+      return this.renderContentInner()
+    }
+    return (
+      <AppDrag>
+        {this.renderContentInner()}
+      </AppDrag>
+    )
+  }
+
+  renderContentInner () {
     const { tabs = [], width } = this.props
     const len = tabs.length
     const tabsWidthAll = tabMargin * len + 10 + this.tabsWidth()
@@ -230,46 +242,51 @@ export default class Tabs extends React.Component {
     const style = {
       width: width - windowControlWidth - 86
     }
+    return (
+      <div
+        className='tabs-inner'
+        style={style}
+      >
+        <div
+          style={{
+            left
+          }}
+        />
+        <div
+          className='tabs-wrapper relative'
+          style={{
+            width: tabsWidthAll + extraTabWidth + 10
+          }}
+          onDoubleClick={this.handleAdd}
+        >
+          {
+            tabs.map((tab, i) => {
+              const isLast = i === len - 1
+              return (
+                <Tab
+                  {...this.props}
+                  tab={tab}
+                  isLast={isLast}
+                  key={tab.id}
+                />
+              )
+            })
+          }
+          {
+            !overflow
+              ? this.renderAddBtn()
+              : null
+          }
+        </div>
+      </div>
+    )
+  }
+
+  render () {
+    const overflow = this.isOverflow()
     return (
       <div className='tabs' ref={this.tabsRef}>
-        <AppDrag>
-          <div
-            className='tabs-inner'
-            style={style}
-          >
-            <div
-              style={{
-                left
-              }}
-            />
-            <div
-              className='tabs-wrapper relative'
-              style={{
-                width: tabsWidthAll + extraTabWidth + 10
-              }}
-              onDoubleClick={this.handleAdd}
-            >
-              {
-                tabs.map((tab, i) => {
-                  const isLast = i === len - 1
-                  return (
-                    <Tab
-                      {...this.props}
-                      tab={tab}
-                      isLast={isLast}
-                      key={tab.id}
-                    />
-                  )
-                })
-              }
-              {
-                !overflow
-                  ? this.renderAddBtn()
-                  : null
-              }
-            </div>
-          </div>
-        </AppDrag>
+        {this.renderContent()}
         <WindowControl
           store={window.store}
         />

package/client/components/terminal/index.jsx

@@ -26,7 +26,8 @@ import {
   terminalActions,
   commonActions,
   rendererTypes,
-  cwdId
+  cwdId,
+  isMac
 } from '../../common/constants'
 import deepCopy from 'json-deep-copy'
 import { readClipboardAsync, copy } from '../../common/clipboard'
@@ -242,6 +243,19 @@ class Term extends Component {
     this.tryInsertSelected()
   }
 
+  pasteShortcut = (e) => {
+    if (isMac) {
+      return true
+    }
+    if (!this.isRemote()) {
+      return true
+    }
+    if (this.term.buffer.active.type !== 'alternate') {
+      return false
+    }
+    return true
+  }
+
   showNormalBufferShortcut = (e) => {
     e.stopPropagation()
     this.openNormalBuffer()

package/client/store/event.js

@@ -48,6 +48,7 @@ export default Store => {
 
   Store.prototype.onBlur = function () {
     window.focused = false
+    window.pre.runSync('windowMove', false)
   }
 
   Store.prototype.selectall = function () {

package/package.json

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