@electerm/electerm-react 2.5.16 → 2.7.6

package/client/common/constants.js

@@ -242,7 +242,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 rdpWikiLink = 'https://github.com/electerm/electerm/wiki/RDP-limitation'
 export const vncWikiLink = 'https://github.com/electerm/electerm/wiki/VNC-session-known-issues'
 export const modals = {
   hide: 0,

package/client/common/create-title.jsx

@@ -22,12 +22,12 @@ export default function createTitle (res, hide = true) {
     return ''
   }
   const {
-    host, port, username, title, type,
+    host, port, username, title, type, url,
     path, connectionHoppings, sshTunnels
   } = res
   const h = hide && window.store.config.hideIP ? maskHost(host) : host
   const fixTitle = `${username || ''}@${h}:${port}`
-  const extra = host || path ? (path || fixTitle) : ''
+  const extra = host || path ? (path || fixTitle) : (url || '')
   let f = title
     ? `${title}` + (extra ? ` - ${extra}` : '')
     : extra

package/client/common/download.jsx

@@ -6,22 +6,22 @@ import ShowItem from '../components/common/show-item'
 import { chooseSaveDirectory } from './choose-save-folder'
 import { DownloadOutlined } from '@ant-design/icons'
 
-function downloadForBrowser (filename, text) {
-  const blob = new Blob([text], { type: 'text/plain;charset=utf-8' })
-  const url = URL.createObjectURL(blob)
-  const a = document.createElement('a')
-  a.href = url
-  a.download = filename
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
-  URL.revokeObjectURL(url)
-}
+// function downloadForBrowser (filename, text) {
+//   const blob = new Blob([text], { type: 'text/plain;charset=utf-8' })
+//   const url = URL.createObjectURL(blob)
+//   const a = document.createElement('a')
+//   a.href = url
+//   a.download = filename
+//   document.body.appendChild(a)
+//   a.click()
+//   document.body.removeChild(a)
+//   URL.revokeObjectURL(url)
+// }
 
 export default async function download (filename, text) {
-  if (window.et.isWebApp) {
-    return downloadForBrowser(filename, text)
-  }
+  // if (window.et.isWebApp) {
+  //   return downloadForBrowser(filename, text)
+  // }
   const savePath = await chooseSaveDirectory()
   if (!savePath) {
     return

package/client/components/bookmark-form/common/encodes.js

@@ -1,6 +1,7 @@
 export default [
   'utf-8',
   'gbk',
+  'gb2312',
   'gb18030',
   'hz-gb-2312',
   'big5',

package/client/components/bookmark-form/config/common-fields.js

@@ -9,6 +9,32 @@ import { isEmpty } from 'lodash-es'
 
 const e = window.translate
 
+const commonLangOptions = [
+  'zh_CN.GBK',
+  'C',
+  'POSIX',
+  'C.UTF-8',
+  'en_US.UTF-8',
+  'en_US',
+  'en_GB.UTF-8',
+  'fr_FR.UTF-8',
+  'de_DE.UTF-8',
+  'es_ES.UTF-8',
+  'it_IT.UTF-8',
+  'pt_BR.UTF-8',
+  'pt_PT.UTF-8',
+  'zh_CN.UTF-8',
+  'zh_CN.GB2312',
+  'zh_TW.UTF-8',
+  'zh_HK.UTF-8',
+  'zh_SG.UTF-8',
+  'ja_JP.UTF-8',
+  'ja_JP.eucJP',
+  'ko_KR.UTF-8',
+  'ru_RU.UTF-8',
+  'ar_SA.UTF-8'
+].map(l => ({ label: l, value: l }))
+
 // Common individual fields
 export const commonFields = {
   // Basic connection fields
@@ -118,10 +144,11 @@ export const commonFields = {
 
   // Terminal UI settings
   envLang: {
-    type: 'input',
+    type: 'autocomplete',
     name: 'envLang',
     label: 'ENV:LANG',
     rules: [{ max: 130, message: '130 chars max' }],
+    options: commonLangOptions,
     props: { placeholder: 'en_US.UTF-8' }
   },
 
@@ -217,7 +244,6 @@ export const commonFields = {
 
 // Common field groups for settings tabs
 export const terminalSettings = [
-  commonFields.envLang,
   commonFields.terminalType,
   commonFields.proxy,
   commonFields.displayRaw,
@@ -281,6 +307,7 @@ export const sshAuthFields = [
   commonFields.startDirectoryLocal,
   commonFields.startDirectory,
   commonFields.interactiveValues,
+  commonFields.envLang,
   commonFields.encode,
   commonFields.type
 ]

package/client/components/common/zoom-control.jsx

@@ -0,0 +1,58 @@
+import React from 'react'
+import InputNumberConfirm from './input-number-confirm'
+import {
+  Space
+} from 'antd'
+import {
+  MinusCircleOutlined,
+  PlusCircleOutlined
+} from '@ant-design/icons'
+
+export default function ZoomControl (props) {
+  const {
+    value,
+    onChange,
+    min = 0.25,
+    max = 5,
+    step = 0.25
+  } = props
+
+  const handleChange = (v) => {
+    onChange(v / 100)
+  }
+
+  const handleAdd = () => {
+    let next = value + step
+    if (next > max) next = max
+    onChange(next)
+  }
+
+  const handleMinus = () => {
+    let next = value - step
+    if (next < min) next = min
+    onChange(next)
+  }
+
+  return (
+    <InputNumberConfirm
+      value={Math.round(value * 100)}
+      onChange={handleChange}
+      step={1}
+      min={min * 100}
+      max={max * 100}
+      suffix='%'
+      addonBefore={
+        <Space.Compact>
+          <PlusCircleOutlined
+            onClick={handleAdd}
+            className='mg1r pointer font16'
+          />
+          <MinusCircleOutlined
+            onClick={handleMinus}
+            className='pointer font16 mg1r'
+          />
+        </Space.Compact>
+      }
+    />
+  )
+}