@electerm/electerm-react 1.60.48 → 1.60.56

package/client/common/default-setting.js

@@ -61,6 +61,6 @@ export default {
   dataSyncSelected: 'all',
   baseURLAI: 'https://api.deepseek.com',
   modelAI: 'deepseek-chat',
-  roleAI: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式',
+  roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions'
 }

package/client/common/download-mirrors.js

@@ -6,9 +6,5 @@ export default [
   {
     name: 'github',
     url: 'https://github.com/electerm/electerm/releases'
-  },
-  {
-    name: 'sourceforge',
-    url: 'https://sourceforge.net/projects/electerm.mirror/files/'
   }
 ]

package/client/components/ai/ai-config.jsx

@@ -19,10 +19,10 @@ import providers from './providers'
 const e = window.translate
 const defaultRoles = [
   {
-    value: 'Terminal expert, provide safe commands for different OS, explain usage and risks, use markdown format'
+    value: 'Terminal expert, provide commands for different OS, explain usage briefly, use markdown format'
   },
   {
-    value: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式'
+    value: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式'
   }
 ]
 

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

@@ -57,6 +57,7 @@ export default auto(function SettingModalWrap (props) {
       ...props0,
       bookmarkSelectMode,
       bookmarkGroups,
+      bookmarksMap: store.bookmarksMap,
       bookmarks,
       ...pick(store, [
         'currentBookmarkGroupId',

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

@@ -12,7 +12,8 @@ export default auto(function BookmarkSelect (props) {
     openedSideBar,
     leftSidebarWidth,
     expandedKeys,
-    bookmarks
+    bookmarks,
+    bookmarksMap
   } = store
   if (from === 'sidebar' && openedSideBar !== 'bookmarks') {
     return null
@@ -33,6 +34,7 @@ export default auto(function BookmarkSelect (props) {
   const propsTree = {
     ...base,
     shouldConfirmDel: true,
+    bookmarksMap,
     bookmarkGroups: store.getBookmarkGroupsTotal(),
     expandedKeys,
     leftSidebarWidth,

package/client/components/terminal/terminal.jsx

@@ -1105,7 +1105,6 @@ clear\r`
   }, 200)
 
   onerrorSocket = err => {
-    this.setStatus(statusMap.error)
     log.error('onerrorSocket', err)
   }
 
@@ -1250,7 +1249,7 @@ clear\r`
         items: this.renderContextMenu(),
         onClick: this.onContextMenu
       },
-      trigger: ['contextMenu']
+      trigger: this.props.config.pasteWhenContextMenu ? [] : ['contextMenu']
     }
     return (
       <Dropdown {...dropdownProps}>

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

@@ -17,13 +17,12 @@ import {
   settingMap
 } from '../../common/constants'
 import findParentBySel from '../../common/find-parent'
-import copy, { deepCopy } from 'json-deep-copy'
+import copy from 'json-deep-copy'
 import NewButtonsGroup from './bookmark-toolbar'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import getInitItem from '../../common/init-setting-item'
 import uid from '../../common/uid'
 import { action } from 'manate'
-import deepEqual from 'fast-deep-equal'
 import './tree-list.styl'
 import TreeExpander from './tree-expander'
 import TreeListItem from './tree-list-item'
@@ -43,8 +42,7 @@ export default class ItemListTree extends Component {
       moveItemIsGroup: false,
       bookmarkGroupTitle: '',
       categoryTitle: '',
-      categoryId: '',
-      expandedKeys: props.expandedKeys
+      categoryId: ''
     }
   }
 
@@ -60,17 +58,6 @@ export default class ItemListTree extends Component {
     }, 100)
   }
 
-  componentDidUpdate (prevProps, prevState) {
-    if (
-      !deepEqual(prevProps.expandedKeys, this.props.expandedKeys) &&
-      !deepEqual(this.props.expandedKeys, this.state.expandedKeys)
-    ) {
-      this.setState({
-        expandedKeys: deepCopy(this.props.expandedKeys)
-      })
-    }
-  }
-
   componentWillUnmount () {
     clearTimeout(this.timer)
   }
@@ -83,7 +70,7 @@ export default class ItemListTree extends Component {
     })
   }
 
-  filter = list => {
+  filter = (list) => {
     const { keyword } = this.state
     return keyword
       ? list.filter(item => {
@@ -92,26 +79,26 @@ export default class ItemListTree extends Component {
       : list
   }
 
-  getBookmarkTree = () => {
-    return this.filter(this.props.bookmarks).reduce((tree, bookmark) => {
-      tree[bookmark.id] = bookmark
-      return tree
-    }, {})
-  }
-
   onExpandKey = group => {
-    const nkeys = [
-      ...this.state.expandedKeys,
-      group.id
-    ]
-    this.onExpand(nkeys)
+    const {
+      expandedKeys
+    } = window.store
+    expandedKeys.push(group.id)
+    this.onExpand()
   }
 
   onUnExpandKey = group => {
-    const nkeys = this.state.expandedKeys.filter(
-      d => d !== group.id
+    const {
+      expandedKeys
+    } = window.store
+    const index = expandedKeys.findIndex(
+      d => d === group.id
     )
-    this.onExpand(nkeys)
+    if (index < 0) {
+      return
+    }
+    expandedKeys.splice(index, 1)
+    this.onExpand(expandedKeys)
   }
 
   handleChange = keyword => {
@@ -280,12 +267,8 @@ export default class ItemListTree extends Component {
     })
   }
 
-  onExpand = (expandedKeys) => {
-    this.setState({
-      expandedKeys
-    })
+  onExpand = () => {
     this.closeNewGroupForm()
-    window.store.expandedKeys = deepCopy(expandedKeys)
   }
 
   onSelect = (
@@ -342,13 +325,10 @@ export default class ItemListTree extends Component {
       return {
         showNewBookmarkGroupForm: true,
         parentId: item.id,
-        bookmarkGroupTitle: '',
-        expandedKeys: uniq([
-          ...old.expandedKeys,
-          item.id
-        ])
+        bookmarkGroupTitle: ''
       }
     })
+    window.store.expandedKeys.push(item.id)
   }
 
   openAll = (item) => {
@@ -745,7 +725,7 @@ export default class ItemListTree extends Component {
       level,
       group,
       keyword: this.state.keyword,
-      expandedKeys: this.state.expandedKeys,
+      expandedKeys: this.props.expandedKeys,
       onExpand: this.onExpandKey,
       onUnExpand: this.onUnExpandKey
     }
@@ -766,7 +746,7 @@ export default class ItemListTree extends Component {
       bookmarkGroupIds = [],
       id
     } = group
-    const shouldRender = this.state.keyword || this.state.expandedKeys.includes(id)
+    const shouldRender = this.state.keyword || this.props.expandedKeys.includes(id)
     if (!shouldRender) {
       return null
     }
@@ -786,8 +766,16 @@ export default class ItemListTree extends Component {
   }
 
   renderChilds = (bookmarkIds, pid) => {
+    const tree = this.props.bookmarksMap
+    const { keyword } = this.state
     const bookmarks = bookmarkIds.map(id => {
-      return this.getBookmarkTree()[id]
+      const item = tree.get(id)
+      if (!item) {
+        return null
+      }
+      return createName(item).toLowerCase().includes(keyword.toLowerCase())
+        ? item
+        : null
     }).filter(d => d)
     return bookmarks.map((node) => {
       return this.renderItemTitle(node, false, pid)

package/client/store/init-state.js

@@ -52,6 +52,7 @@ export default () => {
     history: ls.getItemJSON('history', []),
     sshConfigs: [],
     bookmarks: [],
+    bookmarksMap: new Map(),
     sidebarPanelTab: 'bookmarks',
     profiles: [],
     bookmarkGroups: getDefaultBookmarkGroups([]),

package/client/store/load-data.js

@@ -2,14 +2,13 @@
  * load data from db
  */
 
-import { dbNames, update, getData, fetchInitData, insert, remove } from '../common/db'
+import { dbNames, getData, fetchInitData } from '../common/db'
 import parseInt10 from '../common/parse-int10'
 import { infoTabs, statusMap, defaultEnvLang } from '../common/constants'
 import fs from '../common/fs'
 import generate from '../common/id-with-stamp'
 import defaultSettings from '../common/default-setting'
 import encodes from '../components/bookmark-form/encodes'
-import runIdle from '../common/run-idle'
 import { initWsCommon } from '../common/fetch-from-server'
 import safeParse from '../common/parse-json-safe'
 import initWatch from './watch'
@@ -107,27 +106,6 @@ export async function addTabFromCommandLine (store, opts) {
 }
 
 export default (Store) => {
-  Store.prototype.batchDbUpdate = async function (updates) {
-    runIdle(() => {
-      for (const u of updates) {
-        update(u.id, u.update, u.db, u.upsert)
-      }
-    })
-  }
-  Store.prototype.batchDbAdd = async function (adds) {
-    runIdle(() => {
-      for (const u of adds) {
-        insert(u.db, u.obj)
-      }
-    })
-  }
-  Store.prototype.batchDbDel = async function (dels) {
-    runIdle(() => {
-      for (const u of dels) {
-        remove(u.db, u.id)
-      }
-    })
-  }
   Store.prototype.openInitSessions = function () {
     const { store } = window
     const arr = store.config.onStartSessions || []
@@ -188,6 +166,11 @@ export default (Store) => {
         for (const { name, data } of arr) {
           const dt = JSON.parse(data || '[]')
           refsStatic.add('oldState-' + name, dt)
+          if (name === 'bookmarks') {
+            ext.bookmarksMap = new Map(
+              dt.map(d => [d.id, d])
+            )
+          }
           ext[name] = dt
         }
       })

package/client/store/sync.js

@@ -7,7 +7,7 @@ import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes, syncDataMaps
 } from '../common/constants'
-import { remove, dbNames, insert, update, getData } from '../common/db'
+import { dbNames, update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
@@ -259,7 +259,6 @@ export default (Store) => {
       token,
       store.getProxySetting()
     )
-    const toInsert = []
     const { names, syncConfig } = store.getDataSyncNames()
     for (const n of names) {
       let str = get(gist, `files["${n}.json"].content`)
@@ -290,10 +289,6 @@ export default (Store) => {
           return ai - bi
         })
       }
-      toInsert.push({
-        name: n,
-        value: arr
-      })
       store.setItems(n, arr)
     }
     if (syncConfig) {
@@ -321,10 +316,6 @@ export default (Store) => {
       up[type + 'SyncPassword'] = pass
     }
     store.updateSyncSetting(up)
-    for (const u of toInsert) {
-      await remove(u.name)
-      await insert(u.name, u.value)
-    }
     store.isSyncingSetting = false
     store.isSyncDownload = false
   }
@@ -389,7 +380,6 @@ export default (Store) => {
       .readFile(file.path)
     const { store } = window
     const objs = JSON.parse(txt)
-    const toInsert = []
     const { names } = store.getDataSyncNames(true)
     for (const n of names) {
       let arr = objs[n]
@@ -398,16 +388,8 @@ export default (Store) => {
       } else if (n === settingMap.bookmarks) {
         arr = fixBookmarks(arr)
       }
-      toInsert.push({
-        name: n,
-        value: arr
-      })
       store.setItems(n, objs[n])
     }
-    for (const u of toInsert) {
-      await remove(u.name)
-      await insert(u.name, u.value)
-    }
     store.updateConfig(objs.config)
     store.setTheme(objs.config.theme)
   }

package/client/store/watch.js

@@ -4,7 +4,7 @@
 
 import createTitle from '../common/create-title'
 import { autoRun } from 'manate'
-import { update, remove, dbNamesForWatch } from '../common/db'
+import { update, remove, insert, dbNamesForWatch } from '../common/db'
 import {
   sftpDefaultSortSettingKey,
   checkedKeysLsKey,
@@ -50,17 +50,19 @@ export default store => {
       for (const item of updated) {
         await update(item.id, item, name, false)
       }
-      store.batchDbAdd(added.map(d => {
-        return {
-          db: name,
-          obj: d
-        }
-      }))
+      for (const item of added) {
+        await insert(name, item)
+      }
       await update(
         `${name}:order`,
         (n || []).map(d => d.id)
       )
       refsStatic.add('oldState-' + name, deepCopy(n) || [])
+      if (name === 'bookmarks') {
+        store.bookmarksMap = new Map(
+          n.map(d => [d.id, d])
+        )
+      }
       await store.updateLastDataUpdateTime()
       if (store.config.autoSync) {
         await store.uploadSettingAll()

package/package.json

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