@electerm/electerm-react 1.37.60 → 1.37.68

package/client/common/{create-title.js → create-title.jsx}

@@ -9,7 +9,7 @@ import {
 const { prefix } = window
 const p = prefix('sftp')
 
-export default (res) => {
+export default function createTitle (res) {
   if (!res) {
     return ''
   }
@@ -30,3 +30,21 @@ export default (res) => {
   }
   return f || p(terminalLocalType)
 }
+
+export function createTitleTag (obj) {
+  const { color } = obj
+  const styleTag = color
+    ? { color }
+    : {}
+  return (
+    <span style={styleTag}>♦</span>
+  )
+}
+
+export function createTitleWithTag (obj) {
+  return (
+    <span className='tab-title'>
+      {createTitleTag(obj)} {createTitle(obj)}
+    </span>
+  )
+}

package/client/common/promise-timeout.js

@@ -3,7 +3,7 @@
  */
 
 export class NewPromise extends Promise {
-  constructor (executor, timeout = 30000) {
+  constructor (executor, timeout = 120000) {
     let timeoutId
 
     super((resolve, reject) => {

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

@@ -632,8 +632,10 @@ export default class BatchOp extends Component {
       width: innerWidth - sidebarWidth,
       zIndex: 888,
       placement: 'left',
-      headerStyle: {
-        display: 'none'
+      styles: {
+        header: {
+          display: 'none'
+        }
       }
     }
     return (

package/client/components/bookmark-form/color-picker.jsx

@@ -75,9 +75,9 @@ export const ColorPicker = React.forwardRef((props, ref) => {
     <Popover
       content={renderContent()}
       trigger='click'
-      visible={visible}
+      open={visible}
       placement='bottomLeft'
-      onVisibleChange={handleVisibleChange}
+      onOpenChange={handleVisibleChange}
     >
       <div
         ref={ref}

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

@@ -17,7 +17,7 @@ import SshForm from './ssh-form'
 import SerialForm from './serial-form'
 import LocalForm from './local-form'
 import TelnetForm from './telnet-form'
-import createTitle from '../../common/create-title'
+import { createTitleWithTag } from '../../common/create-title'
 import {
   LoadingOutlined,
   BookOutlined
@@ -104,7 +104,7 @@ export default class BookmarkIndex extends Component {
     }
     return (
       <b className='mg1x'>
-        {createTitle(formData)}
+        {createTitleWithTag(formData)}
       </b>
     )
   }

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

@@ -26,7 +26,7 @@ export default function renderAuth (props) {
   if (authType === 'password') {
     const opts = {
       options: uniqBy(
-        store.getBookmarks()
+        store.bookmarks
           .filter(d => d.password),
         (d) => d.password
       )

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

@@ -71,7 +71,7 @@ export default function TelnetFormUI (props) {
   function renderAuth () {
     const opts = {
       options: uniqBy(
-        props.store.getBookmarks()
+        props.store.bookmarks
           .filter(d => d.password),
         (d) => d.password
       )

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

@@ -1,5 +1,5 @@
 import { Component } from '../common/react-subx'
-import createTitle from '../../common/create-title'
+import { createTitleWithTag } from '../../common/create-title'
 
 export default class HistorySubMenu extends Component {
   render () {
@@ -8,7 +8,7 @@ export default class HistorySubMenu extends Component {
       <div className='sub-context-menu'>
         {
           store.history.map(item => {
-            const title = createTitle(item)
+            const title = createTitleWithTag(item)
             return (
               <div
                 className='sub-context-menu-item'

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

@@ -1,5 +1,5 @@
 import { PureComponent } from 'react'
-import createTitle from '../../common/create-title'
+import { createTitleWithTag } from '../../common/create-title'
 
 export default class TabsSubMenuChild extends PureComponent {
   handleClick = () => {
@@ -8,7 +8,7 @@ export default class TabsSubMenuChild extends PureComponent {
 
   render () {
     const { item } = this.props
-    const title = createTitle(item)
+    const title = createTitleWithTag(item)
     return (
       <div
         className='sub-context-menu-item'

package/client/components/main/upgrade.jsx

@@ -202,9 +202,13 @@ export default class Upgrade extends PureComponent {
   renderError = (err) => {
     return (
       <div className='upgrade-panel'>
-        <div className='upgrade-panel-title'>
-          <CloseOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleClose} />
-          {e('fail')}: {err}
+        <div className='upgrade-panel-title fix'>
+          <span className='fleft'>
+            {e('fail')}: {err}
+          </span>
+          <span className='fright'>
+            <CloseOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleClose} />
+          </span>
         </div>
         <div className='upgrade-panel-body'>
           You can visit
@@ -225,9 +229,13 @@ export default class Upgrade extends PureComponent {
     const cls = `animate upgrade-panel${showUpgradeModal ? '' : ' upgrade-panel-hide'}`
     return (
       <div className={cls}>
-        <div className='upgrade-panel-title'>
-          <CloseOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleClose} />
-          {e('noNeed')}
+        <div className='upgrade-panel-title fix'>
+          <span className='fleft'>
+            {e('noNeed')}
+          </span>
+          <span className='fright'>
+            <CloseOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleClose} />
+          </span>
         </div>
         <div className='upgrade-panel-body'>
           {e('noNeedDesc')}
@@ -316,9 +324,13 @@ export default class Upgrade extends PureComponent {
     const skip = srcsSkipUpgradeCheck.includes(installSrc)
     return (
       <div className={cls}>
-        <div className='upgrade-panel-title'>
-          <MinusSquareOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleMinimize} />
-          {e('newVersion')} <b>{remoteVersion} [{releaseInfo.date}]</b>
+        <div className='upgrade-panel-title fix'>
+          <span className='fleft'>
+            {e('newVersion')} <b>{remoteVersion} [{releaseInfo.date}]</b>
+          </span>
+          <span className='fright'>
+            <MinusSquareOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleMinimize} />
+          </span>
         </div>
         <div className='upgrade-panel-body'>
           {

package/client/components/main/upgrade.styl

@@ -6,7 +6,8 @@
   z-index 9999
   background main
   color text
-  box-shadow 0px 0px 5px 5px alpha(main, .25)
+  border-radius 5px
+  border 1px solid darken(main, 30%)
   padding 0
   width 440px
 .upgrade-panel-hide
@@ -15,13 +16,10 @@
   right auto
   bottom auto
 .close-upgrade-panel
-  position absolute
-  right 5px
-  top 8px
   &:hover
     color success
 .upgrade-panel-title
 .upgrade-panel-body
   padding 10px 15px
 .upgrade-panel-title
-  border-bottom 1px solid main-dark
+  border-bottom 1px solid darken(main, 30%)

package/client/components/setting-panel/bookmark-transport.jsx

@@ -30,8 +30,8 @@ export default class BookmarkTransport extends Component {
         bookmarkGroups: bookmarkGroups1,
         bookmarks: bookmarks1
       } = content
-      const bookmarkGroups = copy(store.getBookmarkGroups())
-      const bookmarks = copy(store.getBookmarks())
+      const bookmarkGroups = copy(store.bookmarkGroups)
+      const bookmarks = copy(store.bookmarks)
       const bmTree = bookmarks.reduce((p, v) => {
         return {
           ...p,
@@ -99,8 +99,8 @@ export default class BookmarkTransport extends Component {
 
   handleDownload = () => {
     const { store } = this.props
-    const bookmarkGroups = store.getBookmarkGroups()
-    const bookmarks = store.getBookmarks()
+    const bookmarkGroups = store.bookmarkGroups
+    const bookmarks = store.bookmarks
     const txt = JSON.stringify({
       bookmarkGroups: copy(bookmarkGroups),
       bookmarks: copy(bookmarks)

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

@@ -5,7 +5,7 @@ import React from 'react'
 import { CloseOutlined, EditOutlined, LoadingOutlined } from '@ant-design/icons'
 import { Popconfirm } from 'antd'
 import Search from '../common/search'
-import createName from '../../common/create-title'
+import createName, { createTitleTag } from '../../common/create-title'
 import classnames from 'classnames'
 import { noop } from 'lodash-es'
 import highlight from '../common/highlight'
@@ -102,6 +102,7 @@ export default class ItemList extends React.PureComponent {
     const { onClickItem, type, activeItemId } = this.props
     const { id } = item
     const title = createName(item)
+    const tag = createTitleTag(item)
     const cls = classnames(
       'item-list-unit',
       {
@@ -122,7 +123,8 @@ export default class ItemList extends React.PureComponent {
         <div
           title={title}
           className='elli pd1y pd2x list-item-title'
-        >{titleHighlight || s('new')}
+        >
+          {tag}{titleHighlight || s('new')}
         </div>
         {this.renderDelBtn(item)}
         {this.renderEditBtn(item, isGroup)}

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

@@ -51,16 +51,16 @@ export default class SettingModalWrap extends Component {
         'currentBookmarkGroupId',
         'config'
       ]),
-      bookmarkGroups: store.getBookmarkGroups(),
-      bookmarks: store.getBookmarks(),
+      bookmarkGroups: store.bookmarkGroups,
+      bookmarks: store.bookmarks,
       serials: store.serials,
       loaddingSerials: store.loaddingSerials
     }
     const treeProps = {
       ...props0,
       bookmarkSelectMode,
-      bookmarkGroups: store.getBookmarkGroups(),
-      bookmarks: store.getBookmarks(),
+      bookmarkGroups: store.bookmarkGroups,
+      bookmarks: store.bookmarks,
       ...pick(store, [
         'currentBookmarkGroupId',
         'autofocustrigger',

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

@@ -361,8 +361,9 @@ export default class SettingTerminal extends Component {
     const { fontFamily } = this.props.config
     const props = {
       mode: 'multiple',
+      className: 'font-sel',
       onChange: this.handleChangeFont,
-      value: fontFamily.split(/, */g)
+      value: fontFamily.split(/, */g).filter(d => d.trim())
     }
     return (
       <Select
@@ -373,10 +374,13 @@ export default class SettingTerminal extends Component {
           fonts.map(f => {
             return (
               <Option value={f} key={f}>
-                <span style={{
-                  fontFamily: f
-                }}
-                >{f}
+                <span
+                  className='font-option'
+                  style={{
+                    fontFamily: f
+                  }}
+                >
+                  {f}
                 </span>
               </Option>
             )

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

@@ -18,8 +18,10 @@ export default class SettingWrap extends Component {
       zIndex: 888,
       placement: 'left',
       destroyOnClose: true,
-      headerStyle: {
-        display: 'none'
+      styles: {
+        header: {
+          display: 'none'
+        }
       }
     }
     return (

package/client/components/setting-panel/setting.styl

@@ -1,4 +1,6 @@
 .pd2b.bg-img-setting
   display inline-block
   padding 0
-  margin 5px 5px 0 0
+  margin 5px 5px 0 0
+.font-sel
+  min-width 200px

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

@@ -1,7 +1,7 @@
 import { TreeSelect } from 'antd'
 import { Component } from '../common/react-subx'
 import copy from 'json-deep-copy'
-import createTitle from '../../common/create-title'
+import { createTitleWithTag } from '../../common/create-title'
 
 const { prefix } = window
 const e = prefix('setting')
@@ -9,8 +9,8 @@ const { SHOW_CHILD } = TreeSelect
 
 export default class StartSessionSelect extends Component {
   buildData = () => {
-    const cats = this.props.store.getBookmarkGroups()
-    const tree = this.props.store.getBookmarks()
+    const cats = this.props.store.bookmarkGroups
+    const tree = this.props.store.bookmarks
       .reduce((p, k) => {
         return {
           ...p,
@@ -50,7 +50,7 @@ export default class StartSessionSelect extends Component {
       return {
         value: x.id,
         key: x.id,
-        title: createTitle(x)
+        title: createTitleWithTag(x)
       }
     }
     const level1 = cats.filter(d => d.level !== 2)

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

@@ -27,7 +27,7 @@ import {
   Tooltip,
   Space
 } from 'antd'
-import createName from '../../common/create-title'
+import createName, { createTitleTag } from '../../common/create-title'
 import classnames from 'classnames'
 import InputAutoFocus from '../common/input-auto-focus'
 import { find, uniq, findIndex, isEqual, filter } from 'lodash-es'
@@ -319,7 +319,7 @@ export default class ItemListTree extends Component {
       })
     } else {
       this.props.store.storeAssign({
-        currentBookmarkGroupId: findBookmarkGroupId(this.props.store.getBookmarkGroups(), id)
+        currentBookmarkGroupId: findBookmarkGroupId(this.props.store.bookmarkGroups, id)
       })
     }
     const bookmarks = copy(this.props.bookmarks)
@@ -712,6 +712,7 @@ export default class ItemListTree extends Component {
         level2: item.level === 2
       }
     )
+    const tag = isGroup ? '' : createTitleTag(item)
     const title = isGroup
       ? item.title
       : createName(item)
@@ -732,7 +733,7 @@ export default class ItemListTree extends Component {
         <div
           className='tree-item-title elli'
         >
-          {titleHighlight}
+          {tag}{titleHighlight}
         </div>
         {
           isGroup

package/client/components/sidebar/bookmark-select.jsx

@@ -24,7 +24,7 @@ export default class BookmarkSelect extends Component {
     }
     const base = {
       store,
-      bookmarks: store.getBookmarks() || [],
+      bookmarks: store.bookmarks || [],
       type: 'bookmarks',
       onClickItem,
       listStyle,

package/client/components/terminal/index.jsx

@@ -7,17 +7,13 @@ import postMessage from '../../common/post-msg'
 import clone from '../../common/to-simple-obj'
 import runIdle from '../../common/run-idle'
 import {
-  CheckCircleOutlined,
   ReloadOutlined
 } from '@ant-design/icons'
 import {
   notification,
   Spin,
-  Modal,
-  Button,
-  Checkbox
+  Button
 } from 'antd'
-import Input from '../common/input-auto-focus'
 import classnames from 'classnames'
 import './terminal.styl'
 import {
@@ -57,10 +53,6 @@ import { KeywordHighlighterAddon } from './highlight-addon.js'
 const { prefix } = window
 const e = prefix('ssh')
 const m = prefix('menu')
-const f = prefix('form')
-const c = prefix('common')
-const authFailMsg = 'All configured authentication methods failed'
-const privateKeyMsg = 'no passphrase'
 
 const computePos = (e) => {
   return {
@@ -76,11 +68,8 @@ class Term extends Component {
       pid: '',
       id: props.id || 'id' + generate(),
       loading: false,
-      promoteModalVisible: false,
-      savePassword: false,
       saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
       addTimeStampToTermLog: !!this.props.config.addTimeStampToTermLog,
-      tempPassword: '',
       passType: 'password',
       zmodemTransfer: null,
       lines: []
@@ -1002,15 +991,7 @@ class Term extends Component {
     let pid = await createTerm(opts)
       .catch(err => {
         const text = err.message
-        if (text.includes(authFailMsg)) {
-          this.setState(() => ({ passType: 'password' }))
-          return 'fail'
-        } else if (text.includes(privateKeyMsg)) {
-          this.setState(() => ({ passType: 'passphrase' }))
-          return 'fail-private'
-        } else {
-          handleErr({ message: text })
-        }
+        handleErr({ message: text })
       })
     pid = pid || ''
     if (pid.includes('fail')) {
@@ -1159,75 +1140,11 @@ class Term extends Component {
     resizeTerm(this.pid, this.props.sessionId, cols, rows)
   }
 
-  promote = () => {
-    this.setState({
-      promoteModalVisible: true,
-      tempPassword: ''
-    })
-  }
-
   handleCancel = () => {
     const { id } = this.props.tab
     this.props.delTab(id)
   }
 
-  handleToggleSavePass = () => {
-    this.setState({
-      savePassword: !this.state.savePassword
-    })
-  }
-
-  renderPasswordForm = () => {
-    const { tempPassword, savePassword, promoteModalVisible } = this.state
-    const { type } = this.props.tab
-    return (
-      <div>
-        <Input
-          value={tempPassword}
-          type='password'
-          autofocustrigger={promoteModalVisible ? 1 : 2}
-          selectall='yes'
-          onChange={this.handleChangePass}
-          onPressEnter={this.handleClickConfirmPass}
-        />
-        {
-          type !== terminalSshConfigType
-            ? (
-              <div className='pd1t'>
-                <Checkbox
-                  checked={savePassword}
-                  onChange={this.handleToggleSavePass}
-                >{f('save')}
-                </Checkbox>
-              </div>
-              )
-            : null
-        }
-      </div>
-    )
-  }
-
-  handleChangePass = e => {
-    this.setState({
-      tempPassword: e.target.value
-    })
-  }
-
-  handleClickConfirmPass = () => {
-    const {
-      tempPassword,
-      passType
-    } = this.state
-    this.props.setSessionState(old => {
-      const sessionOptions = deepCopy(old.sessionOptions) || {}
-      sessionOptions[passType] = tempPassword
-      return { sessionOptions }
-    })
-    this.setState({
-      promoteModalVisible: false
-    }, this.remoteInit)
-  }
-
   handleShowInfo = () => {
     const { id, sessionId, logName } = this.props
     const { pid } = this.state
@@ -1256,54 +1173,6 @@ class Term extends Component {
   //   return result ? result[0].trim() : ''
   // }
 
-  renderPromoteModal = () => {
-    if (!this.isActiveTerminal()) {
-      return null
-    }
-    const {
-      passType = 'password'
-    } = this.state
-    const props = {
-      title: f(passType) + '?',
-      content: this.renderPasswordForm(),
-      onCancel: this.handleCancel,
-      show: this.state.promoteModalVisible,
-      footer: this.renderModalFooter(),
-      cancelText: c('cancel')
-    }
-    return (
-      <Modal
-        {...props}
-      >
-        {this.renderPasswordForm()}
-      </Modal>
-    )
-  }
-
-  renderModalFooter = () => {
-    const disabled = !this.state.tempPassword
-    return (
-      <div className='alignright pd1'>
-        <Button
-          type='primary'
-          icon={<CheckCircleOutlined />}
-          disabled={disabled}
-          onClick={this.handleClickConfirmPass}
-          className='mg1r'
-        >
-          {c('ok')}
-        </Button>
-        <Button
-          type='dashed'
-          className='mg1r'
-          onClick={this.handleCancel}
-        >
-          {c('cancel')}
-        </Button>
-      </div>
-    )
-  }
-
   switchEncoding = encode => {
     this.decode = new TextDecoder(encode)
     this.attachAddon.decoder = this.decode
@@ -1357,7 +1226,6 @@ class Term extends Component {
       <div
         {...prps1}
       >
-        {this.renderPromoteModal()}
         <div
           {...prps2}
         >

package/client/store/bookmark-group.js

@@ -10,21 +10,18 @@ import {
 } from '../common/constants'
 
 export default Store => {
-  Store.prototype.getBookmarkGroups = function () {
-    return window.store.getItems(settingMap.bookmarkGroups)
-  }
   Store.prototype.getBookmarkGroupsTotal = function () {
     const { store } = window
     return store.sshConfigItems.length && !store.config.hideSshConfig
       ? [
-          ...store.getBookmarkGroups(),
+          ...store.bookmarkGroups,
           {
             title: terminalSshConfigType,
             id: terminalSshConfigType,
             bookmarkIds: store.sshConfigItems.map(d => d.id)
           }
         ]
-      : store.getBookmarkGroups()
+      : store.bookmarkGroups
   }
 
   Store.prototype.setBookmarkGroups = function (items) {
@@ -43,7 +40,7 @@ export default Store => {
     const { store } = window
     let ids = item.bookmarkIds
     const gids = item.bookmarkGroupIds || []
-    const bookmarkGroups = store.getBookmarkGroups()
+    const bookmarkGroups = store.bookmarkGroups
     for (const gid of gids) {
       const g = find(bookmarkGroups, g => g.id === gid)
       if (g && g.bookmarkIds && g.bookmarkIds.length) {
@@ -63,7 +60,7 @@ export default Store => {
     if (id === defaultBookmarkGroupId) {
       return
     }
-    let bookmarkGroups = store.getBookmarkGroups()
+    let bookmarkGroups = store.bookmarkGroups
     const tobeDel = find(bookmarkGroups, bg => bg.id === id)
     if (!tobeDel) {
       return

package/client/store/bookmark.js

@@ -13,9 +13,6 @@ export default Store => {
     }
     store.loaddingSerials = false
   }
-  Store.prototype.getBookmarks = function () {
-    return window.store.getItems('bookmarks')
-  }
   Store.prototype.setBookmarks = function (items) {
     return window.store.setItems('bookmarks', items)
   }

package/client/store/index.js

@@ -99,7 +99,7 @@ class Store {
 
   get currentQuickCommands () {
     const { currentTab } = this
-    const quickCommands = window.store.getQuickCommands()
+    const { quickCommands } = window.store
     const currentTabQuickCommands = (
       currentTab.quickCommands || []
     ).map((d, i) => {
@@ -138,7 +138,7 @@ class Store {
   }
 
   get quickCommandTags () {
-    const quickCommands = window.store.getQuickCommands()
+    const { quickCommands } = window.store
     return uniq(
       quickCommands.reduce((p, q) => {
         return [
@@ -149,26 +149,10 @@ class Store {
     )
   }
 
-  get expandedKeys () {
-    return JSON.parse(window.store._expandedKeys || '[]')
-  }
-
-  get checkedKeys () {
-    return JSON.parse(window.store._checkedKeys || '[]')
-  }
-
   get isTransporting () {
     return window.store.getTabs().some(t => t.isTransporting)
   }
 
-  get addressBookmarks () {
-    return JSON.parse(window.store._addressBookmarks || '[]')
-  }
-
-  get addressBookmarksLocal () {
-    return JSON.parse(window.store._addressBookmarksLocal || '[]')
-  }
-
   get settingSidebarList () {
     const {
       settingTab
@@ -203,50 +187,6 @@ class Store {
     return window.store.getTabs().map(d => d.title).join('#')
   }
 
-  get sshConfigItems () {
-    return JSON.parse(window.store._sshConfigItems || '[]')
-  }
-
-  get itermThemes () {
-    return JSON.parse(window.store._itermThemes || '[]')
-  }
-
-  get history () {
-    return JSON.parse(window.store._history || '[]')
-  }
-
-  get bookmarks () {
-    return JSON.parse(window.store._bookmarks || '[]')
-  }
-
-  get bookmarkGroups () {
-    return JSON.parse(window.store._bookmarkGroups || '[]')
-  }
-
-  get tabs () {
-    return JSON.parse(window.store._tabs || '[]')
-  }
-
-  get fileTransfers () {
-    return JSON.parse(window.store._fileTransfers || '[]')
-  }
-
-  get transferHistory () {
-    return JSON.parse(window.store._transferHistory || '[]')
-  }
-
-  get quickCommands () {
-    return JSON.parse(window.store._quickCommands || '[]')
-  }
-
-  get terminalThemes () {
-    return JSON.parse(window.store._terminalThemes || '[]')
-  }
-
-  get serials () {
-    return JSON.parse(window.store._serials || '[]')
-  }
-
   get setting () {
     return [
       {
@@ -272,10 +212,6 @@ class Store {
     return JSON.parse(window.store._sftpSortSetting)
   }
 
-  get fonts () {
-    return JSON.parse(window.store._fonts || '[]')
-  }
-
   get onOperation () {
     const {
       store
@@ -327,6 +263,33 @@ class Store {
   }
 }
 
+const getterProps = [
+  'expandedKeys',
+  'checkedKeys',
+  'addressBookmarks',
+  'addressBookmarksLocal',
+  'sshConfigItems',
+  'itermThemes',
+  'history',
+  'bookmarks',
+  'bookmarkGroups',
+  'tabs',
+  'fileTransfers',
+  'transferHistory',
+  'quickCommands',
+  'terminalThemes',
+  'serials',
+  'fonts'
+]
+
+for (const prop of getterProps) {
+  Object.defineProperty(Store.prototype, prop, {
+    get: function () {
+      return JSON.parse(window.store[`_${prop}`] || '[]').filter(d => d)
+    }
+  })
+}
+
 loadDataExtend(Store)
 eventExtend(Store)
 dbUpgradeExtend(Store)

package/client/store/quick-command.js

@@ -9,10 +9,6 @@ import {
 import postMessage from '../common/post-msg'
 
 export default Store => {
-  Store.prototype.getQuickCommands = function () {
-    return window.store.getItems(settingMap.quickCommands)
-  }
-
   Store.prototype.setQuickCommands = function (list) {
     return window.store.setItems(settingMap.quickCommands, list)
   }

package/client/store/setting.js

@@ -2,7 +2,7 @@
  * setting modal
  */
 
-import { find, isEqual, pick, without } from 'lodash-es'
+import { find } from 'lodash-es'
 import {
   message
 } from 'antd'
@@ -43,7 +43,7 @@ export default Store => {
   }
   Store.prototype.handleEditHistory = function () {
     const { store } = window
-    const all = store.getItems('history')
+    const all = store.history
     store.storeAssign({
       settingTab: settingMap.history,
       autofocustrigger: Date.now()
@@ -74,7 +74,7 @@ export default Store => {
 
   Store.prototype.onSelectHistory = function (id) {
     const { store } = window
-    const history = store.getItems('history')
+    const history = store.history
     const item = find(history, it => it.id === id)
     store.addTab({
       ...copy(item),
@@ -86,8 +86,8 @@ export default Store => {
 
   Store.prototype.onSelectBookmark = function (id) {
     const { store } = window
-    const history = store.getItems('history')
-    const bookmarks = store.getBookmarks()
+    const history = store.history
+    const bookmarks = store.bookmarks
     const item = copy(
       find(bookmarks, it => it.id === id) ||
       find(store.sshConfigItems, it => it.id === id)
@@ -105,15 +105,7 @@ export default Store => {
     if (store.config.disableSshHistory) {
       return
     }
-    const existItem = find(history, j => {
-      const keysj = Object.keys(j)
-      const keysi = Object.keys(item)
-      return isEqual(
-        pick(item, without(keysi, 'id')),
-        pick(j, without(keysj, 'id'))
-      )
-    })
-    history.unshift(existItem)
+    history.unshift(item)
     store.setItems('history', history)
   }
 

package/package.json

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