@electerm/electerm-react 1.39.2 → 1.39.5

package/client/common/constants.js

@@ -238,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 = {
@@ -317,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/components/bookmark-form/rdp-form-ui.jsx

@@ -6,22 +6,28 @@ import { useEffect } from 'react'
 import {
   Input,
   Form,
-  InputNumber
+  InputNumber,
+  TreeSelect
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
 import {
   newBookmarkIdPrefix,
-  terminalRdpType
+  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 [
@@ -36,16 +42,34 @@ export default function LocalFormUi (props) {
       })
     }
   }, [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')}
@@ -114,6 +138,17 @@ export default function LocalFormUi (props) {
         >
           <Input />
         </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={c('bookmarkCategory')}
+          name='category'
+        >
+          <TreeSelect
+            treeData={tree}
+            treeDefaultExpandAll
+            showSearch
+          />
+        </FormItem>
         <FormItem
           {...formItemLayout}
           label='type'

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'

package/client/components/main/main.jsx

@@ -11,7 +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 '../session/resolution-edit'
+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'

package/client/components/{session → rdp}/rdp-session.jsx

@@ -4,7 +4,8 @@ import deepCopy from 'json-deep-copy'
 import clone from '../../common/to-simple-obj'
 import { handleErr } from '../../common/fetch'
 import {
-  statusMap
+  statusMap,
+  rdpHelpLink
 } from '../../common/constants'
 import {
   notification,
@@ -16,6 +17,7 @@ import {
   ReloadOutlined,
   EditOutlined
 } from '@ant-design/icons'
+import HelpIcon from '../common/help-icon'
 import * as ls from '../../common/safe-local-storage'
 import scanCode from './code-scan'
 import resolutions from './resolutions'
@@ -388,9 +390,12 @@ export default class RdpSession extends Component {
           onClick={this.handleEditResolutions}
           className='mg2r mg1l pointer'
         />
-        <span className='mg2l'>
+        <span className='mg2l mg2r'>
           {username}@{host}:{port}
         </span>
+        <HelpIcon
+          link={rdpHelpLink}
+        />
       </div>
     )
   }

package/client/components/session/session.jsx

@@ -4,7 +4,7 @@
 import { Component } from 'react'
 import Term from '../terminal'
 import Sftp from '../sftp/sftp-entry'
-import RdpSession from './rdp-session'
+import RdpSession from '../rdp/rdp-session'
 import {
   BorderVerticleOutlined,
   BorderHorizontalOutlined,

package/client/components/session/sessions.jsx

@@ -1,6 +1,6 @@
 import { Component } from '../common/react-subx'
 import Session from './session'
-import WebSession from './web-session'
+import WebSession from '../web/web-session.jsx'
 import { findIndex, pick } from 'lodash-es'
 import classNames from 'classnames'
 import generate from '../../common/uid'

package/client/components/terminal/index.jsx

@@ -363,6 +363,13 @@ class Term extends Component {
       )
     ) {
       this.searchPrev(keyword, options)
+    } else if (
+      action === terminalActions.clearSearch &&
+      (
+        propSplitId === activeSplitId
+      )
+    ) {
+      this.searchAddon.clearDecorations()
     } else if (
       action === commonActions.getTermLogState &&
       pid === statePid

package/client/components/terminal/term-search.jsx

@@ -55,6 +55,9 @@ class TermSearch extends Component {
   }
 
   toggleSearch = () => {
+    if (this.props.store.termSearchOpen) {
+      this.clearSearch()
+    }
     this.props.store.toggleTerminalSearch()
     setTimeout(window.store.focus, 200)
   }
@@ -89,7 +92,16 @@ class TermSearch extends Component {
     this.prev()
   }
 
+  clearSearch = () => {
+    const { activeTerminalId } = this.props.store
+    postMessage({
+      action: terminalActions.clearSearch,
+      activeSplitId: activeTerminalId
+    })
+  }
+
   close = () => {
+    this.clearSearch()
     this.props.store.termSearchOpen = false
   }
 

package/package.json

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