@electerm/electerm-react 1.37.36 → 1.37.46

package/client/common/resolve.js

@@ -6,7 +6,11 @@
  */
 
 export default (basePath, nameOrDot) => {
-  const sep = basePath.includes('\\') || basePath.includes(':\\') || /^[a-z]+:$/i.test(basePath)
+  const sep = (basePath.includes('\\') ||
+  basePath.includes(':\\') ||
+  /^[a-z]+:$/i.test(basePath) ||
+  /^[a-z]+:$/i.test(nameOrDot)
+  )
     ? '\\'
     : '/'
   if (nameOrDot === '..') {
@@ -18,12 +22,15 @@ export default (basePath, nameOrDot) => {
     const res = arr.slice(0, length - 1).join(sep)
     return res || '/'
   }
-  const pre = nameOrDot.includes(':\\') && basePath === '/'
+  const pre = (nameOrDot.includes(':\\') || /^[a-z]+:$/i.test(nameOrDot)) && basePath === '/'
     ? ''
     : basePath
-  return pre +
-    (basePath.endsWith(sep) ? '' : sep) +
-    nameOrDot
+  const mid = (basePath.endsWith(sep) ? '' : sep)
+  let ff = pre + mid + nameOrDot
+  if (/^\\[a-z]+:$/i.test(ff)) {
+    ff = ff.slice(1)
+  }
+  return ff
 }
 
 export const osResolve = (...args) => {

package/client/common/update-check.js

@@ -6,6 +6,7 @@ import fetch from './fetch-from-server'
 import {
   baseUpdateCheckUrls, packInfo
 } from './constants'
+import dayjs from 'dayjs'
 
 async function fetchData (url, options) {
   const data = {
@@ -75,5 +76,10 @@ export async function getLatestReleaseInfo () {
     url = `${baseUpdateCheckUrls[1]}/data/electerm-github-release.json`
     res = await getInfo(url)
   }
-  return res?.release?.body
+  return res && res.release
+    ? {
+        body: res.release.body,
+        date: dayjs(res.release.published_at).format('YYYY-MM-DD')
+      }
+    : undefined
 }

package/client/components/main/upgrade.jsx

@@ -246,7 +246,7 @@ export default class Upgrade extends PureComponent {
     return (
       <div className='pd1t'>
         <div className='bold'>Changelog:</div>
-        <Markdown text={releaseInfo} />
+        <Markdown text={releaseInfo.body} />
         <Link
           to={packInfo.releases}
         >{e('moreChangeLog')}
@@ -279,6 +279,7 @@ export default class Upgrade extends PureComponent {
       showUpgradeModal,
       upgradePercent,
       shouldUpgrade,
+      releaseInfo,
       error
     } = this.props.upgradeInfo
     if (error) {
@@ -317,7 +318,7 @@ export default class Upgrade extends PureComponent {
       <div className={cls}>
         <div className='upgrade-panel-title'>
           <MinusSquareOutlined className='pointer font16 close-upgrade-panel' onClick={this.handleMinimize} />
-          {e('newVersion')} <b>{remoteVersion}</b>
+          {e('newVersion')} <b>{remoteVersion} [{releaseInfo.date}]</b>
         </div>
         <div className='upgrade-panel-body'>
           {

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

@@ -373,11 +373,11 @@ export default class Sftp extends Component {
   }
 
   doCopy = (type, e) => {
-    this[type + 'Dom'].onCopy(e, this.state.selectedFiles)
+    this[type + 'Dom'].onCopy(this.state.selectedFiles)
   }
 
   doCut = (type, e) => {
-    this[type + 'Dom'].onCut(e, this.state.selectedFiles)
+    this[type + 'Dom'].onCut(this.state.selectedFiles)
   }
 
   doPaste = (type) => {
@@ -396,7 +396,7 @@ export default class Sftp extends Component {
     }
     const { type } = lastClickedFile
     const { inputFocus, onDelete } = this
-    if (keyControlPressed(e) && keyPressed(e, 'a') && !inputFocus) {
+    if (keyControlPressed(e) && keyPressed(e, 'keyA') && !inputFocus) {
       e.stopPropagation()
       this.selectAll(type, e)
     } else if (keyPressed(e, 'arrowdown') && !inputFocus) {
@@ -411,13 +411,13 @@ export default class Sftp extends Component {
     } else if (keyPressed(e, 'enter') && !inputFocus && !onDelete) {
       e.stopPropagation()
       this.enter(type, e)
-    } else if (keyControlPressed(e) && keyPressed(e, 'c') && !inputFocus) {
+    } else if (keyControlPressed(e) && keyPressed(e, 'keyC') && !inputFocus) {
       e.stopPropagation()
       this.doCopy(type, e)
-    } else if (keyControlPressed(e) && keyPressed(e, 'x') && !inputFocus) {
+    } else if (keyControlPressed(e) && keyPressed(e, 'keyX') && !inputFocus) {
       e.stopPropagation()
       this.doCut(type, e)
-    } else if (keyControlPressed(e) && keyPressed(e, 'v') && !inputFocus) {
+    } else if (keyControlPressed(e) && keyPressed(e, 'keyV') && !inputFocus) {
       e.stopPropagation()
       this.doPaste(type, e)
     } else if (keyPressed(e, 'f5')) {

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

@@ -63,7 +63,6 @@ export default () => {
       name: 'terminal_paste',
       shortcut: 'ctrl+v,ctrl+shift+v',
       shortcutMac: 'meta+v',
-      hidden: true,
       readonly: true
     },
     {

package/client/components/tabs/index.jsx

@@ -23,6 +23,7 @@ import findParentBySel from '../../common/find-parent'
 import WindowControl from './window-control'
 import BookmarksList from '../sidebar/bookmark-select'
 import AppDrag from './app-drag'
+import classNames from 'classnames'
 
 const { prefix } = window
 const e = prefix('tabs')
@@ -176,16 +177,19 @@ export default class Tabs extends React.Component {
   }
 
   renderAddBtn = () => {
-    if (!this.props.tabs.length) {
-      return null
-    }
+    const cls = classNames(
+      'pointer tabs-add-btn font16',
+      {
+        empty: !this.props.tabs.length
+      }
+    )
     return (
       <Popover
         content={this.renderMenus()}
       >
         <PlusCircleOutlined
           title={e('openNewTerm')}
-          className='pointer tabs-add-btn font16'
+          className={cls}
           onClick={() => this.props.addTab()}
         />
       </Popover>

package/client/components/tabs/tabs.styl

@@ -121,6 +121,10 @@
   margin 10px 3px 0 3px
   -webkit-app-region no-drag
   color text
+  &.empty
+    font-size 20px
+    margin-left 20px
+    margin-top 20px
   &:hover
     color text-light
 .tabs-extra
@@ -131,6 +135,7 @@
   line-height 20px
   z-index 20
   -webkit-app-region no-drag
+
   // .ant-btn
   //   background #333
   //   color #aaa

package/package.json

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