@electerm/electerm-react 1.38.30 → 1.38.40

package/client/common/choose-save-folder.js

@@ -0,0 +1,22 @@
+const {
+  openDialog
+} = window.api
+
+export async function chooseSaveDirectory () {
+  const savePaths = await openDialog({
+    title: 'Choose a folder to save file(s)',
+    message: 'Choose a folder to save file(s)',
+    properties: [
+      'openDirectory',
+      'showHiddenFiles',
+      'createDirectory',
+      'noResolveAliases',
+      'treatPackageAsDirectory',
+      'dontAddToRecent'
+    ]
+  })
+  if (!savePaths || !savePaths.length) {
+    return undefined
+  }
+  return savePaths[0]
+}

package/client/common/constants.js

@@ -20,7 +20,7 @@ const buildConst = (props) => {
 export const logoPath1 = logoPath1Ref.replace(/^\//, '')
 export const logoPath2 = logoPath2Ref.replace(/^\//, '')
 export const logoPath3 = logoPath3Ref.replace(/^\//, '')
-export const maxEditFileSize = 1024 * 30
+export const maxEditFileSize = 1024 * 3000
 export const defaultBookmarkGroupId = 'default'
 export const newBookmarkIdPrefix = 'new-bookmark'
 export const unexpectedPacketErrorDesc = 'Unexpected packet'

package/client/common/download.jsx

@@ -0,0 +1,31 @@
+/**
+ * simulate download
+ */
+import { notification } from 'antd'
+import ShowItem from '../components/common/show-item'
+import { chooseSaveDirectory } from './choose-save-folder'
+
+export default async function download (filename, text) {
+  const savePath = await chooseSaveDirectory()
+  if (!savePath) {
+    return
+  }
+  const path = window.require('path')
+  const filePath = path.join(savePath, filename)
+  const r = await window.fs.writeFile(filePath, text).catch(window.store.onError)
+  if (!r) {
+    return
+  }
+  notification.success({
+    message: '',
+    description: (
+      <div>
+        <ShowItem
+          to={filePath}
+        >
+          {filePath}
+        </ShowItem>
+      </div>
+    )
+  })
+}

package/client/common/trzsz.js

@@ -1,4 +1,5 @@
 import { TrzszFilter } from 'trzsz'
+import { chooseSaveDirectory } from './choose-save-folder'
 
 const {
   openDialog
@@ -36,24 +37,7 @@ window.newTrzsz = function (
       })
     },
     // choose a directory to save the received files
-    chooseSaveDirectory: async () => {
-      const savePaths = await openDialog({
-        title: 'Choose a folder to save file(s)',
-        message: 'Choose a folder to save file(s)',
-        properties: [
-          'openDirectory',
-          'showHiddenFiles',
-          'createDirectory',
-          'noResolveAliases',
-          'treatPackageAsDirectory',
-          'dontAddToRecent'
-        ]
-      })
-      if (!savePaths || !savePaths.length) {
-        return undefined
-      }
-      return savePaths[0]
-    },
+    chooseSaveDirectory,
     // the terminal columns
     terminalColumns,
     // there is a windows shell

package/client/components/setting-panel/list.styl

@@ -10,6 +10,9 @@
   width 24px
   line-height 35px
   text-align center
+  position absolute
+  right 0
+  top 0
 .list-item-title
   flex-grow: 1
 .item-list-unit

package/client/components/setting-panel/tree-list.styl

@@ -9,6 +9,9 @@
   width 16px
   line-height 26px
   height 20px
+  position absolute
+  right 0
+  top 0
 .tree-item
   display flex
   &.is-category
@@ -25,6 +28,7 @@
   overflow hidden
   white-space nowrap
   text-overflow ellipsis
+  padding-right 20px
 .sidebar-panel .tree-item-title
   max-width 180px
 .with-plus

package/client/components/shortcuts/shortcuts-defaults.js

@@ -50,13 +50,13 @@ export default () => {
       shortcut: 'ctrl+l,ctrl+shift+l',
       shortcutMac: 'meta+l'
     },
-    {
-      name: 'terminal_selectAll',
-      shortcut: 'ctrl+a,ctrl+shift+a',
-      shortcutMac: 'meta+a',
-      skipMac: true,
-      readonly: true
-    },
+    // {
+    //   name: 'terminal_selectAll',
+    //   shortcut: 'ctrl+a,ctrl+shift+a',
+    //   shortcutMac: 'meta+a',
+    //   skipMac: true,
+    //   readonly: true
+    // },
     {
       name: 'terminal_copy',
       shortcut: 'ctrl+c,ctrl+shift+c',

package/client/components/tabs/index.jsx

@@ -49,6 +49,7 @@ export default class Tabs extends React.Component {
       tabsRef
     } = this
     tabsRef.current.addEventListener('mousedown', this.handleClickEvent)
+    tabsRef.current.addEventListener('mousewheel', this.handleWheelEvent)
   }
 
   componentDidUpdate (prevProps) {
@@ -129,6 +130,16 @@ export default class Tabs extends React.Component {
     this.dom.scrollLeft = scrollLeft
   }
 
+  handleWheelEvent = (e) => {
+    if (this.isOverflow()) {
+      if (e.deltaY < 0) {
+        this.handleScrollLeft()
+      } else {
+        this.handleScrollRight()
+      }
+    }
+  }
+
   handleClickMenu = ({ key }) => {
     const id = key.split('##')[1]
     this.props.onChangeTabId(id)

package/client/components/terminal/index.jsx

@@ -234,10 +234,10 @@ class Term extends Component {
     this.onClear()
   }
 
-  selectAllShortcut = (e) => {
-    e.stopPropagation()
-    this.term.selectAll()
-  }
+  // selectAllShortcut = (e) => {
+  //   e.stopPropagation()
+  //   this.term.selectAll()
+  // }
 
   copyShortcut = (e) => {
     const sel = this.term.getSelection()
@@ -425,6 +425,9 @@ class Term extends Component {
   }
 
   webLinkHandler = (event, url) => {
+    if (event?.button === 2) {
+      return false
+    }
     if (!this.props.config.ctrlOrMetaOpenTerminalLink) {
       return window.openLink(url, '_blank')
     }
@@ -757,9 +760,9 @@ class Term extends Component {
     this.term.focus()
   }
 
-  onSelectAll = () => {
-    this.term.selectAll()
-  }
+  // onSelectAll = () => {
+  //   this.term.selectAll()
+  // }
 
   onClear = () => {
     this.term.clear()
@@ -810,7 +813,7 @@ class Term extends Component {
     const copyShortcut = this.getShortcut('terminal_copy')
     const pasteShortcut = this.getShortcut('terminal_paste')
     const clearShortcut = this.getShortcut('terminal_clear')
-    const selectAllShortcut = this.getShortcut('terminal_selectAll')
+    // const selectAllShortcut = this.getShortcut('terminal_selectAll')
     const searchShortcut = this.getShortcut('terminal_search')
     return [
       {
@@ -833,12 +836,12 @@ class Term extends Component {
         text: e('clear'),
         subText: clearShortcut
       },
-      {
-        func: 'onSelectAll',
-        icon: 'SelectOutlined',
-        text: e('selectAll'),
-        subText: selectAllShortcut
-      },
+      // {
+      //   func: 'onSelectAll',
+      //   icon: 'SelectOutlined',
+      //   text: e('selectAll'),
+      //   subText: selectAllShortcut
+      // },
       {
         func: 'toggleSearch',
         icon: 'SearchOutlined',

package/client/components/terminal-info/activity.jsx

@@ -4,7 +4,7 @@
 
 import { Table, Tooltip, Popconfirm } from 'antd'
 import { isEmpty } from 'lodash-es'
-import { CloseCircleOutlined } from '@ant-design/icons'
+import { CloseCircleOutlined, BarsOutlined } from '@ant-design/icons'
 import colsParser from './data-cols-parser'
 
 const { prefix } = window
@@ -47,7 +47,7 @@ export default function TerminalInfoActivities (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-act'>
-      <div className='pd1y bold'>Activities</div>
+      <div className='pd1y bold'><BarsOutlined /> Activities</div>
       <Table {...ps} />
     </div>
   )

package/client/components/terminal-info/base.jsx

@@ -15,10 +15,20 @@ import ShowItem from '../common/show-item'
 import defaults from '../../common/default-setting'
 import postMsg from '../../common/post-msg'
 import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
+import { ClockCircleOutlined, BorderlessTableOutlined, DatabaseOutlined, BarsOutlined, ApiOutlined, PartitionOutlined } from '@ant-design/icons'
 
 const { prefix } = window
 const st = prefix('setting')
 
+const mapper = {
+  uptime: <ClockCircleOutlined />,
+  cpu: <BorderlessTableOutlined />,
+  mem: <DatabaseOutlined />,
+  activities: <BarsOutlined />,
+  network: <ApiOutlined />,
+  disks: <PartitionOutlined />
+}
+
 export default class TerminalInfoBase extends Component {
   state = {
     saveTerminalLogToFile: false,
@@ -154,6 +164,7 @@ export default class TerminalInfoBase extends Component {
                 size='small'
                 onClick={() => this.toggleTerminalLogInfo(f)}
                 className='cap'
+                icon={mapper[f]}
               >
                 {f}
               </Button>
@@ -196,7 +207,7 @@ export default class TerminalInfoBase extends Component {
             }
           </span>
         </div>
-        <div className='pd1y'>
+        <div className='pd2y'>
           {
             this.renderInfoSelection()
           }

package/client/components/terminal-info/disk.jsx

@@ -5,6 +5,7 @@
 import { Table } from 'antd'
 import { isEmpty } from 'lodash-es'
 import colsParser from './data-cols-parser'
+import { PartitionOutlined } from '@ant-design/icons'
 
 export default function TerminalInfoDisk (props) {
   const { disks, isRemote, terminalInfos } = props
@@ -22,7 +23,7 @@ export default function TerminalInfoDisk (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-disk'>
-      <div className='pd1y bold'>File system</div>
+      <div className='pd1y bold'><PartitionOutlined /> File system</div>
       <Table {...ps} />
     </div>
   )

package/client/components/terminal-info/network.jsx

@@ -7,6 +7,7 @@ import { isEmpty } from 'lodash-es'
 import { useEffect, useState } from 'react'
 import { formatBytes } from '../../common/byte-format'
 import copy from 'json-deep-copy'
+import { ApiOutlined } from '@ant-design/icons'
 
 export default function TerminalInfoDisk (props) {
   const { network, isRemote, terminalInfos } = props
@@ -107,7 +108,7 @@ export default function TerminalInfoDisk (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-network'>
-      <div className='pd1y bold'>Network</div>
+      <div className='pd1y bold'><ApiOutlined /> Network</div>
       <Table {...ps} />
     </div>
   )

package/client/components/terminal-info/up.jsx

@@ -2,6 +2,8 @@
  * up time info
  */
 
+import { ClockCircleOutlined } from '@ant-design/icons'
+
 export default function TerminalInfoUp (props) {
   const { uptime, isRemote, terminalInfos } = props
   if (!isRemote || !terminalInfos.includes('uptime')) {
@@ -9,7 +11,7 @@ export default function TerminalInfoUp (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-up'>
-      <b>uptime</b>: {uptime}
+      <b><ClockCircleOutlined /> uptime</b>: {uptime}
     </div>
   )
 }

package/client/store/index.js

@@ -8,7 +8,7 @@ import loadDataExtend from './load-data'
 import dbUpgradeExtend from './db-upgrade'
 import eventExtend from './event'
 import syncExtend from './sync'
-import appUpgrdeExtend from './app-upgrade'
+import appUpgradeExtend from './app-upgrade'
 import bookmarkGroupExtend from './bookmark-group'
 import bookmarkExtend from './bookmark'
 import commonExtend from './common'
@@ -288,7 +288,7 @@ loadDataExtend(Store)
 eventExtend(Store)
 dbUpgradeExtend(Store)
 syncExtend(Store)
-appUpgrdeExtend(Store)
+appUpgradeExtend(Store)
 bookmarkGroupExtend(Store)
 bookmarkExtend(Store)
 commonExtend(Store)

package/client/store/sync.js

@@ -2,12 +2,12 @@
  * sync data to github gist related
  */
 
-import { without, get, pick, debounce } from 'lodash-es'
+import { without, get, pick, debounce, findIndex } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes
 } from '../common/constants'
-import { remove, dbNames, insert, update } from '../common/db'
+import { remove, dbNames, insert, update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
@@ -169,6 +169,10 @@ export default (Store) => {
       objs[`${n}.json`] = {
         content: str
       }
+      const order = await getData(`${n}:order`)
+      objs[`${n}.order.json`] = {
+        content: JSON.stringify(order)
+      }
     }
     const res = await fetchData(type, 'update', [gistId, {
       description: 'sync electerm data',
@@ -235,6 +239,15 @@ export default (Store) => {
       } else if (n === settingMap.bookmarks) {
         arr = fixBookmarks(arr)
       }
+      let strOrder = get(gist, `files["${n}.order.json"].content`)
+      if (strOrder) {
+        strOrder = JSON.parse(strOrder)
+        arr.sort((a, b) => {
+          const ai = findIndex(strOrder, r => r === a.id)
+          const bi = findIndex(strOrder, r => r === b.id)
+          return ai - bi
+        })
+      }
       toInsert.push({
         name: n,
         value: arr

package/package.json

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

package/client/common/download.js

@@ -1,16 +0,0 @@
-/**
- * simulate download
- */
-
-export default function download (filename, text) {
-  const pom = document.createElement('a')
-  pom.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text))
-  pom.setAttribute('download', filename)
-  if (document.createEvent) {
-    const event = document.createEvent('MouseEvents')
-    event.initEvent('click', true, true)
-    pom.dispatchEvent(event)
-  } else {
-    pom.click()
-  }
-}