@electerm/electerm-react 3.1.16 → 3.1.26

package/client/common/db.js

@@ -33,13 +33,16 @@ export const dbNames = [
   'terminalCommandHistory',
   'aiChatHistory'
 ]
-
-export const dbNamesForWatch = [
+export const dbNamesForSync = [
   ...without(
     Object.keys(settingMap),
     settingMap.setting,
     settingMap.widgets
-  ),
+  )
+]
+
+export const dbNamesForWatch = [
+  ...dbNamesForSync,
   'history',
   'terminalCommandHistory',
   'aiChatHistory'

package/client/components/bookmark-form/common/quick-commands.jsx

@@ -22,14 +22,15 @@ const e = window.translate
 
 export default function useQuickCmds (form, formData) {
   function renderItem (field, i, add, remove) {
+    const { key, ...rest } = field
     return (
       <Space
         style={{ display: 'flex', marginBottom: '2px' }}
         align='baseline'
-        key={field.key}
+        key={field.key + 'quickCmd' + i}
       >
         <FormItem
-          {...field}
+          {...rest}
           name={[field.name, 'name']}
           fieldKey={[field.fieldKey, 'first']}
           rules={[{ required: true, max: 30 }]}
@@ -37,9 +38,9 @@ export default function useQuickCmds (form, formData) {
           <Input placeholder={e('quickCommandName')} />
         </FormItem>
         <FormItem
-          {...field}
+          {...rest}
           name={[field.name, 'command']}
-          fieldKey={[field.fieldKey, 'first']}
+          fieldKey={[field.fieldKey, 'second']}
           rules={[{ required: true, max: 300 }]}
         >
           <Input placeholder={e('quickCommand')} />

package/client/store/init-state.js

@@ -126,6 +126,7 @@ export default () => {
     showModal: 0,
 
     // setting sync related
+    autoSyncReady: false,
     isSyncingSetting: false,
     isSyncUpload: false,
     isSyncDownload: false,

package/client/store/load-data.js

@@ -206,6 +206,13 @@ export default (Store) => {
       },
       1000
     )
+    setTimeout(
+      () => {
+        console.log('Auto sync is ready')
+        store.autoSyncReady = true
+      },
+      2000
+    )
     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 { dbNames, update, getData } from '../common/db'
+import { update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
@@ -152,10 +152,8 @@ export default (Store) => {
   }
 
   Store.prototype.uploadSettingAll = async function () {
-    const { store, onSyncAll, syncCount = 0 } = window
-    const max = dbNames.length * 2
-    if (syncCount < max) {
-      window.syncCount = syncCount + 1
+    const { store, onSyncAll } = window
+    if (store.autoSyncReady === false) {
       return
     }
     if (onSyncAll) {

package/client/store/watch.js

@@ -4,7 +4,7 @@
 
 import createTitle from '../common/create-title'
 import { autoRun } from 'manate'
-import { update, remove, insert, dbNamesForWatch } from '../common/db'
+import { update, remove, insert, dbNamesForWatch, dbNamesForSync } from '../common/db'
 import {
   sftpDefaultSortSettingKey,
   checkedKeysLsKey,
@@ -68,7 +68,7 @@ export default store => {
         )
       }
       await store.updateLastDataUpdateTime()
-      if (store.config.autoSync) {
+      if (store.config.autoSync && dbNamesForSync.includes(name)) {
         await store.uploadSettingAll()
       }
       return store[name]

package/package.json

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