@electerm/electerm-react 1.38.86 → 1.39.5

package/client/common/constants.js

@@ -67,7 +67,8 @@ export const connectionMap = buildConst([
   'telnet',
   'serial',
   'local',
-  'web'
+  'web',
+  'rdp'
 ])
 
 export const authTypeMap = buildConst([
@@ -133,6 +134,7 @@ export const terminalSplitDirectionMap = buildConst([
 
 export const terminalSshConfigType = 'ssh-config'
 export const terminalWebType = 'web'
+export const terminalRdpType = 'rdp'
 export const terminalSerialType = 'serial'
 export const terminalTelnetType = 'telnet'
 export const terminalLocalType = 'local'
@@ -236,6 +238,7 @@ export const terminalActions = {
   openTerminalSearch: 'open-terminal-search',
   doSearchNext: 'do-search-next',
   doSearchPrev: 'do-search-prev',
+  clearSearch: 'clear-search',
   zoom: 'zoom-terminal'
 }
 export const fileActions = {
@@ -306,6 +309,7 @@ export const mirrors = {
 }
 export const downloadUpgradeTimeout = 20000
 export const expandedKeysLsKey = 'expanded-keys'
+export const resolutionsLsKey = 'custom-resolution-key'
 export const checkedKeysLsKey = 'checked-keys'
 export const quickCommandLabelsLsKey = 'quick-command-labels'
 export const localAddrBookmarkLsKey = 'local-addr-bookmark-keys'
@@ -314,6 +318,7 @@ export const sshTunnelHelpLink = 'https://github.com/electerm/electerm/wiki/How-
 export const batchOpHelpLink = 'https://github.com/electerm/electerm/wiki/batch-operation'
 export const proxyHelpLink = 'https://github.com/electerm/electerm/wiki/proxy-format'
 export const regexHelpLink = 'https://github.com/electerm/electerm/wiki/Terminal-keywords-highlight-regular-expression-exmaples'
+export const rdpHelpLink = 'https://github.com/electerm/electerm/wiki/RDP-limitation'
 export const modals = {
   hide: 0,
   setting: 1,

package/client/common/default-setting.js

@@ -44,6 +44,7 @@ export default {
   sftpPathFollowSsh: false,
   keepaliveInterval: 0,
   backspaceMode: '^?',
+  showHiddenFilesOnSftpStart: true,
   terminalInfos: [
     'uptime',
     'cpu',

package/client/components/bookmark-form/bookmark-form.styl

@@ -1,5 +1,3 @@
-.dns-section
-  line-height 34px
 .mg24b
   margin-bottom 24px
 .mg60b
@@ -7,4 +5,11 @@
 .compact-input input
   width 80px !important
 .ssh-tunnels-host
-  margin-bottom 0
+  margin-bottom 0
+.ip-item
+   line-height 34px
+  .item-item-use
+    display none
+.ip-item:hover
+    .item-item-use
+      display inline-block

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

@@ -37,11 +37,31 @@ export default function renderCommon (props) {
   const {
     autofocustrigger,
     bookmarkGroups = [],
-    dns,
+    ips,
     form,
     onChangeAuthType
   } = props
   const tree = formatBookmarkGroups(bookmarkGroups)
+
+  // ips is ipaddress string[]
+  function renderIps () {
+    return ips.map(ip => {
+      return (
+        <div
+          key={ip}
+          className='iblock mg2r pointer ip-item'
+          onClick={() => props.useIp(form, ip)}
+        >
+          <b>{ip}</b>
+          <span
+            className='mg1l item-item-use'
+          >
+            {e('use')}
+          </span>
+        </div>
+      )
+    })
+  }
   return (
     <div>
       <FormItem
@@ -56,18 +76,8 @@ export default function renderCommon (props) {
         normalize={props.trim}
       >
         {
-          dns
-            ? (
-              <div className='dns-section'>
-                ip: {dns}
-                <span
-                  className='color-blue pointer mg1l'
-                  onClick={() => props.useIp(form)}
-                >
-                  {e('use')}
-                </span>
-              </div>
-              )
+          ips.length
+            ? renderIps()
             : (
               <div className='dns-section'>
                 hostname or ip

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

@@ -10,6 +10,7 @@ import {
   connectionMap,
   terminalSerialType,
   terminalWebType,
+  terminalRdpType,
   terminalLocalType,
   terminalTelnetType,
   newBookmarkIdPrefix
@@ -19,6 +20,7 @@ import SerialForm from './serial-form'
 import LocalForm from './local-form'
 import TelnetForm from './telnet-form'
 import WebForm from './web-form'
+import RdpForm from './rdp-form'
 import { createTitleWithTag } from '../../common/create-title'
 import {
   LoadingOutlined,
@@ -40,7 +42,8 @@ export default class BookmarkIndex extends Component {
         terminalTelnetType,
         terminalWebType,
         terminalLocalType,
-        terminalSerialType
+        terminalSerialType,
+        terminalRdpType
       ].includes(initType)
     ) {
       initType = connectionMap.ssh
@@ -68,7 +71,8 @@ export default class BookmarkIndex extends Component {
     [connectionMap.telnet]: TelnetForm,
     [connectionMap.serial]: SerialForm,
     [connectionMap.local]: LocalForm,
-    [connectionMap.web]: WebForm
+    [connectionMap.web]: WebForm,
+    [connectionMap.rdp]: RdpForm
   }
 
   handleChange = (e) => {

package/client/components/bookmark-form/rdp-form-ui.jsx

@@ -0,0 +1,175 @@
+/**
+ * web form
+ */
+
+import { useEffect } from 'react'
+import {
+  Input,
+  Form,
+  InputNumber,
+  TreeSelect
+} from 'antd'
+import { formItemLayout } from '../../common/form-layout'
+import {
+  newBookmarkIdPrefix,
+  terminalRdpType,
+  rdpHelpLink
+} from '../../common/constants'
+import useSubmit from './use-submit'
+import copy from 'json-deep-copy'
+import Link from '../common/external-link.jsx'
+import { defaults } from 'lodash-es'
+import { ColorPickerItem } from './color-picker-item.jsx'
+import { getRandomDefaultColor } from '../../common/rand-hex-color.js'
+import formatBookmarkGroups from './bookmark-group-tree-format'
+import findBookmarkGroupId from '../../common/find-bookmark-group-id'
+
+const FormItem = Form.Item
+const { prefix } = window
+const e = prefix('form')
+const c = prefix('common')
+
+export default function LocalFormUi (props) {
+  const [
+    form,
+    handleFinish,
+    submitUi
+  ] = useSubmit(props)
+  useEffect(() => {
+    if (props.formData.id.startsWith(newBookmarkIdPrefix)) {
+      form.setFieldsValue({
+        category: props.currentBookmarkGroupId
+      })
+    }
+  }, [props.currentBookmarkGroupId])
+  const {
+    id = ''
+  } = props.formData
+  const {
+    bookmarkGroups = [],
+    currentBookmarkGroupId
+  } = props
+  let initialValues = copy(props.formData)
+  const initBookmarkGroupId = !id.startsWith(newBookmarkIdPrefix)
+    ? findBookmarkGroupId(bookmarkGroups, id)
+    : currentBookmarkGroupId
+  const defaultValues = {
+    type: terminalRdpType,
+    port: 3389,
+    category: initBookmarkGroupId,
+    color: getRandomDefaultColor()
+  }
+  initialValues = defaults(initialValues, defaultValues)
+  function renderCommon () {
+    const {
+      bookmarkGroups = []
+    } = props
+    const tree = formatBookmarkGroups(bookmarkGroups)
+    return (
+      <div className='pd1x'>
+        <p className='alignright'>
+          <Link to={rdpHelpLink}>Wiki: {rdpHelpLink}</Link>
+        </p>
+        <FormItem
+          {...formItemLayout}
+          label={e('title')}
+          hasFeedback
+        >
+          <FormItem noStyle name='title'>
+            <Input addonBefore={<ColorPickerItem />} />
+          </FormItem>
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('host')}
+          hasFeedback
+          name='host'
+          required
+        >
+          <Input />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('port')}
+          hasFeedback
+          name='port'
+          rules={[{
+            required: true, message: 'port required'
+          }]}
+        >
+          <InputNumber
+            placeholder={e('port')}
+            min={1}
+            max={65535}
+            step={1}
+          />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('username')}
+          hasFeedback
+          name='username'
+          required
+        >
+          <Input />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('password')}
+          hasFeedback
+          name='password'
+          required
+        >
+          <Input.Password />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('description')}
+          name='description'
+          hasFeedback
+        >
+          <Input.TextArea rows={1} />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={e('domain')}
+          hasFeedback
+          name='domain'
+        >
+          <Input />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={c('bookmarkCategory')}
+          name='category'
+        >
+          <TreeSelect
+            treeData={tree}
+            treeDefaultExpandAll
+            showSearch
+          />
+        </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label='type'
+          name='type'
+          className='hide'
+        >
+          <Input />
+        </FormItem>
+      </div>
+    )
+  }
+
+  return (
+    <Form
+      form={form}
+      onFinish={handleFinish}
+      initialValues={initialValues}
+      name='rdp-form'
+    >
+      {renderCommon()}
+      {submitUi}
+    </Form>
+  )
+}

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

@@ -0,0 +1,16 @@
+/**
+ * bookmark form
+ */
+import BookmarkForm from './ssh-form'
+import RdpFormUi from './rdp-form-ui'
+
+export default class WebForm extends BookmarkForm {
+  render () {
+    return (
+      <RdpFormUi
+        {...this.props}
+        {...this.getProps()}
+      />
+    )
+  }
+}

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

@@ -24,19 +24,16 @@ import newTerm from '../../common/new-terminal'
 export default class BookmarkForm extends PureComponent {
   state = {
     testing: false,
-    dns: ''
+    ips: []
   }
 
   trim = (v) => {
     return (v || '').replace(/^\s+|\s+$/g, '')
   }
 
-  useIp = (form) => {
+  useIp = (form, ip) => {
     form.setFieldsValue({
-      host: this.state.dns
-    })
-    this.setState({
-      dns: ''
+      host: ip
     })
   }
 
@@ -76,12 +73,12 @@ export default class BookmarkForm extends PureComponent {
     ) {
       return
     }
-    const ip = await window.pre.runGlobalAsync('lookup', value)
+    const ips = await window.pre.runGlobalAsync('lookup', value)
       .catch(err => {
         log.debug(err)
       })
     this.setState({
-      dns: ip || ''
+      ips: ips || []
     })
   }
 

package/client/components/bookmark-form/web-form-ui.jsx

@@ -5,7 +5,8 @@
 import { useEffect } from 'react'
 import {
   Input,
-  Form
+  Form,
+  TreeSelect
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
 import {
@@ -17,10 +18,13 @@ import copy from 'json-deep-copy'
 import { defaults } from 'lodash-es'
 import { ColorPickerItem } from './color-picker-item.jsx'
 import { getRandomDefaultColor } from '../../common/rand-hex-color.js'
+import formatBookmarkGroups from './bookmark-group-tree-format'
+import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 
 const FormItem = Form.Item
 const { prefix } = window
 const e = prefix('form')
+const c = prefix('common')
 
 export default function LocalFormUi (props) {
   const [
@@ -35,13 +39,28 @@ export default function LocalFormUi (props) {
       })
     }
   }, [props.currentBookmarkGroupId])
+  const {
+    id = ''
+  } = props.formData
+  const {
+    bookmarkGroups = [],
+    currentBookmarkGroupId
+  } = props
+  const initBookmarkGroupId = !id.startsWith(newBookmarkIdPrefix)
+    ? findBookmarkGroupId(bookmarkGroups, id)
+    : currentBookmarkGroupId
   let initialValues = copy(props.formData)
   const defaultValues = {
     type: terminalWebType,
+    category: initBookmarkGroupId,
     color: getRandomDefaultColor()
   }
   initialValues = defaults(initialValues, defaultValues)
   function renderCommon () {
+    const {
+      bookmarkGroups = []
+    } = props
+    const tree = formatBookmarkGroups(bookmarkGroups)
     return (
       <div className='pd1x'>
         <FormItem
@@ -70,6 +89,17 @@ export default function LocalFormUi (props) {
         >
           <Input.TextArea rows={1} />
         </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={c('bookmarkCategory')}
+          name='category'
+        >
+          <TreeSelect
+            treeData={tree}
+            treeDefaultExpandAll
+            showSearch
+          />
+        </FormItem>
         <FormItem
           {...formItemLayout}
           label='type'
@@ -87,7 +117,7 @@ export default function LocalFormUi (props) {
       form={form}
       onFinish={handleFinish}
       initialValues={initialValues}
-      name='local-form'
+      name='web-form'
     >
       {renderCommon()}
       {submitUi}

package/client/components/footer/footer-entry.jsx

@@ -119,7 +119,13 @@ export default class SystemMenu extends Component {
   render () {
     const { tabs, leftSidebarWidth, openedSideBar } = this.props.store
     const pane = this.props.store.currentTab?.pane
-    if (pane === paneMap.fileManager || !tabs.length) {
+    const type = this.props.store.currentTab?.type
+    if (
+      type === 'rdp' ||
+      type === 'web' ||
+      pane === paneMap.fileManager ||
+      !tabs.length
+    ) {
       return null
     }
     const w = 43 + leftSidebarWidth

package/client/components/main/main.jsx

@@ -11,6 +11,7 @@ import BatchOp from '../batch-op/batch-op'
 import CssOverwrite from './css-overwrite'
 import UiTheme from './ui-theme'
 import CustomCss from './custom-css.jsx'
+import Resolutions from '../rdp/resolution-edit'
 import TerminalInteractive from '../terminal/terminal-interactive'
 import ConfirmModalStore from '../sftp/confirm-modal-store.jsx'
 import TransferConflictStore from '../sftp/transfer-conflict-store.jsx'
@@ -61,6 +62,7 @@ export default class Index extends Component {
     store.isSencondInstance = window.pre.runSync('isSencondInstance')
     store.initData()
     store.checkForDbUpgrade()
+    window.pre.runGlobalAsync('registerDeepLink')
   }
 
   render () {
@@ -163,6 +165,7 @@ export default class Index extends Component {
             store={store}
             _fileTransfers={store._fileTransfers}
           />
+          <Resolutions store={store} />
         </div>
       </ConfigProvider>
     )

package/client/components/rdp/code-scan.js

@@ -0,0 +1,155 @@
+// from https://raw.githubusercontent.com/citronneur/mstsc.js/client/js/keyboard.js
+const KeyMap = {
+  '': 0x0000,
+  Escape: 0x0001,
+  Digit1: 0x0002,
+  Digit2: 0x0003,
+  Digit3: 0x0004,
+  Digit4: 0x0005,
+  Digit5: 0x0006,
+  Digit6: 0x0007,
+  Digit7: 0x0008,
+  Digit8: 0x0009,
+  Digit9: 0x000A,
+  Digit0: 0x000B,
+  Minus: 0x000C,
+  Equal: 0x000D,
+  Backspace: 0x000E,
+  Tab: 0x000F,
+  KeyQ: 0x0010,
+  KeyW: 0x0011,
+  KeyE: 0x0012,
+  KeyR: 0x0013,
+  KeyT: 0x0014,
+  KeyY: 0x0015,
+  KeyU: 0x0016,
+  KeyI: 0x0017,
+  KeyO: 0x0018,
+  KeyP: 0x0019,
+  BracketLeft: 0x001A,
+  BracketRight: 0x001B,
+  Enter: 0x001C,
+  ControlLeft: 0x001D,
+  KeyA: 0x001E,
+  KeyS: 0x001F,
+  KeyD: 0x0020,
+  KeyF: 0x0021,
+  KeyG: 0x0022,
+  KeyH: 0x0023,
+  KeyJ: 0x0024,
+  KeyK: 0x0025,
+  KeyL: 0x0026,
+  Semicolon: 0x0027,
+  Quote: 0x0028,
+  Backquote: 0x0029,
+  ShiftLeft: 0x002A,
+  Backslash: 0x002B,
+  KeyZ: 0x002C,
+  KeyX: 0x002D,
+  KeyC: 0x002E,
+  KeyV: 0x002F,
+  KeyB: 0x0030,
+  KeyN: 0x0031,
+  KeyM: 0x0032,
+  Comma: 0x0033,
+  Period: 0x0034,
+  Slash: 0x0035,
+  ShiftRight: 0x0036,
+  NumpadMultiply: 0x0037,
+  AltLeft: 0x0038,
+  Space: 0x0039,
+  CapsLock: 0x003A,
+  F1: 0x003B,
+  F2: 0x003C,
+  F3: 0x003D,
+  F4: 0x003E,
+  F5: 0x003F,
+  F6: 0x0040,
+  F7: 0x0041,
+  F8: 0x0042,
+  F9: 0x0043,
+  F10: 0x0044,
+  Pause: 0x0045,
+  ScrollLock: 0x0046,
+  Numpad7: 0x0047,
+  Numpad8: 0x0048,
+  Numpad9: 0x0049,
+  NumpadSubtract: 0x004A,
+  Numpad4: 0x004B,
+  Numpad5: 0x004C,
+  Numpad6: 0x004D,
+  NumpadAdd: 0x004E,
+  Numpad1: 0x004F,
+  Numpad2: 0x0050,
+  Numpad3: 0x0051,
+  Numpad0: 0x0052,
+  NumpadDecimal: 0x0053,
+  PrintScreen: 0x0054,
+  IntlBackslash: 0x0056,
+  F11: 0x0057,
+  F12: 0x0058,
+  NumpadEqual: 0x0059,
+  F13: 0x0064,
+  F14: 0x0065,
+  F15: 0x0066,
+  F16: 0x0067,
+  F17: 0x0068,
+  F18: 0x0069,
+  F19: 0x006A,
+  F20: 0x006B,
+  F21: 0x006C,
+  F22: 0x006D,
+  F23: 0x006E,
+  KanaMode: 0x0070,
+  Lang2: 0x0071,
+  Lang1: 0x0072,
+  IntlRo: 0x0073,
+  F24: 0x0076,
+  Convert: 0x0079,
+  NonConvert: 0x007B,
+  IntlYen: 0x007D,
+  NumpadComma: 0x007E,
+  MediaTrackPrevious: 0xE010,
+  MediaTrackNext: 0xE019,
+  NumpadEnter: 0xE01C,
+  ControlRight: 0xE01D,
+  VolumeMute: 0xE020,
+  LaunchApp2: 0xE021,
+  MediaPlayPause: 0xE022,
+  MediaStop: 0xE024,
+  VolumeDown: 0xE02E,
+  VolumeUp: 0xE030,
+  BrowserHome: 0xE032,
+  NumpadDivide: 0xE035,
+  // PrintScreen: 0xE037,
+  AltRight: 0xE038,
+  NumLock: 0xE045,
+  // Pause: 0xE046,
+  Home: 0xE047,
+  ArrowUp: 0xE048,
+  PageUp: 0xE049,
+  ArrowLeft: 0xE04B,
+  ArrowRight: 0xE04D,
+  End: 0xE04F,
+  ArrowDown: 0xE050,
+  PageDown: 0xE051,
+  Insert: 0xE052,
+  Delete: 0xE053,
+  OSLeft: 0xE05B,
+  OSRight: 0xE05C,
+  ContextMenu: 0xE05D,
+  Power: 0xE05E,
+  BrowserSearch: 0xE065,
+  BrowserFavorites: 0xE066,
+  BrowserRefresh: 0xE067,
+  BrowserStop: 0xE068,
+  BrowserForward: 0xE069,
+  BrowserBack: 0xE06A,
+  LaunchApp1: 0xE06B,
+  LaunchMail: 0xE06C,
+  MediaSelect: 0xE06D
+}
+
+export default function scancode (e) {
+  return KeyMap[e.code]
+}