@electerm/electerm-react 1.60.18 → 1.60.32

package/client/common/clipboard.js

@@ -3,9 +3,6 @@
  */
 
 import { message } from 'antd'
-import {
-  copyBookmarkItemPrefix
-} from './constants'
 
 const fileRegWin = /^(remote:)?\w:\\.+/
 const fileReg = /^(remote:)?\/.+/
@@ -24,7 +21,7 @@ export const readClipboardAsync = () => {
 
 export const copy = (str) => {
   message.success({
-    content: 'Copied',
+    content: window.translate('copied'),
     duation: 2,
     key: 'copy-message'
   })
@@ -45,13 +42,3 @@ export const hasFileInClipboardText = (
       (fileReg.test(t) || fileRegWin.test(t))
   }, true)
 }
-
-export const hasBookmarkOrGroupInClipboardText = (
-  text = readClipboard()
-) => {
-  const arr = text.split('\n')
-  return arr.reduce((prev, t = '') => {
-    return prev &&
-      t.startsWith(copyBookmarkItemPrefix)
-  }, true)
-}

package/client/common/constants.js

@@ -171,10 +171,6 @@ export const defaultTheme = {
   uiThemeConfig: getUiThemeConfig(window.et.stylus)
 }
 
-export const eventTypes = {
-  resetFileListTable: 'reset-file-list-table'
-}
-
 export const commonBaudRates = [
   110,
   300,
@@ -229,17 +225,6 @@ const defaultThemeLightConf = _get(
 )
 defaultThemeLightConf.id = defaultThemeLightConf._id
 export const defaultThemeLight = defaultThemeLightConf
-export const terminalActions = {
-  showInfoPanel: 'show-info-panel',
-  changeEncode: 'change-encode',
-  batchInput: 'batch-input',
-  quickCommand: 'quick-command',
-  openTerminalSearch: 'open-terminal-search',
-  doSearchNext: 'do-search-next',
-  doSearchPrev: 'do-search-prev',
-  clearSearch: 'clear-search',
-  zoom: 'zoom-terminal'
-}
 export const fileActions = {
   cancel: 'cancel',
   skip: 'skip',
@@ -250,32 +235,6 @@ export const fileActions = {
   renameAll: 'renameAll'
 }
 
-export const commonActions = {
-  returnTermLogState: 'return-term-log-state',
-  getTermLogState: 'get-term-log-state',
-  setTermLogState: 'set-term-log-state',
-  batchOp: 'batch-op',
-  updateStore: 'update-store',
-  editWithSystemEditorDone: 'edit-with-system-editor-done',
-  editWithSystemEditor: 'edit-with-system-editor',
-  onCloseTextEditor: 'on-close-text-editor',
-  submitTextEditorText: 'submit-text-editor-text',
-  fetchTextEditorText: 'fetch-text-editor-text',
-  loadTextEditorText: 'load-text-editor-text',
-  openTextEditor: 'open-text-editor',
-  submitFileModeEdit: 'submit-file-mode-edit',
-  submitFileModeClose: 'submit-file-mode-close',
-  showFileModeModal: 'show-file-mode-modal',
-  showFileInfoModal: 'show-file-info-modal',
-  appUpdateCheck: 'check-app-update',
-  closeContextMenu: 'close-context-menu',
-  closeContextMenuAfter: 'close-context-menu-after',
-  clickContextMenu: 'click-context-menu',
-  openContextMenu: 'open-context-menu',
-  addTransfer: 'add-transfer',
-  sftpList: 'sftp-list'
-}
-
 export const srcsSkipUpgradeCheck = [
   '.appx',
   '.snap',
@@ -283,8 +242,6 @@ export const srcsSkipUpgradeCheck = [
 ]
 export const termLSPrefix = 'term:sess:'
 export const batchInputLsKey = 'batch-inputs'
-export const copyBookmarkItemPrefix = 'bookmark:'
-export const copyBookmarkGroupItemPrefix = 'bookmarkGroup:'
 export const rendererTypes = {
   dom: 'dom',
   canvas: 'canvas',

package/client/common/data-compare.js

@@ -0,0 +1,55 @@
+/**
+ * Compare two arrays of objects and return differences
+ * @param {Array} oldArr - Original array of objects
+ * @param {Array} newArr - New array of objects to compare against
+ * @returns {Object} Object containing arrays of items to update, add, and remove
+ */
+export default function compare (oldArr, newArr) {
+  if (!oldArr || !newArr) {
+    return {
+      updated: [],
+      added: [],
+      removed: []
+    }
+  }
+  // Create maps for faster lookup
+  const oldMap = new Map(
+    oldArr.map(item => [item.id, item])
+  )
+  const newMap = new Map(
+    newArr.map(item => [item.id, item])
+  )
+
+  const updated = []
+  const added = []
+  const removed = []
+
+  // Find items to update or add
+  for (const item of newArr) {
+    const oldItem = oldMap.get(item.id)
+    if (!oldItem) {
+      // Item doesn't exist in old array - need to add
+      added.push(item)
+    } else {
+      // Item exists - check if it needs updating
+      // Convert to JSON strings for deep comparison
+      const oldStr = JSON.stringify(oldItem)
+      const newStr = JSON.stringify(item)
+      if (oldStr !== newStr) {
+        updated.push(item)
+      }
+    }
+  }
+
+  // Find items to remove
+  for (const item of oldArr) {
+    if (!newMap.has(item.id)) {
+      removed.push(item)
+    }
+  }
+  return {
+    updated,
+    added,
+    removed
+  }
+}

package/client/common/default-setting.js

@@ -16,7 +16,7 @@ export default {
   execMacArgs: [],
   execLinuxArgs: [],
   enableGlobalProxy: false,
-  disableSshHistory: false,
+  disableConnectionHistory: false,
   disableTransferHistory: false,
   terminalBackgroundImagePath: '',
   terminalBackgroundFilterOpacity: 1,
@@ -61,13 +61,5 @@ export default {
   dataSyncSelected: 'all',
   baseURLAI: 'https://api.deepseek.com',
   modelAI: 'deepseek-chat',
-  roleAI: `You are a terminal command expert.
-- Provide clear, safe, and efficient shell commands
-- Always explain what each command does
-- Warn about potentially dangerous operations
-- Format command output with markdown code blocks
-- If multiple steps are needed, number them
-- Mention any prerequisites or dependencies
-- Include common flags and options
-- Specify which OS (Linux/Mac/Windows) the command is for`
+  roleAI: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式'
 }

package/client/common/resolve.js

@@ -6,31 +6,27 @@
  */
 
 export default (basePath, nameOrDot) => {
-  const sep = (basePath.includes('\\') ||
-  basePath.includes(':\\') ||
-  /^[a-z]+:$/i.test(basePath) ||
-  /^[a-z]+:$/i.test(nameOrDot)
-  )
-    ? '\\'
-    : '/'
+  const hasWinDrive = (path) => /^[a-zA-Z]:/.test(path)
+  const isWin = basePath.includes('\\') || nameOrDot.includes('\\') || hasWinDrive(basePath) || hasWinDrive(nameOrDot)
+  const sep = isWin ? '\\' : '/'
+  // Handle Windows drive letters (with or without initial slash)
+  if (/^[a-zA-Z]:/.test(nameOrDot)) {
+    return nameOrDot.replace(/^\//, '').replace(/\//g, sep)
+  }
+  // Handle absolute paths
+  if (nameOrDot.startsWith('/')) {
+    return nameOrDot.replace(/\\/g, sep)
+  }
   if (nameOrDot === '..') {
-    const arr = basePath.split(sep)
-    const { length } = arr
-    if (length === 1) {
-      return '/'
+    const parts = basePath.split(sep)
+    if (parts.length > 1) {
+      parts.pop()
+      return isWin && parts.length === 1 ? '/' : parts.join(sep) || '/'
     }
-    const res = arr.slice(0, length - 1).join(sep)
-    return res || '/'
-  }
-  const pre = (nameOrDot.includes(':\\') || /^[a-z]+:$/i.test(nameOrDot)) && basePath === '/'
-    ? ''
-    : basePath
-  const mid = (basePath.endsWith(sep) ? '' : sep)
-  let ff = pre + mid + nameOrDot
-  if (/^\\[a-z]+:$/i.test(ff)) {
-    ff = ff.slice(1)
+    return '/'
   }
-  return ff
+  const result = basePath.endsWith(sep) ? basePath + nameOrDot : basePath + sep + nameOrDot
+  return isWin && result.length === 3 && result.endsWith(':\\') ? '/' : result
 }
 
 export const osResolve = (...args) => {

package/client/common/sftp.js

@@ -7,7 +7,6 @@ import Transfer from './transfer'
 import { transferTypeMap, instSftpKeys as keys } from './constants'
 import initWs from './ws'
 
-window.sftps = {}
 const transferKeys = Object.keys(transferTypeMap)
 
 class Sftp {
@@ -57,7 +56,6 @@ class Sftp {
   }
 
   async destroy () {
-    delete window.sftps[this.sessionId]
     const { ws } = this
     ws.s({
       action: 'sftp-destroy',
@@ -71,6 +69,5 @@ class Sftp {
 export default async (sessionId) => {
   const sftp = new Sftp()
   await sftp.init(sessionId)
-  window.sftps[sessionId] = sftp
   return sftp
 }

package/client/components/ai/ai-chat.jsx

@@ -15,6 +15,7 @@ import {
   aiConfigWikiLink
 } from '../../common/constants'
 import HelpIcon from '../common/help-icon'
+import { refsStatic } from '../common/ref'
 import './ai.styl'
 
 const { TextArea } = Input
@@ -34,7 +35,12 @@ export default function AIChat (props) {
     setPrompt(e.target.value)
   }
 
-  async function handleSubmit () {
+  function buildRole () {
+    const lang = props.config.languageAI || window.store.getLangName()
+    return props.config.roleAI + `;用[${lang}]回复`
+  }
+
+  const handleSubmit = useCallback(async function () {
     if (aiConfigMissing()) {
       window.store.toggleAIConfig()
     }
@@ -44,7 +50,7 @@ export default function AIChat (props) {
       'AIchat',
       prompt,
       props.config.modelAI,
-      props.config.roleAI,
+      buildRole(),
       props.config.baseURLAI,
       props.config.apiKeyAI
     ).catch(
@@ -72,19 +78,26 @@ export default function AIChat (props) {
     }
     setPrompt('')
     setIsLoading(false)
-  }
+  }, [prompt, isLoading, props.config])
 
   function handleConfigSubmit (values) {
     window.store.updateConfig(values)
     message.success('Saved')
   }
 
+  function getInitialValues () {
+    const res = pick(props.config, aiConfigsArr)
+    if (!res.languageAI) {
+      res.languageAI = window.store.getLangName()
+    }
+    return res
+  }
+
   const renderConfig = useCallback(() => {
     if (!props.showAIConfig) return null
-    const aiConfigs = pick(props.config, aiConfigsArr)
     return (
       <AIConfigForm
-        initialValues={aiConfigs}
+        initialValues={getInitialValues()}
         onSubmit={handleConfigSubmit}
         showAIConfig={props.showAIConfig}
       />
@@ -124,10 +137,21 @@ export default function AIChat (props) {
   }
 
   useEffect(() => {
+    refsStatic.add('AIChat', {
+      setPrompt,
+      handleSubmit
+    })
     if (aiConfigMissing()) {
       window.store.toggleAIConfig()
     }
-  }, [])
+    return () => {
+      refsStatic.remove('AIChat')
+    }
+  }, [handleSubmit])
+
+  if (props.rightPanelTab !== 'ai') {
+    return null
+  }
 
   return (
     <Flex vertical className='ai-chat-container'>

package/client/components/ai/ai-config.jsx

@@ -16,6 +16,14 @@ import {
 import providers from './providers'
 
 const e = window.translate
+const defaultRoles = [
+  {
+    value: 'Terminal expert, provide safe commands for different OS, explain usage and risks, use markdown format'
+  },
+  {
+    value: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式'
+  }
+]
 
 export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig }) {
   const [form] = Form.useForm()
@@ -86,6 +94,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         form={form}
         onFinish={handleSubmit}
         initialValues={initialValues}
+        layout='vertical'
       >
         <Form.Item
           label='API URL'
@@ -105,7 +114,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         </Form.Item>
 
         <Form.Item
-          label='Model'
+          label={e('modelAi')}
           name='modelAI'
           rules={[{ required: true, message: 'Please input or select a model!' }]}
         >
@@ -124,14 +133,16 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         </Form.Item>
 
         <Form.Item
-          label='System Role'
+          label={e('roleAI')}
           name='roleAI'
           rules={[{ required: true, message: 'Please input the AI role!' }]}
         >
-          <Input.TextArea
-            placeholder='Enter AI role/system prompt'
-            rows={4}
-          />
+          <AutoComplete options={defaultRoles} placement='topLeft'>
+            <Input.TextArea
+              placeholder='Enter AI role/system prompt'
+              rows={1}
+            />
+          </AutoComplete>
         </Form.Item>
 
         <Form.Item>

package/client/components/batch-op/batch-op.jsx

@@ -17,7 +17,6 @@ import {
 import {
   sidebarWidth,
   statusMap,
-  commonActions,
   batchOpHelpLink,
   modals
 } from '../../common/constants'
@@ -31,6 +30,7 @@ import uid from '../../common/uid'
 import wait from '../../common/wait'
 import { getFolderFromFilePath } from '../sftp/file-read'
 import resolveFilePath from '../../common/resolve'
+import { refsStatic } from '../common/ref'
 
 const e = window.translate
 
@@ -85,19 +85,8 @@ export default class BatchOp extends PureComponent {
   ]
 
   componentDidMount () {
-    this.watch()
-  }
-
-  componentWillUnmount () {
-    this.unwatch()
-  }
-
-  watch () {
-    window.addEventListener('message', this.handleEvent)
-  }
-
-  unwatch () {
-    window.removeEventListener('message', this.handleEvent)
+    this.id = 'batch-op'
+    refsStatic.add(this.id, this)
   }
 
   handleDownloadExample = () => {
@@ -109,16 +98,6 @@ export default class BatchOp extends PureComponent {
     download('batch-op-example.csv', csvText)
   }
 
-  handleEvent = e => {
-    if (e && e.data && e.data.action === commonActions.batchOp) {
-      const {
-        func,
-        args
-      } = e.data.batchOp
-      this[func](...args)
-    }
-  }
-
   handleCancel = () => {
     window.store.toggleBatchOp()
   }

package/client/components/bookmark-form/bookmark-group-tree-format.js

@@ -2,16 +2,10 @@
  * create bookmark group tree data
  */
 
-export default (bookmarkGroups = []) => {
-  const btree = bookmarkGroups
-    .reduce((prev, k) => {
-      return {
-        ...prev,
-        [k.id]: k
-      }
-    }, {})
+export default (bookmarkGroups = [], disabledId = '', returnMap = false) => {
+  const btree = new Map(bookmarkGroups.map(d => [d.id, d]))
   function buildSubCats (id) {
-    const x = btree[id]
+    const x = btree.get(id)
     if (!x) {
       return ''
     }
@@ -32,9 +26,13 @@ export default (bookmarkGroups = []) => {
         title: d.title,
         value: d.id,
         key: d.id,
+        disabled: d.id === disabledId,
         children: (d.bookmarkGroupIds || []).map(buildSubCats).filter(d => d)
       }
       return r
     }).filter(d => d)
+  if (returnMap) {
+    return [level1, btree]
+  }
   return level1
 }

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

@@ -32,7 +32,6 @@ const e = window.translate
 
 export default function renderCommon (props) {
   const {
-    autofocustrigger,
     bookmarkGroups = [],
     ips,
     form,
@@ -85,7 +84,6 @@ export default function renderCommon (props) {
         }
         <FormItem noStyle name='host'>
           <InputAutoFocus
-            autofocustrigger={autofocustrigger}
             selectall='yes'
             name='host'
             onBlur={props.onBlur}

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

@@ -5,7 +5,7 @@ import { PureComponent } from 'react'
 import {
   message
 } from 'antd'
-import { uniq, isEqual, pick } from 'lodash-es'
+import { uniq, pick } from 'lodash-es'
 import copy from 'json-deep-copy'
 import generate from '../../common/uid'
 import {
@@ -20,6 +20,7 @@ import testCon from '../../common/test-connection'
 import FormUi from './ssh-form-ui'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import newTerm from '../../common/new-terminal'
+import { action } from 'manate'
 
 export default class BookmarkForm extends PureComponent {
   state = {
@@ -95,7 +96,10 @@ export default class BookmarkForm extends PureComponent {
       : currentBookmarkGroupId
   }
 
-  updateBookmarkGroups = (bookmarkGroups, bookmark, categoryId) => {
+  updateBookmarkGroups = action((bookmark, categoryId) => {
+    const {
+      bookmarkGroups
+    } = window.store
     let index = bookmarkGroups.findIndex(
       bg => bg.id === categoryId
     )
@@ -106,50 +110,21 @@ export default class BookmarkForm extends PureComponent {
     }
     const bid = bookmark.id
     const bg = bookmarkGroups[index]
-    const updates = []
-    const old = copy(bg.bookmarkIds)
     if (!bg.bookmarkIds.includes(bid)) {
       bg.bookmarkIds.unshift(bid)
     }
     bg.bookmarkIds = uniq(bg.bookmarkIds)
-    if (!isEqual(bg.bookmarkIds, old)) {
-      updates.push({
-        id: bg.id,
-        db: 'bookmarkGroups',
-        update: {
-          bookmarkIds: bg.bookmarkIds
-        }
-      })
-    }
-    bookmarkGroups = bookmarkGroups.map((bg, i) => {
+    bookmarkGroups.forEach((bg, i) => {
       if (i === index) {
         return bg
       }
-      const olde = copy(bg.bookmarkIds)
       bg.bookmarkIds = bg.bookmarkIds.filter(
         g => g !== bid
       )
-      if (!isEqual(bg.bookmarkIds, olde)) {
-        updates.push({
-          id: bg.id,
-          db: 'bookmarkGroups',
-          update: {
-            bookmarkIds: bg.bookmarkIds
-          }
-        })
-      }
       return bg
     })
-    runIdle(() => {
-      this.props.store.setBookmarkGroups(
-        bookmarkGroups
-      )
-    })
-    runIdle(() => {
-      this.props.store.batchDbUpdate(updates)
-    })
     message.success('OK', 3)
-  }
+  })
 
   submit = (evt, item, type = this.props.type) => {
     if (item.host) {
@@ -162,9 +137,6 @@ export default class BookmarkForm extends PureComponent {
     const { addItem, editItem } = this.props.store
     const categoryId = obj.category
     delete obj.category
-    const bookmarkGroups = copy(
-      this.props.bookmarkGroups
-    )
     if (!obj.id.startsWith(newBookmarkIdPrefix)) {
       const tar = copy(obj)
       delete tar.id
@@ -172,7 +144,6 @@ export default class BookmarkForm extends PureComponent {
         editItem(obj.id, tar, settingMap.bookmarks)
       })
       this.updateBookmarkGroups(
-        bookmarkGroups,
         obj,
         categoryId
       )
@@ -185,7 +156,6 @@ export default class BookmarkForm extends PureComponent {
         addItem(obj, settingMap.bookmarks)
       })
       this.updateBookmarkGroups(
-        bookmarkGroups,
         obj,
         categoryId
       )
@@ -200,9 +170,6 @@ export default class BookmarkForm extends PureComponent {
     settingItem = getInitItem([], settingMap.bookmarks)
   ) => {
     const { store } = this.props
-    this.props.store.storeAssign({
-      autofocustrigger: Date.now()
-    })
     store.setSettingItem(settingItem)
   }
 

package/client/components/bookmark-form/tree-delete.jsx

@@ -20,20 +20,8 @@ export default class BookmarkTreeDelete extends StartSessionSelect {
   handleDel = () => {
     const { store } = window
     const {
-      checkedKeys,
-      bookmarks,
-      bookmarkGroups
+      checkedKeys
     } = this.props
-    store.setBookmarks(
-      bookmarks.filter(f => {
-        return !checkedKeys.includes(f.id)
-      })
-    )
-    store.setBookmarkGroups(
-      bookmarkGroups.filter(f => {
-        return f.id === defaultBookmarkGroupId || !checkedKeys.includes(f.id)
-      })
-    )
     const arr = checkedKeys.filter(d => d !== defaultBookmarkGroupId)
     store.delItems(arr, settingMap.bookmarks)
     store.delItems(arr, settingMap.bookmarkGroups)

package/client/components/common/animate-text.jsx

@@ -3,17 +3,16 @@
  */
 
 import React from 'react'
-import uid from '../../common/uid'
 import './animate-text.styl'
 
 export default class AnimateText extends React.PureComponent {
   constructor (props) {
     super(props)
-    this.uid = 'AnimateText-' + uid()
+    this.textRef = React.createRef()
   }
 
   componentDidUpdate () {
-    const dom = document.getElementById(this.uid)
+    const dom = this.textRef.current
     dom.className = (this.props.className || 'animate-text-wrap') + ' animated bounceIn'
     this.timer = setTimeout(() => {
       if (dom) {
@@ -29,7 +28,7 @@ export default class AnimateText extends React.PureComponent {
   render () {
     const { children, className } = this.props
     return (
-      <div className={className} id={this.uid}>
+      <div className={className} ref={this.textRef}>
         {children}
       </div>
     )