@electerm/electerm-react 2.8.16 → 2.10.6

package/client/components/bookmark-form/common/category-select.jsx

@@ -14,7 +14,7 @@ const e = window.translate
 export default function BookmarkCategorySelect ({
   bookmarkGroups = [],
   form,
-  formItemLayout,
+  formItemLayout = defaultFormItemLayout,
   name = 'category',
   onChange,
   formData = {} // Add formData prop to access bookmark ID
@@ -67,11 +67,9 @@ export default function BookmarkCategorySelect ({
     }
   }
 
-  const layout = formItemLayout || defaultFormItemLayout
-
   return (
     <FormItem
-      {...layout}
+      {...formItemLayout}
       label={e('bookmarkCategory')}
       name={name}
     >

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

@@ -21,12 +21,6 @@ import SshHostSelector from './ssh-host-selector.jsx'
 import SshAuthTypeSelector from './ssh-auth-type-selector.jsx'
 import SshAuthSelector from './ssh-auth-selector.jsx'
 import CategorySelect from './category-select.jsx'
-import WikiAlert from './wiki-alert.jsx'
-import {
-  rdpWikiLink,
-  vncWikiLink
-} from '../../../common/constants.js'
-
 const Fragment = React.Fragment
 const FormItem = Form.Item
 
@@ -126,10 +120,6 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
       return <Alert key={name} type='info' {...item.props} />
     case 'warning':
       return <Alert key={name} type='warning' {...item.props} />
-    case 'rdpWarning':
-      return <WikiAlert key={name} wikiUrl={rdpWikiLink} />
-    case 'vncWarning':
-      return <WikiAlert key={name} wikiUrl={vncWikiLink} />
     case 'categorySelect':
       return (
         <CategorySelect

package/client/components/bookmark-form/config/rdp.js

@@ -21,7 +21,6 @@ const rdpConfig = {
       key: 'auth',
       label: e('auth'),
       fields: [
-        { type: 'rdpWarning', name: 'rdpWarning' },
         commonFields.category,
         commonFields.colorTitle,
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },

package/client/components/bookmark-form/config/session-config.js

@@ -8,6 +8,7 @@ import serial from './serial'
 import local from './local'
 import rdp from './rdp'
 import ftp from './ftp'
+import spice from './spice'
 
 const sessionConfig = {
   [connectionMap.ssh]: ssh,
@@ -17,7 +18,8 @@ const sessionConfig = {
   [connectionMap.vnc]: vnc,
   [connectionMap.rdp]: rdp,
   [connectionMap.ftp]: ftp,
-  [connectionMap.web]: web
+  [connectionMap.web]: web,
+  [connectionMap.spice]: spice
 }
 
 export default sessionConfig

package/client/components/bookmark-form/config/spice.js

@@ -0,0 +1,44 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalSpiceType } from '../../../common/constants.js'
+import { createBaseInitValues, getAuthTypeDefault } from '../common/init-values.js'
+import { isEmpty } from 'lodash-es'
+import { commonFields, connectionHoppingTab } from './common-fields.js'
+
+const e = window.translate
+
+const spiceConfig = {
+  key: 'spice',
+  type: terminalSpiceType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalSpiceType, {
+      port: 5900,
+      viewOnly: false,
+      scaleViewport: true,
+      connectionHoppings: [],
+      ...getAuthTypeDefault(props)
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: [
+        commonFields.category,
+        commonFields.colorTitle,
+        { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
+        commonFields.port,
+        { type: 'switch', name: 'viewOnly', label: () => e('viewOnly'), valuePropName: 'checked' },
+        { type: 'switch', name: 'scaleViewport', label: () => e('scaleViewport'), valuePropName: 'checked' },
+        { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.spice) },
+        commonFields.password,
+        commonFields.description,
+        commonFields.proxy,
+        commonFields.type
+      ]
+    },
+    connectionHoppingTab()
+  ]
+}
+
+export default spiceConfig

package/client/components/bookmark-form/config/vnc.js

@@ -13,7 +13,7 @@ const vncConfig = {
     return createBaseInitValues(props, terminalVncType, {
       port: 5900,
       viewOnly: false,
-      clipViewport: true,
+      clipViewport: false,
       scaleViewport: true,
       qualityLevel: 3, // 0-9, lower = faster performance, default 6
       compressionLevel: 1, // 0-9, lower = faster performance, default 2
@@ -28,7 +28,6 @@ const vncConfig = {
       key: 'auth',
       label: e('auth'),
       fields: [
-        { type: 'vncWarning', name: 'vncWarning' },
         commonFields.category,
         commonFields.colorTitle,
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },

package/client/components/bookmark-form/fix-bookmark-default.js

@@ -0,0 +1,134 @@
+import bookmarkSchema from './bookmark-schema.js'
+
+const defaultValues = {
+  ssh: {
+    port: 22,
+    enableSsh: true,
+    enableSftp: true,
+    useSshAgent: true,
+    x11: false,
+    term: 'xterm-256color',
+    displayRaw: false,
+    encode: 'utf8',
+    envLang: 'en_US.UTF-8'
+  },
+  telnet: {
+    port: 23
+  },
+  serial: {
+    baudRate: 9600,
+    dataBits: 8,
+    stopBits: 1,
+    parity: 'none',
+    rtscts: false,
+    xon: false,
+    xoff: false,
+    xany: false
+  },
+  vnc: {
+    port: 5900,
+    viewOnly: false,
+    clipViewport: false,
+    scaleViewport: true,
+    qualityLevel: 3,
+    compressionLevel: 1,
+    shared: true
+  },
+  rdp: {
+    port: 3389
+  },
+  ftp: {
+    port: 21,
+    secure: false
+  }
+}
+
+const requiredFields = {
+  ssh: ['host', 'username', 'term'],
+  telnet: ['host'],
+  serial: ['path'],
+  vnc: ['host'],
+  rdp: ['host'],
+  ftp: ['host'],
+  web: ['url']
+}
+
+export function fixBookmarkData (data) {
+  if (!data || typeof data !== 'object') {
+    return data
+  }
+
+  const type = data.type || 'ssh'
+  const schema = bookmarkSchema[type]
+
+  if (!schema) {
+    return data
+  }
+
+  const fixed = { ...data }
+
+  if (!fixed.type) {
+    fixed.type = type
+  }
+
+  const defaults = defaultValues[type] || {}
+  for (const [key, value] of Object.entries(defaults)) {
+    if (fixed[key] === undefined || fixed[key] === null) {
+      fixed[key] = value
+    }
+  }
+
+  if (fixed.connectionHoppings?.length) {
+    fixed.hasHopping = true
+  }
+
+  return fixed
+}
+
+export function validateBookmarkData (data) {
+  if (!data || typeof data !== 'object') {
+    return {
+      valid: false,
+      errors: ['Invalid data format']
+    }
+  }
+
+  const type = data.type || 'ssh'
+  const required = requiredFields[type] || []
+  const errors = []
+
+  for (const field of required) {
+    if (!data[field]) {
+      errors.push(`Missing required field: ${field}`)
+    }
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors
+  }
+}
+
+export function getMissingRequiredFields (data) {
+  if (!data || typeof data !== 'object') {
+    return []
+  }
+
+  const type = data.type || 'ssh'
+  const required = requiredFields[type] || []
+  const missing = []
+
+  for (const field of required) {
+    if (!data[field]) {
+      missing.push(field)
+    }
+  }
+
+  return missing
+}
+
+export default {
+  fixBookmarkData,
+  validateBookmarkData,
+  getMissingRequiredFields
+}

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

@@ -2,7 +2,7 @@
  * Config-driven bookmark form (drop-in replacement)
  */
 import { PureComponent } from 'react'
-import { Radio } from 'antd'
+import { Radio, Button } from 'antd'
 import {
   settingMap,
   connectionMap,
@@ -13,12 +13,14 @@ import {
   terminalLocalType,
   terminalTelnetType,
   terminalFtpType,
-  newBookmarkIdPrefix
+  newBookmarkIdPrefix,
+  terminalSpiceType
 } from '../../common/constants'
 import { createTitleWithTag } from '../../common/create-title'
-import { LoadingOutlined, BookOutlined } from '@ant-design/icons'
+import { LoadingOutlined, BookOutlined, RobotOutlined } from '@ant-design/icons'
 import sessionConfig from './config/session-config'
 import renderForm from './render-form'
+import AIBookmarkForm from './ai-bookmark-form'
 import './bookmark-form.styl'
 
 const e = window.translate
@@ -34,27 +36,56 @@ export default class BookmarkIndex2 extends PureComponent {
       terminalSerialType,
       terminalRdpType,
       terminalVncType,
-      terminalFtpType
+      terminalFtpType,
+      terminalSpiceType
     ].includes(initType)) {
       initType = connectionMap.ssh
     }
-    this.state = { ready: false, bookmarkType: initType }
+    const v = this.getInitAiModeState()
+    this.state = {
+      ready: v,
+      bookmarkType: initType,
+      aiMode: v
+    }
   }
 
   componentDidMount () {
-    this.timer = setTimeout(() => this.setState({ ready: true }), 75)
+    this.timer = setTimeout(() => {
+      this.setState({ ready: true })
+    }, 75)
   }
 
   componentWillUnmount () {
     clearTimeout(this.timer)
   }
 
+  getInitAiModeState () {
+    const v = window.et.openBookmarkWithAIMode
+    if (v !== true) {
+      return false
+    }
+    delete window.et.openBookmarkWithAIMode
+    return true
+  }
+
   handleChange = (e) => {
     this.setState({ bookmarkType: e.target.value })
   }
 
+  handleCancelAiMode = () => {
+    this.setState({ aiMode: false })
+  }
+
+  handleToggleAIMode = () => {
+    if (window.store.aiConfigMissing()) {
+      window.store.toggleAIConfig()
+      return
+    }
+    this.setState(prev => ({ aiMode: !prev.aiMode }))
+  }
+
   renderTypes (bookmarkType, isNew, keys) {
-    if (!isNew) return null
+    if (!isNew || this.state.aiMode) return null
     return (
       <Radio.Group
         buttonStyle='solid'
@@ -66,11 +97,7 @@ export default class BookmarkIndex2 extends PureComponent {
       >
         {keys.map(v => {
           const txt = v === 'ssh' ? 'Ssh/Sftp' : e(v)
-          let sup = null
-          if (v === connectionMap.vnc || v === connectionMap.rdp) {
-            sup = <sup className='color-red'>Beta</sup>
-          }
-          return (<Radio.Button key={v} value={v}>{txt}{sup}</Radio.Button>)
+          return (<Radio.Button key={v} value={v}>{txt}</Radio.Button>)
         })}
       </Radio.Group>
     )
@@ -85,6 +112,39 @@ export default class BookmarkIndex2 extends PureComponent {
     )
   }
 
+  renderAIButton (isNew) {
+    if (!isNew || this.state.aiMode) {
+      return null
+    }
+    return (
+      <Button
+        type='primary'
+        size='small'
+        className='mg2l create-ai-btn'
+        icon={<RobotOutlined />}
+        onClick={this.handleToggleAIMode}
+      >
+        {e('createBookmarkByAI')}
+      </Button>
+    )
+  }
+
+  renderAiForm () {
+    return (
+      <AIBookmarkForm
+        onCancel={this.handleCancelAiMode}
+      />
+    )
+  }
+
+  renderForm () {
+    const { bookmarkType, aiMode } = this.state
+    if (aiMode) {
+      return this.renderAiForm()
+    }
+    return renderForm(bookmarkType, this.props)
+  }
+
   render () {
     const { formData } = this.props
     const { id = '' } = formData
@@ -109,8 +169,9 @@ export default class BookmarkIndex2 extends PureComponent {
           </span>
           {this.renderTitle(formData, isNew)}
           {this.renderTypes(bookmarkType, isNew, keys)}
+          {this.renderAIButton(isNew)}
         </div>
-        {renderForm(bookmarkType, this.props)}
+        {this.renderForm()}
       </div>
     )
   }

package/client/components/session/session.jsx

@@ -8,6 +8,7 @@ import Sftp from '../sftp/sftp-entry'
 import RdpSession from '../rdp/rdp-session'
 import VncSession from '../vnc/vnc-session'
 import WebSession from '../web/web-session.jsx'
+import SpiceSession from '../spice/spice-session'
 import {
   SearchOutlined,
   FullscreenOutlined,
@@ -29,7 +30,8 @@ import {
   terminalVncType,
   terminalWebType,
   terminalTelnetType,
-  terminalFtpType
+  terminalFtpType,
+  terminalSpiceType
 } from '../../common/constants'
 import { SplitViewIcon } from '../icons/split-view'
 import { refs } from '../common/ref'
@@ -269,7 +271,7 @@ export default class SessionWrapper extends Component {
         />
       )
     }
-    if (type === terminalRdpType || type === terminalVncType) {
+    if (type === terminalRdpType || type === terminalVncType || type === terminalSpiceType) {
       const rdpProps = {
         tab: this.props.tab,
         ...pick(this.props, [
@@ -299,6 +301,13 @@ export default class SessionWrapper extends Component {
           />
         )
       }
+      if (type === terminalSpiceType) {
+        return (
+          <SpiceSession
+            {...rdpProps}
+          />
+        )
+      }
 
       return (
         <RdpSession
@@ -373,7 +382,8 @@ export default class SessionWrapper extends Component {
       type === terminalVncType ||
       type === terminalWebType ||
       type === terminalTelnetType ||
-      type === terminalFtpType
+      type === terminalFtpType ||
+      type === terminalSpiceType
   }
 
   calcSftpWidthHeight = () => {

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

@@ -27,7 +27,6 @@ export default class KeywordsTransport extends BookmarkTransport {
     const { store } = this.props
     const arr = store.config.keywords || []
     const txt = JSON.stringify(arr, null, 2)
-    console.log(txt, 'txt')
     const stamp = time(undefined, 'YYYY-MM-DD-HH-mm-ss')
     download('electerm-' + this.name + '-' + stamp + '.json', txt)
   }

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

@@ -175,12 +175,18 @@ export function shortcutExtend (Cls) {
       type === 'keydown' &&
       !altKey &&
       !shiftKey &&
-      ctrlKey &&
-      this.zmodemClient &&
-      this.zmodemClient.isActive
+      ctrlKey
     ) {
-      this.zmodemClient.cancel()
-      return false
+      // Cancel zmodem transfer if active
+      if (this.zmodemClient && this.zmodemClient.isActive) {
+        this.zmodemClient.cancel()
+        return false
+      }
+      // Cancel trzsz transfer if active
+      if (this.trzszClient && this.trzszClient.isActive) {
+        this.trzszClient.cancel()
+        return false
+      }
     }
 
     let codeName

package/client/components/sidebar/index.jsx

@@ -7,7 +7,8 @@ import {
   SettingOutlined,
   UpCircleOutlined,
   BarsOutlined,
-  AppstoreOutlined
+  AppstoreOutlined,
+  RobotOutlined
 } from '@ant-design/icons'
 import { Tooltip } from 'antd'
 import SideBarPanel from './sidebar-panel'
@@ -86,6 +87,7 @@ export default function Sidebar (props) {
 
   const {
     onNewSsh,
+    onNewSshAI,
     openSetting,
     openAbout,
     openSettingSync,
@@ -142,6 +144,14 @@ export default function Sidebar (props) {
             onClick={onNewSsh}
           />
         </SideIcon>
+        <SideIcon
+          title={e('createBookmarkByAI')}
+        >
+          <RobotOutlined
+            className='font20 iblock control-icon'
+            onClick={onNewSshAI}
+          />
+        </SideIcon>
         <SideIcon
           title={e(settingMap.bookmarks)}
           active={bookmarksActive}