@electerm/electerm-react 1.91.1 → 1.91.8

package/client/common/default-setting.js

@@ -63,6 +63,7 @@ export default {
   modelAI: 'deepseek-chat',
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions',
+  proxyAI: '',
   sessionLogPath: '',
   sshSftpSplitView: false,
   showCmdSuggestions: false,

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

@@ -46,7 +46,8 @@ export default function AIChat (props) {
       buildRole(),
       props.config.baseURLAI,
       props.config.apiPathAI,
-      props.config.apiKeyAI
+      props.config.apiKeyAI,
+      props.config.proxyAI
     ).catch(
       window.store.onError
     )

package/client/components/ai/ai-config-props.js

@@ -3,5 +3,7 @@ export const aiConfigsArr = [
   'modelAI',
   'roleAI',
   'apiKeyAI',
-  'apiPathAI'
+  'apiPathAI',
+  'languageAI',
+  'proxyAI'
 ]

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

@@ -26,6 +26,12 @@ const defaultRoles = [
   }
 ]
 
+const proxyOptions = [
+  { value: 'socks5://127.0.0.1:1080' },
+  { value: 'http://127.0.0.1:8080' },
+  { value: 'https://proxy.example.com:3128' }
+]
+
 export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig }) {
   const [form] = Form.useForm()
   const [modelOptions, setModelOptions] = useState([])
@@ -171,6 +177,21 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
           </AutoComplete>
         </Form.Item>
 
+        <Form.Item
+          label={e('proxy')}
+          name='proxyAI'
+          tooltip='Proxy for AI API requests (e.g., socks5://127.0.0.1:1080)'
+        >
+          <AutoComplete
+            options={proxyOptions}
+            placeholder='Enter proxy URL (optional)'
+            filterOption={filter}
+            allowClear
+          >
+            <Input />
+          </AutoComplete>
+        </Form.Item>
+
         <Form.Item>
           <Button type='primary' htmlType='submit'>
             {e('save')}

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

@@ -21,7 +21,8 @@ function buildTreeData (bookmarkGroups, tree) {
     const y = {
       key: x.id,
       value: x.id,
-      title: x.title
+      title: x.title,
+      selectable: false // Make categories non-selectable
     }
     y.children = [
       ...(x.bookmarkGroupIds || []).map(buildSubCats),
@@ -49,6 +50,7 @@ function buildTreeData (bookmarkGroups, tree) {
         title: d.title,
         value: d.id,
         key: d.id,
+        selectable: false, // Make categories non-selectable
         children: [
           ...(d.bookmarkGroupIds || []).map(buildSubCats),
           ...(d.bookmarkIds || []).map(buildLeaf)
@@ -82,13 +84,26 @@ export default function BookmarkSelect (props) {
       props.onSelect(item)
     }
   }
+
+  // Custom filter function to only match leaf nodes
+  function filterTreeNode (inputValue, treeNode) {
+    // Skip filtering for category nodes
+    if (treeNode.selectable === false) {
+      return false
+    }
+
+    // Match against searchText which includes both title and host
+    return treeNode.title && treeNode.title.toLowerCase().includes(inputValue.toLowerCase())
+  }
+
   const treeData = buildTreeData(bookmarkGroups, tree)
   const treeProps = {
     treeData,
     onChange: onSelect,
     placeholder: e('chooseFromBookmarks'),
     showSearch: true,
-    value: undefined
+    value: undefined,
+    filterTreeNode
   }
   return (
     <TreeSelect {...treeProps} />

package/client/components/sys-menu/menu-btn.jsx

@@ -27,10 +27,6 @@ class MenuBtn extends PureComponent {
     window.store.addTab()
   }
 
-  onNewWindow = () => {
-    window.store.onNewWindow()
-  }
-
   openAbout = () => {
     window.store.openAbout()
   }
@@ -80,11 +76,6 @@ class MenuBtn extends PureComponent {
         icon: 'RightSquareFilled',
         text: e('newTab')
       },
-      {
-        func: 'onNewWindow',
-        icon: 'WindowsOutlined',
-        text: e('newWindow')
-      },
       // {
       //   type: 'hr'
       // },

package/client/store/common.js

@@ -314,7 +314,7 @@ export default Store => {
   }
 
   Store.prototype.aiConfigMissing = function () {
-    return aiConfigsArr.some(k => !window.store.config[k])
+    return aiConfigsArr.slice(0, -1).some(k => !window.store.config[k])
   }
 
   Store.prototype.addCmdHistory = action(function (cmd) {

package/client/store/sync.js

@@ -512,7 +512,9 @@ export default (Store) => {
       'dataSyncSelected',
       'baseURLAI',
       'modelAI',
-      'roleAI'
+      'roleAI',
+      'languageAI',
+      'proxyAI'
     ]
     return pick(store.config, configSyncKeys)
   }

package/client/store/system-menu.js

@@ -61,10 +61,6 @@ export default Store => {
     store.openSettingModal()
   }
 
-  Store.prototype.onNewWindow = async function () {
-    window.pre.runGlobalAsync('openNewInstance')
-  }
-
   Store.prototype.confirmExit = function (type) {
     const { store } = window
     let mod = null

package/package.json

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