@electerm/electerm-react 1.60.32 → 1.60.46

package/client/common/constants.js

@@ -265,6 +265,7 @@ export const proxyHelpLink = 'https://github.com/electerm/electerm/wiki/proxy-fo
 export const regexHelpLink = 'https://github.com/electerm/electerm/wiki/Terminal-keywords-highlight-regular-expression-exmaples'
 export const connectionHoppingWikiLink = 'https://github.com/electerm/electerm/wiki/Connection-Hopping-Behavior-Change-in-electerm-since-v1.50.65'
 export const aiConfigWikiLink = 'https://github.com/electerm/electerm/wiki/AI-model-config-guide'
+export const rdpWikiLink = 'https://github.com/electerm/electerm/wiki/RDP-session-known-issues'
 export const modals = {
   hide: 0,
   setting: 1,

package/client/common/default-setting.js

@@ -31,7 +31,7 @@ export default {
   checkUpdateOnStart: true,
   cursorBlink: false,
   cursorStyle: 'block',
-  useSystemTitleBar: window.pre.isLinux || window.et.isLinux || false,
+  useSystemTitleBar: false,
   opacity: 1,
   defaultEditor: '',
   terminalWordSeparator: './\\()"\'-:,.;<>~!@#$%^&*|+=[]{}`~ ?',
@@ -61,5 +61,6 @@ export default {
   dataSyncSelected: 'all',
   baseURLAI: 'https://api.deepseek.com',
   modelAI: 'deepseek-chat',
-  roleAI: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式'
+  roleAI: '终端专家,提供不同系统下安全命令,解释用法及风险,用markdown格式',
+  apiPathAI: '/chat/completions'
 }

package/client/components/ai/ai-chat.jsx

@@ -24,7 +24,8 @@ const aiConfigsArr = [
   'baseURLAI',
   'modelAI',
   'roleAI',
-  'apiKeyAI'
+  'apiKeyAI',
+  'apiPathAI'
 ]
 
 export default function AIChat (props) {
@@ -52,6 +53,7 @@ export default function AIChat (props) {
       props.config.modelAI,
       buildRole(),
       props.config.baseURLAI,
+      props.config.apiPathAI,
       props.config.apiKeyAI
     ).catch(
       window.store.onError

package/client/components/ai/ai-config.jsx

@@ -4,7 +4,8 @@ import {
   Button,
   AutoComplete,
   Modal,
-  Alert
+  Alert,
+  Space
 } from 'antd'
 import { useEffect, useState } from 'react'
 import Link from '../common/external-link'
@@ -76,12 +77,14 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
     return null
   }
   const title = 'AI ' + e('setting')
+  const defaultLangs = window.store.getLangNames().map(l => ({ value: l }))
   return (
     <Modal
       title={title}
       open
       onCancel={handleCancel}
       footer={null}
+      width='90%'
     >
       <Alert
         message={
@@ -96,23 +99,38 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         initialValues={initialValues}
         layout='vertical'
       >
-        <Form.Item
-          label='API URL'
-          name='baseURLAI'
-          rules={[
-            { required: true, message: 'Please input or select API provider URL!' },
-            { type: 'url', message: 'Please enter a valid URL!' }
-          ]}
-        >
-          <AutoComplete
-            options={getBaseURLOptions()}
-            placeholder='Enter or select API provider URL'
-            filterOption={filter}
-            onChange={handleChange}
-            allowClear
-          />
+        <Form.Item label='API URL' required>
+          <Space.Compact block>
+            <Form.Item
+              label='API URL'
+              name='baseURLAI'
+              noStyle
+              rules={[
+                { required: true, message: 'Please input or select API provider URL!' },
+                { type: 'url', message: 'Please enter a valid URL!' }
+              ]}
+            >
+              <AutoComplete
+                options={getBaseURLOptions()}
+                placeholder='Enter or select API provider URL'
+                filterOption={filter}
+                onChange={handleChange}
+                allowClear
+                style={{ width: '75%' }}
+              />
+            </Form.Item>
+            <Form.Item
+              label='API PATH'
+              name='apiPathAI'
+              noStyle
+            >
+              <Input
+                placeholder='Enter API path'
+                style={{ width: '25%' }}
+              />
+            </Form.Item>
+          </Space.Compact>
         </Form.Item>
-
         <Form.Item
           label={e('modelAi')}
           name='modelAI'
@@ -145,6 +163,18 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
           </AutoComplete>
         </Form.Item>
 
+        <Form.Item
+          label={e('language')}
+          name='languageAI'
+          rules={[{ required: true, message: 'Please input language' }]}
+        >
+          <AutoComplete options={defaultLangs} placement='topLeft'>
+            <Input
+              placeholder={e('language')}
+            />
+          </AutoComplete>
+        </Form.Item>
+
         <Form.Item>
           <Button type='primary' htmlType='submit'>
             {e('save')}

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

@@ -7,12 +7,14 @@ import {
   Input,
   Form,
   InputNumber,
-  TreeSelect
+  TreeSelect,
+  Alert
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
 import {
   newBookmarkIdPrefix,
-  terminalRdpType
+  terminalRdpType,
+  rdpWikiLink
 } from '../../common/constants'
 import useSubmit from './use-submit'
 import copy from 'json-deep-copy'
@@ -22,6 +24,7 @@ import { getRandomDefaultColor } from '../../common/rand-hex-color.js'
 import formatBookmarkGroups from './bookmark-group-tree-format'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import ProfileItem from './profile-form-item'
+import Link from '../common/external-link'
 
 const FormItem = Form.Item
 const e = window.translate
@@ -63,8 +66,18 @@ export default function RdpFormUi (props) {
       bookmarkGroups = []
     } = props
     const tree = formatBookmarkGroups(bookmarkGroups)
+    const alertProps = {
+      message: (
+        <Link to={rdpWikiLink}>WIKI: {rdpWikiLink}</Link>
+      ),
+      type: 'warning',
+      className: 'mg2y'
+    }
     return (
       <div className='pd1x'>
+        <Alert
+          {...alertProps}
+        />
         <FormItem
           {...formItemLayout}
           label={e('title')}

package/client/components/common/component.jsx

@@ -0,0 +1,42 @@
+import React from 'react'
+import writeEmitter from 'manate/events/write-emitter'
+import { run } from 'manate/utils'
+
+export class Component extends React.Component {
+  constructor (props) {
+    super(props)
+    this.isTrigger = null
+    this.originalRender = this.render
+    this.render = this.autoRender
+
+    const originalDidMount = this.componentDidMount
+    this.componentDidMount = () => {
+      writeEmitter.on(this.handleWrite)
+      if (originalDidMount) {
+        originalDidMount.call(this)
+      }
+    }
+
+    const originalWillUnmount = this.componentWillUnmount
+    this.componentWillUnmount = () => {
+      writeEmitter.off(this.handleWrite)
+      if (originalWillUnmount) {
+        originalWillUnmount.call(this)
+      }
+    }
+  }
+
+  handleWrite = (writeLog) => {
+    if (this.isTrigger && this.isTrigger(writeLog)) {
+      this.forceUpdate()
+    }
+  }
+
+  autoRender = () => {
+    const [element, isTrigger] = run(() => {
+      return this.originalRender()
+    })
+    this.isTrigger = isTrigger
+    return element
+  }
+}

package/client/components/common/input-auto-focus.jsx

@@ -6,17 +6,21 @@ import {
 export default function InputAutoFocus (props) {
   const { type, selectall = false, ...rest } = props
   const inputRef = useRef(null)
+  const isFirstRender = useRef(true)
 
   useEffect(() => {
     if (inputRef.current) {
       const { value } = props
-      if (value && selectall) {
+      if (value && selectall && isFirstRender.current) {
+        inputRef.current.focus()
         inputRef.current.setSelectionRange(0, value.length)
+        isFirstRender.current = false
       } else {
         inputRef.current.focus()
       }
     }
-  }, [props.value, props.selectall]) // Focus when these props change
+  }, [props.value, props.selectall])
+
   let InputComponent
   switch (type) {
     case 'password':
@@ -25,11 +29,11 @@ export default function InputAutoFocus (props) {
     default:
       InputComponent = Input
   }
+
   return (
     <InputComponent
       ref={inputRef}
       {...rest}
     />
-
   )
 }

package/client/components/layout/layout.jsx

@@ -13,7 +13,6 @@ import Footer from '../footer/footer-entry'
 import SessionsWrap from '../session/sessions'
 import QuickCommandsFooterBox from '../quick-commands/quick-commands-box'
 import pixed from './pixed'
-import copy from 'json-deep-copy'
 import { pick } from 'lodash-es'
 import './layout.styl'
 
@@ -181,7 +180,7 @@ export default auto(function Layout (props) {
       'openedSideBar',
       'config'
     ]),
-    tabs: copy(store.tabs)
+    tabs: store.tabs
   }
   return [
     <Layouts {...layoutProps} key='layouts'>

package/client/components/layout/layouts.jsx

@@ -1,11 +1,10 @@
-import { memo } from 'react'
 import {
   splitConfig
 } from '../../common/constants'
 import LayoutItem from './layout-item'
 import pixed from './pixed'
 
-export default memo(function LayoutWrap (props) {
+export default function LayoutWrap (props) {
   const {
     children,
     layout,
@@ -61,4 +60,4 @@ export default memo(function LayoutWrap (props) {
       }
     </div>
   )
-})
+}

package/client/components/main/main.jsx

@@ -165,7 +165,7 @@ export default auto(function Index (props) {
       'commandLineHelp'
     ]),
     installSrc,
-    upgradeInfo
+    upgradeInfo: store.upgradeInfo
   }
   const conflictStoreProps = {
     fileTransferChanged: JSON.stringify(copiedTransfer),

package/client/components/session/session.jsx

@@ -1,7 +1,8 @@
 /**
  * terminal/sftp wrapper
  */
-import { Component, createRef } from 'react'
+import { createRef } from 'react'
+import { Component } from '../common/component'
 import Term from '../terminal/terminal.jsx'
 import Sftp from '../sftp/sftp-entry'
 import RdpSession from '../rdp/rdp-session'

package/client/components/session/sessions.jsx

@@ -1,4 +1,4 @@
-import { Component } from 'react'
+import { Component } from '../common/component'
 import Session from './session.jsx'
 
 import { pick } from 'lodash-es'

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

@@ -15,7 +15,6 @@ import TabQuickCommands from './tab-quick-commands'
 import TabSettings from './tab-settings'
 import TabThemes from './tab-themes'
 import TabProfiles from './tab-profiles'
-import deepCopy from 'json-deep-copy'
 
 const e = window.translate
 
@@ -39,8 +38,7 @@ export default auto(function SettingModalWrap (props) {
       shouldConfirmDel: tabsShouldConfirmDel.includes(settingTab),
       list: settingSidebarList
     }
-    const bookmarks = deepCopy(store.bookmarks)
-    const bookmarkGroups = deepCopy(store.bookmarkGroups)
+    const { bookmarks, bookmarkGroups } = store
     const formProps = {
       store,
       formData: settingItem,

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

@@ -69,7 +69,7 @@ export default class SettingTerminal extends Component {
     if (name === 'useSystemTitleBar') {
       message.info(e('useSystemTitleBarTip'), 8)
     } else if (name === 'sftpPathFollowSsh' && value) {
-      message.warn(e('sftpPathFollowSshTip'), 8)
+      message.warning(e('sftpPathFollowSshTip'), 8)
     }
     this.saveConfig({
       [name]: value

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

@@ -4,7 +4,6 @@
 
 import { auto } from 'manate/react'
 import TreeList from '../tree-list/tree-list'
-import deepCopy from 'json-deep-copy'
 
 export default auto(function BookmarkSelect (props) {
   const { store, from } = props
@@ -25,7 +24,7 @@ export default auto(function BookmarkSelect (props) {
     store.onSelectBookmark(item.id)
   }
   const base = {
-    bookmarks: deepCopy(bookmarks || []),
+    bookmarks: bookmarks || [],
     type: 'bookmarks',
     onClickItem,
     listStyle,
@@ -34,7 +33,7 @@ export default auto(function BookmarkSelect (props) {
   const propsTree = {
     ...base,
     shouldConfirmDel: true,
-    bookmarkGroups: deepCopy(store.getBookmarkGroupsTotal()),
+    bookmarkGroups: store.getBookmarkGroupsTotal(),
     expandedKeys,
     leftSidebarWidth,
     bookmarkGroupTree: store.bookmarkGroupTree

package/client/components/sidebar/info-modal.jsx

@@ -1,4 +1,3 @@
-import { memo } from 'react'
 import {
   GithubOutlined,
   GlobalOutlined,
@@ -16,6 +15,7 @@ import { Modal, Tabs, Button } from 'antd'
 import Link from '../common/external-link'
 import LogoElem from '../common/logo-elem'
 import RunningTime from './app-running-time'
+import { auto } from 'manate/react'
 
 import {
   packInfo,
@@ -26,7 +26,7 @@ import './info.styl'
 
 const e = window.translate
 
-export default memo(function InfoModal (props) {
+export default auto(function InfoModal (props) {
   const handleChangeTab = key => {
     window.store.infoModalTab = key
   }

package/client/components/tabs/index.jsx

@@ -2,6 +2,7 @@
  * session tabs component
  */
 
+import { Component } from '../common/component'
 import React from 'react'
 import runIdle from '../../common/run-idle'
 import { throttle } from 'lodash-es'
@@ -43,7 +44,7 @@ import classNames from 'classnames'
 
 const e = window.translate
 
-export default class Tabs extends React.Component {
+export default class Tabs extends Component {
   constructor (props) {
     super(props)
     this.tabsRef = React.createRef()

package/client/components/tabs/tab.jsx

@@ -2,7 +2,8 @@
  * file section
  */
 
-import { Component, createRef } from 'react'
+import { createRef } from 'react'
+import { Component } from '../common/component'
 import { refs } from '../common/ref'
 import {
   CloseOutlined,

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

@@ -2,7 +2,7 @@
  * tree list for bookmarks
  */
 
-import { Component } from 'react'
+import { Component } from '../common/component'
 import {
   CheckOutlined,
   CloseOutlined,

package/client/store/common.js

@@ -15,6 +15,7 @@ import {
 import * as ls from '../common/safe-local-storage'
 import { refs, refsStatic } from '../components/common/ref'
 import { action } from 'manate'
+import deepCopy from 'json-deep-copy'
 
 const e = window.translate
 const { assign } = Object
@@ -192,10 +193,11 @@ export default Store => {
     if (!profile || authType !== 'profiles') {
       return tab
     }
-    const p = window.store.profiles.find(x => x.id === profile)
+    let p = window.store.profiles.find(x => x.id === profile)
     if (!p) {
       return tab
     }
+    p = deepCopy(p)
     // delete tab.password
     // delete tab.privateKey
     // delete tab.passphrase
@@ -279,4 +281,26 @@ export default Store => {
   Store.prototype.getLangNames = function () {
     return window.et.langs.map(d => d.name)
   }
+
+  Store.prototype.fixProfiles = function () {
+    const { profiles } = window.store
+    const len = profiles.length
+    let i = len - 1
+    for (;i >= 0; i--) {
+      const f = profiles[i]
+      if (f.name) {
+        continue
+      }
+      let count = 0
+      let id = 'PROFILE' + i
+      while (profiles.find(d => d.id === id)) {
+        count = count + 1
+        id = 'PROFILE' + count
+      }
+      const np = deepCopy(f)
+      np.id = id
+      np.name = id
+      profiles[i] = np
+    }
+  }
 }

package/client/store/load-data.js

@@ -194,6 +194,7 @@ export default (Store) => {
     ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
     Object.assign(store, ext)
     await store.fixBookmarkGroups()
+    await store.fixProfiles()
 
     store.checkDefaultTheme()
     store.loadFontList()

package/package.json

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