@electerm/electerm-react 1.39.68 → 1.39.76

package/client/components/bookmark-form/render-auth-ssh.jsx

@@ -24,6 +24,13 @@ export default function renderAuth (props) {
     form,
     authType
   } = props
+  const beforeUpload = async (file) => {
+    const privateKey = await window.fs.readFile(file.path)
+    form.setFieldsValue({
+      privateKey
+    })
+    return false
+  }
   if (authType === 'password') {
     const opts = {
       options: uniqBy(
@@ -101,7 +108,7 @@ export default function renderAuth (props) {
         />
       </FormItem>
       <Upload
-        beforeUpload={file => props.beforeUpload(file, form)}
+        beforeUpload={beforeUpload}
         fileList={[]}
       >
         <Button

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

@@ -307,17 +307,8 @@ export default class BookmarkForm extends PureComponent {
     }
   }
 
-  beforeUpload = async (file, form) => {
-    const privateKey = await window.fs.readFile(file.path)
-    form.setFieldsValue({
-      privateKey
-    })
-    return false
-  }
-
   getProps = () => {
     const funcs = pick(this, [
-      'beforeUpload',
       'handleFinish',
       'testConnection',
       'connect',

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

@@ -17,7 +17,7 @@ const {
 const { prefix } = window
 const f = prefix('form')
 
-export default class SystemMenu extends Component {
+export default class FooterEntry extends Component {
   handleInfoPanel = () => {
     const { activeTerminalId } = this.props.store
     postMessage({

package/client/components/quick-commands/quick-commands-box.jsx

@@ -167,7 +167,9 @@ export default class QuickCommandsFooterBox extends Component {
       openQuickCommandBar,
       pinnedQuickCommandBar,
       qmSortByFrequency,
-      inActiveTerminal
+      inActiveTerminal,
+      leftSidebarWidth,
+      openedSideBar
     } = this.props.store
     if ((!openQuickCommandBar && !pinnedQuickCommandBar) || !inActiveTerminal) {
       return null
@@ -205,11 +207,18 @@ export default class QuickCommandsFooterBox extends Component {
       { 'fil-keyword': !!keyword }
     )
     const type = qmSortByFrequency ? 'primary' : 'default'
+    const w = openedSideBar ? 43 + leftSidebarWidth : 43
+    const qmProps = {
+      className: 'qm-wrap-tooltip',
+      style: {
+        left: w
+      },
+      onMouseLeave: this.handleMouseLeave,
+      onMouseEnter: this.handleMouseEnter
+    }
     return (
       <div
-        className='qm-wrap-tooltip'
-        onMouseLeave={this.handleMouseLeave}
-        onMouseEnter={this.handleMouseEnter}
+        {...qmProps}
       >
         <div className='pd2'>
           <div className='pd2b fix'>

package/client/components/tree-list/tree-list.jsx

@@ -997,7 +997,8 @@ export default class ItemListTree extends Component {
       bookmarkGroupIds = [],
       id
     } = group
-    if (!this.state.expandedKeys.includes(id)) {
+    const shouldRender = this.state.keyword || this.state.expandedKeys.includes(id)
+    if (!shouldRender) {
       return null
     }
     return [

package/package.json

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