@electerm/electerm-react 1.40.6 → 1.40.18

package/client/components/main/upgrade.jsx

@@ -27,7 +27,7 @@ const {
 export default class Upgrade extends PureComponent {
   state = {
     showCount: 0,
-    mirror: mirrors['download-electerm']
+    mirror: mirrors.github
   }
 
   downloadTimer = null
@@ -115,9 +115,9 @@ export default class Upgrade extends PureComponent {
     const next = mirror !== mirrors.sourceforge
       ? this.doUpgrade
       : undefined
-    const nextMirror = mirror === mirrors.github
+    const nextMirror = mirror === mirrors['download-electerm']
       ? mirrors.sourceforge
-      : mirrors.github
+      : mirrors['download-electerm']
     this.setState({
       mirror: nextMirror
     }, next)

package/client/components/quick-commands/qm.styl

@@ -11,7 +11,7 @@
   z-index 89
   height auto
   bottom 36px
-  background alpha(main-dark, .9)
+
 .qm-pinned
   .qm-wrap-tooltip
     height 180px

package/client/components/sftp/transfer-conflict-store.jsx

@@ -240,7 +240,7 @@ export default class TransferConflictStore extends Component {
     } else {
       toFile = await this.checkExist(typeTo, toPath, sessionId)
     }
-    if (fromFile.isDirectory) {
+    if (fromFile.isDirectory && typeFrom !== typeTo) {
       const props = {
         sftp: window.sftps[sessionId]
       }

package/client/components/sftp/transport-action-store.jsx

@@ -380,12 +380,12 @@ export default class TransportAction extends Component {
     })
     this.inst.startTime = t
     this.inst.started = true
-    if (unzip && inited) {
+    if (typeFrom === typeTo) {
+      return this.mvOrCp()
+    } else if (unzip && inited) {
       this.unzipFile()
     } else if (zip && inited) {
       this.zipTransfer()
-    } else if (typeFrom === typeTo) {
-      return this.mvOrCp()
     } else if (isDirectory && expanded && this.isTransferAction(action)) {
       return this.mkdir()
         .then(this.onEnd)

package/client/components/sftp/zip.js

@@ -16,7 +16,7 @@ export async function zipCmd (pid, sessionId, filePath) {
   const id = generate()
   const { path, name } = getFolderFromFilePath(filePath, isRemote)
   const np = resolve(temp, `electerm-${id}.tar`)
-  const cmd = `tar -C ${path} -cf ${np} ${name}`
+  const cmd = `tar -C "${path}" -cf "${np}" "${name}"`
   await runCmd(pid, sessionId, cmd)
   return np
 }

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

@@ -32,7 +32,6 @@ import {
 } from '../../common/constants'
 import findParentBySel from '../../common/find-parent'
 import copy from 'json-deep-copy'
-import Search from '../common/search'
 import Btns from './bookmark-transport'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import getInitItem from '../../common/init-setting-item'
@@ -41,6 +40,7 @@ import deepEqual from 'fast-deep-equal'
 import './tree-list.styl'
 import TreeExpander from './tree-expander'
 import TreeListItem from './tree-list-item'
+import TreeSearch from './tree-search'
 
 const e = window.translate
 
@@ -114,9 +114,9 @@ export default class ItemListTree extends Component {
     this.onExpand(nkeys)
   }
 
-  handleChange = e => {
+  handleChange = keyword => {
     this.setState({
-      keyword: e.target.value
+      keyword
     })
   }
 
@@ -341,9 +341,9 @@ export default class ItemListTree extends Component {
   renderSearch = () => {
     return (
       <div className='pd1y'>
-        <Search
-          onChange={this.handleChange}
-          value={this.state.keyword}
+        <TreeSearch
+          onSearch={this.handleChange}
+          keyword={this.state.keyword}
         />
       </div>
     )

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

@@ -0,0 +1,27 @@
+import React, { useState, memo } from 'react'
+import { debounce } from 'lodash-es'
+import Search from '../common/search'
+import runIdle from '../../common/run-idle'
+
+export default memo(function TreeSearchComponent ({ onSearch, keyword }) {
+  const [searchTerm, setSearchTerm] = useState(keyword)
+
+  const performSearch = debounce((term) => {
+    runIdle(() => {
+      onSearch(term)
+    })
+  })
+
+  const handleChange = (e) => {
+    const term = e.target.value
+    setSearchTerm(term)
+    performSearch(term)
+  }
+
+  return (
+    <Search
+      onChange={handleChange}
+      value={searchTerm}
+    />
+  )
+})

package/package.json

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