@electerm/electerm-react 1.91.1 → 1.91.16

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-history-item.jsx

@@ -7,17 +7,31 @@ import {
 import {
   UserOutlined,
   CopyOutlined,
-  CloseOutlined
+  CloseOutlined,
+  CaretDownOutlined,
+  CaretRightOutlined
 } from '@ant-design/icons'
 import { copy } from '../../common/clipboard'
+import { useState } from 'react'
 
 export default function AIChatHistoryItem ({ item }) {
+  const [showOutput, setShowOutput] = useState(true)
   const {
     prompt
   } = item
+
+  function toggleOutput () {
+    setShowOutput(!showOutput)
+  }
+
   const alertProps = {
     message: (
-      <><UserOutlined />: {prompt}</>
+      <>
+        <span className='pointer mg1r' onClick={toggleOutput}>
+          {showOutput ? <CaretDownOutlined /> : <CaretRightOutlined />}
+        </span>
+        <UserOutlined />: {prompt}
+      </>
     ),
     type: 'info'
   }
@@ -63,7 +77,7 @@ export default function AIChatHistoryItem ({ item }) {
           <Alert {...alertProps} />
         </Tooltip>
       </div>
-      <AIOutput item={item} />
+      {showOutput && <AIOutput item={item} />}
     </div>
   )
 }

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/ai/ai-output.jsx

@@ -1,15 +1,13 @@
-import { useState, useMemo } from 'react'
 import ReactMarkdown from 'react-markdown'
 import { copy } from '../../common/clipboard'
 import Link from '../common/external-link'
 import { Tag } from 'antd'
-import { CopyOutlined, PlayCircleOutlined, DownCircleOutlined } from '@ant-design/icons'
+import { CopyOutlined, PlayCircleOutlined } from '@ant-design/icons'
 import getBrand from './get-brand'
 
 const e = window.translate
 
 export default function AIOutput ({ item }) {
-  const [showFull, setShowFull] = useState(false)
   const {
     response,
     baseURLAI
@@ -20,18 +18,6 @@ export default function AIOutput ({ item }) {
 
   const { brand, brandUrl } = getBrand(baseURLAI)
 
-  const truncatedResponse = useMemo(() => {
-    if (!response) return ''
-    const codeBlockRegex = /```[\s\S]*?```/
-    const match = response.match(codeBlockRegex)
-    if (match) {
-      const index = match.index + match[0].length
-      return response.slice(0, index) + '\n\n... ...'
-    }
-    // If no code block found, show first 5 lines
-    return response.split('\n').slice(0, 5).join('\n') + '\n\n... ...'
-  }, [response])
-
   const renderCode = (props) => {
     const { node, className = '', children, ...rest } = props
     const code = String(children).replace(/\n$/, '')
@@ -87,22 +73,8 @@ export default function AIOutput ({ item }) {
     )
   }
 
-  function renderShowMore () {
-    if (showFull) {
-      return null
-    }
-    return (
-      <span
-        onClick={() => setShowFull(true)}
-        className='mg1t pointer'
-      >
-        <DownCircleOutlined /> {e('fullContent')}
-      </span>
-    )
-  }
-
   const mdProps = {
-    children: showFull ? response : truncatedResponse,
+    children: response,
     components: {
       code: renderCode
     }
@@ -112,7 +84,6 @@ export default function AIOutput ({ item }) {
     <div className='pd1'>
       {renderBrand()}
       <ReactMarkdown {...mdProps} />
-      {renderShowMore()}
     </div>
   )
 }

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/components/sys-menu/sys-menu.jsx

@@ -77,9 +77,12 @@ export default class ContextMenu extends PureComponent {
     if (type === 'hr') {
       return <hr />
     }
-    const baseCls = 'context-item'
+    let baseCls = 'context-item'
     if (module && this.modules[module]) {
       const Mod = this.modules[module]
+      if (module === 'Zoom') {
+        baseCls = 'context-item zoom-item'
+      }
       return (
         <div className={baseCls}>
           <Mod {...this.props} />

package/client/components/sys-menu/sys-menu.styl

@@ -20,6 +20,11 @@
       color #777
       background #333
       cursor not-allowed
+  &.zoom-item
+    height 36px
+    line-height 36px
+    &:hover
+      background transparent
 
 .context-sub-text
   position absolute

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

@@ -385,6 +385,7 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
+    console.log('tar', target, tar)
     const dataDragged = e.dataTransfer.getData('idDragged')
     const [idDragged, pidDrags, isGroupDragged] = dataDragged.split('@')
     const isGroupDrag = isGroupDragged === 'true'
@@ -395,7 +396,6 @@ export default class ItemListTree extends Component {
     const pidDrops = target.getAttribute('data-parent-id') || ''
     const pidDropsArr = pidDrops.split('#')
     const pidDrop = pidDropsArr[pidDropsArr.length - 1]
-
     // can not drag item to its own children
     if (
       (idDragged === 'default' &&
@@ -404,7 +404,8 @@ export default class ItemListTree extends Component {
         pidDrop &&
         pidDrags !== pidDrops &&
         pidDrops.includes(idDragged)
-      )
+      ) ||
+      idDragged === idDrop
     ) {
       return
     }

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.16",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",