@electerm/electerm-react 2.3.75 → 2.3.100

package/client/components/bookmark-form/config/common-fields.js

@@ -43,6 +43,20 @@ export const commonFields = {
     label: e('password')
   },
 
+  loginPrompt: {
+    type: 'input',
+    name: 'loginPrompt',
+    label: e('loginPrompt'),
+    props: { placeholder: '/login[: ]*$/i' }
+  },
+
+  passwordPrompt: {
+    type: 'input',
+    name: 'passwordPrompt',
+    label: e('passwordPrompt'),
+    props: { placeholder: '/password[: ]*$/i' }
+  },
+
   port: {
     type: 'number',
     name: 'port',
@@ -274,6 +288,8 @@ export const telnetAuthFields = [
   commonFields.host,
   commonFields.username,
   commonFields.password,
+  commonFields.loginPrompt,
+  commonFields.passwordPrompt,
   { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.telnet) },
   commonFields.port,
   commonFields.runScripts,

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

@@ -281,7 +281,7 @@ export default function FormRenderer ({ config, props }) {
     onSelectProxy,
     onChangeAuthType,
     handleBlur: onBlur,
-    onPaste,
+    handlePaste: onPaste,
     useIp
   }
 

package/client/components/sidebar/transfer-history-modal.jsx

@@ -61,7 +61,10 @@ export default memo(function TransferHistoryModal (props) {
     dataIndex: 'fromPath',
     key: 'fromPath',
     render: (txt, inst) => {
-      return inst.fromPathReal || txt
+      const t = inst.fromPathReal || txt
+      return (
+        <div className='sftp-file history-file' title={t}>{t}</div>
+      )
     },
     sorter: sorterFactory('fromPath')
   }, {
@@ -69,7 +72,10 @@ export default memo(function TransferHistoryModal (props) {
     dataIndex: 'toPath',
     key: 'toPath',
     render: (txt, inst) => {
-      return inst.toPathReal || txt
+      const t = inst.toPathReal || txt
+      return (
+        <div className='sftp-file history-file' title={t}>{t}</div>
+      )
     },
     sorter: sorterFactory('toPath')
   }, {

package/client/components/sidebar/transfer.styl

@@ -4,4 +4,11 @@
   .ant-badge-multiple-words
     padding 0 3px
 .transfer-list-card
-  width calc(100% - 48px)
+  width calc(100vw - 48px)
+.sftp-file
+  max-width calc(50vw - 250px)
+  overflow hidden
+  text-overflow ellipsis
+  white-space nowrap
+  &.history-file
+    max-width calc(50vw - 440px)

package/client/components/tabs/tab.jsx

@@ -367,12 +367,14 @@ class Tab extends Component {
       if (name) {
         tunnel = `[${name}] ${tunnel}`
       }
-      return <div key={tunnel}>{tunnel}</div>
+      return <div key={tunnel + '-' + i} className='ssh-tunnel-item'>{tunnel}</div>
     })
     return (
       <>
         <div>{title}</div>
-        {list}
+        <div className='ssh-tunnel-list-wrapper'>
+          {list}
+        </div>
       </>
     )
   }

package/client/components/tabs/tabs.styl

@@ -241,3 +241,8 @@
   .sidebar-panel-history .pd2x
     width 400px
     margin 0 auto
+
+.ssh-tunnel-list-wrapper
+  max-height 300px
+  overflow-y auto
+

package/client/components/terminal/terminal.jsx

@@ -314,7 +314,9 @@ class Term extends Component {
         <div>
           <p>{e('paste')}:</p>
           <div className='paste-text'>
-            {readClipboard()}
+            <pre>
+              <code>{readClipboard()}</code>
+            </pre>
           </div>
         </div>
       ),

package/client/components/text-editor/simple-editor.jsx

@@ -20,24 +20,32 @@ export default function SimpleEditor (props) {
     if (currentMatch >= 0 && occurrences.length > 0) {
       const match = occurrences[currentMatch]
       if (editorRef.current) {
+        const textarea = editorRef.current.resizableTextArea.textArea
+
         // Set selection range to select the matched text
-        editorRef.current.resizableTextArea.textArea.setSelectionRange(match.start, match.end)
+        textarea.setSelectionRange(match.start, match.end)
 
         // Only focus the textarea when explicitly navigating between matches
         if (isNavigating) {
-          editorRef.current.resizableTextArea.textArea.focus()
+          textarea.focus()
         }
 
         // Scroll to the selection position
-        const textarea = editorRef.current.resizableTextArea.textArea
-        const textBeforeSelection = props.value.substring(0, match.start)
-        const lineBreaks = textBeforeSelection.split('\n').length - 1
+        // Use setTimeout to ensure the selection is rendered before scrolling
+        setTimeout(() => {
+          const textBeforeSelection = props.value.substring(0, match.start)
+          const lineBreaks = textBeforeSelection.split('\n').length - 1
 
-        // Estimate the scroll position
-        const lineHeight = 20 // Approximate line height in pixels
-        const scrollPosition = lineHeight * lineBreaks
+          // Estimate the scroll position
+          const lineHeight = parseInt(window.getComputedStyle(textarea).lineHeight) || 20
+          const scrollPosition = lineHeight * lineBreaks
 
-        textarea.scrollTop = Math.max(0, scrollPosition - textarea.clientHeight / 2)
+          // Scroll to center the match, but ensure we can scroll to the bottom
+          const targetScroll = scrollPosition - textarea.clientHeight / 2
+          const maxScroll = textarea.scrollHeight - textarea.clientHeight
+
+          textarea.scrollTop = Math.max(0, Math.min(targetScroll, maxScroll))
+        }, 0)
       }
     }
     // Reset navigating flag after using it
@@ -89,8 +97,6 @@ export default function SimpleEditor (props) {
 
   function handleChange (e) {
     setSearchKeyword(e.target.value)
-    findMatches()
-    goToNextMatch()
   }
 
   // Navigate to next match

package/client/components/tree-list/bookmark-transport.jsx

@@ -4,8 +4,8 @@
 
 import { PureComponent } from 'react'
 import {
-  DownloadOutlined,
-  UploadOutlined,
+  ExportOutlined,
+  ImportOutlined,
   EditOutlined
 } from '@ant-design/icons'
 import { Upload, Button } from 'antd'
@@ -36,7 +36,7 @@ export default class BookmarkTransport extends PureComponent {
     return [
       this.renderEdit(),
       <Button
-        icon={<DownloadOutlined />}
+        icon={<ExportOutlined />}
         onClick={this.handleDownload}
         title={e('export')}
         className='download-bookmark-icon'
@@ -49,7 +49,7 @@ export default class BookmarkTransport extends PureComponent {
         key='Upload'
       >
         <Button
-          icon={<UploadOutlined />}
+          icon={<ImportOutlined />}
           title={e('importFromFile')}
         />
       </Upload>

package/client/components/tree-list/tree-list-item.jsx

@@ -188,7 +188,7 @@ export default function TreeListItem (props) {
     {
       selected: selectedItemId === item.id
     },
-    'tree-item elli',
+    'tree-item',
     {
       'is-category': isGroup,
       level2: item.level === 2
@@ -232,10 +232,7 @@ export default function TreeListItem (props) {
     onClick: onSelect,
     'data-item-id': item.id,
     'data-is-group': isGroup ? 'true' : 'false',
-    'data-parent-id': props.parentId,
-    style: props.staticList
-      ? { maxWidth: (props.leftSidebarWidth - 110) + 'px' }
-      : undefined
+    'data-parent-id': props.parentId
   }
   const key = item.id || uid()
   return (

package/client/components/tree-list/tree-list.styl

@@ -11,6 +11,9 @@
   line-height 26px
   padding-left 5px
   border-radius 3px
+  overflow hidden
+  white-space nowrap
+  text-overflow ellipsis
   &.is-category
     .tree-item-title
       font-weight bold
@@ -30,13 +33,12 @@
 .tree-item-title
   flex-grow 1
   line-height 26px
-  max-width 300px
   overflow hidden
   white-space nowrap
   text-overflow ellipsis
 
 .sidebar-panel .tree-item-title
-  max-width 180px
+   max-width 100%
 .with-plus
   &:after
     content '+'

package/client/store/tab.js

@@ -227,9 +227,13 @@ export default Store => {
     const removedSet = new Set(removedIds)
     const batchFirstTabs = {}
     const currentIdNeedFix = removedSet.has(store.activeTabId)
-
+    const copiedTabs = remainingTabs.map(t => ({
+      id: t.id,
+      batch: t.batch,
+      tabCount: t.tabCount
+    })).sort((a, b) => b.tabCount - a.tabCount)
     // Get first valid tab for each batch
-    for (const tab of remainingTabs) {
+    for (const tab of copiedTabs) {
       if (!batchFirstTabs[tab.batch]) {
         batchFirstTabs[tab.batch] = tab.id
       }

package/package.json

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