@electerm/electerm-react 1.34.37 → 1.34.39

package/client/components/bookmark-form/form-ssh-common.jsx

@@ -118,7 +118,6 @@ export default function renderCommon (props) {
       <FormItem
         {...formItemLayout}
         label={e('port')}
-        hasFeedback
         name='port'
         rules={[{
           required: true, message: 'port required'

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

@@ -1,28 +1,7 @@
-// .tree-list
-//   .ant-tree li
-//     > .ant-tree-node-content-wrapper
-//       width calc(100% - 24px)
-//       line-height 1.6
-//       height auto
-//     .ant-tree-child-tree
-//       span.ant-tree-switcher.ant-tree-switcher-noop
-//         display none
-//       li.ant-tree-treenode-switcher-open
-//       li.ant-tree-treenode-switcher-close
-//         & > .ant-tree-switcher.ant-tree-switcher-noop
-//           display inline-block
-//       .ant-tree-node-content-wrapper-open
-//       .ant-tree-node-content-wrapper-close
-//         width calc(100% - 48px)
-//         display inline-block
-//       .ant-tree-child-tree
-//         .ant-tree-node-content-wrapper
-//           display block
-//           padding-left 8px
-//           width 100%
-//           overflow hidden
-//           white-space nowrap
-//           text-overflow ellipsis
+.tree-list
+    .ant-tree-child-tree
+      span.ant-tree-switcher.ant-tree-switcher-noop
+        display none
 
 .tree-control-btn
   display none

package/client/components/terminal/index.jsx

@@ -86,6 +86,8 @@ export default class Term extends Component {
     }
   }
 
+  dataCache = ''
+
   componentDidMount () {
     this.initTerminal()
     this.initEvt()
@@ -765,6 +767,22 @@ export default class Term extends Component {
     }
   }
 
+  onData = (d) => {
+    if (!d.includes('\r') && !d.includes('\r')) {
+      this.dataCache += d
+      delete this.userTypeExit
+    } else {
+      const data = this.dataCache.trim()
+      this.dataCache = ''
+      if (data === 'exit') {
+        this.userTypeExit = true
+        this.timers.userTypeExit = setTimeout(() => {
+          delete this.userTypeExit
+        }, 2000)
+      }
+    }
+  }
+
   loadRenderer = (term, config) => {
     if (config.rendererType === rendererTypes.canvas) {
       term.loadAddon(new CanvasAddon())
@@ -817,6 +835,7 @@ export default class Term extends Component {
     // term.textarea.addEventListener('blur', this.onBlur)
 
     // term.on('keydown', this.handleEvent)
+    term.onData(this.onData)
     this.term = term
     term.attachCustomKeyEventHandler(this.handleEvent)
     term.onKey(this.onKey)
@@ -1092,6 +1111,9 @@ export default class Term extends Component {
     if (!this.isActiveTerminal() || !window.focused) {
       return false
     }
+    if (this.userTypeExit) {
+      return this.props.delSplit(this.state.id)
+    }
     const key = `open${Date.now()}`
     function closeMsg () {
       notification.destroy(key)

package/client/components/terminal-theme/theme-list.jsx

@@ -23,6 +23,10 @@ export default class ThemeList extends List {
     this.setState({ page })
   }
 
+  handlePageSizeChange = (page, pageSize) => {
+    this.setState({ pageSize, page })
+  }
+
   renderApplyBtn = item => {
     if (!item.id) {
       return null
@@ -130,6 +134,7 @@ export default class ThemeList extends List {
           total={all}
           current={page}
           pageSize={pageSize}
+          onShowSizeChange={this.handlePageSizeChange}
         />
         {
           ready

package/package.json

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