@electerm/electerm-react 1.39.76 → 1.39.99

package/client/components/terminal-theme/index.jsx

@@ -8,10 +8,7 @@ import InputAutoFocus from '../common/input-auto-focus'
 
 const { TextArea } = Input
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('setting')
-const t = prefix('terminalThemes')
+const e = window.translate
 
 export default function ThemeForm (props) {
   const [form] = Form.useForm()
@@ -115,7 +112,7 @@ export default function ThemeForm (props) {
         formData.id || update1.id
       )
     }
-    message.success(s('saved'))
+    message.success(e('saved'))
     action.current = 'submit'
   }
 
@@ -157,7 +154,7 @@ export default function ThemeForm (props) {
           type='dashed'
           onClick={exporter}
         >
-          {t('export')}
+          {e('export')}
         </Button>
       </FormItem>
     )
@@ -187,7 +184,7 @@ export default function ThemeForm (props) {
     >
       {renderFuncs(id)}
       <FormItem
-        label={t('themeName')}
+        label={e('themeName')}
         hasFeedback
         name='themeName'
         rules={[{
@@ -203,7 +200,7 @@ export default function ThemeForm (props) {
         />
       </FormItem>
       <FormItem
-        label={t('themeConfig')}
+        label={e('themeConfig')}
       >
         <div className='pd1b'>
           <Upload
@@ -245,7 +242,7 @@ export default function ThemeForm (props) {
                   type='primary'
                   htmlType='submit'
                   className='mg1r mg1b'
-                >{t('saveAndApply')}
+                >{e('saveAndApply')}
                 </Button>
                 <Button
                   type='dashed'

package/client/components/terminal-theme/theme-list.jsx

@@ -10,8 +10,7 @@ import { defaultTheme } from '../../common/constants'
 import highlight from '../common/highlight'
 import './terminal-theme-list.styl'
 
-const { prefix } = window
-const e = prefix('terminalThemes')
+const e = window.translate
 
 export default class ThemeList extends List {
   del = (item, e) => {

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

@@ -6,11 +6,7 @@ import { useEffect } from 'react'
 import { Input, Form, Button } from 'antd'
 
 const FormItem = Form.Item
-
-const { prefix } = window
-const e = prefix('form')
-const c = prefix('common')
-const s = prefix('sftp')
+const e = window.translate
 
 export default function TextEditorForm (props) {
   const [form] = Form.useForm()
@@ -71,7 +67,7 @@ export default function TextEditorForm (props) {
       <div className='pd1t pd2b'>
         <Button
           {...popsEdit}
-        >{s('editWithSystemEditor')}
+        >{e('editWithSystemEditor')}
         </Button>
         <Button
           type='primary'
@@ -85,11 +81,11 @@ export default function TextEditorForm (props) {
           className='mg1r mg1b'
           disabled={loading}
           onClick={reset}
-        >{s('reset')}
+        >{e('reset')}
         </Button>
         <Button
           {...popsCancel}
-        >{c('cancel')}
+        >{e('cancel')}
         </Button>
       </div>
     </Form>

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

@@ -9,8 +9,7 @@ import resolve from '../../common/resolve'
 import { commonActions } from '../../common/constants'
 import postMsg from '../../common/post-msg'
 
-const { prefix } = window
-const s = prefix('sftp')
+const e = window.translate
 
 export default class TextEditor extends PureComponent {
   state = {
@@ -152,7 +151,7 @@ export default class TextEditor extends PureComponent {
     if (!file) {
       return null
     }
-    const title = `${s('edit')} ${s('remote')} ${s('file')}: ${path}`
+    const title = `${e('edit')} ${e('remote')} ${e('file')}: ${path}`
     const propsAll = {
       footer: null,
       title,

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

@@ -15,10 +15,7 @@ import copy from 'json-deep-copy'
 import { find, uniq, isEqual } from 'lodash-es'
 import { fixBookmarks } from '../../common/db-fix'
 
-const { prefix } = window
-const f = prefix('form')
-const t = prefix('terminalThemes')
-const m = prefix('menu')
+const e = window.translate
 
 export default class BookmarkTransport extends Component {
   beforeUpload = async (file) => {
@@ -118,7 +115,7 @@ export default class BookmarkTransport extends Component {
       <Button
         icon={<EditOutlined />}
         onClick={this.handleToggleEdit}
-        title={m('edit')}
+        title={e('edit')}
         key='edit-and-del'
       />
     )
@@ -130,7 +127,7 @@ export default class BookmarkTransport extends Component {
       <Button
         icon={<DownloadOutlined />}
         onClick={this.handleDownload}
-        title={t('export')}
+        title={e('export')}
         key='export'
       />,
       <Upload
@@ -140,7 +137,7 @@ export default class BookmarkTransport extends Component {
       >
         <Button
           icon={<UploadOutlined />}
-          title={f('importFromFile')}
+          title={e('importFromFile')}
         />
       </Upload>
     ]

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

@@ -24,10 +24,7 @@ import uid from '../../common/uid'
 import { memo } from 'react'
 import './tree-list.styl'
 
-const { prefix } = window
-const e = prefix('menu')
-const c = prefix('common')
-const s = prefix('setting')
+const e = window.translate
 
 export default memo(function TreeListItem (props) {
   const handleDel = (e) => {
@@ -43,7 +40,7 @@ export default memo(function TreeListItem (props) {
         title={e('del') + '?'}
         onConfirm={handleDel}
         okText={e('del')}
-        cancelText={c('cancel')}
+        cancelText={e('cancel')}
         placement='top'
       >
         <CloseOutlined title={e('del')} className='pointer tree-control-btn' />
@@ -86,7 +83,7 @@ export default memo(function TreeListItem (props) {
     return (
       <FolderAddOutlined
         key='new-tree'
-        title={`${s('new')} ${c('bookmarkCategory')}`}
+        title={`${e('new')} ${e('bookmarkCategory')}`}
         onClick={handleAddSubCat}
         className='pointer tree-control-btn'
       />
@@ -129,7 +126,7 @@ export default memo(function TreeListItem (props) {
       return null
     }
     return (
-      <Tooltip title={s('openAll')}>
+      <Tooltip title={e('openAll')}>
         <FolderOpenOutlined
           key='open-all-tree'
           onClick={handleOpenAll}

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

@@ -42,10 +42,7 @@ import './tree-list.styl'
 import TreeExpander from './tree-expander'
 import TreeListItem from './tree-list-item'
 
-const { prefix } = window
-const e = prefix('menu')
-const c = prefix('common')
-const s = prefix('setting')
+const e = window.translate
 
 export default class ItemListTree extends Component {
   constructor (props) {
@@ -902,13 +899,13 @@ export default class ItemListTree extends Component {
         <Space.Compact>
           <Button
             onClick={this.handleNewBookmark}
-            title={`${s('new')} ${c('bookmarks')}`}
+            title={`${e('new')} ${e('bookmarks')}`}
           >
             <BookOutlined className='with-plus' />
           </Button>
           <Button
             onClick={this.handleNewBookmarkGroup}
-            title={`${s('new')} ${c('bookmarkCategory')}`}
+            title={`${e('new')} ${e('bookmarkCategory')}`}
           >
             <FolderOutlined className='with-plus' />
           </Button>

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

@@ -3,10 +3,11 @@
   display none
   margin-left 3px
   width 16px
-  line-height 26px
-  height 20px
+  line-height 30px
+  height 26px
 .tree-item
   display flex
+  position relative
   line-height 26px
   padding-left 5px
   border-radius 3px

package/client/components/vnc/vnc-form.jsx

@@ -10,9 +10,7 @@ import {
 import { formItemLayout, tailFormItemLayout } from '../../common/form-layout'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('sftp')
+const e = window.translate
 
 export default function VncForm (props) {
   const [form] = Form.useForm()
@@ -57,7 +55,7 @@ export default function VncForm (props) {
             type='primary'
             htmlType='submit'
           >
-            {s('submit')}
+            {e('submit')}
           </Button>
         </FormItem>
       </div>

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

@@ -18,8 +18,7 @@ import resolutions from '../rdp/resolutions'
 import RFB from '@novnc/novnc/core/rfb'
 import VncForm from './vnc-form'
 
-const { prefix } = window
-const e = prefix('form')
+const e = window.translate
 
 export default class VncSession extends RdpSession {
   constructor (props) {

package/client/entry/basic.js

@@ -43,12 +43,10 @@ async function load () {
   window.getLang = (lang = window.store?.config.language || 'en_us') => {
     return _get(window.langMap, `[${lang}].lang`)
   }
-  window.prefix = prefix => {
-    return (id) => {
-      const lang = window.getLang()
-      const str = _get(lang, `[${prefix}][${id}]`) || id
-      return window.capitalizeFirstLetter(str)
-    }
+  window.translate = txt => {
+    const lang = window.getLang()
+    const str = _get(lang, `[${txt}]`) || txt
+    return window.capitalizeFirstLetter(str)
   }
   await loadWorker()
   loadScript()

package/client/store/common.js

@@ -16,9 +16,7 @@ import {
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 
-const { prefix } = window
-const m = prefix('menu')
-const c = prefix('common')
+const e = window.translate
 
 export default Store => {
   Store.prototype.storeAssign = function (updates) {
@@ -160,14 +158,14 @@ export default Store => {
     ls.setItem(dismissDelKeyTipLsKey, 'y')
     window.store.hideDelKeyTip = true
   }
-  Store.prototype.beforeExit = function (e) {
+  Store.prototype.beforeExit = function (evt) {
     const { confirmBeforeExit } = window.store.config
     if (
       (confirmBeforeExit &&
       !window.confirmExit) ||
       window.store.isTransporting
     ) {
-      e.returnValue = false
+      evt.returnValue = false
       let mod = null
       mod = Modal.confirm({
         onCancel: () => {
@@ -178,14 +176,14 @@ export default Store => {
           window.confirmExit = true
           window.store[window.exitFunction]()
         },
-        title: m('quit'),
-        okText: c('ok'),
-        cancelText: c('cancel'),
+        title: e('quit'),
+        okText: e('ok'),
+        cancelText: e('cancel'),
         content: ''
       })
     }
   }
-  Store.prototype.beforeExitApp = function (e, name) {
+  Store.prototype.beforeExitApp = function (evt, name) {
     let mod = null
     mod = Modal.confirm({
       onCancel: () => {
@@ -195,9 +193,9 @@ export default Store => {
       onOk: () => {
         window.pre.runGlobalAsync(name)
       },
-      title: m('quit'),
-      okText: c('ok'),
-      cancelText: c('cancel'),
+      title: e('quit'),
+      okText: e('ok'),
+      cancelText: e('cancel'),
       content: ''
     })
   }

package/client/store/index.js

@@ -41,10 +41,7 @@ import {
   theme
 } from 'antd'
 
-const { prefix } = window
-const ss = prefix('settingSync')
-const s = prefix('setting')
-const sss = prefix('ssh')
+const e = window.translate
 
 function getReverseColor (hex) {
   // Check if the input is a valid hex color code
@@ -201,15 +198,15 @@ class Store {
     return [
       {
         id: settingTerminalId,
-        title: sss('terminal')
+        title: e('terminal')
       },
       {
         id: settingShortcutsId,
-        title: s('settingShortcuts')
+        title: e('settingShortcuts')
       },
       {
         id: settingSyncId,
-        title: ss('settingSync')
+        title: e('settingSync')
       }
     ]
   }

package/client/store/init-state.js

@@ -25,13 +25,12 @@ import { buildDefaultThemes } from '../common/terminal-theme'
 import * as ls from '../common/safe-local-storage'
 import initSettingItem from '../common/init-setting-item'
 
-const { prefix } = window
-const t = prefix('terminalThemes')
+const e = window.translate
 
 function getDefaultBookmarkGroups (bookmarks) {
   return [
     JSON.stringify({
-      title: t(defaultBookmarkGroupId),
+      title: e(defaultBookmarkGroupId),
       id: defaultBookmarkGroupId,
       bookmarkIds: bookmarks.map(d => d.id)
     })

package/client/store/load-data.js

@@ -11,6 +11,7 @@ import defaultSettings from '../common/default-setting'
 import encodes from '../components/bookmark-form/encodes'
 import runIdle from '../common/run-idle'
 import { initWsCommon } from '../common/fetch-from-server'
+import safeParse from '../common/parse-json-safe'
 
 function getHost (argv, opts) {
   const arr = argv
@@ -75,6 +76,15 @@ export async function addTabFromCommandLine (store, opts) {
   if (options.port && parseInt10(options.port)) {
     update.port = parseInt10(options.port)
   }
+  if (options.opts) {
+    const opts = safeParse(options.opts)
+    if (opts !== options.opts) {
+      Object.assign(update, opts)
+    }
+  }
+  if (options.type) {
+    update.type = options.type
+  }
   Object.assign(conf, update)
   if (options.privateKeyPath) {
     conf.privateKey = await fs.readFile(options.privateKeyPath)

package/client/store/setting.js

@@ -18,8 +18,7 @@ import { buildNewTheme } from '../common/terminal-theme'
 import getInitItem from '../common/init-setting-item'
 import newTerm from '../common/new-terminal'
 
-const { prefix } = window
-const m = prefix('menu')
+const e = window.translate
 
 export default Store => {
   Store.prototype.setConfig = function (conf) {
@@ -161,7 +160,7 @@ export default Store => {
     const { store } = window
     if (store.isSencondInstance) {
       return message.warning(
-        m('sencondInstanceTip')
+        e('sencondInstanceTip')
       )
     }
     store.showModal = modals.setting

package/client/store/sync.js

@@ -2,10 +2,10 @@
  * sync data to github gist related
  */
 
-import { without, get, pick, debounce, findIndex } from 'lodash-es'
+import { get, pick, debounce, findIndex } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
-  settingMap, packInfo, syncTypes
+  settingMap, packInfo, syncTypes, syncDataMaps
 } from '../common/constants'
 import { remove, dbNames, insert, update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
@@ -14,7 +14,6 @@ import { fixBookmarks } from '../common/db-fix'
 import dayjs from 'dayjs'
 import parseJsonSafe from '../common/parse-json-safe'
 
-const names = without(dbNames, settingMap.history)
 const {
   version: packVer
 } = packInfo
@@ -162,6 +161,7 @@ export default (Store) => {
     }
     const pass = store.getSyncPassword(type)
     const objs = {}
+    const { names, syncConfig } = store.getDataSyncNames()
     for (const n of names) {
       let str = store.getItems(n)
       const order = await getData(`${n}:order`)
@@ -182,14 +182,18 @@ export default (Store) => {
       objs[`${n}.order.json`] = {
         content: 'empty'
       }
+      if (syncConfig) {
+        objs['userConfig.json'] = {
+          content: JSON.stringify(
+            store.getSyncConfig()
+          )
+        }
+      }
     }
     const res = await fetchData(type, 'update', [gistId, {
       description: 'sync electerm data',
       files: {
         ...objs,
-        'userConfig.json': {
-          content: JSON.stringify(pick(store.config, ['theme']))
-        },
         'electerm-status.json': {
           content: JSON.stringify({
             lastSyncTime: Date.now(),
@@ -230,6 +234,7 @@ export default (Store) => {
       store.getProxySetting()
     )
     const toInsert = []
+    const { names, syncConfig } = store.getDataSyncNames()
     for (const n of names) {
       let str = get(gist, `files["${n}.json"].content`)
       if (!str) {
@@ -267,12 +272,18 @@ export default (Store) => {
       })
       store.setItems(n, arr)
     }
-    const userConfig = parseJsonSafe(
-      get(gist, 'files["userConfig.json"].content')
-    )
-    if (userConfig && userConfig.theme) {
-      store.setTheme(userConfig.theme)
+    if (syncConfig) {
+      const userConfig = parseJsonSafe(
+        get(gist, 'files["userConfig.json"].content')
+      )
+      if (userConfig) {
+        store.setConfig(userConfig)
+      }
+      if (userConfig && userConfig.theme) {
+        store.setTheme(userConfig.theme)
+      }
     }
+
     const up = {
       [type + 'LastSyncTime']: Date.now()
     }
@@ -331,6 +342,7 @@ export default (Store) => {
   Store.prototype.handleExportAllData = async function () {
     const { store } = window
     const objs = {}
+    const names = store.getDataSyncNames(true)
     for (const n of names) {
       objs[n] = store.getItems(n)
       const order = await getData(`${n}:order`)
@@ -342,49 +354,7 @@ export default (Store) => {
         })
       }
     }
-    objs.config = pick(store.config, [
-      'theme',
-      'useSystemTitleBar',
-      'defaultEditor',
-      'checkUpdateOnStart',
-      'confirmBeforeExit',
-      'ctrlOrMetaOpenTerminalLink',
-      'cursorStyle',
-      'defaultEditor',
-      'disableSshHistory',
-      'disableTransferHistory',
-      'enableGlobalProxy',
-      'execLinux',
-      'execLinuxArgs',
-      'execMac',
-      'execMacArgs',
-      'execWindows',
-      'execWindowsArgs',
-      'fontFamily',
-      'fontSize',
-      'hotkey',
-      'keepaliveCountMax',
-      'keepaliveInterval',
-      'language',
-      'opacity',
-      'pasteWhenContextMenu',
-      'proxyIp',
-      'proxyPassword',
-      'proxyPort',
-      'proxyType',
-      'proxyUsername',
-      'rendererType',
-      'rightClickSelectsWord',
-      'saveTerminalLogToFile',
-      'scrollback',
-      'sshReadyTimeout',
-      'syncSetting',
-      'terminalTimeout',
-      'terminalType',
-      'theme',
-      'useSystemTitleBar',
-      'zoom'
-    ])
+    objs.config = store.config
     const text = JSON.stringify(objs)
     const name = dayjs().format('YYYY-MM-DD-HH-mm-ss') + '-electerm-all-data.json'
     download(name, text)
@@ -396,6 +366,7 @@ export default (Store) => {
     const { store } = window
     const objs = JSON.parse(txt)
     const toInsert = []
+    const { names } = store.getDataSyncNames(true)
     for (const n of names) {
       let arr = objs[n]
       if (n === settingMap.terminalThemes) {
@@ -423,4 +394,83 @@ export default (Store) => {
       autoSync: v
     })
   }
+
+  Store.prototype.toggleDataSyncSelected = function (key) {
+    const { store } = window
+    const {
+      dataSyncSelected
+    } = store.config
+    let arr = dataSyncSelected && dataSyncSelected !== 'all'
+      ? dataSyncSelected.split(',')
+      : Object.keys(syncDataMaps)
+    if (arr.includes(key)) {
+      arr = arr.filter(d => d !== key)
+    } else {
+      arr.push(key)
+    }
+    store.setConfig({
+      dataSyncSelected: arr.join(',')
+    })
+  }
+  Store.prototype.getDataSyncNames = function (all) {
+    const { store } = window
+    const {
+      dataSyncSelected
+    } = store.config
+    const syncAll = all || dataSyncSelected === 'all'
+    const keys = syncAll
+      ? Object.keys(syncDataMaps)
+      : dataSyncSelected.split(',')
+    const names = keys
+      .filter(d => d !== 'settings')
+      .map(d => syncDataMaps[d]).flat()
+    const syncConfig = keys.includes('settings')
+    return {
+      names,
+      syncConfig
+    }
+  }
+  Store.prototype.getSyncConfig = function () {
+    const { store } = window
+    const configSyncKeys = [
+      'keepaliveInterval',
+      'rightClickSelectsWord',
+      'pasteWhenContextMenu',
+      'ctrlOrMetaOpenTerminalLink',
+      'hotkey',
+      'sshReadyTimeout',
+      'scrollback',
+      'fontSize',
+      'execWindows',
+      'execMac',
+      'execLinux',
+      'execWindowsArgs',
+      'execMacArgs',
+      'execLinuxArgs',
+      'disableSshHistory',
+      'disableTransferHistory',
+      'terminalType',
+      'keepaliveCountMax',
+      'saveTerminalLogToFile',
+      'checkUpdateOnStart',
+      'cursorBlink',
+      'cursorStyle',
+      'terminalWordSeparator',
+      'confirmBeforeExit',
+      'autoRefreshWhenSwitchToSftp',
+      'addTimeStampToTermLog',
+      'showHiddenFilesOnSftpStart',
+      'terminalInfos',
+      'filePropsEnabled',
+      'hideIP',
+      'terminalTimeout',
+      'theme',
+      'terminalTypes',
+      'language',
+      'copyWhenSelect',
+      'customCss',
+      'dataSyncSelected'
+    ]
+    return pick(store.config, configSyncKeys)
+  }
 }