@electerm/electerm-react 1.51.3 → 1.51.8

package/client/store/transfer-list.js

@@ -1,103 +1,103 @@
-import { findIndex } from 'lodash-es'
+/**
+ * file transfer list related functions
+ */
+const { assign } = Object
+
 export default Store => {
   Store.prototype.handleTransferTab = function (tab) {
     window.store.transferTab = tab
   }
 
-  Store.prototype.setTransfers = function (list, _sessId) {
-    const { store } = window
-    let oldList = store.fileTransfers
-    const sessId = _sessId || list[0].sessionId
-    const arr2 = oldList.filter(t => {
-      return t.sessionId === sessId
-    })
-    const idsToRm = arr2.reduce((prev, curr) => {
-      if (!list.find(l => l.id === curr.id)) {
-        prev.push(curr.id)
-      }
-      return prev
-    }, [])
-    if (idsToRm.length) {
-      oldList = oldList.filter(t => {
-        return !idsToRm.includes(t.id)
-      })
-    }
-    for (const ntm of list) {
-      const index = findIndex(oldList, t => {
-        return t.id === ntm.id
-      })
-      if (index >= 0) {
-        oldList[index] = ntm
-        continue
-      } else {
-        oldList.unshift(ntm)
-      }
+  Store.prototype.updateTransfer = function (id, update) {
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === id)
+    if (index < 0) {
+      return
     }
-    store.setItems('fileTransfers', oldList)
-  }
-  Store.prototype.getTransfers = function () {
-    return window.store.getItems('fileTransfers')
-  }
-  Store.prototype.delTransfers = function (ids) {
-    return window.store.delItems(ids, 'fileTransfers')
-  }
-  Store.prototype.editTransfer = function (id, updates) {
-    return window.store.editItem(id, updates, 'fileTransfers')
-  }
-  Store.prototype.addTransfers = function (objs) {
-    return window.store.addItems(objs, 'fileTransfers')
+    assign(fileTransfers[index], update)
   }
-  Store.prototype.setFileTransfers = function (objs) {
-    return window.store.setState('fileTransfers', objs.filter(d => !d.cancel))
-  }
-  Store.prototype.addTransferList = function (objs) {
-    const { store } = window
-    store.setFileTransfers([
-      ...store.fileTransfers,
-      ...objs
-    ])
+
+  Store.prototype.addTransferList = function (items) {
+    const { fileTransfers } = window.store
+    fileTransfers.push(...items)
   }
+
   Store.prototype.toggleTransfer = function (itemId) {
-    const { store } = window
-    const { fileTransfers } = store
-    const index = findIndex(fileTransfers, t => t.id === itemId)
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === itemId)
     if (index < 0) {
       return
     }
     fileTransfers[index].pausing = !fileTransfers[index].pausing
-    store.setFileTransfers(fileTransfers)
   }
 
   Store.prototype.pauseAll = function () {
-    const { store } = window
-    store.pauseAllTransfer = true
-    store.setFileTransfers(store.fileTransfers.map(t => {
-      t.pausing = true
-      return t
-    }))
+    const { fileTransfers } = window.store
+    window.store.pauseAllTransfer = true
+    const len = fileTransfers.length
+    for (let i = 0; i < len; i++) {
+      fileTransfers[i].pausing = true
+    }
   }
+
   Store.prototype.resumeAll = function () {
-    const { store } = window
-    store.pauseAllTransfer = false
-    store.setFileTransfers(store.fileTransfers.map(t => {
-      t.pausing = false
-      return t
-    }))
+    const { fileTransfers } = window.store
+    window.store.pauseAllTransfer = false
+    const len = fileTransfers.length
+    for (let i = 0; i < len; i++) {
+      fileTransfers[i].pausing = false
+    }
   }
+
   Store.prototype.cancelAll = function () {
-    const arr = document.querySelectorAll('.sftp-transport .transfer-control-cancel')
-    arr.forEach(d => {
-      d.click()
-    })
+    const { fileTransfers } = window.store
+    const len = fileTransfers.length
+    for (let i = len - 1; i >= 0; i--) {
+      fileTransfers[i].cancel = true
+      fileTransfers.splice(i, 1)
+    }
   }
+
   Store.prototype.cancelTransfer = function (itemId) {
-    const { store } = window
-    const { fileTransfers } = store
-    const index = findIndex(fileTransfers, t => t.id === itemId)
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === itemId)
     if (index < 0) {
       return
     }
     fileTransfers[index].cancel = true
-    store.setFileTransfers(fileTransfers)
+    fileTransfers.splice(index, 1)
+  }
+
+  Store.prototype.removeTransfer = function (id) {
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === id)
+    if (index > -1) {
+      fileTransfers.splice(index, 1)
+    }
+  }
+
+  Store.prototype.skipAllTransfersSinceIndex = function (index) {
+    window.store.fileTransfers.splice(index)
+  }
+
+  Store.prototype.updateTransfersFromIndex = function (index, update) {
+    const { fileTransfers } = window.store
+    if (index < 0 || index >= fileTransfers.length) {
+      return
+    }
+    const len = fileTransfers.length
+    for (let i = index; i < len; i++) {
+      assign(fileTransfers[i], update)
+    }
+  }
+
+  // Add a new method to find index by ID and then update
+  Store.prototype.updateTransfersFromId = function (id, update) {
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === id)
+    if (index < 0) {
+      return
+    }
+    window.store.updateTransfersFromIndex(index, update)
   }
 }

package/client/store/watch.js

@@ -43,7 +43,7 @@ export default store => {
         await store.uploadSettingAll()
       }
       return store['_' + name]
-    }, func => debounce(func, 100)).start()
+    }).start()
   }
 
   autoRun(async () => {
@@ -97,6 +97,11 @@ export default store => {
     return store._checkedKeys
   }).start()
 
+  autoRun(() => {
+    ls.setItemJSON('history', store.history)
+    return store.history
+  }).start()
+
   autoRun(() => {
     const tabs = store.getTabs()
     const { activeTabId } = store
@@ -106,6 +111,9 @@ export default store => {
       window.pre.runGlobalAsync('setTitle', title)
       window.store.currentLayoutBatch = tab.batch
     }
+    if (tab && store.rightPanelVisible) {
+      window.store.openInfoPanel()
+    }
     return store.activeTabId
   }).start()
 }

package/package.json

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

package/client/components/setting-panel/tab-history.jsx

@@ -1,43 +0,0 @@
-import SettingCol from './col'
-import BookmarkForm from '../bookmark-form'
-import List from './list'
-import {
-  settingMap
-} from '../../common/constants'
-
-const e = window.translate
-
-export default function TabHistory (props) {
-  const {
-    settingTab
-  } = props
-  if (settingTab !== settingMap.history) {
-    return null
-  }
-  const {
-    settingItem,
-    listProps,
-    formProps
-  } = props
-  return (
-    <div
-      className='setting-tabs-history'
-    >
-      <SettingCol>
-        <List
-          {...listProps}
-        />
-        {
-          settingItem.id
-            ? (
-              <BookmarkForm
-                key={settingItem.id}
-                {...formProps}
-              />
-              )
-            : <div className='form-wrap pd2 aligncenter'>{e('notFoundContent')}</div>
-        }
-      </SettingCol>
-    </div>
-  )
-}