@electerm/electerm-react 1.38.60 → 1.38.65

package/client/components/quick-commands/quick-commands-box.jsx

@@ -182,7 +182,7 @@ export default class QuickCommandsFooterBox extends Component {
   sortArray (array, keyword, labels, qmSortByFrequency) {
     const sorters = [
       (obj) => !(keyword && obj.name.toLowerCase().includes(keyword)),
-      (obj) => !labels.some((label) => obj.labels.includes(label))
+      (obj) => !labels.some((label) => (obj.labels || []).includes(label))
     ]
     if (qmSortByFrequency) {
       sorters.push((obj) => -(obj.clickCount || 0))
@@ -194,9 +194,10 @@ export default class QuickCommandsFooterBox extends Component {
     const {
       openQuickCommandBar,
       pinnedQuickCommandBar,
-      qmSortByFrequency
+      qmSortByFrequency,
+      inActiveTerminal
     } = this.props.store
-    if (!openQuickCommandBar && !pinnedQuickCommandBar) {
+    if ((!openQuickCommandBar && !pinnedQuickCommandBar) || !inActiveTerminal) {
       return null
     }
     const all = this.props.store.currentQuickCommands
@@ -210,7 +211,7 @@ export default class QuickCommandsFooterBox extends Component {
         return {
           ...d,
           nameMatch: keyword && d.name.toLowerCase().includes(keyword),
-          labelMatch: labels.some((label) => d.labels.includes(label))
+          labelMatch: labels.some((label) => (d.labels || []).includes(label))
         }
       })
     const sprops = {

package/client/components/sftp/sftp-entry.jsx

@@ -568,10 +568,14 @@ export default class Sftp extends Component {
         return arr.map(item => {
           const { type } = item
           return {
-            ...pick(item, ['name', 'size', 'accessTime', 'modifyTime', 'mode', 'owner', 'group']),
+            ...pick(
+              item,
+              ['name', 'size', 'accessTime', 'modifyTime', 'mode', 'owner', 'group']
+            ),
             isDirectory: type === fileTypeMap.directory,
             type: typeMap.remote,
             path: remotePath,
+            isSymbol: type === fileTypeMap.link,
             id: generate()
           }
         })
@@ -711,8 +715,8 @@ export default class Sftp extends Component {
   ) => {
     const remote = []
     for (const r of remotes) {
-      const { type, name } = r
-      if (type === fileTypeMap.link) {
+      const { name } = r
+      if (r.isSymbol) {
         const linkPath = resolve(remotePath, name)
         let realpath = await sftp.readlink(linkPath)
           .catch(e => {

package/package.json

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