@electerm/electerm-react 1.34.39 → 1.34.46

package/client/common/constants.js

@@ -33,7 +33,7 @@ export const splitDraggerWidth = 5
 export const minTerminalWidth = 90
 export const filePropMinWidth = 1
 export const contextMenuHeight = 28
-export const contextMenuWidth = 220
+export const contextMenuWidth = 280
 export const contextMenuPaddingTop = 10
 export const sftpControlHeight = 28 + 42 + 33 + 56
 export const sidebarWidth = 43

package/client/components/common/animate-text.styl

@@ -1,54 +1,39 @@
+// animate.css -http://daneden.me/animate
+// Version - 3.5.2
+// Licensed under the MIT license - http://opensource.org/licenses/MIT
+// Copyright (c) 2017 Daniel Eden
 
-/*!
- * animate.css -http://daneden.me/animate
- * Version - 3.5.2
- * Licensed under the MIT license - http://opensource.org/licenses/MIT
- *
- * Copyright (c) 2017 Daniel Eden
- */
-
-.animated {
-  animation-duration: 1s;
-  animation-fill-mode: both;
-}
-
-.animated.bounceIn {
-  animation-duration: .45s;
-}
-
-@keyframes bounceIn {
-  from, 20%, 40%, 60%, 80%, to {
-    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-  }
-
-  0% {
-    opacity: 0;
-    transform: scale3d(.3, .3, .3);
-  }
-
-  20% {
-    transform: scale3d(1.1, 1.1, 1.1);
-  }
-
-  40% {
-    transform: scale3d(.9, .9, .9);
-  }
-
-  60% {
-    opacity: 1;
-    transform: scale3d(1.03, 1.03, 1.03);
-  }
-
-  80% {
-    transform: scale3d(.97, .97, .97);
-  }
-
-  to {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.bounceIn {
-  animation-name: bounceIn;
-}
+.animated
+  animation-duration 1s
+  animation-fill-mode both
+
+.animated.bounceIn
+  animation-duration .45s
+
+@keyframes bounceIn
+  from, 20%, 40%, 60%, 80%, to
+    animation-timing-function cubic-bezier(0.215, 0.610, 0.355, 1.000)
+
+  0%
+    opacity 0
+    transform scale3d(.3, .3, .3)
+
+  20%
+    transform scale3d(1.1, 1.1, 1.1)
+
+  40%
+    transform scale3d(.9, .9, .9)
+
+  60%
+    opacity 1
+    transform scale3d(1.03, 1.03, 1.03)
+
+  80%
+    transform scale3d(.97, .97, .97)
+
+  to
+    opacity 1
+    transform scale3d(1, 1, 1)
+
+.bounceIn
+  animation-name bounceIn

package/client/components/context-menu/context-menu.styl

@@ -1,10 +1,9 @@
 @require '../../css/includes/theme-default'
 .context-menu
   position: absolute
-  width 220px
+  width 280px
   background main-dark
   box-shadow 0px 0px 3px 3px alpha(main-dark, .35)
-  // border 1px solid #222
   padding 10px 0
   z-index 999
   -webkit-app-region no-drag

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

@@ -19,8 +19,7 @@ import {
   noTerminalBgValue,
   settingMap,
   rendererTypes,
-  proxyHelpLink,
-  isWin
+  proxyHelpLink
 } from '../../common/constants'
 import defaultSettings from '../../common/default-setting'
 import ShowItem from '../common/show-item'
@@ -618,24 +617,6 @@ export default class Setting extends Component {
     }
   }
 
-  renderMakePortable () {
-    const {
-      isPortable
-    } = this.props.store
-    if (!isWin || isPortable) {
-      return null
-    }
-    return (
-      <div className='pd1y'>
-        <Button
-          onClick={this.handlePortable}
-        >
-          {e('makeItPortable')}
-        </Button>
-      </div>
-    )
-  }
-
   render () {
     const { ready } = this.state
     if (!ready) {
@@ -655,7 +636,7 @@ export default class Setting extends Component {
       appPath,
       langs
     } = this.props.store
-    const terminalLogPath = osResolve(appPath, 'electerm', 'session_logs')
+    const terminalLogPath = appPath ? osResolve(appPath, 'electerm', 'session_logs') : window.et.sessionLogPath
     const terminalThemes = this.props.store.getSidebarList(settingMap.terminalThemes)
     const [modifier, key] = hotkey.split('+')
     const pops = {
@@ -848,9 +829,6 @@ export default class Setting extends Component {
         {this.renderToggle('saveTerminalLogToFile', (
           <ShowItem to={terminalLogPath} className='mg1l'>{p('open')}</ShowItem>
         ))}
-        {
-          this.renderMakePortable()
-        }
         {this.renderReset()}
       </div>
     )

package/client/components/sftp/file-item.jsx

@@ -871,7 +871,7 @@ export default class FileSection extends React.Component {
 
   newItem = (isDirectory) => {
     const { type } = this.state.file
-    const list = this.props[type]
+    const list = copy(this.props[type])
     list.unshift({
       name: '',
       nameTemp: '',
@@ -1031,14 +1031,12 @@ export default class FileSection extends React.Component {
     res.push({
       func: 'newFile',
       icon: 'FileAddOutlined',
-      text: e('newFile'),
-      subText: `${ctrlOrCmd}+v`
+      text: e('newFile')
     })
     res.push({
       func: 'newDirectory',
       icon: 'FolderAddOutlined',
-      text: e('newFolder'),
-      subText: `${ctrlOrCmd}+v`
+      text: e('newFolder')
     })
     res.push({
       func: 'selectAll',

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

@@ -137,7 +137,7 @@ export default class Sftp extends Component {
         [`${k}FileTree`]: {},
         [`${k}Loading`]: false,
         [`${k}InputFocus`]: false,
-        [`${k}ShowHiddenFile`]: false,
+        [`${k}ShowHiddenFile`]: true,
         [`${k}Path`]: '',
         [`${k}PathTemp`]: '',
         [`${k}PathHistory`]: [],

package/client/components/sidebar/sidebar.styl

@@ -71,43 +71,29 @@
   //   color #aaa
   //   border-color #555
 
-/*!
- * Hover.css (http://ianlunn.github.io/Hover/)
- * Version: 2.3.2
- * Author: Ian Lunn @IanLunn
- * Author URL: http://ianlunn.co.uk/
- * Github: https://github.com/IanLunn/Hover
+// Hover.css (http://ianlunn.github.io/Hover/)
+// Version: 2.3.2
+// Author: Ian Lunn @IanLunn
+// Author URL: http://ianlunn.co.uk/
+// Github: https://github.com/IanLunn/Hover
+// Hover.css Copyright Ian Lunn 2017. Generated with Sass.
 
- * Hover.css Copyright Ian Lunn 2017. Generated with Sass.
- */
-/* Bob */
-@keyframes hvr-bob {
-  0% {
-    -webkit-transform: translateY(-8px);
-    transform: translateY(-8px);
-  }
-  50% {
-    -webkit-transform: translateY(-4px);
-    transform: translateY(-4px);
-  }
-  100% {
-    -webkit-transform: translateY(-8px);
-    transform: translateY(-8px);
-  }
-}
-@-webkit-keyframes hvr-bob-float {
-  100% {
-    -webkit-transform: translateY(-8px);
-    transform: translateY(-8px);
-  }
-}
-@keyframes hvr-bob-float {
-  100% {
-    -webkit-transform: translateY(-8px);
-    transform: translateY(-8px);
-  }
-}
-.hvr-bob {
+// Bob
+@keyframes hvr-bob
+  0%
+    transform translateY(-8px)
+
+  50%
+    transform translateY(-4px)
+
+  100%
+    transform translateY(-8px)
+
+@keyframes hvr-bob-float
+  100%
+    transform translateY(-8px)
+
+.hvr-bob
   transform perspective(1px) translateZ(0)
   box-shadow 0 0 1px rgba(0, 0, 0, 0)
   animation-name hvr-bob-float, hvr-bob
@@ -117,7 +103,7 @@
   animation-iteration-count 1, infinite
   animation-fill-mode forwards
   animation-direction normal, alternate
-}
+
 .btns .upgrade-icon
   color success
 .close-info-modal

package/client/components/sidebar/transfer-history-modal.jsx

@@ -83,6 +83,16 @@ export default class TransferHistoryModal extends Component {
       key: 'speed',
       sorter: sorterFactory('speed')
     }]
+    const tabConf = {
+      dataSource: transferHistory,
+      columns,
+      bordered: true,
+      pagination: {
+        pageSize: 10
+      },
+      size: 'small',
+      rowKey: 'id'
+    }
     return (
       <div className='pd2'>
         <div>
@@ -96,12 +106,7 @@ export default class TransferHistoryModal extends Component {
         </div>
         <div className='table-scroll-wrap'>
           <Table
-            dataSource={transferHistory}
-            columns={columns}
-            bordered
-            pagination={false}
-            size='small'
-            rowKey='id'
+            {...tabConf}
           />
         </div>
       </div>

package/client/components/sidebar/transfer.styl

@@ -1,4 +1,3 @@
-@require '../../css/includes/theme-default'
 .control-icon-wrap
   .ant-badge-count-sm
     font-size 11px

package/client/components/terminal/index.jsx

@@ -684,7 +684,6 @@ export default class Term extends Component {
   }
 
   searchNext = (searchInput, options) => {
-    console.log(this.searchAddon.onDidChangeResults, 'searchAddon')
     this.searchAddon.findNext(
       searchInput, options
     )
@@ -1018,15 +1017,16 @@ export default class Term extends Component {
     const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket
-    this.attachAddon = new AttachAddon(
-      socket,
-      undefined,
-      encode,
-      isWin && !this.isRemote()
-    )
-    term.loadAddon(this.attachAddon)
     socket.onopen = () => {
+      this.attachAddon = new AttachAddon(
+        socket,
+        undefined,
+        encode,
+        isWin && !this.isRemote()
+      )
+      term.loadAddon(this.attachAddon)
       socket.addEventListener('message', this.onSocketData)
+      this.runInitScript()
       term._initialized = true
     }
     this.socket = socket
@@ -1072,7 +1072,6 @@ export default class Term extends Component {
     //   }
     // }
     this.term = term
-    this.runInitScript()
     window.store.triggerResize()
   }
 

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

@@ -11,7 +11,10 @@ const st = prefix('setting')
 
 export default function TerminalInfoBase (props) {
   const { id, saveTerminalLogToFile, logName } = props
-  const path = osResolve(props.appPath, 'electerm', 'session_logs', logName + '.log')
+  const base = props.appPath
+    ? osResolve(props.appPath, 'electerm', 'session_logs')
+    : window.et.sessionLogPath
+  const path = osResolve(base, logName + '.log')
   const to = saveTerminalLogToFile
     ? <ShowItem disabled={!saveTerminalLogToFile} to={path}>{path}</ShowItem>
     : `-> ${c('setting')} -> ${st('saveTerminalLogToFile')}`

package/package.json

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