@electerm/electerm-react 1.37.1 → 1.37.6

package/client/common/default-setting.js

@@ -39,5 +39,6 @@ export default {
   initDefaultTabOnStart: true,
   screenReaderMode: false,
   autoRefreshWhenSwitchToSftp: false,
-  hideSshConfig: false
+  hideSshConfig: false,
+  addTimeStampToTermLog: false
 }

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

@@ -475,8 +475,12 @@ export default class SettingTerminal extends Component {
         {
           this.renderCursorStyleSelect()
         }
+        {this.renderToggle('saveTerminalLogToFile', (
+          <ShowItem to={terminalLogPath} className='mg1l'>{p('open')}</ShowItem>
+        ))}
         {
           [
+            'addTimeStampToTermLog',
             'cursorBlink',
             'rightClickSelectsWord',
             'pasteWhenContextMenu',
@@ -484,9 +488,6 @@ export default class SettingTerminal extends Component {
             'ctrlOrMetaOpenTerminalLink'
           ].map(this.renderToggle)
         }
-        {this.renderToggle('saveTerminalLogToFile', (
-          <ShowItem to={terminalLogPath} className='mg1l'>{p('open')}</ShowItem>
-        ))}
         {this.renderReset()}
       </div>
     )

package/client/components/shortcuts/shortcut-control.jsx

@@ -39,7 +39,7 @@ class ShortcutControl extends React.PureComponent {
     e.stopPropagation()
     const x = document.querySelector('.icon-split')
     x && x.click()
-  }, 300)
+  }, 1200)
 
   zoominShortcut = (e) => {
     e.stopPropagation()

package/client/components/shortcuts/shortcut-handler.js

@@ -4,8 +4,8 @@ import {
   isMacJs
 } from '../../common/constants'
 
-function buildConfig (config) {
-  const defs = shortcutsDefaultsGen()
+function buildConfig (config, filter = d => d) {
+  const defs = shortcutsDefaultsGen().filter(filter)
   const { shortcuts = {} } = config
   return defs.reduce((p, c) => {
     const propName = isMacJs ? 'shortcutMac' : 'shortcut'
@@ -45,7 +45,7 @@ export function shortcutExtend (Cls) {
       (shiftKey ? 'shift+' : '') +
       (altKey ? 'alt+' : '') +
       codeK.toLowerCase()
-    const shortcutsConfig = buildConfig(this.props.config)
+    const shortcutsConfig = buildConfig(this.props.config, d => !d.readonly)
     const keys = Object.keys(shortcutsConfig)
     const len = keys.length
     for (let i = 0; i < len; i++) {

package/client/components/shortcuts/shortcuts.jsx

@@ -36,16 +36,18 @@ export default class Shortcuts extends Component {
 
   getData () {
     const { shortcuts = {} } = this.props.store.config
-    return shortcutsDefaults.map((c, i) => {
-      const propName = isMac ? 'shortcutMac' : 'shortcut'
-      const name = c.name + '_' + propName
-      return {
-        index: i + 1,
-        name,
-        readonly: c.readonly,
-        shortcut: c.readonly ? c[propName] : (shortcuts[name] || c[propName])
-      }
-    })
+    return shortcutsDefaults
+      .filter(g => !g.readonly)
+      .map((c, i) => {
+        const propName = isMac ? 'shortcutMac' : 'shortcut'
+        const name = c.name + '_' + propName
+        return {
+          index: i + 1,
+          name,
+          readonly: c.readonly,
+          shortcut: c.readonly ? c[propName] : (shortcuts[name] || c[propName])
+        }
+      })
   }
 
   getKeysTakenData = () => {

package/client/components/terminal/index.jsx

@@ -78,6 +78,7 @@ class Term extends Component {
       promoteModalVisible: false,
       savePassword: false,
       saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
+      addTimeStampToTermLog: !!this.props.config.addTimeStampToTermLog,
       tempPassword: '',
       passType: 'password',
       zmodemTransfer: null,
@@ -232,15 +233,15 @@ class Term extends Component {
     this.term.selectAll()
   }
 
-  copyShortcut = (e) => {
-    const sel = this.term.getSelection()
-    if (sel) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.copySelectionToClipboard()
-      return false
-    }
-  }
+  // copyShortcut = (e) => {
+  //   const sel = this.term.getSelection()
+  //   if (sel) {
+  //     e.stopPropagation()
+  //     e.preventDefault()
+  //     this.copySelectionToClipboard()
+  //     return false
+  //   }
+  // }
 
   searchShortcut = (e) => {
     e.stopPropagation()
@@ -274,6 +275,7 @@ class Term extends Component {
       action,
       encode,
       saveTerminalLogToFile,
+      addTimeStampToTermLog,
       type,
       cmd,
       activeSplitId,
@@ -348,17 +350,10 @@ class Term extends Component {
     ) {
       postMessage({
         action: commonActions.returnTermLogState,
-        state: this.state.saveTerminalLogToFile,
-        pid: statePid
-      })
-      postMessage({
-        action: commonActions.returnTermLogState,
-        state: this.state.saveTerminalLogToFile,
-        pid: statePid
-      })
-      postMessage({
-        action: commonActions.returnTermLogState,
-        state: this.state.saveTerminalLogToFile,
+        state: {
+          saveTerminalLogToFile: this.state.saveTerminalLogToFile,
+          addTimeStampToTermLog: this.state.addTimeStampToTermLog
+        },
         pid: statePid
       })
     } else if (
@@ -366,6 +361,7 @@ class Term extends Component {
       pid === statePid
     ) {
       this.setState({
+        addTimeStampToTermLog,
         saveTerminalLogToFile
       })
     }
@@ -674,14 +670,6 @@ class Term extends Component {
     window.store.toggleTerminalSearch()
   }
 
-  // onLineFeed = e => {
-  //   // console.log(e, 'onLineFeed')
-  // }
-
-  onTitleChange = e => {
-    log.debug(e, 'title change')
-  }
-
   onSearchResultsChange = ({ resultIndex, resultCount }) => {
     window.store.storeAssign({
       termSearchMatchCount: resultCount,
@@ -839,7 +827,7 @@ class Term extends Component {
     term.loadAddon(this.fitAddon)
     term.loadAddon(this.searchAddon)
     // term.onLineFeed(this.onLineFeed)
-    term.onTitleChange(this.onTitleChange)
+    // term.onTitleChange(this.onTitleChange)
     term.onSelectionChange(this.onSelection)
     this.loadState(term)
     term.open(document.getElementById(id), true)
@@ -963,6 +951,7 @@ class Term extends Component {
       ...extra,
       logName,
       ...pick(config, [
+        'addTimeStampToTermLog',
         'keepaliveInterval',
         'keepaliveCountMax',
         'execWindows',

package/client/components/terminal/terminal-apis.js

@@ -37,3 +37,11 @@ export function toggleTerminalLog (pid, sessionId) {
     action: 'toggle-terminal-log'
   })
 }
+
+export function toggleTerminalLogTimestamp (pid, sessionId) {
+  return fetch({
+    pid,
+    sessionId,
+    action: 'toggle-terminal-log-timestamp'
+  })
+}

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

@@ -11,14 +11,15 @@ import {
 } from 'antd'
 import ShowItem from '../common/show-item'
 import postMsg from '../../common/post-msg'
-import { toggleTerminalLog } from '../terminal/terminal-apis'
+import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
 
 const { prefix } = window
 const st = prefix('setting')
 
 export default class TerminalInfoBase extends Component {
   state = {
-    saveTerminalLogToFile: false
+    saveTerminalLogToFile: false,
+    addTimeStampToTermLog: false
   }
 
   componentDidMount () {
@@ -30,8 +31,31 @@ export default class TerminalInfoBase extends Component {
     this.exit()
   }
 
+  handleToggleTimestamp = () => {
+    const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
+    const {
+      pid,
+      sessionId
+    } = this.props
+    toggleTerminalLogTimestamp(
+      pid,
+      sessionId
+    )
+    const nv = !addTimeStampToTermLog
+    this.setState({
+      addTimeStampToTermLog: nv
+    })
+    postMsg({
+      action: commonActions.setTermLogState,
+      pid,
+      addTimeStampToTermLog: nv,
+      saveTerminalLogToFile,
+      sessionId
+    })
+  }
+
   handleToggle = () => {
-    const { saveTerminalLogToFile } = this.state
+    const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
     const {
       pid,
       sessionId
@@ -48,6 +72,7 @@ export default class TerminalInfoBase extends Component {
       action: commonActions.setTermLogState,
       pid,
       saveTerminalLogToFile: nv,
+      addTimeStampToTermLog,
       sessionId
     })
   }
@@ -62,9 +87,7 @@ export default class TerminalInfoBase extends Component {
       action === commonActions.returnTermLogState &&
       this.props.pid === ppid
     ) {
-      this.setState({
-        saveTerminalLogToFile: state
-      })
+      this.setState(state)
       window.removeEventListener('message', this.onEvent)
     }
   }
@@ -85,6 +108,22 @@ export default class TerminalInfoBase extends Component {
     window.removeEventListener('message', this.onEvent)
   }
 
+  renderTimestamp () {
+    const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
+    if (!saveTerminalLogToFile) {
+      return null
+    }
+    const name = st('addTimeStampToTermLog')
+    return (
+      <Switch
+        checkedChildren={name}
+        unCheckedChildren={name}
+        checked={addTimeStampToTermLog}
+        onChange={this.handleToggleTimestamp}
+      />
+    )
+  }
+
   render () {
     const {
       id,
@@ -110,7 +149,11 @@ export default class TerminalInfoBase extends Component {
               unCheckedChildren={name}
               checked={saveTerminalLogToFile}
               onChange={this.handleToggle}
+              className='mg1r'
             />
+            {
+              this.renderTimestamp()
+            }
           </span>
         </div>
         <p><b>log:</b> {to}</p>

package/package.json

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