@electerm/electerm-react 1.39.88 → 1.39.103

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

@@ -19,10 +19,7 @@ import {
 
 const FormItem = Form.Item
 const { Option } = Select
-const { prefix } = window
-const e = prefix('form')
-const t = prefix('quickCommands')
-const s = prefix('setting')
+const e = window.translate
 const shortcutsDefaults = shortcutsDefaultsGen()
 
 export default function QuickCommandForm (props) {
@@ -38,7 +35,6 @@ export default function QuickCommandForm (props) {
     setShortcut(value)
   }
   const handleClear = () => {
-    console.log('handleClear')
     form.setFieldsValue({
       shortcut: ''
     })
@@ -107,10 +103,10 @@ export default function QuickCommandForm (props) {
       store.addQuickCommand(update1)
       store.setSettingItem({
         id: '',
-        name: t('newQuickCommand')
+        name: e('newQuickCommand')
       })
     }
-    message.success(s('saved'))
+    message.success(e('saved'))
   }
   const initialValues = formData
   if (!initialValues.labels) {
@@ -123,7 +119,6 @@ export default function QuickCommandForm (props) {
       delay: 100
     }]
   }
-  console.log('initialValues', initialValues, formData)
   const editorProps = {
     data: {
       name: uid,
@@ -144,7 +139,7 @@ export default function QuickCommandForm (props) {
       initialValues={initialValues}
     >
       <FormItem
-        label={t('quickCommandName')}
+        label={e('quickCommandName')}
         rules={[{
           max: 60, message: '60 chars max'
         }, {
@@ -161,7 +156,7 @@ export default function QuickCommandForm (props) {
       {renderQm()}
       <FormItem
         name='labels'
-        label={t('label')}
+        label={e('label')}
       >
         <Select
           mode='tags'
@@ -178,7 +173,7 @@ export default function QuickCommandForm (props) {
         </Select>
       </FormItem>
       <FormItem
-        label={s('settingShortcuts')}
+        label={e('settingShortcuts')}
         name='shortcut'
       >
         <div>
@@ -189,7 +184,7 @@ export default function QuickCommandForm (props) {
         </div>
       </FormItem>
       <FormItem
-        label={t('inputOnly')}
+        label={e('inputOnly')}
         name='inputOnly'
         valuePropName='checked'
       >

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

@@ -14,8 +14,7 @@ import { useRef } from 'react'
 
 const FormItem = Form.Item
 const FormList = Form.List
-const { prefix } = window
-const t = prefix('quickCommands')
+const e = window.translate
 
 export default function renderQm () {
   const focused = useRef(0)
@@ -34,7 +33,7 @@ export default function renderQm () {
             min={1}
             step={1}
             max={65535}
-            addonBefore={t('delay')}
+            addonBefore={e('delay')}
             placeholder={100}
             className='compact-input'
           />
@@ -46,8 +45,8 @@ export default function renderQm () {
           className='mg2x'
         >
           <Input.TextArea
-            rows={1}
-            placeholder={t('quickCommand')}
+            autoSize={{ minRows: 1 }}
+            placeholder={e('quickCommand')}
             className='compact-input qm-input'
             onFocus={() => {
               focused.current = i
@@ -100,7 +99,7 @@ export default function renderQm () {
   })
   const label = (
     <div>
-      {t('commonCommands')}
+      {e('commonCommands')}
       <HelpIcon
         title={cmds}
       />
@@ -127,7 +126,7 @@ export default function renderQm () {
                     block
                     icon={<PlusOutlined />}
                   >
-                    {t('quickCommand')}
+                    {e('quickCommand')}
                   </Button>
                 </FormItem>
               </div>

package/client/components/quick-commands/quick-commands-list.jsx

@@ -10,8 +10,7 @@ import highlight from '../common/highlight'
 import QmTransport from './quick-command-transport'
 
 const { Option } = Select
-const { prefix } = window
-const q = prefix('quickCommands')
+const e = window.translate
 
 export default class QuickCommandsList extends List {
   del = (item, e) => {
@@ -114,7 +113,7 @@ export default class QuickCommandsList extends List {
   renderLabels = () => {
     const arr = this.getLabels()
     const props = {
-      placeholder: q('labels'),
+      placeholder: e('labels'),
       mode: 'multiple',
       value: this.state.labels,
       onChange: this.handleChange,

package/client/components/quick-commands/quick-commands-select.jsx

@@ -6,8 +6,7 @@ import { PureComponent } from 'react'
 import { Button } from 'antd'
 import './qm.styl'
 
-const { prefix } = window
-const e = prefix('quickCommands')
+const e = window.translate
 
 export default class QuickCommandsFooter extends PureComponent {
   handleOpen = () => {

package/client/components/rdp/rdp-session.jsx

@@ -23,9 +23,6 @@ import scanCode from './code-scan'
 import resolutions from './resolutions'
 
 const { Option } = Select
-// const { prefix } = window
-// const e = prefix('ssh')
-// const m = prefix('menu')
 
 export default class RdpSession extends Component {
   constructor (props) {

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

@@ -11,10 +11,7 @@ import { formItemLayout, tailFormItemLayout } from '../../common/form-layout'
 import resolutions from './resolutions'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('ssh')
-const c = prefix('common')
-const m = prefix('menu')
+const e = window.translate
 
 export default function ResolutionForm (props) {
   const {
@@ -43,7 +40,7 @@ export default function ResolutionForm (props) {
         return `${item.width}x${item.height}`
       }
     }, {
-      title: m('del'),
+      title: e('del'),
       key: 'op',
       dataIndex: 'id',
       render: (id, item) => {
@@ -91,7 +88,7 @@ export default function ResolutionForm (props) {
         initialValues={initialValues}
       >
         <FormItem
-          label={c('resolutions')}
+          label={e('resolutions')}
           {...formItemLayout}
           required
           className='ssh-tunnels-host'

package/client/components/session/session.jsx

@@ -13,7 +13,8 @@ import {
   SearchOutlined,
   FullscreenOutlined,
   PaperClipOutlined,
-  CloseOutlined
+  CloseOutlined,
+  QuestionCircleOutlined
 } from '@ant-design/icons'
 import {
   Tooltip
@@ -37,6 +38,7 @@ import ResizeWrap from '../common/resize-wrap'
 import safeName from '../../common/safe-name'
 import TerminalInfoContent from '../terminal-info/content'
 import uid from '../../common/id-with-stamp'
+import Link from '../common/external-link'
 import postMessage from '../../common/post-msg'
 import './session.styl'
 
@@ -60,9 +62,7 @@ const getPrevTerminal = terminals => {
   return last(terminals)
 }
 
-const { prefix } = window
-const e = prefix('ssh')
-const m = prefix('menu')
+const e = window.translate
 
 export default class SessionWrapper extends Component {
   constructor (props) {
@@ -543,7 +543,18 @@ export default class SessionWrapper extends Component {
     if (isSsh || isLocal) {
       controls.push(isSsh ? paneMap.sftp : paneMap.fileManager)
     }
-    const checkTxt = e('sftpPathFollowSsh') + ' [Beta]'
+    const checkTxt = (
+      <div>
+        <span>{e('sftpPathFollowSsh')}</span>
+        <span className='mg1l color-red'>[Beta]</span>
+        <Link
+          to='https://github.com/electerm/electerm/wiki/Warning-about-sftp-follow-ssh-path-function'
+          className='mg1l'
+        >
+          Wiki <QuestionCircleOutlined />
+        </Link>
+      </div>
+    )
     const checkProps = {
       onClick: this.toggleCheckSftpPathFollowSsh,
       className: classnames(
@@ -615,7 +626,7 @@ export default class SessionWrapper extends Component {
                       <CloseSquareFilled
                         className='mg1r icon-trash font16 iblock pointer spliter'
                         onClick={() => this.delSplit()}
-                        title={m('del')}
+                        title={e('del')}
                       />
                       )
                 }

package/client/components/session/session.styl

@@ -32,7 +32,11 @@
   &.active
     .type-tab-line
       display inline-block
-
+#container
+  .sftp-follow-ssh-icon
+    &:hover
+    &.active
+      color red
 .is-transporting
   .type-tab.sftp
     .type-tab-line

package/client/components/session/sessions.jsx

@@ -25,9 +25,7 @@ import { Button } from 'antd'
 import toSimpleObj from '../../common/to-simple-obj'
 import { shortcutExtend } from '../shortcuts/shortcut-handler.js'
 
-const { prefix } = window
-const e = prefix('tabs')
-const c = prefix('control')
+const e = window.translate
 
 class Sessions extends Component {
   state = {
@@ -187,8 +185,8 @@ class Sessions extends Component {
     })
   }
 
-  onDuplicateTab = (tabToDup) => {
-    this.setState(oldState => {
+  onDuplicateTab = async (tabToDup) => {
+    this.setState(async oldState => {
       const defaultStatus = statusMap.processing
       let tab = copy(tabToDup)
       updateCount(tab)
@@ -317,7 +315,7 @@ class Sessions extends Component {
           size='large'
           className='mg1r mg1b'
         >
-          {c('newBookmark')}
+          {e('newBookmark')}
         </Button>
         <div className='pd3'>
           <LogoElem />

package/client/components/setting-panel/keywords-form.jsx

@@ -14,8 +14,7 @@ import {
 const FormItem = Form.Item
 const FormList = Form.List
 const OptionSel = Select.Option
-const { prefix } = window
-const f = prefix('form')
+const e = window.translate
 
 export default function KeywordForm (props) {
   const {
@@ -131,7 +130,7 @@ export default function KeywordForm (props) {
                         })}
                         icon={<PlusOutlined />}
                       >
-                        {f('keyword')}
+                        {e('keyword')}
                       </Button>
                     </FormItem>
                   </div>

package/client/components/setting-panel/list.jsx

@@ -12,10 +12,7 @@ import highlight from '../common/highlight'
 import { settingSyncId, settingCommonId } from '../../common/constants'
 import './list.styl'
 
-const { prefix } = window
-const e = prefix('menu')
-const c = prefix('common')
-const s = prefix('setting')
+const e = window.translate
 
 export default class ItemList extends React.PureComponent {
   state = {
@@ -88,7 +85,7 @@ export default class ItemList extends React.PureComponent {
           title={e('del') + '?'}
           onConfirm={e => this.del(item, e)}
           okText={e('del')}
-          cancelText={c('cancel')}
+          cancelText={e('cancel')}
           placement='top'
         >
           {icon}
@@ -124,7 +121,7 @@ export default class ItemList extends React.PureComponent {
           title={title}
           className='elli pd1y pd2x list-item-title'
         >
-          {tag}{titleHighlight || s('new')}
+          {tag}{titleHighlight || e('new')}
         </div>
         {this.renderDelBtn(item)}
         {this.renderEditBtn(item, isGroup)}

package/client/components/setting-panel/setting-common.jsx

@@ -29,11 +29,7 @@ import delay from '../../common/wait.js'
 import './setting.styl'
 
 const { Option } = Select
-const { prefix } = window
-const e = prefix('setting')
-const f = prefix('form')
-const p = prefix('sftp')
-const t = prefix('terminalThemes')
+const e = window.translate
 
 const modifiers = [
   'Command',
@@ -55,7 +51,7 @@ export default class SettingCommon extends Component {
     passwordChanged: false,
     submittingPass: false,
     passInputFocused: false,
-    placeholderLogin: window.pre.requireAuth ? '********' : f('notSet'),
+    placeholderLogin: window.pre.requireAuth ? '********' : e('notSet'),
     loginPass: ''
   }
 
@@ -92,7 +88,7 @@ export default class SettingCommon extends Component {
         loginPass: pass ? '********' : '',
         submittingPass: false,
         passwordChanged: true,
-        placeholderLogin: pass ? '********' : f('notSet')
+        placeholderLogin: pass ? '********' : e('notSet')
       }, () => {
         this.submitting = false
       })
@@ -417,7 +413,7 @@ export default class SettingCommon extends Component {
       <div className='pd1b'>
         <div className='pd1b'>
           <span className='pd1r'>
-            {e('global')} {f('proxy')}
+            {e('global')} {e('proxy')}
             <HelpIcon
               title={table}
               overlayInnerStyle={style}
@@ -478,7 +474,7 @@ export default class SettingCommon extends Component {
     }
     return (
       <div>
-        <div className='pd1b'>{f('loginPassword')}</div>
+        <div className='pd1b'>{e('loginPassword')}</div>
         <div className='pd2b'>
           <Input.Password
             {...props}
@@ -575,7 +571,7 @@ export default class SettingCommon extends Component {
         }
 
         <div className='pd2b'>
-          <span className='inline-title mg1r'>{t('uiThemes')}</span>
+          <span className='inline-title mg1r'>{e('uiThemes')}</span>
           <Select
             onChange={this.handleChangeTerminalTheme}
             popupMatchSelectWidth={false}
@@ -617,18 +613,18 @@ export default class SettingCommon extends Component {
               })
             }
           </Select>
-          <Link className='mg1l' to={createEditLangLink(language)}>{p('edit')}</Link>
+          <Link className='mg1l' to={createEditLangLink(language)}>{e('edit')}</Link>
         </div>
         {this.renderRestart('languageChanged')}
-        <div className='pd1b'>{t('default')} {e('execWindows')}</div>
+        <div className='pd1b'>{e('default')} {e('execWindows')}</div>
         {
           this.renderTextExec('execWindows')
         }
-        <div className='pd1b'>{t('default')} {e('execMac')}</div>
+        <div className='pd1b'>{e('default')} {e('execMac')}</div>
         {
           this.renderTextExec('execMac')
         }
-        <div className='pd1b'>{t('default')} {e('execLinux')}</div>
+        <div className='pd1b'>{e('default')} {e('execLinux')}</div>
         {
           this.renderTextExec('execLinux')
         }

package/client/components/setting-panel/setting-modal.jsx

@@ -17,11 +17,7 @@ import TabSettings from './tab-settings'
 import TabThemes from './tab-themes'
 import TabProfiles from './tab-profiles'
 
-const { prefix } = window
-const m = prefix('common')
-const t = prefix('terminalThemes')
-const q = prefix('quickCommands')
-const f = prefix('form')
+const e = window.translate
 
 export default class SettingModalWrap extends Component {
   selectItem = (item) => {
@@ -72,32 +68,32 @@ export default class SettingModalWrap extends Component {
     const items = [
       {
         key: settingMap.history,
-        label: m(settingMap.history),
+        label: e(settingMap.history),
         children: null
       },
       {
         key: settingMap.bookmarks,
-        label: m(settingMap.bookmarks),
+        label: e(settingMap.bookmarks),
         children: null
       },
       {
         key: settingMap.setting,
-        label: m(settingMap.setting),
+        label: e(settingMap.setting),
         children: null
       },
       {
         key: settingMap.terminalThemes,
-        label: t('uiThemes'),
+        label: e('uiThemes'),
         children: null
       },
       {
         key: settingMap.quickCommands,
-        label: q(settingMap.quickCommands),
+        label: e(settingMap.quickCommands),
         children: null
       },
       {
         key: settingMap.profiles,
-        label: f(settingMap.profiles),
+        label: e(settingMap.profiles),
         children: null
       }
     ]

package/client/components/setting-panel/setting-terminal.jsx

@@ -31,12 +31,7 @@ import HelpIcon from '../common/help-icon'
 import './setting.styl'
 
 const { Option } = Select
-const { prefix } = window
-const e = prefix('setting')
-const s = prefix('ssh')
-const p = prefix('sftp')
-const t = prefix('terminalThemes')
-const f = prefix('form')
+const e = window.translate
 
 export default class SettingTerminal extends Component {
   state = {
@@ -107,12 +102,13 @@ export default class SettingTerminal extends Component {
 
   renderToggle = (name, extra = null) => {
     const checked = !!this.props.config[name]
+    const txt = e(name)
     return (
       <div className='pd2b' key={'rt' + name}>
         <Switch
           checked={checked}
-          checkedChildren={e(name)}
-          unCheckedChildren={e(name)}
+          checkedChildren={txt}
+          unCheckedChildren={txt}
           onChange={v => this.onChangeValue(v, name)}
         />
         {isNumber(extra) ? null : extra}
@@ -207,7 +203,7 @@ export default class SettingTerminal extends Component {
     const dataSource = [
       {
         value: '',
-        desc: t('default')
+        desc: e('default')
       },
       {
         value: noTerminalBgValue,
@@ -423,7 +419,7 @@ export default class SettingTerminal extends Component {
       : window.et.sessionLogPath
     const tip = (
       <div>
-        <span className='mg1r'>{f('supportRegexp')}</span>
+        <span className='mg1r'>{e('supportRegexp')}</span>
         <Link to={regexHelpLink}>wiki</Link>
       </div>
     )
@@ -431,7 +427,7 @@ export default class SettingTerminal extends Component {
       <div className='form-wrap pd1y pd2x'>
         <div className='pd1y font16 bold'>
           <CodeOutlined className='mg1r' />
-          {s('terminal')} {e('settings')}
+          {e('terminal')} {e('settings')}
         </div>
         {
           this.renderNumber('scrollback', {
@@ -459,17 +455,17 @@ export default class SettingTerminal extends Component {
           this.renderNumber('fontSize', {
             step: 1,
             min: 9
-          }, `${t('default')} ${e('fontSize')}`, 400)
+          }, `${e('default')} ${e('fontSize')}`, 400)
         }
         <div className='pd2b'>
-          <span className='inline-title mg1r'>{t('default')} {e('fontFamily')}</span>
+          <span className='inline-title mg1r'>{e('default')} {e('fontFamily')}</span>
           {
             this.renderFontFamily()
           }
         </div>
         <div className='pd2b'>
           <div className='pd1b'>
-            <span className='inline-title mg1r'>{f('keywordsHighlight')}</span>
+            <span className='inline-title mg1r'>{e('keywordsHighlight')}</span>
             <HelpIcon
               title={tip}
             />
@@ -496,7 +492,7 @@ export default class SettingTerminal extends Component {
           this.renderCursorStyleSelect()
         }
         {this.renderToggle('saveTerminalLogToFile', (
-          <ShowItem to={terminalLogPath} className='mg1l'>{p('open')}</ShowItem>
+          <ShowItem to={terminalLogPath} className='mg1l'>{e('open')}</ShowItem>
         ))}
         {this.renderToggle('addTimeStampToTermLog')}
         {
@@ -505,7 +501,8 @@ export default class SettingTerminal extends Component {
             'rightClickSelectsWord',
             'pasteWhenContextMenu',
             'copyWhenSelect',
-            'ctrlOrMetaOpenTerminalLink'
+            'ctrlOrMetaOpenTerminalLink',
+            'sftpPathFollowSsh'
           ].map(this.renderToggle)
         }
         <div className='pd1b'>{e('terminalBackSpaceMode')}</div>

package/client/components/setting-panel/start-session-select.jsx

@@ -3,8 +3,7 @@ import { Component } from '../common/react-subx'
 import copy from 'json-deep-copy'
 import { createTitleWithTag } from '../../common/create-title'
 
-const { prefix } = window
-const e = prefix('setting')
+const e = window.translate
 const { SHOW_CHILD } = TreeSelect
 
 export default class StartSessionSelect extends Component {

package/client/components/setting-panel/tab-history.jsx

@@ -5,8 +5,7 @@ import {
   settingMap
 } from '../../common/constants'
 
-const { prefix } = window
-const c = prefix('control')
+const e = window.translate
 
 export default function TabHistory (props) {
   const {
@@ -36,7 +35,7 @@ export default function TabHistory (props) {
                 {...formProps}
               />
               )
-            : <div className='form-wrap pd2 aligncenter'>{c('notFoundContent')}</div>
+            : <div className='form-wrap pd2 aligncenter'>{e('notFoundContent')}</div>
         }
       </SettingCol>
     </div>

package/client/components/setting-sync/data-import.jsx

@@ -15,14 +15,11 @@ import {
 } from '@ant-design/icons'
 import { Component } from '../common/react-subx'
 
-const { prefix } = window
-const e = prefix('form')
-const t = prefix('terminalThemes')
-const s = prefix('settingSync')
+const e = window.translate
 
 export class DataTransport extends Component {
   render () {
-    const txt = s('autoSync')
+    const txt = e('autoSync')
     const {
       store
     } = this.props
@@ -34,7 +31,7 @@ export class DataTransport extends Component {
             className='mg1r'
             onClick={store.handleExportAllData}
           >
-            {t('export')}
+            {e('export')}
           </Button>
           <Upload
             beforeUpload={store.importAll}
@@ -55,7 +52,7 @@ export class DataTransport extends Component {
             unCheckedChildren={txt}
             className='mg3l mg1r'
           />
-          <Tooltip title={s('autoSyncTip')}>
+          <Tooltip title={e('autoSyncTip')}>
             <InfoCircleOutlined />
           </Tooltip>
         </div>