@electerm/electerm-react 1.60.46 → 1.60.50

package/client/common/data-compare.js

@@ -4,6 +4,9 @@
  * @param {Array} newArr - New array of objects to compare against
  * @returns {Object} Object containing arrays of items to update, add, and remove
  */
+
+import deepCopy from 'json-deep-copy'
+
 export default function compare (oldArr, newArr) {
   if (!oldArr || !newArr) {
     return {
@@ -48,8 +51,8 @@ export default function compare (oldArr, newArr) {
     }
   }
   return {
-    updated,
-    added,
-    removed
+    updated: deepCopy(updated),
+    added: deepCopy(added),
+    removed: deepCopy(removed)
   }
 }

package/client/components/terminal/terminal.jsx

@@ -1250,7 +1250,7 @@ clear\r`
         items: this.renderContextMenu(),
         onClick: this.onContextMenu
       },
-      trigger: ['contextMenu']
+      trigger: this.props.config.pasteWhenContextMenu ? [] : ['contextMenu']
     }
     return (
       <Dropdown {...dropdownProps}>

package/client/store/common.js

@@ -300,7 +300,7 @@ export default Store => {
       const np = deepCopy(f)
       np.id = id
       np.name = id
-      profiles[i] = np
+      profiles.splice(i, 1, np)
     }
   }
 }

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 || []
@@ -193,9 +171,6 @@ export default (Store) => {
       })
     ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
     Object.assign(store, ext)
-    await store.fixBookmarkGroups()
-    await store.fixProfiles()
-
     store.checkDefaultTheme()
     store.loadFontList()
     store.fetchItermThemes()
@@ -203,6 +178,13 @@ export default (Store) => {
     store.fetchSshConfigItems()
     store.initCommandLine().catch(store.onError)
     initWatch(store)
+    setTimeout(
+      () => {
+        store.fixProfiles()
+        store.fixBookmarkGroups()
+      },
+      1000
+    )
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate(false)
     }

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,12 +50,9 @@ 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)

package/package.json

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