@electerm/electerm-react 1.100.6 → 1.100.18

package/client/components/quick-commands/quick-commands-form-elem.jsx

@@ -16,6 +16,8 @@ import deepCopy from 'json-deep-copy'
 import {
   isMacJs as isMac
 } from '../../common/constants.js'
+import templates from './templates'
+import HelpIcon from '../common/help-icon'
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -130,72 +132,85 @@ export default function QuickCommandForm (props) {
     handleClear,
     renderClear: true
   }
+  const templatesStr = templates.map(t => {
+    return `{{${t}}}`
+  }).join(', ')
+  const wiki = 'https://github.com/electerm/electerm/wiki/quick-command-templates'
   return (
-    <Form
-      form={form}
-      onFinish={handleSubmit}
-      className='form-wrap pd2l'
-      layout='vertical'
-      initialValues={initialValues}
-    >
-      <FormItem
-        label={e('quickCommandName')}
-        rules={[{
-          max: 60, message: '60 chars max'
-        }, {
-          required: true, message: 'Name required'
-        }]}
-        hasFeedback
-        name='name'
+    <>
+      <p>
+        <b className='mg1r'>{e('templates')}:</b>
+        <span className='mg1r'>{templatesStr}</span>
+        <HelpIcon
+          link={wiki}
+        />
+      </p>
+      <Form
+        form={form}
+        onFinish={handleSubmit}
+        className='form-wrap pd2l'
+        layout='vertical'
+        initialValues={initialValues}
       >
-        <InputAutoFocus />
-      </FormItem>
-      {renderQm()}
-      <FormItem
-        name='labels'
-        label={e('label')}
-      >
-        <Select
-          mode='tags'
+        <FormItem
+          label={e('quickCommandName')}
+          rules={[{
+            max: 60, message: '60 chars max'
+          }, {
+            required: true, message: 'Name required'
+          }]}
+          hasFeedback
+          name='name'
         >
-          {
-            quickCommandTags.map(q => {
-              return (
-                <Option value={q} key={'qmt-' + q}>
-                  {q}
-                </Option>
-              )
-            })
-          }
-        </Select>
-      </FormItem>
-      <FormItem
-        label={e('settingShortcuts')}
-        name='shortcut'
-      >
-        <div>
-          <Input className='hide' />
-          <ShortcutEdit
-            {...editorProps}
-          />
-        </div>
-      </FormItem>
-      <FormItem
-        label={e('inputOnly')}
-        name='inputOnly'
-        valuePropName='checked'
-      >
-        <Switch />
-      </FormItem>
-      <FormItem>
-        <p>
-          <Button
-            type='primary'
-            htmlType='submit'
-          >{e('save')}
-          </Button>
-        </p>
-      </FormItem>
-    </Form>
+          <InputAutoFocus />
+        </FormItem>
+        {renderQm()}
+        <FormItem
+          name='labels'
+          label={e('label')}
+        >
+          <Select
+            mode='tags'
+          >
+            {
+              quickCommandTags.map(q => {
+                return (
+                  <Option value={q} key={'qmt-' + q}>
+                    {q}
+                  </Option>
+                )
+              })
+            }
+          </Select>
+        </FormItem>
+        <FormItem
+          label={e('settingShortcuts')}
+          name='shortcut'
+        >
+          <div>
+            <Input className='hide' />
+            <ShortcutEdit
+              {...editorProps}
+            />
+          </div>
+        </FormItem>
+        <FormItem
+          label={e('inputOnly')}
+          name='inputOnly'
+          valuePropName='checked'
+        >
+          <Switch />
+        </FormItem>
+        <FormItem>
+          <p>
+            <Button
+              type='primary'
+              htmlType='submit'
+            >{e('save')}
+            </Button>
+          </p>
+        </FormItem>
+      </Form>
+    </>
   )
 }

package/client/components/quick-commands/templates.js

@@ -0,0 +1,5 @@
+export default [
+  'clipboard',
+  'time',
+  'date'
+]

package/client/components/sftp/address-bookmark-item.jsx

@@ -2,6 +2,9 @@ import { Component } from 'react'
 import {
   CloseCircleOutlined
 } from '@ant-design/icons'
+import {
+  Tag
+} from 'antd'
 
 export default class AddrBookmarkItem extends Component {
   handleClick = () => {
@@ -50,6 +53,9 @@ export default class AddrBookmarkItem extends Component {
       item
     } = this.props
     const id = `${item.host}#${item.id}`
+    const globTag = item.isGlobal
+      ? <Tag color='green'>G</Tag>
+      : null
     return (
       <div
         key={item.id}
@@ -61,7 +67,8 @@ export default class AddrBookmarkItem extends Component {
         onDragStart={this.handleDragStart}
         onDrop={this.handleDrop}
       >
-        {item.addr}
+        {globTag}
+        <b>{item.addr}</b>
         <CloseCircleOutlined
           className='del-addr-bookmark'
           onClick={this.handleDel}

package/client/components/sftp/address-bookmark.jsx

@@ -4,7 +4,8 @@ import {
   PlusSquareOutlined
 } from '@ant-design/icons'
 import {
-  Popover
+  Popover,
+  Button
 } from 'antd'
 import AddrBookmarkItem from './address-bookmark-item'
 import { typeMap } from '../../common/constants'
@@ -16,7 +17,7 @@ export default auto(function AddrBookmark (props) {
     window.store.delAddressBookmark(item)
   }
 
-  function handleAddAddr () {
+  function handleAddAddrAct (isGlobal = false) {
     const {
       host, realPath, type
     } = props
@@ -24,11 +25,20 @@ export default auto(function AddrBookmark (props) {
       {
         addr: realPath,
         host: type === typeMap.local ? '' : host,
+        isGlobal,
         id: uid()
       }
     )
   }
 
+  function handleAddAddr () {
+    handleAddAddrAct(false)
+  }
+
+  function handleAddAddrGlob () {
+    handleAddAddrAct(true)
+  }
+
   const { type, onClickHistory, host } = props
   const { store } = window
   // const cls = classnames(
@@ -36,10 +46,13 @@ export default auto(function AddrBookmark (props) {
   //   'animated',
   //   `sftp-history-${type}`
   // )
-  const addrs = type === typeMap.local
+  const isLocal = type === typeMap.local
+  const addrs = isLocal
     ? store.addressBookmarksLocal
     : store.addressBookmarks.filter(
-      g => g.host === host
+      g => {
+        return g.isGlobal || g.host === host
+      }
     )
   const inner = addrs.length
     ? addrs.map(o => {
@@ -61,11 +74,25 @@ export default auto(function AddrBookmark (props) {
       {inner}
     </div>
   )
+  const globButton = isLocal
+    ? null
+    : (
+      <Button
+        onClick={handleAddAddrGlob}
+        icon={<PlusSquareOutlined />}
+      >
+        {window.translate('global')}
+      </Button>
+      )
   const title = (
-    <PlusSquareOutlined
-      className='add-addr-bookmark'
-      onClick={handleAddAddr}
-    />
+    <div>
+      <Button
+        className='add-addr-bookmark mg1r'
+        onClick={handleAddAddr}
+        icon={<PlusSquareOutlined />}
+      />
+      {globButton}
+    </div>
   )
   return (
     <Popover

package/client/components/sftp/file-item.jsx

@@ -52,7 +52,7 @@ export default class FileSection extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      file: copy(props.file),
+      file: props.file,
       overwriteStrategy: '',
       dropdownOpen: false
     }
@@ -122,7 +122,7 @@ export default class FileSection extends React.Component {
     const files = targetFiles ||
       (
         selected
-          ? this.props.selectedFiles
+          ? this.props.getSelectedFiles()
           : [file]
       )
     const prefix = file.type === typeMap.remote
@@ -141,7 +141,7 @@ export default class FileSection extends React.Component {
     const files = targetFiles ||
       (
         selected
-          ? this.props.selectedFiles
+          ? this.props.getSelectedFiles()
           : [file]
       )
     const textToCopy = files.map(f => {
@@ -220,7 +220,7 @@ export default class FileSection extends React.Component {
     this.props.modifier({
       onDrag: true
     })
-    const cls = this.props.selectedFiles.length > 1
+    const cls = this.props.selectedFiles.size > 1
       ? onDragCls + ' ' + onMultiDragCls
       : onDragCls
     addClass(this.domRef.current, cls)
@@ -357,7 +357,7 @@ export default class FileSection extends React.Component {
 
   transferDrop = (fromFiles, toFile, operation) => {
     const files = this.isSelected(fromFiles[0])
-      ? this.props.selectedFiles
+      ? this.props.getSelectedFiles()
       : fromFiles
     return this.doTransferSelected(
       null,
@@ -369,10 +369,7 @@ export default class FileSection extends React.Component {
   }
 
   isSelected = file => {
-    return some(
-      this.props.selectedFiles,
-      f => f.id === file.id
-    )
+    return this.props.selectedFiles.has(file.id)
   }
 
   doRename = () => {
@@ -453,7 +450,7 @@ export default class FileSection extends React.Component {
   }
 
   getShiftSelected (file, type) {
-    const indexs = this.props.selectedFiles.map(
+    const indexs = this.props.getSelectedFiles().map(
       this.props.getIndex
     )
     const i = this.props.getIndex(file)
@@ -486,12 +483,10 @@ export default class FileSection extends React.Component {
     this.onDragEnd(e)
     if (!id) {
       return this.props.modifier({
-        selectedFiles: []
+        selectedFiles: new Set()
       })
     }
-    const selectedFilesOld = copy(
-      this.props.selectedFiles
-    )
+    const selectedFilesOld = this.props.getSelectedFiles()
     const isSameSide = selectedFilesOld.length &&
       type === selectedFilesOld[0].type
     let selectedFiles = [file]
@@ -515,7 +510,8 @@ export default class FileSection extends React.Component {
       }
     }
     this.props.modifier({
-      selectedFiles,
+      selectedFiles: new Set(selectedFiles.map(f => f.id)),
+      selectedType: type,
       lastClickedFile: file
     })
   }
@@ -779,7 +775,7 @@ export default class FileSection extends React.Component {
 
   doTransferSelected = async (
     e,
-    selectedFiles = this.props.selectedFiles,
+    selectedFiles = this.props.getSelectedFiles(),
     toPathBase,
     typeTo,
     operation
@@ -820,16 +816,16 @@ export default class FileSection extends React.Component {
       selectedFiles
     } = this.props
     return id &&
-      selectedFiles.length > 1 &&
-      some(selectedFiles, d => d.id === id)
+      selectedFiles.size > 1 &&
+      selectedFiles.has(id)
   }
 
   del = async () => {
     const delSelected = this.shouldShowSelectedMenu()
-    const { file, selectedFiles } = this.props
+    const { file } = this.props
     const { type } = file
     const files = delSelected
-      ? selectedFiles
+      ? this.props.getSelectedFiles()
       : [file]
     await this.props.delFiles(type, files)
   }
@@ -875,9 +871,9 @@ export default class FileSection extends React.Component {
   }
 
   renderDelConfirmTitle (shouldShowSelectedMenu) {
-    const { file, selectedFiles } = this.props
+    const { file } = this.props
     const files = shouldShowSelectedMenu
-      ? selectedFiles
+      ? this.props.getSelectedFiles()
       : [file]
     return this.props.renderDelConfirmTitle(files, true)
   }
@@ -966,10 +962,10 @@ export default class FileSection extends React.Component {
     const iconType = isLocal
       ? 'CloudUploadOutlined'
       : 'CloudDownloadOutlined'
-    const len = selectedFiles.length
+    const len = selectedFiles.size
     const shouldShowSelectedMenu = id &&
       len > 1 &&
-      some(selectedFiles, d => d.id === id)
+      selectedFiles.has(id)
     const delTxt = shouldShowSelectedMenu ? `${e('deleteAll')}(${len})` : e('del')
     const canPaste = hasFileInClipboardText()
     const showEdit = !isDirectory && id &&
@@ -1219,7 +1215,7 @@ export default class FileSection extends React.Component {
     if (isEditing) {
       return this.renderEditing(file)
     }
-    const selected = some(selectedFiles.filter(d => d), s => s.id === id)
+    const selected = selectedFiles.has(id)
     const className = classnames('sftp-item', cls, type, {
       directory: isDirectory,
       selected

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

@@ -41,7 +41,8 @@ export default class Sftp extends Component {
     super(props)
     this.state = {
       id: props.id || generate(),
-      selectedFiles: [],
+      selectedFiles: new Set(),
+      selectedType: '',
       lastClickedFile: null,
       onEditFile: false,
       ...this.defaultState(),
@@ -71,17 +72,17 @@ export default class Sftp extends Component {
     }
     if (
       prevState.remotePath !== this.state.remotePath &&
-      this.state.selectedFiles.some(f => f.type === typeMap.remote)
+      this.state.selectedType === typeMap.remote
     ) {
       this.setState({
-        selectedFiles: []
+        selectedFiles: new Set()
       })
     } else if (
       prevState.localPath !== this.state.localPath &&
-      this.state.selectedFiles.some(f => f.type === typeMap.local)
+      this.state.selectedType === typeMap.local
     ) {
       this.setState({
-        selectedFiles: []
+        selectedFiles: new Set()
       })
     }
     if (
@@ -136,6 +137,14 @@ export default class Sftp extends Component {
     return this.directions[i]
   }
 
+  getFileItemById = (id, type) => {
+    if (type) {
+      return this.state[`${type}FileTree`].get(id)
+    }
+    return this.getFileItemById(id, typeMap.local) ||
+      this.getFileItemById(id, typeMap.remote)
+  }
+
   defaultState = () => {
     const def = this.props.config.showHiddenFilesOnSftpStart
     return Object.keys(typeMap).reduce((prev, k, i) => {
@@ -288,49 +297,61 @@ export default class Sftp extends Component {
   selectAll = (type, e) => {
     e && e.preventDefault && e.preventDefault()
     this.setState({
-      selectedFiles: this.getFileList(type)
+      selectedFiles: new Set(this.getFileList(type).map(f => f.id))
     })
   }
 
   selectNext = type => {
     const { selectedFiles } = this.state
-    const sorted = selectedFiles.map(f => this.getIndex(f))
-      .sort(sorterIndex)
-    const lastOne = last(sorted)
-    const list = this.getFileList(type)
-    if (!list.length) {
+    const fileList = this.getFileList(type)
+    if (!fileList.length) {
       return
     }
+
+    // Convert Set of IDs to array of indices
+    const fileIndices = Array.from(selectedFiles)
+      .map(id => fileList.findIndex(f => f.id === id))
+      .filter(index => index !== -1)
+      .sort(sorterIndex)
+
+    const lastOne = last(fileIndices)
     let next = 0
     if (isNumber(lastOne)) {
-      next = (lastOne + 1) % list.length
+      next = (lastOne + 1) % fileList.length
     }
-    const nextFile = list[next]
+
+    const nextFile = fileList[next]
     if (nextFile) {
       this.setState({
-        selectedFiles: [nextFile]
+        selectedFiles: new Set([nextFile.id])
       })
     }
   }
 
   selectPrev = type => {
     const { selectedFiles } = this.state
-    const sorted = selectedFiles.map(f => this.getIndex(f))
-      .sort(sorterIndex)
-    const lastOne = sorted[0]
-    const list = this.getFileList(type)
-    if (!list.length) {
+    const fileList = this.getFileList(type)
+    if (!fileList.length) {
       return
     }
+
+    // Convert Set of IDs to array of indices
+    const fileIndices = Array.from(selectedFiles)
+      .map(id => fileList.findIndex(f => f.id === id))
+      .filter(index => index !== -1)
+      .sort(sorterIndex)
+
+    const firstOne = fileIndices[0]
     let next = 0
-    const len = list.length
-    if (isNumber(lastOne)) {
-      next = (lastOne - 1 + len) % len
+    const len = fileList.length
+    if (isNumber(firstOne)) {
+      next = (firstOne - 1 + len) % len
     }
-    const nextFile = list[next]
+
+    const nextFile = fileList[next]
     if (nextFile) {
       this.setState({
-        selectedFiles: [nextFile]
+        selectedFiles: new Set([nextFile.id])
       })
     }
   }
@@ -366,14 +387,23 @@ export default class Sftp extends Component {
     })
   }
 
-  delFiles = async (_type, files = this.state.selectedFiles) => {
+  getSelectedFiles = (selectedFiles = this.state.selectedFiles) => {
+    // Convert Set of IDs to array of file objects
+    return Array.isArray(selectedFiles)
+      ? selectedFiles
+      : Array.from(selectedFiles)
+        .map(id => this.getFileItemById(id))
+        .filter(Boolean) // Filter out any undefined items
+  }
+
+  delFiles = async (_type, files = this.getSelectedFiles()) => {
     this.onDelete = true
     const confirm = await this.confirmDelete(files)
     this.onDelete = false
     if (!confirm) {
       return
     }
-    const type = files[0].type || _type
+    const type = files[0]?.type || _type
     const func = this[type + 'Del']
     for (const f of files) {
       await func(f)
@@ -384,7 +414,7 @@ export default class Sftp extends Component {
     this[type + 'List']()
   }
 
-  renderDelConfirmTitle (files = this.state.selectedFiles, pureText) {
+  renderDelConfirmTitle (files = this.getSelectedFiles(), pureText) {
     const hasDirectory = some(files, f => f.isDirectory)
     const names = hasDirectory ? e('filesAndFolders') : e('files')
     if (pureText) {
@@ -409,10 +439,14 @@ export default class Sftp extends Component {
 
   enter = (type, e) => {
     const { selectedFiles, onEditFile } = this.state
-    if (onEditFile || selectedFiles.length !== 1) {
+    if (onEditFile || selectedFiles.size !== 1) {
+      return
+    }
+    const fileId = Array.from(selectedFiles)[0]
+    const file = this.getFileItemById(fileId)
+    if (!file) {
       return
     }
-    const file = selectedFiles[0]
     const { isDirectory } = file
     if (isDirectory) {
       this[type + 'Dom'].enterDirectory(e, file)
@@ -440,11 +474,13 @@ export default class Sftp extends Component {
   }
 
   doCopy = (type, e) => {
-    this[type + 'Dom'].onCopy(this.state.selectedFiles)
+    const selectedFiles = this.getSelectedFiles()
+    this[type + 'Dom'].onCopy(selectedFiles)
   }
 
   doCut = (type, e) => {
-    this[type + 'Dom'].onCut(this.state.selectedFiles)
+    const selectedFiles = this.getSelectedFiles()
+    this[type + 'Dom'].onCut(selectedFiles)
   }
 
   doPaste = (type) => {
@@ -937,7 +973,9 @@ export default class Sftp extends Component {
         'getFileList',
         'onGoto',
         'addTransferList',
-        'renderDelConfirmTitle'
+        'renderDelConfirmTitle',
+        'getSelectedFiles',
+        'getFileItemById'
       ]),
       ...pick(this.state, [
         'id',

package/client/components/terminal/terminal.jsx

@@ -58,6 +58,19 @@ import SearchResultBar from './terminal-search-bar'
 
 const e = window.translate
 
+const PS1_SETUP_CMD = `\recho $0|grep csh >/dev/null && set prompt_bak="$prompt" && set prompt="$prompt${cwdId}%/${cwdId}"\r
+echo $0|grep zsh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'${cwdId}%d${cwdId}'\r
+echo $0|grep ash >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
+echo $0|grep ksh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
+echo $0|grep '^sh' >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
+clear\r`
+
+const PS1_RESTORE_CMD = `\recho $0|grep csh >/dev/null && set prompt="$prompt_bak"\r
+echo $0|grep zsh >/dev/null && PS1="$PS1_bak"\r
+echo $0|grep ash >/dev/null && PS1="$PS1_bak"\r
+echo $0|grep ksh >/dev/null && PS1="$PS1_bak"\r
+echo $0|grep '^sh' >/dev/null && PS1="$PS1_bak"\r
+clear\r`
 class Term extends Component {
   constructor (props) {
     super(props)
@@ -133,25 +146,20 @@ class Term extends Component {
     )
 
     if (sftpPathFollowSshChanged) {
-      const ps1Cmd = `\recho $0|grep csh >/dev/null && set prompt_bak="$prompt" && set prompt="$prompt${cwdId}%/${cwdId}"\r
-echo $0|grep zsh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'${cwdId}%d${cwdId}'\r
-echo $0|grep ash >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
-echo $0|grep ksh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
-echo $0|grep '^sh' >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
-clear\r`
-      const ps1RestoreCmd = `\recho $0|grep csh >/dev/null && set prompt="$prompt_bak"\r
-echo $0|grep zsh >/dev/null && PS1="$PS1_bak"\r
-echo $0|grep ash >/dev/null && PS1="$PS1_bak"\r
-echo $0|grep ksh >/dev/null && PS1="$PS1_bak"\r
-echo $0|grep '^sh' >/dev/null && PS1="$PS1_bak"\r
-clear\r`
-
       if (this.props.sftpPathFollowSsh) {
-        this.socket.send(ps1Cmd)
-        this.term.cwdId = cwdId
+        if (this.attachAddon && this.term) {
+          this.attachAddon._sendData(PS1_SETUP_CMD)
+          this.term.cwdId = cwdId
+        } else {
+          log.warn('Term or attachAddon not ready for PS1_SETUP_CMD in componentDidUpdate')
+        }
       } else {
-        this.socket.send(ps1RestoreCmd)
-        delete this.term.cwdId
+        if (this.attachAddon) {
+          this.attachAddon._sendData(PS1_RESTORE_CMD)
+        }
+        if (this.term) {
+          delete this.term.cwdId
+        }
       }
     }
   }
@@ -878,17 +886,17 @@ clear\r`
   getCwd = () => {
     if (
       this.props.sftpPathFollowSsh &&
+      this.term &&
       this.term.buffer.active.type !== 'alternate' && !this.term.cwdId
     ) {
+      // This block should ideally not be hit for initial setup if runInitScript works.
+      // It acts as a fallback.
       this.term.cwdId = cwdId
-
-      const ps1Cmd = `\recho $0|grep csh >/dev/null && set prompt_bak="$prompt" && set prompt="$prompt${cwdId}%/${cwdId}"\r
-echo $0|grep zsh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'${cwdId}%d${cwdId}'\r
-echo $0|grep ash >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
-echo $0|grep ksh >/dev/null && PS1_bak=$PS1&&PS1=$PS1'\`echo ${cwdId}$PWD${cwdId}\`'\r
-clear\r`
-
-      this.socket.send(ps1Cmd)
+      if (this.attachAddon) {
+        this.attachAddon._sendData(PS1_SETUP_CMD)
+      } else {
+        log.warn('attachAddon not ready for PS1_SETUP_CMD in getCwd fallback')
+      }
     }
   }
 
@@ -1053,9 +1061,23 @@ clear\r`
     } = this.props.tab
     const startFolder = startDirectory || window.initFolder
     if (startFolder) {
-      const cmd = `cd "${startFolder}"\r`
-      this.attachAddon._sendData(cmd)
+      if (this.attachAddon) {
+        const cmd = `cd "${startFolder}"\r`
+        this.attachAddon._sendData(cmd)
+      } else {
+        log.warn('attachAddon not ready for cd command in runInitScript')
+      }
+    }
+
+    if (this.props.sftpPathFollowSsh) {
+      if (this.term && this.attachAddon) {
+        this.attachAddon._sendData(PS1_SETUP_CMD)
+        this.term.cwdId = cwdId
+      } else {
+        log.warn('Term or attachAddon not ready for PS1_SETUP_CMD in runInitScript')
+      }
     }
+
     if (runScripts && runScripts.length) {
       this.delayedScripts = deepCopy(runScripts)
       this.timers.timerDelay = setTimeout(this.runDelayedScripts, this.delayedScripts[0].delay || 0)

package/client/store/quick-command.js

@@ -12,6 +12,35 @@ import generate from '../common/uid'
 import * as ls from '../common/safe-local-storage'
 import { debounce } from 'lodash-es'
 import { refs } from '../components/common/ref'
+import templates from '../components/quick-commands/templates'
+import { readClipboardAsync } from '../common/clipboard'
+
+// Function to parse templates in command string
+async function parseTemplates (cmd) {
+  if (!cmd.includes('{{')) return cmd
+
+  // Process each template from templates.js
+  for (const template of templates) {
+    const placeholder = `{{${template}}}`
+    if (cmd.includes(placeholder)) {
+      let replacement = ''
+
+      // Handle each supported template using if-else
+      if (template === 'clipboard') {
+        replacement = await readClipboardAsync()
+      } else if (template === 'time') {
+        replacement = Date.now()
+      } else if (template === 'date') {
+        replacement = new Date().toLocaleDateString()
+      }
+      // Add more conditions for any new templates as needed
+
+      cmd = cmd.replaceAll(placeholder, replacement)
+    }
+  }
+
+  return cmd
+}
 
 export default Store => {
   Store.prototype.addQuickCommand = function (
@@ -54,9 +83,13 @@ export default Store => {
           : []
         )
     for (const q of qms) {
-      const realCmd = isWin
+      let realCmd = isWin
         ? q.command.replace(/\n/g, '\n\r')
         : q.command
+
+      // Parse templates
+      realCmd = await parseTemplates(realCmd)
+
       await delay(q.delay || 100)
       runQuickCommand(realCmd, qm.inputOnly)
       store.editQuickCommand(qm.id, {

package/package.json

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