@electerm/electerm-react 3.9.15 → 3.10.0

package/client/common/default-setting.js

@@ -64,7 +64,7 @@ export default {
   ],
   hideIP: false,
   dataSyncSelected: 'all',
-  baseURLAI: 'https://api.deepseek.com',
+  baseURLAI: 'https://api.atlascloud.ai/v1',
   modelAI: 'deepseek-chat',
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions',
@@ -75,5 +75,6 @@ export default {
   autoReconnectTerminal: false,
   startDirectoryLocal: '',
   allowMultiInstance: false,
-  disableDeveloperTool: false
+  disableDeveloperTool: false,
+  dragDropBehavior: 'ask'
 }

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

@@ -36,6 +36,7 @@ const proxyOptions = [
 
 export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig }) {
   const [form] = Form.useForm()
+  const baseURLAI = Form.useWatch('baseURLAI', form)
 
   useEffect(() => {
     if (initialValues) {
@@ -67,6 +68,13 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
     return { label, title }
   }
 
+  function renderApiUrlLabel () {
+    if (baseURLAI === 'https://api.atlascloud.ai/v1') {
+      return <span>API URL (<Link to='https://atlascloud.ai'>AtlasCloud</Link>)</span>
+    }
+    return 'API URL'
+  }
+
   if (!showAIConfig) {
     return null
   }
@@ -90,7 +98,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         layout='vertical'
         className='ai-config-form'
       >
-        <Form.Item label='API URL' required>
+        <Form.Item label={renderApiUrlLabel()} required>
           <Space.Compact className='width-100'>
             <Form.Item
               label='API URL'

package/client/components/batch-op/batch-op-runner.jsx

@@ -1,5 +1,5 @@
 import { Component } from 'react'
-import { refsStatic } from '../common/ref'
+import { refsStatic, refs } from '../common/ref'
 import { statusMap } from '../../common/constants'
 import { autoRun } from 'manate'
 import uid from '../../common/uid'
@@ -237,7 +237,6 @@ export default class BatchOpRunner extends Component {
       throw new Error('No active tab. Please connect first.')
     }
 
-    const { refs } = await import('../common/ref')
     const term = refs.get('term-' + tabId)
     if (!term || !term.term) {
       throw new Error('Terminal not found')

package/client/components/bookmark-form/common/bookmark-group-tree-format.js

@@ -21,7 +21,7 @@ export default (bookmarkGroups = [], disabledId = '', returnMap = false, current
     }
     return y
   }
-  const level1 = bookmarkGroups.filter(d => d.level !== 2)
+  const level1 = bookmarkGroups.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const r = {
         title: d.title,

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

@@ -38,7 +38,7 @@ function buildTreeData (bookmarkGroups, tree) {
     if (!x) return ''
     return { value: x.id, key: x.id, title: createTitle(x) }
   }
-  const level1 = cats.filter(d => d.level !== 2)
+  const level1 = cats.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const r = {
         title: d.title,

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

@@ -79,7 +79,7 @@ function buildData (bookmarks, bookmarkGroups, searchText = '') {
       title: createTitleWithTag(x)
     }
   }
-  const level1 = cats.filter(d => d.level !== 2)
+  const level1 = cats.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const children = [
         ...(d.bookmarkGroupIds || []).map(buildSubCats),

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

@@ -84,6 +84,7 @@ export default class SettingTerminal extends Component {
 
   handleChangeDelMode = v => this.onChangeValue(v, 'backspaceMode')
   handleChangeRenderType = v => this.onChangeValue(v, 'rendererType')
+  handleChangeDragDropBehavior = v => this.onChangeValue(v, 'dragDropBehavior')
 
   handleChangeFont = (values) => {
     this.onChangeValue(
@@ -471,6 +472,7 @@ export default class SettingTerminal extends Component {
     const {
       rendererType,
       backspaceMode = '^?',
+      dragDropBehavior = 'ask',
       keywords = [{ color: 'red' }]
     } = this.props.config
     const {
@@ -593,6 +595,16 @@ export default class SettingTerminal extends Component {
             'autoReconnectTerminal'
           ].map(d => this.renderToggle(d))
         }
+        <div className='pd1b'>{e('dragDropBehavior')}</div>
+        <Select
+          onChange={this.handleChangeDragDropBehavior}
+          value={dragDropBehavior}
+          popupMatchSelectWidth={false}
+        >
+          {['ask', 'trz', 'rz', 'inputOnly'].map(id => (
+            <Option key={id} value={id}>{e(id)}</Option>
+          ))}
+        </Select>
         <div className='pd1b'>{e('terminalBackSpaceMode')}</div>
         <Select
           onChange={this.handleChangeDelMode}

package/client/components/setting-panel/start-session-select.jsx

@@ -65,7 +65,7 @@ function BookmarkSelect (props) {
         title: createTitleWithTag(x)
       }
     }
-    const level1 = cats.filter(d => d.level !== 2)
+    const level1 = cats.filter(d => d.level === 1 || !d.level)
       .map(d => {
         const r = {
           title: d.title,

package/client/components/terminal/drop-file-modal.jsx

@@ -26,21 +26,21 @@ export class DropFileModal extends Component {
             <button
               type='button'
               className='custom-modal-ok-btn'
-              onClick={() => onSelect('trzUpload')}
+              onClick={() => onSelect('trz')}
             >
               trz
             </button>
             <button
               type='button'
               className='custom-modal-cancel-btn'
-              onClick={() => onSelect('rzUpload')}
+              onClick={() => onSelect('rz')}
             >
               rz
             </button>
             <button
               type='button'
               className='custom-modal-cancel-btn'
-              onClick={() => onSelect('inputPath')}
+              onClick={() => onSelect('inputOnly')}
             >
               {e('inputOnly')}
             </button>

package/client/components/terminal/terminal-apis.js

@@ -41,3 +41,11 @@ export function toggleTerminalLogTimestamp (pid) {
     action: 'toggle-terminal-log-timestamp'
   })
 }
+
+export function setTerminalLogPath (pid, logPath) {
+  return fetch({
+    pid,
+    logPath,
+    action: 'set-terminal-log-path'
+  })
+}

package/client/components/terminal/terminal-interactive.jsx

@@ -48,6 +48,13 @@ export default function TermInteractive () {
   function onOk () {
     form.submit()
   }
+  function onConfirm () {
+    window.et.commonWs.s({
+      id: opts.id,
+      results: [opts.options.confirmResult || 'yes']
+    })
+    clear()
+  }
   function onIgnore () {
     window.et.commonWs.s({
       id: opts.id,
@@ -91,6 +98,32 @@ export default function TermInteractive () {
       </FormItem>
     )
   }
+  function renderConfirmBody () {
+    const instructions = opts.options.instructions || []
+    return (
+      <div>
+        {
+          instructions.map((note, index) => {
+            return <pre key={note + index}>{note}</pre>
+          })
+        }
+        <FormItem>
+          <Button
+            type='primary'
+            onClick={onConfirm}
+          >
+            {opts.options.submitText || e('submit')}
+          </Button>
+          <Button
+            className='mg1l'
+            onClick={onCancel}
+          >
+            {opts.options.cancelText || e('cancel')}
+          </Button>
+        </FormItem>
+      </div>
+    )
+  }
   async function initWatch () {
     let done = false
     while (!done) {
@@ -125,36 +158,42 @@ export default function TermInteractive () {
     <Modal
       {...props}
     >
-      <Form
-        form={form}
-        layout='vertical'
-        onFinish={onFinish}
-      >
-        {
-          opts.options.prompts.map(renderFormItem)
-        }
-        <FormItem>
-          <Button
-            type='primary'
-            htmlType='submit'
-          >
-            {e('submit')}
-          </Button>
-          <Button
-            type='dashed'
-            className='mg1l'
-            onClick={onIgnore}
-          >
-            {e('ignore')}
-          </Button>
-          <Button
-            className='mg1l'
-            onClick={onCancel}
-          >
-            {e('cancel')}
-          </Button>
-        </FormItem>
-      </Form>
+      {
+        opts.options?.mode === 'confirm'
+          ? renderConfirmBody()
+          : (
+            <Form
+              form={form}
+              layout='vertical'
+              onFinish={onFinish}
+            >
+              {
+                opts.options.prompts.map(renderFormItem)
+              }
+              <FormItem>
+                <Button
+                  type='primary'
+                  htmlType='submit'
+                >
+                  {e('submit')}
+                </Button>
+                <Button
+                  type='dashed'
+                  className='mg1l'
+                  onClick={onIgnore}
+                >
+                  {e('ignore')}
+                </Button>
+                <Button
+                  className='mg1l'
+                  onClick={onCancel}
+                >
+                  {e('cancel')}
+                </Button>
+              </FormItem>
+            </Form>
+            )
+      }
     </Modal>
   )
 }

package/client/components/terminal/terminal.jsx

@@ -70,6 +70,7 @@ class Term extends Component {
       hasSelection: false,
       saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
       addTimeStampToTermLog: !!this.props.config.addTimeStampToTermLog,
+      logPath: this.props.config.sessionLogPath || createDefaultLogPath(),
       passType: 'password',
       lines: [],
       searchResults: [],
@@ -400,10 +401,15 @@ class Term extends Component {
           return
         }
         if (isSshTerminal) {
-          this.setState({
-            dropFileModalVisible: true,
-            droppedFiles: [{ path: filePath, isRemote: true }]
-          })
+          const behavior = this.props.config.dragDropBehavior || 'ask'
+          if (behavior === 'ask') {
+            this.setState({
+              dropFileModalVisible: true,
+              droppedFiles: [{ path: filePath, isRemote: true }]
+            })
+          } else {
+            this.handleDropFileAction(behavior, [{ path: filePath, isRemote: true }])
+          }
           return
         }
         this.attachAddon._sendData(`"${filePath}" `)
@@ -425,10 +431,15 @@ class Term extends Component {
       }
 
       if (isSshTerminal) {
-        this.setState({
-          dropFileModalVisible: true,
-          droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
-        })
+        const behavior = this.props.config.dragDropBehavior || 'ask'
+        if (behavior === 'ask') {
+          this.setState({
+            dropFileModalVisible: true,
+            droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
+          })
+        } else {
+          this.handleDropFileAction(behavior, filePaths.map(path => ({ path, isRemote: false })))
+        }
         return
       }
 
@@ -444,8 +455,8 @@ class Term extends Component {
     })
   }
 
-  handleDropFileAction = (action) => {
-    const { droppedFiles } = this.state
+  handleDropFileAction = (action, filesOverride) => {
+    const droppedFiles = filesOverride || this.state.droppedFiles
     if (!droppedFiles || !droppedFiles.length) {
       this.handleDropFileModalCancel()
       return
@@ -454,7 +465,7 @@ class Term extends Component {
     const filePaths = droppedFiles.map(f => f.path)
 
     switch (action) {
-      case 'trzUpload': {
+      case 'trz': {
         if (this.trzszClient && this.trzszClient.isActive) {
           message.warning('A transfer is already in progress')
           this.handleDropFileModalCancel()
@@ -464,7 +475,7 @@ class Term extends Component {
         this.attachAddon._sendData('trz\r')
         break
       }
-      case 'rzUpload': {
+      case 'rz':{
         if (this.zmodemClient && this.zmodemClient.isActive) {
           message.warning('A transfer is already in progress')
           this.handleDropFileModalCancel()
@@ -474,7 +485,7 @@ class Term extends Component {
         this.attachAddon._sendData('rz\r')
         break
       }
-      case 'inputPath':
+      case 'inputOnly':
       default: {
         const filesAll = filePaths.map(path => `"${path}"`).join(' ')
         this.attachAddon._sendData(filesAll)
@@ -825,6 +836,9 @@ class Term extends Component {
       if (currentCmd && currentCmd.trim() && this.shouldUseManualHistory()) {
         window.store.addCmdHistory(currentCmd.trim())
       }
+      if (currentCmd && currentCmd.trim() === 'exit') {
+        this.userTypeExit = true
+      }
       this.closeSuggestions()
     }
   }
@@ -1223,7 +1237,7 @@ class Term extends Component {
       ...extra,
       ...execOpts,
       logName,
-      sessionLogPath: config.sessionLogPath || createDefaultLogPath(),
+      sessionLogPath: this.state.logPath,
       ...pick(config, [
         'addTimeStampToTermLog',
         'keepaliveCountMax',

package/client/components/terminal-info/base.jsx

@@ -2,15 +2,13 @@
  * show base terminal info, id sessionID
  */
 import { Component } from 'react'
-import { osResolve } from '../../common/resolve'
 import {
   Switch,
   Space,
   Button
 } from 'antd'
-import ShowItem from '../common/show-item'
 import defaults from '../../common/default-setting'
-import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
+import { toggleTerminalLog, toggleTerminalLogTimestamp, setTerminalLogPath } from '../terminal/terminal-apis'
 import {
   ClockCircleOutlined,
   BorderlessTableOutlined,
@@ -19,8 +17,8 @@ import {
   ApiOutlined,
   PartitionOutlined
 } from '@ant-design/icons'
-import createDefaultSessionLogPath from '../../common/default-log-path'
 import { refs } from '../common/ref'
+import LogPathEdit from './log-path-edit'
 
 const e = window.translate
 
@@ -36,7 +34,8 @@ const mapper = {
 export default class TerminalInfoBase extends Component {
   state = {
     saveTerminalLogToFile: false,
-    addTimeStampToTermLog: false
+    addTimeStampToTermLog: false,
+    logPath: ''
   }
 
   componentDidMount () {
@@ -75,6 +74,17 @@ export default class TerminalInfoBase extends Component {
     })
   }
 
+  onLogPathChange = (v) => {
+    const { pid } = this.props
+    setTerminalLogPath(pid, v)
+    refs.get('term-' + pid)?.setState({
+      logPath: v
+    })
+    this.setState({
+      logPath: v
+    })
+  }
+
   handleToggle = () => {
     const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
     const {
@@ -101,7 +111,8 @@ export default class TerminalInfoBase extends Component {
     if (term) {
       this.setState({
         saveTerminalLogToFile: term.state.saveTerminalLogToFile,
-        addTimeStampToTermLog: term.state.addTimeStampToTermLog
+        addTimeStampToTermLog: term.state.addTimeStampToTermLog,
+        logPath: term.state.logPath
       })
     } else {
       this.timer = setTimeout(this.getState, 100)
@@ -156,15 +167,10 @@ export default class TerminalInfoBase extends Component {
     const {
       id,
       logName,
-      sessionLogPath
+      pid
     } = this.props
-    const { saveTerminalLogToFile } = this.state
-    const base = sessionLogPath || createDefaultSessionLogPath()
-    const path = osResolve(base, logName + '.log')
+    const { saveTerminalLogToFile, logPath } = this.state
     const name = e('saveTerminalLogToFile')
-    const to = saveTerminalLogToFile
-      ? <ShowItem disabled={!saveTerminalLogToFile} to={path}>{path}</ShowItem>
-      : path
     return (
       <div className='terminal-info-section terminal-info-base'>
         <div className='fix'>
@@ -187,7 +193,12 @@ export default class TerminalInfoBase extends Component {
             this.renderInfoSelection()
           }
         </div>
-        <p><b>log:</b> {to}</p>
+        <LogPathEdit
+          pid={pid}
+          logPath={logPath}
+          logName={logName}
+          setLogPath={this.onLogPathChange}
+        />
       </div>
     )
   }

package/client/components/terminal-info/log-path-edit.jsx

@@ -0,0 +1,86 @@
+/**
+ * Per-terminal log path editor
+ * Reads/writes logPath on the terminal's own state via refs
+ */
+import { Button } from 'antd'
+import message from '../common/message'
+import InputConfirm from '../common/input-confirm'
+import ShowItem from '../common/show-item'
+import { chooseSaveDirectory } from '../../common/choose-save-folder'
+import createDefaultLogPath from '../../common/default-log-path'
+import { osResolve } from '../../common/resolve'
+
+const e = window.translate
+
+export default function LogPathEdit ({ pid, logPath, logName, setLogPath }) {
+  const defaultPath = createDefaultLogPath()
+  const base = logPath || defaultPath
+  const fullPath = osResolve(base, logName + '.log')
+
+  const testAndSet = async (v) => {
+    if (v) {
+      try {
+        const { fs } = window
+        const uid = 'test-' + Date.now()
+        const testFile = osResolve(v, uid + '.test.log')
+        await fs.touch(testFile)
+        await fs.unlink(testFile)
+      } catch (err) {
+        console.log('log path test failed', err)
+        message.error('invalid log folder')
+        return
+      }
+    }
+    setLogPath(v)
+  }
+
+  const handleChange = (v) => {
+    testAndSet(v)
+  }
+
+  const handleChooseFolder = async () => {
+    const path = await chooseSaveDirectory()
+    if (path) {
+      handleChange(path)
+    }
+  }
+
+  const handleReset = () => {
+    setLogPath('')
+  }
+
+  const inputProps = {
+    value: logPath,
+    placeholder: defaultPath,
+    onChange: handleChange,
+    addonAfter: (
+      <>
+        <Button
+          onClick={handleChooseFolder}
+          className='mg1r'
+          type='text'
+          size='small'
+        >
+          {e('chooseFolder')}
+        </Button>
+        <Button
+          size='small'
+          type='text'
+          onClick={handleReset}
+        >
+          {e('reset')}
+        </Button>
+      </>
+    ),
+    prefix: e('terminalLogPath') + ': '
+  }
+
+  return (
+    <div className='pd1b'>
+      <InputConfirm {...inputProps} />
+      <div className='pd1t font-xs color-grey'>
+        {fullPath} <ShowItem to={fullPath} />
+      </div>
+    </div>
+  )
+}

package/client/components/widgets/widget-form.jsx

@@ -50,6 +50,9 @@ export default function WidgetForm ({ widget, onSubmit, loading, hasRunningInsta
       case 'string':
         control = <Input placeholder={description} />
         break
+      case 'textarea':
+        control = <Input.TextArea autoSize={{ minRows: 3 }} placeholder={description} />
+        break
       case 'number':
         control = <InputNumber style={{ width: '100%' }} placeholder={description} />
         break

package/package.json

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