@electerm/electerm-react 1.51.20 → 1.60.6

package/client/store/index.js

@@ -2,297 +2,9 @@
  * central state store powered by manate - https://github.com/tylerlong/manate
  */
 
+import { StateStore } from './store'
 import { manage } from 'manate'
-import initState from './init-state'
-import loadDataExtend from './load-data'
-import dbUpgradeExtend from './db-upgrade'
-import eventExtend from './event'
-import syncExtend from './sync'
-import appUpgradeExtend from './app-upgrade'
-import bookmarkGroupExtend from './bookmark-group'
-import bookmarkExtend from './bookmark'
-import commonExtend from './common'
-import contextMenuExtend from './context-menu'
-import itemExtend from './item'
-import quickCommandExtend from './quick-command'
-import sessionExtend from './session'
-import settingExtend from './setting'
-import sidebarExtend from './sidebar'
-import sysMenuExtend from './system-menu'
-import tabExtend from './tab'
-import uiThemeExtend from './ui-theme'
-import terminalThemeExtend from './terminal-theme'
-import transferHistoryExtend from './transfer-history'
-import batchInputHistory from './batch-input-history'
-import transferExtend from './transfer-list'
-import addressBookmarkExtend from './address-bookmark'
-import isColorDark from '../common/is-color-dark'
-import { getReverseColor } from '../common/reverse-color'
-import { uniq } from 'lodash-es'
-import deepCopy from 'json-deep-copy'
-import {
-  settingMap,
-  paneMap,
-  settingSyncId,
-  settingShortcutsId,
-  settingTerminalId,
-  terminalSshConfigType
-} from '../common/constants'
-import getInitItem from '../common/init-setting-item'
-import {
-  theme
-} from 'antd'
 
-const e = window.translate
-
-class Store {
-  constructor () {
-    Object.assign(
-      this,
-      initState()
-    )
-  }
-
-  get width () {
-    return window.store.innerWidth
-  }
-
-  get config () {
-    return deepCopy(window.store._config)
-  }
-
-  get currentQuickCommands () {
-    const { currentTab } = this
-    const { quickCommands } = window.store
-    const currentTabQuickCommands = (
-      currentTab.quickCommands || []
-    ).map((d, i) => {
-      return {
-        ...d,
-        id: 'tab-qm-' + currentTab.id + '#' + i
-      }
-    })
-    return [
-      ...currentTabQuickCommands,
-      ...quickCommands
-    ]
-  }
-
-  get currentTab () {
-    const {
-      activeTabId
-    } = this
-    const { tabs } = window.store
-    const tab = tabs.find(t => t.id === activeTabId)
-    if (!tab) {
-      return false
-    }
-    return tab
-  }
-
-  get inActiveTerminal () {
-    const { store } = window
-    if (store.showModal) {
-      return false
-    }
-    const {
-      currentTab
-    } = store
-    if (!currentTab) {
-      return false
-    }
-    const {
-      type,
-      pane
-    } = currentTab
-    if (type === 'rdp' || type === 'vnc' || type === 'web') {
-      return false
-    }
-    return pane === paneMap.ssh ||
-        pane === paneMap.terminal
-  }
-
-  get quickCommandTags () {
-    const { quickCommands } = window.store
-    return uniq(
-      quickCommands.reduce((p, q) => {
-        return [
-          ...p,
-          ...(q.labels || [])
-        ]
-      }, [])
-    )
-  }
-
-  get isTransporting () {
-    return window.store.tabs.some(t => t.isTransporting)
-  }
-
-  get transferCount () {
-    return window.store.fileTransfers.length
-  }
-
-  get settingSidebarList () {
-    const {
-      settingTab
-    } = this
-    const arr = window.store.getSidebarList(settingTab)
-    const initItem = getInitItem(arr, settingTab)
-    return settingTab === settingMap.history
-      ? arr
-      : [
-          deepCopy(initItem),
-          ...arr
-        ]
-  }
-
-  get termSearchOptions () {
-    const {
-      store
-    } = window
-    const theme = store.getThemeConfig()
-    return {
-      ...window.store._termSearchOptions,
-      decorations: {
-        activeMatchBorder: theme.yellow,
-        activeMatchBackground: theme.selectionBackground,
-        activeMatchColorOverviewRuler: theme.selectionBackground,
-        matchBackground: theme.background,
-        matchOverviewRuler: theme.yellow,
-        matchBorder: getReverseColor(theme.background)
-      }
-    }
-  }
-
-  get tabTitles () {
-    return window.store.tabs.map(d => d.title).join('#')
-  }
-
-  get setting () {
-    return [
-      {
-        id: settingTerminalId,
-        title: e('terminal')
-      },
-      {
-        id: settingShortcutsId,
-        title: e('settingShortcuts')
-      },
-      {
-        id: settingSyncId,
-        title: e('settingSync')
-      }
-    ]
-  }
-
-  get onOperation () {
-    const {
-      store
-    } = window
-    return store.showModal ||
-      store.showInfoModal ||
-      store.showEditor ||
-      store.showFileModal
-  }
-
-  get uiThemeConfig () {
-    const { store } = window
-    const themeConf = store.getUiThemeConfig()
-    return {
-      token: {
-        borderRadius: 3,
-        colorPrimary: themeConf.primary,
-        colorBgBase: themeConf.main,
-        colorError: themeConf.error,
-        colorInfo: themeConf.info,
-        colorSuccess: themeConf.success,
-        colorWarning: themeConf.warn,
-        colorTextBase: themeConf.text,
-        colorLink: themeConf['text-light']
-      },
-      algorithm: isColorDark(themeConf.main) ? theme.darkAlgorithm : theme.defaultAlgorithm
-    }
-  }
-
-  get bookmarkTree () {
-    const {
-      bookmarks
-    } = window.store
-    return bookmarks.reduce((p, v) => {
-      return {
-        ...p,
-        [v.id]: v
-      }
-    }, {})
-  }
-
-  hasSshConfig () {
-    return !!window.store
-      .bookmarkGroups
-      .find(b => b.id === terminalSshConfigType)
-  }
-
-  get bookmarkGroupTree () {
-    const {
-      bookmarkGroups
-    } = window.store
-    return bookmarkGroups.reduce((p, v) => {
-      return {
-        ...p,
-        [v.id]: v
-      }
-    }, {})
-  }
-
-  get hasOldConnectionHoppingBookmark () {
-    return window.store.bookmarks.some(b => {
-      return b.connectionHoppings?.length && !b.hasHopping
-    })
-  }
-}
-
-const arrGetterProps = [
-  'addressBookmarks',
-  'addressBookmarksLocal',
-  'bookmarks',
-  'bookmarkGroups',
-  'profiles',
-  'quickCommands',
-  'terminalThemes'
-]
-
-for (const prop of arrGetterProps) {
-  Object.defineProperty(Store.prototype, prop, {
-    get: function () {
-      return JSON.parse(window.store[`_${prop}`] || '[]').filter(d => d)
-    }
-  })
-}
-
-loadDataExtend(Store)
-eventExtend(Store)
-dbUpgradeExtend(Store)
-syncExtend(Store)
-appUpgradeExtend(Store)
-bookmarkGroupExtend(Store)
-bookmarkExtend(Store)
-commonExtend(Store)
-contextMenuExtend(Store)
-itemExtend(Store)
-quickCommandExtend(Store)
-sessionExtend(Store)
-settingExtend(Store)
-sidebarExtend(Store)
-sysMenuExtend(Store)
-tabExtend(Store)
-terminalThemeExtend(Store)
-uiThemeExtend(Store)
-transferHistoryExtend(Store)
-batchInputHistory(Store)
-transferExtend(Store)
-addressBookmarkExtend(Store)
-
-export const StateStore = Store
-const store = manage(new Store())
+const store = manage(new StateStore())
 
 export default store

package/client/store/init-state.js

@@ -19,6 +19,7 @@ import {
   dismissDelKeyTipLsKey,
   qmSortByFrequencyKey,
   resolutionsLsKey,
+  aiChatHistoryKey,
   splitMap
 } from '../common/constants'
 import { buildDefaultThemes } from '../common/terminal-theme'
@@ -76,6 +77,11 @@ export default () => {
     selectedSessions: [],
     sessionModalVisible: false,
 
+    // batch input selected tab ids
+    _batchInputSelectedTabIds: new Set(),
+    showAIConfig: false,
+    aiChatHistory: ls.getItemJSON(aiChatHistoryKey, []),
+
     // sftp
     fileOperation: fileOperationsMap.cp, // cp or mv
     pauseAllTransfer: false,
@@ -103,6 +109,7 @@ export default () => {
     activeTabId3: '',
     terminalInfoProps: {},
     rightPanelVisible: false,
+    rightPanelTab: 'info',
     rightPanelPinned: false,
     rightPanelWidth: parseInt(ls.getItem(rightSidebarWidthKey), 10) || 500,
 
@@ -144,7 +151,6 @@ export default () => {
     // sidebar
     openedSideBar: ls.getItem(openedSidebarKey),
     leftSidebarWidth: parseInt(ls.getItem(leftSidebarWidthKey), 10) || 300,
-    rightSidebarWidth: parseInt(ls.getItem(rightSidebarWidthKey), 10) || 500,
     menuOpened: false,
     pinned: ls.getItem(sidebarPinnedKey) === 'true',
 

package/client/store/store.js

@@ -0,0 +1,298 @@
+/**
+ * central state store powered by manate - https://github.com/tylerlong/manate
+ */
+
+import initState from './init-state'
+import loadDataExtend from './load-data'
+import dbUpgradeExtend from './db-upgrade'
+import eventExtend from './event'
+import syncExtend from './sync'
+import appUpgradeExtend from './app-upgrade'
+import bookmarkGroupExtend from './bookmark-group'
+import bookmarkExtend from './bookmark'
+import commonExtend from './common'
+import contextMenuExtend from './context-menu'
+import itemExtend from './item'
+import quickCommandExtend from './quick-command'
+import sessionExtend from './session'
+import settingExtend from './setting'
+import sidebarExtend from './sidebar'
+import sysMenuExtend from './system-menu'
+import tabExtend from './tab'
+import uiThemeExtend from './ui-theme'
+import terminalThemeExtend from './terminal-theme'
+import transferHistoryExtend from './transfer-history'
+import batchInputHistory from './batch-input-history'
+import transferExtend from './transfer-list'
+import addressBookmarkExtend from './address-bookmark'
+import isColorDark from '../common/is-color-dark'
+import { getReverseColor } from '../common/reverse-color'
+import { uniq } from 'lodash-es'
+import deepCopy from 'json-deep-copy'
+import {
+  settingMap,
+  paneMap,
+  settingSyncId,
+  settingShortcutsId,
+  settingTerminalId,
+  terminalSshConfigType
+} from '../common/constants'
+import getInitItem from '../common/init-setting-item'
+import {
+  theme
+} from 'antd'
+
+const e = window.translate
+
+class Store {
+  constructor () {
+    Object.assign(
+      this,
+      initState()
+    )
+  }
+
+  get width () {
+    return window.store.innerWidth
+  }
+
+  get config () {
+    return deepCopy(window.store._config)
+  }
+
+  get currentQuickCommands () {
+    const { currentTab } = this
+    const { quickCommands } = window.store
+    const currentTabQuickCommands = (
+      currentTab.quickCommands || []
+    ).map((d, i) => {
+      return {
+        ...d,
+        id: 'tab-qm-' + currentTab.id + '#' + i
+      }
+    })
+    return [
+      ...currentTabQuickCommands,
+      ...quickCommands
+    ]
+  }
+
+  get currentTab () {
+    const {
+      activeTabId
+    } = this
+    const { tabs } = window.store
+    const tab = tabs.find(t => t.id === activeTabId)
+    if (!tab) {
+      return false
+    }
+    return tab
+  }
+
+  get batchInputSelectedTabIds () {
+    return Array.from(window.store._batchInputSelectedTabIds)
+  }
+
+  get inActiveTerminal () {
+    const { store } = window
+    if (store.showModal) {
+      return false
+    }
+    const {
+      currentTab
+    } = store
+    if (!currentTab) {
+      return false
+    }
+    const {
+      type,
+      pane
+    } = currentTab
+    if (type === 'rdp' || type === 'vnc' || type === 'web') {
+      return false
+    }
+    return pane === paneMap.ssh ||
+        pane === paneMap.terminal
+  }
+
+  get quickCommandTags () {
+    const { quickCommands } = window.store
+    return uniq(
+      quickCommands.reduce((p, q) => {
+        return [
+          ...p,
+          ...(q.labels || [])
+        ]
+      }, [])
+    )
+  }
+
+  get isTransporting () {
+    return window.store.tabs.some(t => t.isTransporting)
+  }
+
+  get transferCount () {
+    return window.store.fileTransfers.length
+  }
+
+  get settingSidebarList () {
+    const {
+      settingTab
+    } = this
+    const arr = window.store.getSidebarList(settingTab)
+    const initItem = getInitItem(arr, settingTab)
+    return settingTab === settingMap.history
+      ? arr
+      : [
+          deepCopy(initItem),
+          ...arr
+        ]
+  }
+
+  get termSearchOptions () {
+    const {
+      store
+    } = window
+    const theme = store.getThemeConfig()
+    return {
+      ...window.store._termSearchOptions,
+      decorations: {
+        activeMatchBorder: theme.yellow,
+        activeMatchBackground: theme.selectionBackground,
+        activeMatchColorOverviewRuler: theme.selectionBackground,
+        matchBackground: theme.background,
+        matchOverviewRuler: theme.yellow,
+        matchBorder: getReverseColor(theme.background)
+      }
+    }
+  }
+
+  get tabTitles () {
+    return window.store.tabs.map(d => d.title).join('#')
+  }
+
+  get setting () {
+    return [
+      {
+        id: settingTerminalId,
+        title: e('terminal')
+      },
+      {
+        id: settingShortcutsId,
+        title: e('settingShortcuts')
+      },
+      {
+        id: settingSyncId,
+        title: e('settingSync')
+      }
+    ]
+  }
+
+  get onOperation () {
+    const {
+      store
+    } = window
+    return store.showModal ||
+      store.showInfoModal ||
+      store.showEditor ||
+      store.showFileModal
+  }
+
+  get uiThemeConfig () {
+    const { store } = window
+    const themeConf = store.getUiThemeConfig()
+    return {
+      token: {
+        borderRadius: 3,
+        colorPrimary: themeConf.primary,
+        colorBgBase: themeConf.main,
+        colorError: themeConf.error,
+        colorInfo: themeConf.info,
+        colorSuccess: themeConf.success,
+        colorWarning: themeConf.warn,
+        colorTextBase: themeConf.text,
+        colorLink: themeConf['text-light']
+      },
+      algorithm: isColorDark(themeConf.main) ? theme.darkAlgorithm : theme.defaultAlgorithm
+    }
+  }
+
+  get bookmarkTree () {
+    const {
+      bookmarks
+    } = window.store
+    return bookmarks.reduce((p, v) => {
+      return {
+        ...p,
+        [v.id]: v
+      }
+    }, {})
+  }
+
+  hasSshConfig () {
+    return !!window.store
+      .bookmarkGroups
+      .find(b => b.id === terminalSshConfigType)
+  }
+
+  get bookmarkGroupTree () {
+    const {
+      bookmarkGroups
+    } = window.store
+    return bookmarkGroups.reduce((p, v) => {
+      return {
+        ...p,
+        [v.id]: v
+      }
+    }, {})
+  }
+
+  get hasOldConnectionHoppingBookmark () {
+    return window.store.bookmarks.some(b => {
+      return b.connectionHoppings?.length && !b.hasHopping
+    })
+  }
+}
+
+const arrGetterProps = [
+  'addressBookmarks',
+  'addressBookmarksLocal',
+  'bookmarks',
+  'bookmarkGroups',
+  'profiles',
+  'quickCommands',
+  'terminalThemes'
+]
+
+for (const prop of arrGetterProps) {
+  Object.defineProperty(Store.prototype, prop, {
+    get: function () {
+      return JSON.parse(window.store[`_${prop}`] || '[]').filter(d => d)
+    }
+  })
+}
+
+loadDataExtend(Store)
+eventExtend(Store)
+dbUpgradeExtend(Store)
+syncExtend(Store)
+appUpgradeExtend(Store)
+bookmarkGroupExtend(Store)
+bookmarkExtend(Store)
+commonExtend(Store)
+contextMenuExtend(Store)
+itemExtend(Store)
+quickCommandExtend(Store)
+sessionExtend(Store)
+settingExtend(Store)
+sidebarExtend(Store)
+sysMenuExtend(Store)
+tabExtend(Store)
+terminalThemeExtend(Store)
+uiThemeExtend(Store)
+transferHistoryExtend(Store)
+batchInputHistory(Store)
+transferExtend(Store)
+addressBookmarkExtend(Store)
+
+export const StateStore = Store

package/client/store/tab.js

@@ -341,7 +341,10 @@ export default Store => {
 
     // Find the current tab index and its batch
     const currentIndex = tabs.findIndex(t => t.id === activeTabId)
-    if (currentIndex === -1) return // Current tab not found, do nothing
+
+    if (currentIndex === -1) {
+      return // Current tab not found, do nothing
+    }
 
     const currentBatch = tabs[currentIndex].batch
 
@@ -363,6 +366,7 @@ export default Store => {
     // If a valid next tab is found, update the activeTabId
     if (nextIndex !== -1 && nextIndex !== currentIndex) {
       store.activeTabId = tabs[nextIndex].id
+      store[`activeTabId${currentBatch}`] = tabs[nextIndex].id
     }
   }
 
@@ -492,4 +496,53 @@ export default Store => {
       }
     })()
   }
+
+  Store.prototype.updateBatchInputSelectedTabIds = function () {
+    const { store } = window
+    store._batchInputSelectedTabIds = new Set([store.activeTabId])
+  }
+
+  Store.prototype.onSelectBatchInputSelectedTabId = action(function (id) {
+    const { store } = window
+    const { _batchInputSelectedTabIds } = store
+    if (_batchInputSelectedTabIds.has(id)) {
+      _batchInputSelectedTabIds.delete(id)
+    } else {
+      _batchInputSelectedTabIds.add(id)
+    }
+    if (_batchInputSelectedTabIds.size === 0) {
+      _batchInputSelectedTabIds.add(store.activeTabId)
+    }
+  })
+
+  Store.prototype.filterBatchInputSelectedTabIds = action(function () {
+    const { store } = window
+    const { _batchInputSelectedTabIds, tabs } = store
+    const validTabIds = new Set(tabs.map(tab => tab.id))
+
+    // Filter out invalid tab IDs
+    for (const id of _batchInputSelectedTabIds) {
+      if (!validTabIds.has(id)) {
+        _batchInputSelectedTabIds.delete(id)
+      }
+    }
+
+    // If no valid tabs are selected, add the active tab
+    if (_batchInputSelectedTabIds.size === 0) {
+      _batchInputSelectedTabIds.add(store.activeTabId)
+    }
+  })
+
+  Store.prototype.selectAllBatchInputTabs = function () {
+    const { store } = window
+    const { tabs } = store
+    store._batchInputSelectedTabIds = new Set(tabs.map(tab => tab.id))
+  }
+
+  Store.prototype.selectNoneBatchInputTabs = action(function () {
+    const { store } = window
+    store._batchInputSelectedTabIds.clear()
+    // Ensure at least the active tab is selected
+    store._batchInputSelectedTabIds.add(store.activeTabId)
+  })
 }