@electerm/electerm-react 1.39.88 → 1.39.99

package/client/components/bookmark-form/serial-form-ui.jsx

@@ -37,11 +37,7 @@ import { ColorPickerItem } from './color-picker-item.jsx'
 
 const FormItem = Form.Item
 const { Option } = Select
-const { prefix } = window
-const e = prefix('form')
-const c = prefix('common')
-const s = prefix('setting')
-const m = prefix('menu')
+const e = window.translate
 
 export default function SerialFormUi (props) {
   const [
@@ -124,7 +120,7 @@ export default function SerialFormUi (props) {
           </FormItem>
           <Spin spinning={loaddingSerials}>
             <span onClick={props.store.handleGetSerials}>
-              <ReloadOutlined /> {m('reload')} serials
+              <ReloadOutlined /> {e('reload')} serials
             </span>
           </Spin>
         </FormItem>
@@ -262,7 +258,7 @@ export default function SerialFormUi (props) {
         </FormItem>
         <FormItem
           {...formItemLayout}
-          label={c('bookmarkCategory')}
+          label={e('bookmarkCategory')}
           name='category'
         >
           <TreeSelect
@@ -285,7 +281,7 @@ export default function SerialFormUi (props) {
       },
       {
         key: 'settings',
-        label: s('settings'),
+        label: e('settings'),
         forceRender: true,
         children: uis
       },

package/client/components/bookmark-form/sftp-enable.jsx

@@ -6,8 +6,7 @@ import {
 import { formItemLayout } from '../../common/form-layout'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
+const e = window.translate
 
 export default function renderEnableSftp () {
   return [

package/client/components/bookmark-form/telnet-form-ui.jsx

@@ -25,9 +25,7 @@ import { defaultsDeep, uniqBy } from 'lodash-es'
 import './bookmark-form.styl'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('setting')
+const e = window.translate
 
 export default function TelnetFormUI (props) {
   const [
@@ -125,7 +123,7 @@ export default function TelnetFormUI (props) {
       },
       {
         key: 'settings',
-        label: s('settings'),
+        label: e('settings'),
         forceRender: true,
         children: uis
       },

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

@@ -5,8 +5,7 @@ import {
 } from 'antd'
 import { defaultBookmarkGroupId, settingMap } from '../../common/constants'
 
-const { prefix } = window
-const m = prefix('common')
+const e = window.translate
 
 export default class BookmarkTreeDelete extends StartSessionSelect {
   onExpand = (expandedKeys) => {
@@ -72,12 +71,12 @@ export default class BookmarkTreeDelete extends StartSessionSelect {
             disabled={!len}
             onClick={this.handleDel}
           >
-            {m('delSelected')} ({len})
+            {e('delSelected')} ({len})
           </Button>
           <Button
             onClick={this.handleCancel}
           >
-            {m('cancel')}
+            {e('cancel')}
           </Button>
         </div>
         <Tree {...rProps} />

package/client/components/bookmark-form/use-quick-commands.jsx

@@ -18,8 +18,7 @@ import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'
 
 const FormItem = Form.Item
 const FormList = Form.List
-const { prefix } = window
-const t = prefix('quickCommands')
+const e = window.translate
 
 export default function useQuickCmds (form, formData) {
   function renderItem (field, i, add, remove) {
@@ -35,7 +34,7 @@ export default function useQuickCmds (form, formData) {
           fieldKey={[field.fieldKey, 'first']}
           rules={[{ required: true, max: 30 }]}
         >
-          <Input placeholder={t('quickCommandName')} />
+          <Input placeholder={e('quickCommandName')} />
         </FormItem>
         <FormItem
           {...field}
@@ -43,7 +42,7 @@ export default function useQuickCmds (form, formData) {
           fieldKey={[field.fieldKey, 'first']}
           rules={[{ required: true, max: 300 }]}
         >
-          <Input placeholder={t('quickCommand')} />
+          <Input placeholder={e('quickCommand')} />
         </FormItem>
         <MinusCircleOutlined onClick={() => remove(field.name)} />
       </Space>
@@ -52,7 +51,7 @@ export default function useQuickCmds (form, formData) {
   return (
     <FormList
       {...formItemLayout}
-      label={t('quickCommands')}
+      label={e('quickCommands')}
       name='quickCommands'
     >
       {
@@ -71,7 +70,7 @@ export default function useQuickCmds (form, formData) {
                   block
                   icon={<PlusOutlined />}
                 >
-                  {t('newQuickCommand')}
+                  {e('newQuickCommand')}
                 </Button>
               </FormItem>
             </div>

package/client/components/bookmark-form/use-submit.jsx

@@ -17,8 +17,7 @@ import { tailFormItemLayout } from '../../common/form-layout'
 import useFuncs from './use-form-funcs'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
+const e = window.translate
 
 export default function useBookmarkSubmit (props) {
   const [

package/client/components/bookmark-form/use-ui.jsx

@@ -19,9 +19,7 @@ import mapper from '../../common/auto-complete-data-mapper'
 import { defaultEnvLang } from '../../common/constants'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('setting')
+const e = window.translate
 
 export default function useBookmarkFormUI (props) {
   const {
@@ -66,7 +64,7 @@ export default function useBookmarkFormUI (props) {
     </FormItem>,
     <FormItem
       {...formItemLayout}
-      label={s('fontFamily')}
+      label={e('fontFamily')}
       key='fontFamily'
       name='fontFamily'
       rules={[{
@@ -78,7 +76,7 @@ export default function useBookmarkFormUI (props) {
     <FormItem
       key='fontSize'
       {...formItemLayout}
-      label={s('fontSize')}
+      label={e('fontSize')}
       name='fontSize'
     >
       <InputNumber
@@ -91,7 +89,7 @@ export default function useBookmarkFormUI (props) {
     <FormItem
       key='keepaliveInterval'
       {...formItemLayout}
-      label={s('keepaliveIntervalDesc')}
+      label={e('keepaliveIntervalDesc')}
       name='keepaliveInterval'
     >
       <InputNumber

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

@@ -27,9 +27,7 @@ import renderProxy from './proxy'
 import ConnectionHopping from './render-connection-hopping.jsx'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const c = prefix('common')
+const e = window.translate
 
 export default function VncFormUi (props) {
   const [
@@ -180,7 +178,7 @@ export default function VncFormUi (props) {
         </FormItem>
         <FormItem
           {...formItemLayout}
-          label={c('bookmarkCategory')}
+          label={e('bookmarkCategory')}
           name='category'
         >
           <TreeSelect

package/client/components/bookmark-form/web-form-ui.jsx

@@ -22,9 +22,7 @@ import formatBookmarkGroups from './bookmark-group-tree-format'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const c = prefix('common')
+const e = window.translate
 
 export default function LocalFormUi (props) {
   const [
@@ -91,7 +89,7 @@ export default function LocalFormUi (props) {
         </FormItem>
         <FormItem
           {...formItemLayout}
-          label={c('bookmarkCategory')}
+          label={e('bookmarkCategory')}
           name='category'
         >
           <TreeSelect

package/client/components/common/markdown.jsx

@@ -18,7 +18,7 @@ export default ({ text = '' }) => {
     )
   }
   return (
-    <div className='pd1y'>
+    <div className='markdown-wrap'>
       {
         arr.map(render)
       }

package/client/components/context-menu/context-menu.jsx

@@ -44,8 +44,7 @@ import {
   ReloadOutlined
 } from '@ant-design/icons'
 
-const { prefix } = window
-const c = prefix('common')
+const e = window.translate
 
 export default class ContextMenu extends React.PureComponent {
   state = {
@@ -288,9 +287,9 @@ export default class ContextMenu extends React.PureComponent {
     )
     return (
       <Popconfirm
-        cancelText={c('cancel')}
+        cancelText={e('cancel')}
         key={`context-item-${i}-${text}`}
-        okText={c('ok')}
+        okText={e('ok')}
         title={title}
         onConfirm={(e) => this.onClick(e, item)}
       >

package/client/components/context-menu/menu-btn.jsx

@@ -8,12 +8,7 @@ import { commonActions } from '../../common/constants'
 import { shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
 import generate from '../../common/uid'
 
-const { prefix } = window
-const e = prefix('control')
-const m = prefix('menu')
-const c = prefix('common')
-const t = prefix('tabs')
-const s = prefix('setting')
+const e = window.translate
 const logo = logoRef.replace(/^\//, '')
 
 class MenuBtn extends Component {
@@ -115,7 +110,7 @@ class MenuBtn extends Component {
       {
         func: 'addTab',
         icon: 'RightSquareFilled',
-        text: t('newTab')
+        text: e('newTab')
       },
       {
         func: 'onNewWindow',
@@ -128,19 +123,19 @@ class MenuBtn extends Component {
       {
         noCloseMenu: true,
         icon: 'BookOutlined',
-        text: c('bookmarks'),
+        text: e('bookmarks'),
         submenu: 'Bookmark'
       },
       {
         noCloseMenu: true,
         icon: 'ClockCircleOutlined',
-        text: c('history'),
+        text: e('history'),
         submenu: 'History'
       },
       {
         noCloseMenu: true,
         icon: 'BarsOutlined',
-        text: t('sessions'),
+        text: e('sessions'),
         submenu: 'Tabs'
       },
       // {
@@ -149,17 +144,17 @@ class MenuBtn extends Component {
       {
         func: 'openAbout',
         icon: 'InfoCircleOutlined',
-        text: m('about')
+        text: e('about')
       },
       {
         func: 'openSetting',
         icon: 'SettingOutlined',
-        text: s('settings')
+        text: e('settings')
       },
       {
         func: 'openDevTools',
         icon: 'LeftSquareFilled',
-        text: m('toggledevtools')
+        text: e('toggledevtools')
       },
       // {
       //   type: 'hr'
@@ -170,17 +165,17 @@ class MenuBtn extends Component {
       {
         func: 'minimize',
         icon: 'SwitcherFilled',
-        text: m('minimize')
+        text: e('minimize')
       },
       {
         func: 'maximize',
         icon: 'LayoutFilled',
-        text: m('maximize')
+        text: e('maximize')
       },
       {
         func: 'reload',
         icon: 'ReloadOutlined',
-        text: m('reload')
+        text: e('reload')
       },
       // {
       //   type: 'hr'
@@ -196,12 +191,12 @@ class MenuBtn extends Component {
       {
         func: 'restart',
         icon: 'RedoOutlined',
-        text: m('restart')
+        text: e('restart')
       },
       {
         func: 'close',
         icon: 'CloseOutlined',
-        text: m('close')
+        text: e('close')
       }
     ]
   }

package/client/components/footer/batch-input.jsx

@@ -13,8 +13,7 @@ import { batchInputLsKey, commonActions } from '../../common/constants'
 import postMsg from '../../common/post-msg'
 import classNames from 'classnames'
 
-const { prefix } = window
-const e = prefix('ssh')
+const e = window.translate
 
 export default class BatchInput extends Component {
   state = {

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

@@ -14,8 +14,7 @@ const {
   Option
 } = Select
 
-const { prefix } = window
-const f = prefix('form')
+const e = window.translate
 
 export default class FooterEntry extends Component {
   handleInfoPanel = () => {
@@ -80,7 +79,7 @@ export default class FooterEntry extends Component {
       style: {
         minWidth: 30
       },
-      placeholder: f('encode'),
+      placeholder: e('encode'),
       defaultValue: this.props.currentTab?.encode,
       onSelect: this.handleSwitchEncoding,
       size: 'small',

package/client/components/main/error-wrapper.jsx

@@ -5,9 +5,7 @@ import {
   logoPath1
 } from '../../common/constants'
 
-const { prefix } = window
-const e = prefix('main')
-const m = prefix('menu')
+const e = window.translate
 
 export default class ErrorBoundary extends React.PureComponent {
   constructor (props) {
@@ -46,7 +44,7 @@ export default class ErrorBoundary extends React.PureComponent {
               className='iblock'
               icon={<ReloadOutlined />}
             >
-              {m('reload')}
+              {e('reload')}
             </Button>
           </h1>
           <div className='pd1y'>{message}</div>

package/client/components/main/upgrade.jsx

@@ -19,12 +19,10 @@ import Markdown from '../common/markdown'
 import downloadMirrors from '../../common/download-mirrors'
 import './upgrade.styl'
 
-const { prefix } = window
+const e = window.translate
 const {
   homepage
 } = packInfo
-const e = prefix('updater')
-const c = prefix('common')
 
 export default class Upgrade extends PureComponent {
   state = {
@@ -347,7 +345,7 @@ export default class Upgrade extends PureComponent {
                   >
                     {
                       upgrading
-                        ? <span>{`${e('upgrading')}... ${upgradePercent || 0}% ${c('cancel')}`}</span>
+                        ? <span>{`${e('upgrading')}... ${upgradePercent || 0}% ${e('cancel')}`}</span>
                         : e('upgrade')
                     }
                   </Button>

package/client/components/main/upgrade.styl

@@ -22,4 +22,7 @@
 .upgrade-panel-body
   padding 10px 15px
 .upgrade-panel-title
-  border-bottom 1px solid darken(main, 30%)
+  border-bottom 1px solid darken(main, 30%)
+.markdown-wrap
+  max-height 40vh
+  overflow-y auto

package/client/components/profile/profile-form-elem.jsx

@@ -1,9 +1,9 @@
 import {
   Form,
   message,
-  Button
+  Button,
+  Input
 } from 'antd'
-import generate from '../../common/uid'
 import InputAutoFocus from '../common/input-auto-focus'
 import renderAuth from '../bookmark-form/render-auth-ssh'
 import { formItemLayout } from '../../common/form-layout'
@@ -11,19 +11,25 @@ import {
   settingMap
 } from '../../common/constants'
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('setting')
-const ss = prefix('sftp')
+const e = window.translate
 
 export default function QuickCommandForm (props) {
   const [form] = Form.useForm()
-  const { autofocustrigger } = props.store
+  const { autofocustrigger, profiles } = props.store
+  function genId () {
+    let count = profiles.length ? profiles.length : ''
+    let id = 'PROFILE' + count
+    while (profiles.find(d => d.id === id)) {
+      count = count + 1
+      id = 'PROFILE' + count
+    }
+    return id
+  }
   async function handleSubmit (res) {
     const { formData } = props
     const update1 = {
       ...res,
-      id: generate()
+      id: genId()
     }
     if (formData.id) {
       props.store.editItem(formData.id, res, settingMap.profiles)
@@ -34,7 +40,7 @@ export default function QuickCommandForm (props) {
         name: e('profile')
       })
     }
-    message.success(s('saved'))
+    message.success(e('saved'))
   }
   return (
     <Form
@@ -44,6 +50,7 @@ export default function QuickCommandForm (props) {
       layout='vertical'
       initialValues={props.formData}
     >
+      <p>ID: {props.formData.id || genId()}</p>
       <FormItem
         label={e('profileName')}
         {...formItemLayout}
@@ -60,6 +67,17 @@ export default function QuickCommandForm (props) {
           autofocustrigger={autofocustrigger}
         />
       </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label={e('username')}
+        hasFeedback
+        name='username'
+        rules={[{
+          max: 128, message: '128 chars max'
+        }]}
+      >
+        <Input />
+      </FormItem>
       {
         renderAuth({
           store: props.store,
@@ -78,7 +96,7 @@ export default function QuickCommandForm (props) {
           type='primary'
           htmlType='submit'
         >
-          {ss('submit')}
+          {e('submit')}
         </Button>
       </FormItem>
     </Form>

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

@@ -16,8 +16,7 @@ import {
 import classNames from 'classnames'
 import './qm.styl'
 
-const { prefix } = window
-const e = prefix('quickCommands')
+const e = window.translate
 const addQuickCommands = 'addQuickCommands'
 const { Option } = Select
 

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'
           />
@@ -47,7 +46,7 @@ export default function renderQm () {
         >
           <Input.TextArea
             rows={1}
-            placeholder={t('quickCommand')}
+            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>