@electerm/electerm-react 1.39.31 → 1.39.46

package/client/common/create-title.jsx

@@ -26,7 +26,7 @@ export default function createTitle (res, hide = true) {
     host, port, username, title, type,
     path, connectionHoppings, sshTunnels
   } = res
-  const h = hide ? maskHost(host) : host
+  const h = hide && window.store.config.hideIP ? maskHost(host) : host
   const fixTitle = `${username || ''}@${h}:${port}`
   const extra = host || path ? (path || fixTitle) : ''
   let f = title

package/client/common/default-setting.js

@@ -57,5 +57,6 @@ export default {
     'name',
     'size',
     'modifyTime'
-  ]
+  ],
+  hideIP: false
 }

package/client/components/bookmark-form/bookmark-group-tree-format.js

@@ -3,37 +3,38 @@
  */
 
 export default (bookmarkGroups = []) => {
-  const dict = bookmarkGroups
+  const btree = bookmarkGroups
     .reduce((prev, k) => {
       return {
         ...prev,
         [k.id]: k
       }
     }, {})
-  return bookmarkGroups
-    .filter(d => d.level !== 2)
-    .map(j => {
+  function buildSubCats (id) {
+    const x = btree[id]
+    if (!x) {
+      return ''
+    }
+    const y = {
+      key: x.id,
+      value: x.id,
+      title: x.title
+    }
+    y.children = (x.bookmarkGroupIds || []).map(buildSubCats).filter(d => d)
+    if (!y.children.length) {
+      delete y.children
+    }
+    return y
+  }
+  const level1 = bookmarkGroups.filter(d => d.level !== 2)
+    .map(d => {
       const r = {
-        title: j.title,
-        value: j.id,
-        key: j.id
-      }
-      if (j.bookmarkGroupIds && j.bookmarkGroupIds.length) {
-        r.children = j.bookmarkGroupIds.map(k => {
-          const o = dict[k]
-          return o
-            ? {
-                title: o.title,
-                value: o.id,
-                key: o.id
-              }
-            : null
-        })
-        r.children = r.children.filter(d => d)
-        if (!r.children.length) {
-          delete r.children
-        }
+        title: d.title,
+        value: d.id,
+        key: d.id,
+        children: (d.bookmarkGroupIds || []).map(buildSubCats).filter(d => d)
       }
       return r
-    })
+    }).filter(d => d)
+  return level1
 }

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

@@ -192,6 +192,16 @@ export default function renderCommon (props) {
       >
         <Input />
       </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label={e('interactiveValues')}
+        name='interactiveValues'
+        hasFeedback
+      >
+        <Input.TextArea
+          rows={1}
+        />
+      </FormItem>
       {renderRunScripts()}
       <FormItem
         {...formItemLayout}

package/client/components/bookmark-form/render-connection-hopping.jsx

@@ -37,11 +37,11 @@ export default function renderConnectionHopping (props) {
     authType: authTypeMap.password
   })
   const [list, setList] = useState(formData.connectionHoppings || [])
-  function onChangeAuthType (authType) {
+  function onChangeAuthType (e) {
     editState(old => {
       return {
         ...old,
-        authType
+        authType: e.target.value
       }
     })
   }
@@ -68,7 +68,7 @@ export default function renderConnectionHopping (props) {
     })
     formChild.resetFields()
   }
-  const authTypes = Object.keys(authTypeMap).map(k => {
+  const authTypes = props.authTypes || Object.keys(authTypeMap).map(k => {
     return k
   })
 
@@ -95,7 +95,8 @@ export default function renderConnectionHopping (props) {
         const pass = item.password ? ':*****' : ''
         const ph = item.passphase ? '(passphase:*****)' : ''
         const pk = item.privateKey ? '(privateKey:*****)' : ''
-        return <span>{item.username}{pass}@{item.host}:{item.port}{pk}{ph}</span>
+        const useProfile = item.profile ? '[profile] ' : ''
+        return <span>{useProfile}{item.username}{pass}@{item.host}:{item.port}{pk}{ph}</span>
       }
     }, {
       title: m('del'),
@@ -159,6 +160,22 @@ export default function renderConnectionHopping (props) {
         >
           <Input />
         </FormItem>
+        <FormItem
+          {...formItemLayout}
+          label={f('port')}
+          hasFeedback
+          name='port'
+          rules={[{
+            required: true, message: 'port required'
+          }]}
+        >
+          <InputNumber
+            placeholder={f('port')}
+            min={1}
+            max={65535}
+            step={1}
+          />
+        </FormItem>
         <FormItem
           {...formItemLayout}
           label={f('username')}
@@ -192,22 +209,6 @@ export default function renderConnectionHopping (props) {
             }
           </RadioGroup>
         </FormItem>
-        <FormItem
-          {...formItemLayout}
-          label={f('port')}
-          hasFeedback
-          name='port'
-          rules={[{
-            required: true, message: 'port required'
-          }]}
-        >
-          <InputNumber
-            placeholder={f('port')}
-            min={1}
-            max={65535}
-            step={1}
-          />
-        </FormItem>
         <RenderAuth
           form={formChild}
           store={store}

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

@@ -88,13 +88,14 @@ export default function renderSshTunnels (props) {
         const {
           sshTunnel,
           sshTunnelRemoteHost = '127.0.0.1',
-          sshTunnelRemotePort,
+          sshTunnelRemotePort = '',
           sshTunnelLocalHost = '127.0.0.1',
-          sshTunnelLocalPort,
+          sshTunnelLocalPort = '',
           name
         } = item
         if (sshTunnel === 'dynamicForward') {
-          return `socks5://${sshTunnelLocalHost}:${sshTunnelLocalPort}`
+          const n = name ? `[${name}] ` : ''
+          return `${n}socks5://${sshTunnelLocalHost}:${sshTunnelLocalPort}`
         }
         const to = sshTunnel === 'forwardRemoteToLocal'
           ? `${s('local')}:${sshTunnelLocalHost}:${sshTunnelLocalPort}`

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

@@ -225,7 +225,7 @@ export default class BookmarkForm extends PureComponent {
   }
 
   test = async (update) => {
-    const options = {
+    let options = {
       ...this.props.formData,
       ...update
     }
@@ -233,6 +233,7 @@ export default class BookmarkForm extends PureComponent {
     this.setState({
       testing: true
     })
+    options = window.store.applyProfileToTabs(options)
     const res = await testCon(options)
       .then(r => r)
       .catch((e) => {

package/client/components/bookmark-form/vnc-form-ui.jsx

@@ -8,7 +8,8 @@ import {
   Form,
   InputNumber,
   TreeSelect,
-  Switch
+  Switch,
+  Tabs
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
 import {
@@ -22,6 +23,8 @@ import { ColorPickerItem } from './color-picker-item.jsx'
 import { getRandomDefaultColor } from '../../common/rand-hex-color.js'
 import formatBookmarkGroups from './bookmark-group-tree-format'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
+import renderProxy from './proxy'
+import ConnectionHopping from './render-connection-hopping.jsx'
 
 const FormItem = Form.Item
 const { prefix } = window
@@ -58,9 +61,42 @@ export default function VncFormUi (props) {
     category: initBookmarkGroupId,
     color: getRandomDefaultColor(),
     viewOnly: false,
-    scaleViewport: true
+    scaleViewport: true,
+    connectionHoppings: []
   }
   initialValues = defaults(initialValues, defaultValues)
+
+  function renderTabs (props) {
+    const items = [
+      {
+        key: 'auth',
+        label: e('auth'),
+        forceRender: true,
+        children: renderCommon()
+      },
+      {
+        key: 'connectionHopping',
+        label: e('connectionHopping'),
+        forceRender: true,
+        children: renderHopping()
+      }
+    ]
+    return (
+      <Tabs
+        items={items}
+      />
+    )
+  }
+
+  function renderHopping () {
+    return (
+      <ConnectionHopping
+        {...props}
+        form={form}
+      />
+    )
+  }
+
   function renderCommon () {
     const {
       bookmarkGroups = []
@@ -153,6 +189,9 @@ export default function VncFormUi (props) {
             showSearch
           />
         </FormItem>
+        {
+          renderProxy(props)
+        }
         <FormItem
           {...formItemLayout}
           label='type'
@@ -172,7 +211,7 @@ export default function VncFormUi (props) {
       initialValues={initialValues}
       name='vnc-form'
     >
-      {renderCommon()}
+      {renderTabs()}
       {submitUi}
     </Form>
   )

package/client/components/main/main.jsx

@@ -83,7 +83,7 @@ export default class Index extends Component {
       loaded: configLoaded,
       'system-ui': store.config.useSystemTitleBar,
       'not-system-ui': !store.config.useSystemTitleBar,
-      'is-mac': isMac,
+      'is-mac': isMac && !window.et.isWebApp,
       'is-win': isWin,
       pinned,
       'qm-pinned': pinnedQuickCommandBar,

package/client/components/profile/profile-form-elem.jsx

@@ -21,7 +21,6 @@ export default function QuickCommandForm (props) {
   const { autofocustrigger } = props.store
   async function handleSubmit (res) {
     const { formData } = props
-    console.log(res)
     const update1 = {
       ...res,
       id: generate()

package/client/components/quick-commands/quick-command-transport-mod.jsx

@@ -1,4 +1,4 @@
-import BookmarkTransport from '../setting-panel/bookmark-transport'
+import BookmarkTransport from '../tree-list/bookmark-transport'
 import download from '../../common/download'
 import time from '../../common/time'
 import copy from 'json-deep-copy'

package/client/components/setting-panel/bookmark-tree-list.jsx

@@ -1,4 +1,4 @@
-import TreeList from './tree-list'
+import TreeList from '../tree-list/tree-list'
 import BookmarkTreeDelete from '../bookmark-form/tree-delete'
 
 export default function BookmarkTreeList (props) {

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

@@ -644,6 +644,7 @@ export default class SettingCommon extends Component {
             'checkUpdateOnStart',
             'useSystemTitleBar',
             'confirmBeforeExit',
+            'hideIP',
             'debug'
           ].map(this.renderToggle)
         }

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

@@ -21,7 +21,7 @@ const { prefix } = window
 const m = prefix('common')
 const t = prefix('terminalThemes')
 const q = prefix('quickCommands')
-const f = prefix('profiles')
+const f = prefix('form')
 
 export default class SettingModalWrap extends Component {
   selectItem = (item) => {

package/client/components/setting-panel/start-session-select.jsx

@@ -34,9 +34,10 @@ export default class StartSessionSelect extends Component {
         value: x.id,
         title: x.title
       }
-      if (x.bookmarkIds && x.bookmarkIds.length) {
-        y.children = x.bookmarkIds.map(buildLeaf).filter(d => d)
-      }
+      y.children = [
+        ...(x.bookmarkGroupIds || []).map(buildSubCats),
+        ...(x.bookmarkIds || []).map(buildLeaf)
+      ].filter(d => d)
       if (y.children && !y.children.length) {
         delete y.children
       }

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

@@ -10,7 +10,7 @@ import {
 } from '@ant-design/icons'
 import classnames from 'classnames'
 import copy from 'json-deep-copy'
-import { pick, some } from 'lodash-es'
+import { pick, some, without } from 'lodash-es'
 import Input from '../common/input-auto-focus'
 import resolve from '../../common/resolve'
 import { addClass, removeClass } from '../../common/class'
@@ -382,7 +382,7 @@ export default class FileSection extends React.Component {
     const { type } = this.props
     window.store.openFileInfoModal({
       file: this.state.file,
-      tab: this.props.tab,
+      tab: without(this.props.tab, 'terminals'),
       visible: true,
       pid: this.props.pid,
       sessionId: this.props.sessionId,
@@ -531,7 +531,7 @@ export default class FileSection extends React.Component {
       'message', this.changeFileMode
     )
     window.store.openFileModeModal({
-      tab: this.props.tab,
+      tab: without(this.props.tab, 'terminals'),
       visible: true,
       uidTree: this.props[`${type}UidTree`],
       gidTree: this.props[`${type}GidTree`]

package/client/components/sidebar/bookmark-select.jsx

@@ -3,7 +3,7 @@
  */
 
 import { Component } from '../common/react-subx'
-import TreeList from '../setting-panel/tree-list'
+import TreeList from '../tree-list/tree-list'
 
 export default class BookmarkSelect extends Component {
   render () {

package/client/components/tabs/index.jsx

@@ -256,7 +256,7 @@ export default class Tabs extends React.Component {
     const left = overflow
       ? '100%'
       : tabsWidthAll
-    const w1 = isMacJs ? 30 : windowControlWidth
+    const w1 = isMacJs && window.et.isWebApp ? 30 : windowControlWidth
     const style = {
       width: width - w1 - 166
     }

package/client/components/tabs/tabs.styl

@@ -11,7 +11,7 @@
   .tabs-inner
     margin-left 72px
   .tabs-extra
-    right 0
+    right 96px
 .tabs-inner
   position relative
   z-index 2
@@ -137,7 +137,7 @@
   position absolute
   height 40px
   top 0
-  right 96px
+  right 0
   line-height 40px
   z-index 20
 

package/client/components/terminal/index.jsx

@@ -1092,7 +1092,7 @@ class Term extends Component {
       server = ''
     } = config
     const { sessionId, terminalIndex, id, logName } = this.props
-    const tab = window.store.applyProfile(deepCopy(this.props.tab || {}))
+    const tab = window.store.applyProfileToTabs(deepCopy(this.props.tab || {}))
     const {
       srcId, from = 'bookmarks',
       type,

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

@@ -0,0 +1,36 @@
+import {
+  CaretDownOutlined,
+  CaretRightOutlined
+} from '@ant-design/icons'
+import { memo } from 'react'
+
+export default memo(function TreeExpander (props) {
+  function onExpand () {
+    props.onExpand(group)
+  }
+  function onUnExpand () {
+    props.onUnExpand(group)
+  }
+  const { group } = props
+  if (
+    !group?.bookmarkIds?.length &&
+    !group?.bookmarkGroupIds?.length
+  ) {
+    return null
+  }
+  const shouldOpen = props.keyword || props.expandedKeys.includes(group.id)
+  const Icon = shouldOpen
+    ? CaretDownOutlined
+    : CaretRightOutlined
+  const func = shouldOpen
+    ? onUnExpand
+    : onExpand
+  return (
+    <div
+      className='tree-expander pointer'
+      onClick={func}
+    >
+      <Icon />
+    </div>
+  )
+})