@electerm/electerm-react 1.60.36 → 1.60.48

package/client/common/data-compare.js

@@ -4,6 +4,9 @@
  * @param {Array} newArr - New array of objects to compare against
  * @returns {Object} Object containing arrays of items to update, add, and remove
  */
+
+import deepCopy from 'json-deep-copy'
+
 export default function compare (oldArr, newArr) {
   if (!oldArr || !newArr) {
     return {
@@ -48,8 +51,8 @@ export default function compare (oldArr, newArr) {
     }
   }
   return {
-    updated,
-    added,
-    removed
+    updated: deepCopy(updated),
+    added: deepCopy(added),
+    removed: deepCopy(removed)
   }
 }

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/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/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/store/common.js

@@ -300,7 +300,7 @@ export default Store => {
       const np = deepCopy(f)
       np.id = id
       np.name = id
-      profiles[i] = np
+      profiles.splice(i, 1, np)
     }
   }
 }

package/client/store/load-data.js

@@ -193,9 +193,6 @@ export default (Store) => {
       })
     ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
     Object.assign(store, ext)
-    await store.fixBookmarkGroups()
-    await store.fixProfiles()
-
     store.checkDefaultTheme()
     store.loadFontList()
     store.fetchItermThemes()
@@ -203,6 +200,13 @@ export default (Store) => {
     store.fetchSshConfigItems()
     store.initCommandLine().catch(store.onError)
     initWatch(store)
+    setTimeout(
+      () => {
+        store.fixProfiles()
+        store.fixBookmarkGroups()
+      },
+      1000
+    )
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate(false)
     }

package/package.json

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