@electerm/electerm-react 1.36.1 → 1.37.1

package/client/common/constants.js

@@ -35,7 +35,7 @@ export const filePropMinWidth = 1
 export const contextMenuHeight = 28
 export const contextMenuWidth = 280
 export const contextMenuPaddingTop = 10
-export const sftpControlHeight = 28 + 42 + 33 + 56
+export const sftpControlHeight = 28 + 42 + 33 + 46
 export const sidebarWidth = 43
 export const sidebarPanelWidth = 300
 export const maxHistory = 50
@@ -258,6 +258,9 @@ export const tabActions = {
 }
 
 export const commonActions = {
+  returnTermLogState: 'return-term-log-state',
+  getTermLogState: 'get-term-log-state',
+  setTermLogState: 'set-term-log-state',
   batchOp: 'batch-op',
   updateStore: 'update-store',
   editWithSystemEditorDone: 'edit-with-system-editor-done',

package/client/common/default-setting.js

@@ -38,5 +38,6 @@ export default {
   confirmBeforeExit: false,
   initDefaultTabOnStart: true,
   screenReaderMode: false,
-  autoRefreshWhenSwitchToSftp: false
+  autoRefreshWhenSwitchToSftp: false,
+  hideSshConfig: false
 }

package/client/components/auth/login.jsx

@@ -15,6 +15,8 @@ import './login.styl'
 const { prefix } = window
 const f = prefix('form')
 
+window.store = store
+
 export default class Login extends Component {
   state = {
     pass: '',

package/client/components/main/main.jsx

@@ -51,7 +51,6 @@ export default class Index extends Component {
       e.stopPropagation()
     })
     window.addEventListener('offline', store.setOffline)
-    window.addEventListener('mousewheel', store.onMouseWheel)
     store.isSencondInstance = window.pre.runSync('isSencondInstance')
     store.initData()
     store.checkForDbUpgrade()

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

@@ -21,7 +21,6 @@ export default function KeywordForm (props) {
   const {
     formData
   } = props
-  console.log('formData', formData)
   const [formChild] = Form.useForm()
   function handleTrigger () {
     formChild.submit()

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

@@ -642,6 +642,7 @@ export default class SettingCommon extends Component {
         {
           [
             'autoRefreshWhenSwitchToSftp',
+            'hideSshConfig',
             'screenReaderMode',
             'initDefaultTabOnStart',
             'disableSshHistory',

package/client/components/shortcuts/shortcut-control.jsx

@@ -53,15 +53,20 @@ class ShortcutControl extends React.PureComponent {
 
   zoominTerminalShortcut = (event) => {
     if (window.store.inActiveTerminal) {
-      window.store.zoomTerminal(event.wheelDeltaY)
+      window.store.zoomTerminal(event.wheelDeltaY || 120)
     } else {
-      const plus = event.wheelDeltaY > 0 ? 0.2 : -0.2
+      const plus = 0.2
       window.store.zoom(plus, true)
     }
   }
 
   zoomoutTerminalShortcut = (event) => {
-    this.zoominTerminalShortcut(event)
+    if (window.store.inActiveTerminal) {
+      window.store.zoomTerminal(event.wheelDeltaY || -120)
+    } else {
+      const plus = -0.2
+      window.store.zoom(plus, true)
+    }
   }
 
   render () {

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

@@ -24,15 +24,15 @@ export default class BookmarkSelect extends Component {
     }
     const base = {
       store,
-      bookmarks: [
-        ...(store.getBookmarks() || []),
-        ...store.sshConfigItems
-      ],
+      bookmarks: store.getBookmarks() || [],
       type: 'bookmarks',
       onClickItem,
       listStyle,
       staticList: true
     }
+    if (!store.config.hideSshConfig) {
+      base.bookmarks.push(...store.sshConfigItems)
+    }
     const propsTree = {
       ...base,
       shouldConfirmDel: true,

package/client/components/sidebar/sidebar.styl

@@ -4,7 +4,7 @@
 .sidebar-panel
   position absolute
   left 43px
-  top 56px
+  top 46px
   bottom 36px
   z-index 200
   width 0
@@ -14,8 +14,7 @@
   .item-list-unit:hover
     .list-item-remove
       display none !important
-.system-ui .sidebar-panel
-  top 45px
+
 .pinned .sidebar-panel
   bottom 0
 .sidebar

package/client/components/tabs/app-drag.jsx

@@ -0,0 +1,50 @@
+export default function AppDrag (props) {
+  function canOperate (e) {
+    const {
+      target
+    } = e
+    if (
+      target instanceof window.SVGElement ||
+      target.classList.contains('tab-title') ||
+      target.classList.contains('tab-title')
+    ) {
+      window.pre.runSync('windowMove', false)
+      return false
+    }
+    return true
+  }
+
+  function onMouseDown (e) {
+    if (canOperate(e)) {
+      window.pre.runSync('windowMove', true)
+    }
+  }
+
+  function onMouseUp (e) {
+    window.pre.runSync('windowMove', false)
+  }
+
+  function onDoubleClick (e) {
+    if (!canOperate(e)) {
+      return window.pre.runSync('windowMove', false)
+    }
+    const {
+      isMaximized
+    } = window.store
+    if (isMaximized) {
+      window.pre.runGlobalAsync('unmaximize')
+    } else {
+      window.pre.runGlobalAsync('maximize')
+    }
+  }
+  return (
+    <div
+      className='app-drag'
+      onMouseDown={onMouseDown}
+      onMouseUp={onMouseUp}
+      onDoubleClick={onDoubleClick}
+    >
+      {props.children}
+    </div>
+  )
+}

package/client/components/tabs/index.jsx

@@ -5,7 +5,7 @@
 
 import React from 'react'
 import { findIndex } from 'lodash-es'
-
+import TabTitle from './tab-title'
 import {
   CodeFilled,
   DownOutlined,
@@ -19,11 +19,10 @@ import { Dropdown, Menu, Popover } from 'antd'
 import Tab from './tab'
 import './tabs.styl'
 import { tabWidth, tabMargin, extraTabWidth, windowControlWidth } from '../../common/constants'
-import createName from '../../common/create-title'
 import findParentBySel from '../../common/find-parent'
 import WindowControl from './window-control'
 import BookmarksList from '../sidebar/bookmark-select'
-import { hasClass } from '../../common/class'
+import AppDrag from './app-drag'
 
 const { prefix } = window
 const e = prefix('tabs')
@@ -42,7 +41,6 @@ export default class Tabs extends React.Component {
     const {
       tabsRef
     } = this
-    tabsRef.current.addEventListener('dblclick', this.handleDblClickEvent)
     tabsRef.current.addEventListener('mousedown', this.handleClickEvent)
   }
 
@@ -70,7 +68,7 @@ export default class Tabs extends React.Component {
     const len = tabs.length
     const addBtnWidth = 22
     const tabsWidth = this.tabsWidth()
-    const tabsWidthAll = tabMargin * len + 130 + tabsWidth
+    const tabsWidthAll = tabMargin * len + 216 + tabsWidth
     return width < (tabsWidthAll + addBtnWidth)
   }
 
@@ -84,23 +82,6 @@ export default class Tabs extends React.Component {
     }
   }
 
-  handleDblClickEvent = e => {
-    const t = e.target
-    if (
-      hasClass(t, 'app-drag-area') ||
-      hasClass(t, 'tabs-inner')
-    ) {
-      const {
-        isMaximized
-      } = window.store
-      if (isMaximized) {
-        window.pre.runGlobalAsync('unmaximize')
-      } else {
-        window.pre.runGlobalAsync('maximize')
-      }
-    }
-  }
-
   handleAdd = e => {
     if (!e.target.className.includes('tabs-wrapper')) {
       return
@@ -155,7 +136,8 @@ export default class Tabs extends React.Component {
             return (
               <MenuItem
                 key={i + '##' + t.id}
-              >{createName(t)}
+              >
+                <TabTitle tab={t} />
               </MenuItem>
             )
           })
@@ -194,6 +176,9 @@ export default class Tabs extends React.Component {
   }
 
   renderAddBtn = () => {
+    if (!this.props.tabs.length) {
+      return null
+    }
     return (
       <Popover
         content={this.renderMenus()}
@@ -239,48 +224,48 @@ export default class Tabs extends React.Component {
       ? '100%'
       : tabsWidthAll
     const style = {
-      width: width - windowControlWidth
+      width: width - windowControlWidth - 86
     }
     return (
       <div className='tabs' ref={this.tabsRef}>
-        <div
-          className='tabs-inner'
-          style={style}
-        >
-          <div
-            style={{
-              left
-            }}
-          />
+        <AppDrag>
           <div
-            className='tabs-wrapper relative'
-            style={{
-              width: tabsWidthAll + extraTabWidth + 10
-            }}
-            onDoubleClick={this.handleAdd}
+            className='tabs-inner'
+            style={style}
           >
-            {
-              tabs.map((tab, i) => {
-                const isLast = i === len - 1
-                return (
-                  <Tab
-                    {...this.props}
-                    tab={tab}
-                    isLast={isLast}
-                    key={tab.id}
-                  />
-                )
-              })
-            }
-            {
-              !overflow
-                ? this.renderAddBtn()
-                : null
-            }
+            <div
+              style={{
+                left
+              }}
+            />
+            <div
+              className='tabs-wrapper relative'
+              style={{
+                width: tabsWidthAll + extraTabWidth + 10
+              }}
+              onDoubleClick={this.handleAdd}
+            >
+              {
+                tabs.map((tab, i) => {
+                  const isLast = i === len - 1
+                  return (
+                    <Tab
+                      {...this.props}
+                      tab={tab}
+                      isLast={isLast}
+                      key={tab.id}
+                    />
+                  )
+                })
+              }
+              {
+                !overflow
+                  ? this.renderAddBtn()
+                  : null
+              }
+            </div>
           </div>
-        </div>
-        <div className='app-drag' />
-        <div className='app-drag-area' />
+        </AppDrag>
         <WindowControl
           store={window.store}
         />

package/client/components/tabs/tab-title.jsx

@@ -0,0 +1,15 @@
+import createName from '../../common/create-title'
+
+export default function tabTitle (props) {
+  const { tab } = props
+  const title = createName(tab)
+  const { tabCount, color } = props.tab
+  const styleTag = color
+    ? { color }
+    : {}
+  return (
+    <span>
+      <span style={styleTag}>♦</span> {tabCount}. {title}
+    </span>
+  )
+}

package/client/components/tabs/tab.jsx

@@ -21,6 +21,7 @@ import {
   terminalSshConfigType,
   commonActions
 } from '../../common/constants'
+import TabTitle from './tab-title'
 
 const { prefix } = window
 const e = prefix('tabs')
@@ -357,7 +358,7 @@ export default class Tab extends React.Component {
     } = this.props
     const { isLast } = this.props
     const { tab, terminalOnData } = this.state
-    const { id, isEditting, status, isTransporting, tabCount, color } = tab
+    const { id, isEditting, status, isTransporting } = tab
     const active = id === currentTabId
     const cls = classnames(
       `tab-${id}`,
@@ -378,9 +379,6 @@ export default class Tab extends React.Component {
     if (isEditting) {
       return this.renderEditting(tab, cls)
     }
-    const styleTag = color
-      ? { color }
-      : {}
     return (
       <Tooltip
         title={title}
@@ -413,7 +411,7 @@ export default class Tab extends React.Component {
               onClick={this.handleReloadTab}
               title={m('reload')}
             />
-            <span style={styleTag}>♦</span> {tabCount}. {title}
+            <TabTitle tab={tab} />
           </div>
           <div className={'tab-status ' + status} />
           <div className='tab-traffic' />

package/client/components/tabs/tabs.styl

@@ -1,34 +1,23 @@
 @require '../../css/includes/theme-default'
 .tabs
   position relative
-  height 56px
+  height 45px
   overflow hidden
   background main-dark
-.app-drag-area
-.app-drag
-  position absolute
-  left 0
-  top 0
-  height 15px
-  right 0
-  z-index 1
-.app-drag
-  -webkit-app-region drag
+
 .tabs-inner
   position relative
   z-index 2
-  padding 0 5px 0 0
-  margin-top 10px
+  padding 0
+  margin-top 0
   display inline-block
   height 63px
   overflow-x scroll
   overflow-y hidden
   margin-left 42px
-  -webkit-app-region drag
 .tabs-wrapper
   z-index 3
 .tab
-  -webkit-app-region no-drag
   display inline-block
   vertical-align middle
   cursor pointer
@@ -137,8 +126,8 @@
 .tabs-extra
   position absolute
   height 20px
-  top 34px
-  right 0
+  top 14px
+  right 96px
   line-height 20px
   z-index 20
   -webkit-app-region no-drag
@@ -212,9 +201,4 @@
 
 .system-ui
   .window-controls
-  .app-drag
     display none
-  .tabs
-    height 45px
-  .tabs-inner
-    margin-top 0

package/client/components/tabs/window-control.jsx

@@ -11,8 +11,12 @@ const m = prefix('menu')
 export default class WindowControl extends Component {
   render () {
     const {
-      isMaximized
+      isMaximized,
+      config
     } = this.props.store
+    if (config.useSystemTitleBar) {
+      return null
+    }
     const minimize = () => {
       window.pre.runGlobalAsync('minimize')
     }

package/client/components/terminal/highlight-addon.js

@@ -29,7 +29,6 @@ export class KeywordHighlighterAddon {
   }
 
   highlightKeywords = (text) => {
-    console.log('this.keywords', this.keywords)
     for (const obj of this.keywords) {
       const {
         keyword,

package/client/components/terminal/index.jsx

@@ -77,6 +77,7 @@ class Term extends Component {
       loading: false,
       promoteModalVisible: false,
       savePassword: false,
+      saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
       tempPassword: '',
       passType: 'password',
       zmodemTransfer: null,
@@ -272,15 +273,18 @@ class Term extends Component {
       options,
       action,
       encode,
-      // id,
+      saveTerminalLogToFile,
       type,
       cmd,
       activeSplitId,
+      pid,
       toAll,
       inputOnly,
       zoomValue
     } = e?.data || {}
+
     const { id: propSplitId } = this.props
+    const { pid: statePid } = this.state
     if (
       action === terminalActions.zoom &&
       propSplitId === activeSplitId
@@ -338,6 +342,32 @@ class Term extends Component {
       )
     ) {
       this.searchPrev(keyword, options)
+    } else if (
+      action === commonActions.getTermLogState &&
+      pid === statePid
+    ) {
+      postMessage({
+        action: commonActions.returnTermLogState,
+        state: this.state.saveTerminalLogToFile,
+        pid: statePid
+      })
+      postMessage({
+        action: commonActions.returnTermLogState,
+        state: this.state.saveTerminalLogToFile,
+        pid: statePid
+      })
+      postMessage({
+        action: commonActions.returnTermLogState,
+        state: this.state.saveTerminalLogToFile,
+        pid: statePid
+      })
+    } else if (
+      action === commonActions.setTermLogState &&
+      pid === statePid
+    ) {
+      this.setState({
+        saveTerminalLogToFile
+      })
     }
     const isActiveTerminal = this.isActiveTerminal()
     if (
@@ -644,9 +674,9 @@ class Term extends Component {
     window.store.toggleTerminalSearch()
   }
 
-  onLineFeed = e => {
-    // console.log(e, 'onLineFeed')
-  }
+  // onLineFeed = e => {
+  //   // console.log(e, 'onLineFeed')
+  // }
 
   onTitleChange = e => {
     log.debug(e, 'title change')
@@ -808,7 +838,7 @@ class Term extends Component {
     term.unicode.activeVersion = '11'
     term.loadAddon(this.fitAddon)
     term.loadAddon(this.searchAddon)
-    term.onLineFeed(this.onLineFeed)
+    // term.onLineFeed(this.onLineFeed)
     term.onTitleChange(this.onTitleChange)
     term.onSelectionChange(this.onSelection)
     this.loadState(term)

package/client/components/terminal/terminal-apis.js

@@ -29,3 +29,11 @@ export function resizeTerm (pid, sessionId, cols, rows) {
     action: 'resize-terminal'
   })
 }
+
+export function toggleTerminalLog (pid, sessionId) {
+  return fetch({
+    pid,
+    sessionId,
+    action: 'toggle-terminal-log'
+  })
+}

package/client/components/terminal-info/base.jsx

@@ -1,27 +1,120 @@
 /**
  * show base terminal info, id sessionID
  */
-
+import { Component } from 'react'
 import { osResolve } from '../../common/resolve'
+import {
+  commonActions
+} from '../../common/constants'
+import {
+  Switch
+} from 'antd'
 import ShowItem from '../common/show-item'
+import postMsg from '../../common/post-msg'
+import { toggleTerminalLog } from '../terminal/terminal-apis'
 
 const { prefix } = window
-const c = prefix('common')
 const st = prefix('setting')
 
-export default function TerminalInfoBase (props) {
-  const { id, saveTerminalLogToFile, logName } = props
-  const base = props.appPath
-    ? osResolve(props.appPath, 'electerm', 'session_logs')
-    : window.et.sessionLogPath
-  const path = osResolve(base, logName + '.log')
-  const to = saveTerminalLogToFile
-    ? <ShowItem disabled={!saveTerminalLogToFile} to={path}>{path}</ShowItem>
-    : `-> ${c('setting')} -> ${st('saveTerminalLogToFile')}`
-  return (
-    <div className='terminal-info-section terminal-info-base'>
-      <p><b>ID:</b> {id}</p>
-      <p><b>log:</b> {to}</p>
-    </div>
-  )
+export default class TerminalInfoBase extends Component {
+  state = {
+    saveTerminalLogToFile: false
+  }
+
+  componentDidMount () {
+    this.getState()
+    window.addEventListener('message', this.onEvent)
+  }
+
+  componentWillUnmount () {
+    this.exit()
+  }
+
+  handleToggle = () => {
+    const { saveTerminalLogToFile } = this.state
+    const {
+      pid,
+      sessionId
+    } = this.props
+    toggleTerminalLog(
+      pid,
+      sessionId
+    )
+    const nv = !saveTerminalLogToFile
+    this.setState({
+      saveTerminalLogToFile: nv
+    })
+    postMsg({
+      action: commonActions.setTermLogState,
+      pid,
+      saveTerminalLogToFile: nv,
+      sessionId
+    })
+  }
+
+  onEvent = (e) => {
+    const {
+      action,
+      state,
+      pid: ppid
+    } = e.data || {}
+    if (
+      action === commonActions.returnTermLogState &&
+      this.props.pid === ppid
+    ) {
+      this.setState({
+        saveTerminalLogToFile: state
+      })
+      window.removeEventListener('message', this.onEvent)
+    }
+  }
+
+  getState = () => {
+    const {
+      pid,
+      sessionId
+    } = this.props
+    postMsg({
+      action: commonActions.getTermLogState,
+      pid,
+      sessionId
+    })
+  }
+
+  exit = () => {
+    window.removeEventListener('message', this.onEvent)
+  }
+
+  render () {
+    const {
+      id,
+      logName,
+      appPath
+    } = this.props
+    const { saveTerminalLogToFile } = this.state
+    const base = appPath
+      ? osResolve(appPath, 'electerm', 'session_logs')
+      : window.et.sessionLogPath
+    const path = osResolve(base, logName + '.log')
+    const name = st('saveTerminalLogToFile')
+    const to = saveTerminalLogToFile
+      ? <ShowItem disabled={!saveTerminalLogToFile} to={path}>{path}</ShowItem>
+      : path
+    return (
+      <div className='terminal-info-section terminal-info-base'>
+        <div className='fix'>
+          <span className='fleft'><b>ID:</b> {id}</span>
+          <span className='fright'>
+            <Switch
+              checkedChildren={name}
+              unCheckedChildren={name}
+              checked={saveTerminalLogToFile}
+              onChange={this.handleToggle}
+            />
+          </span>
+        </div>
+        <p><b>log:</b> {to}</p>
+      </div>
+    )
+  }
 }

package/client/css/basic.styl

@@ -6,7 +6,7 @@ html
   background rgba(0,0,0,.01)
 
 body
-  color main
+  color text
   overflow hidden
   background alpha(main, .3)
   font-size 12px
@@ -36,3 +36,6 @@ body
   word-break break-all
 .hide-resize-observer
   display: none !important
+
+a
+  color primary

package/client/store/bookmark-group.js

@@ -15,7 +15,7 @@ export default Store => {
   }
   Store.prototype.getBookmarkGroupsTotal = function () {
     const { store } = window
-    return store.sshConfigItems.length
+    return store.sshConfigItems.length && !store.config.hideSshConfig
       ? [
           ...store.getBookmarkGroups(),
           {

package/client/store/event.js

@@ -40,6 +40,7 @@ export default Store => {
 
   Store.prototype.blur = function () {
     window.focused = false
+    window.pre.runSync('windowMove', false)
     postMessage({
       type: 'blur'
     })

package/client/store/index.js

@@ -88,7 +88,7 @@ class Store {
   constructor () {
     Object.assign(
       this,
-      initState
+      initState()
     )
   }
 
@@ -292,7 +292,7 @@ class Store {
   }
 
   get tabsHeight () {
-    return window.store.config.useSystemTitleBar ? 45 : 56
+    return 45 // window.store.config.useSystemTitleBar ? 45 : 56
   }
 
   get langs () {
@@ -350,7 +350,7 @@ batchInputHistory(Store)
 transferExtend(Store)
 addressBookmarkExtend(Store)
 
+export const StateStore = Store
 const store = manage(new Store())
 
-window.store = store
 export default store

package/client/store/init-state.js

@@ -53,132 +53,134 @@ export const getInitItem = (arr, tab) => {
   }
 }
 
-export default {
-  // common
-  wsInited: false,
-  configLoaded: false,
-  loadTime: 0,
-  lastDataUpdateTime: 0,
-  _tabs: '[]',
-  currentTabId: '',
-  termFocused: false,
-  _history: '[]',
-  _bookmarks: '[]',
-  _bookmarkGroups: JSON.stringify(
-    getDefaultBookmarkGroups([])
-  ),
-  _config: '{}',
-  _terminalThemes: JSON.stringify([
-    buildDefaultThemes()
-  ]),
-  _itermThemes: '[]',
-  currentBookmarkGroupId: defaultBookmarkGroupId,
-  _expandedKeys: ls.getItem(expandedKeysLsKey) || JSON.stringify([
-    defaultBookmarkGroupId
-  ]),
-  bookmarkSelectMode: false,
-  _checkedKeys: ls.getItem(checkedKeysLsKey) || '[]',
-  _addressBookmarks: '[]',
-  _addressBookmarksLocal: ls.getItem(localAddrBookmarkLsKey) || '[]',
-
-  // init session control
-  selectedSessions: [],
-  sessionModalVisible: false,
-
-  // sftp
-  fileOperation: fileOperationsMap.cp, // cp or mv
-  transferTab: 'transfer',
-  _transferHistory: '[]',
-  _fileTransfers: '[]',
-  _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
-    local: {
-      prop: 'modifyTime',
-      direction: 'asc'
-    },
-    remote: {
-      prop: 'modifyTime',
-      direction: 'desc'
-    }
-  }),
-
-  // for settings related
-  _setting: '',
-  _settingItem: JSON.stringify(getInitItem([], settingMap.bookmarks)),
-  settingTab: settingMap.bookmarks, // setting tab
-  autofocustrigger: Date.now(),
-  bookmarkId: undefined,
-  showModal: 0,
-  activeTerminalId: '',
-
-  // setting sync related
-  isSyncingSetting: false,
-  isSyncUpload: false,
-  isSyncDownload: false,
-  syncSetting: {},
-  syncType: syncTypes.github,
-  _fonts: '[]',
-
-  // term search
-  termSearchOpen: false,
-  termSearch: '',
-  termSearchMatchCount: 0,
-  termSearchMatchIndex: 0,
-  _termSearchOptions: JSON.stringify({
-    caseSensitive: false,
-    wholeWord: false,
-    regex: false,
-    decorations: {
-      activeMatchColorOverviewRuler: 'yellow'
-    }
-  }),
-
-  // quick commands
-  _quickCommands: '[]',
-  quickCommandId: '',
-  openQuickCommandBar: false,
-  pinnedQuickCommandBar: false,
-
-  // sidebar
-  openedSideBar: ls.getItem(openedSidebarKey),
-  menuOpened: false,
-  pinned: ls.getItem(sidebarPinnedKey) === 'true',
-
-  // info/help modal
-  showInfoModal: false,
-  infoModalTab: infoTabs.info,
-  commandLineHelp: '',
-
-  // editor
-  showEditor: false,
-
-  // file/info modal
-  showFileModal: false,
-
-  // update
-  _upgradeInfo: '{}',
-
-  // serial list related
-  _serials: '[]',
-  loaddingSerials: false,
-
-  // transfer list
-  transports: [],
-
-  _sshConfigItems: '[]',
-
-  appPath: '',
-  exePath: '',
-  isPortable: false,
-  installSrc: '',
-
-  _langs: '[]',
-
-  // batch inputs
-  batchInputs: ls.getItemJSON(batchInputLsKey, []),
-
-  // ui
-  innerWidth: window.innerWidth,
-  height: 500,
-  isMaximized: window.pre.runSync('isMaximized'),
-  terminalFullScreen: false
+export default () => {
+  return {
+    // common
+    wsInited: false,
+    configLoaded: false,
+    loadTime: 0,
+    lastDataUpdateTime: 0,
+    _tabs: '[]',
+    currentTabId: '',
+    termFocused: false,
+    _history: '[]',
+    _bookmarks: '[]',
+    _bookmarkGroups: JSON.stringify(
+      getDefaultBookmarkGroups([])
+    ),
+    _config: '{}',
+    _terminalThemes: JSON.stringify([
+      buildDefaultThemes()
+    ]),
+    _itermThemes: '[]',
+    currentBookmarkGroupId: defaultBookmarkGroupId,
+    _expandedKeys: ls.getItem(expandedKeysLsKey) || JSON.stringify([
+      defaultBookmarkGroupId
+    ]),
+    bookmarkSelectMode: false,
+    _checkedKeys: ls.getItem(checkedKeysLsKey) || '[]',
+    _addressBookmarks: '[]',
+    _addressBookmarksLocal: ls.getItem(localAddrBookmarkLsKey) || '[]',
+
+    // init session control
+    selectedSessions: [],
+    sessionModalVisible: false,
+
+    // sftp
+    fileOperation: fileOperationsMap.cp, // cp or mv
+    transferTab: 'transfer',
+    _transferHistory: '[]',
+    _fileTransfers: '[]',
+    _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
+      local: {
+        prop: 'modifyTime',
+        direction: 'asc'
+      },
+      remote: {
+        prop: 'modifyTime',
+        direction: 'desc'
+      }
+    }),
+
+    // for settings related
+    _setting: '',
+    _settingItem: JSON.stringify(getInitItem([], settingMap.bookmarks)),
+    settingTab: settingMap.bookmarks, // setting tab
+    autofocustrigger: Date.now(),
+    bookmarkId: undefined,
+    showModal: 0,
+    activeTerminalId: '',
+
+    // setting sync related
+    isSyncingSetting: false,
+    isSyncUpload: false,
+    isSyncDownload: false,
+    syncSetting: {},
+    syncType: syncTypes.github,
+    _fonts: '[]',
+
+    // term search
+    termSearchOpen: false,
+    termSearch: '',
+    termSearchMatchCount: 0,
+    termSearchMatchIndex: 0,
+    _termSearchOptions: JSON.stringify({
+      caseSensitive: false,
+      wholeWord: false,
+      regex: false,
+      decorations: {
+        activeMatchColorOverviewRuler: 'yellow'
+      }
+    }),
+
+    // quick commands
+    _quickCommands: '[]',
+    quickCommandId: '',
+    openQuickCommandBar: false,
+    pinnedQuickCommandBar: false,
+
+    // sidebar
+    openedSideBar: ls.getItem(openedSidebarKey),
+    menuOpened: false,
+    pinned: ls.getItem(sidebarPinnedKey) === 'true',
+
+    // info/help modal
+    showInfoModal: false,
+    infoModalTab: infoTabs.info,
+    commandLineHelp: '',
+
+    // editor
+    showEditor: false,
+
+    // file/info modal
+    showFileModal: false,
+
+    // update
+    _upgradeInfo: '{}',
+
+    // serial list related
+    _serials: '[]',
+    loaddingSerials: false,
+
+    // transfer list
+    transports: [],
+
+    _sshConfigItems: '[]',
+
+    appPath: '',
+    exePath: '',
+    isPortable: false,
+    installSrc: '',
+
+    _langs: '[]',
+
+    // batch inputs
+    batchInputs: ls.getItemJSON(batchInputLsKey, []),
+
+    // ui
+    innerWidth: window.innerWidth,
+    height: 500,
+    isMaximized: window.pre.runSync('isMaximized'),
+    terminalFullScreen: false
+  }
 }

package/client/store/load-data.js

@@ -180,7 +180,9 @@ export default (Store) => {
     store.loadFontList()
     store.fetchItermThemes()
     store.openInitSessions()
-    store.fetchSshConfigItems()
+    if (!store.config.hideSshConfig) {
+      store.fetchSshConfigItems()
+    }
     store.initCommandLine().catch(store.onError)
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate()

package/client/store/session.js

@@ -2,26 +2,11 @@
  * sessions not proper closed related functions
  */
 
-import { isMac, terminalActions } from '../common/constants'
+import { terminalActions } from '../common/constants'
 import { debounce } from 'lodash-es'
 import postMsg from '../common/post-msg'
 
 export default Store => {
-  Store.prototype.onMouseWheel = function (event) {
-    if (
-      (isMac && event.metaKey) ||
-      (!isMac && event.ctrlKey)
-    ) {
-      event.stopPropagation()
-      if (window.store.inActiveTerminal) {
-        window.store.zoomTerminal(event.wheelDeltaY)
-      } else {
-        const plus = event.wheelDeltaY > 0 ? 0.2 : -0.2
-        window.store.zoom(plus, true)
-      }
-    }
-  }
-
   Store.prototype.zoomTerminal = debounce(function (delta) {
     postMsg({
       action: terminalActions.zoom,

package/package.json

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