@electerm/electerm-react 1.35.6 → 1.36.2

package/client/store/index.js

@@ -35,7 +35,8 @@ import {
   sidebarPanelWidth,
   paneMap,
   settingSyncId,
-  settingShortcutsId
+  settingShortcutsId,
+  settingTerminalId
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import {
@@ -45,6 +46,7 @@ import {
 const { prefix } = window
 const ss = prefix('settingSync')
 const s = prefix('setting')
+const sss = prefix('ssh')
 
 function getReverseColor (hex) {
   // Check if the input is a valid hex color code
@@ -86,7 +88,7 @@ class Store {
   constructor () {
     Object.assign(
       this,
-      initState
+      initState()
     )
   }
 
@@ -248,12 +250,16 @@ class Store {
   get setting () {
     return [
       {
-        id: settingSyncId,
-        title: ss('settingSync')
+        id: settingTerminalId,
+        title: sss('terminal')
       },
       {
         id: settingShortcutsId,
         title: s('settingShortcuts')
+      },
+      {
+        id: settingSyncId,
+        title: ss('settingSync')
       }
     ]
   }
@@ -344,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/setting.js

@@ -11,6 +11,7 @@ import copy from 'json-deep-copy'
 import {
   settingMap,
   settingCommonId,
+  settingSyncId,
   modals
 } from '../common/constants'
 import { buildNewTheme } from '../common/terminal-theme'
@@ -150,7 +151,7 @@ export default Store => {
     store.storeAssign({
       settingTab: settingMap.setting
     })
-    store.setSettingItem(copy(store.setting[0]))
+    store.setSettingItem(copy(store.setting.find(d => d.id === settingSyncId)))
     store.openSettingModal()
   }
 

package/package.json

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