@electerm/electerm-react 3.15.161 → 3.15.166

package/client/common/constants.js

@@ -251,6 +251,7 @@ export const checkedKeysLsKey = 'checked-keys'
 export const quickCommandLabelsLsKey = 'quick-command-label'
 export const localAddrBookmarkLsKey = 'local-addr-bookmark-keys'
 export const dismissDelKeyTipLsKey = 'dismiss-del-key-tip'
+export const treeSortLsKey = 'tree-sort'
 export const sshTunnelHelpLink = 'https://github.com/electerm/electerm/wiki/How-to-use-ssh-tunnel'
 export const proxyHelpLink = 'https://github.com/electerm/electerm/wiki/proxy-format'
 export const regexHelpLink = 'https://github.com/electerm/electerm/wiki/Terminal-keywords-highlight-regular-expression-exmaples'

package/client/common/update-check.js

@@ -69,6 +69,23 @@ export async function getLatestReleaseVersion (n) {
   }
 }
 
+export function getDownloadUrl (browserDownloadUrl, mirror) {
+  if (!browserDownloadUrl) {
+    return ''
+  }
+  if (mirror === 'gh-proxy') {
+    return `https://electerm-mirror.html5beta.com/${browserDownloadUrl}`
+  } if (mirror === 'sourceforge') {
+    const arr = browserDownloadUrl.split('/')
+    const len = arr.length
+    return `https://master.dl.sourceforge.net/project/electerm.mirror/${arr[len - 2]}/${arr[len - 1]}?viasf=1`
+  } else if (mirror === 'r2') {
+    return `https://electerm-store.html5beta.com/r/${browserDownloadUrl.split('/').pop()}`
+  } else {
+    return browserDownloadUrl
+  }
+}
+
 export async function getLatestReleaseInfo () {
   let url = `${baseUpdateCheckUrls[0]}/data/electerm-github-release.json`
   let res = await getInfo(url)
@@ -76,10 +93,14 @@ export async function getLatestReleaseInfo () {
     url = `${baseUpdateCheckUrls[1]}/data/electerm-github-release.json`
     res = await getInfo(url)
   }
-  return res && res.release
-    ? {
-        body: res.release.body,
-        date: dayjs(res.release.published_at).format('YYYY-MM-DD')
-      }
-    : undefined
+  if (!res || !res.release) {
+    return undefined
+  }
+  const { installSrc } = window.store
+  const asset = (res.release.assets || []).find(r => r.name.includes(installSrc))
+  return {
+    body: res.release.body,
+    date: dayjs(res.release.published_at).format('YYYY-MM-DD'),
+    browserDownloadUrl: asset ? asset.browser_download_url : ''
+  }
 }

package/client/components/main/upgrade.jsx

@@ -1,7 +1,7 @@
 import { PureComponent } from 'react'
 import { CloseOutlined, MinusSquareOutlined, UpCircleOutlined } from '@ant-design/icons'
 import { Button, Select, Space } from 'antd'
-import { getLatestReleaseInfo, getLatestReleaseVersion } from '../../common/update-check'
+import { getLatestReleaseInfo, getLatestReleaseVersion, getDownloadUrl } from '../../common/update-check'
 import upgrade from '../../common/upgrade'
 import compare from '../../common/version-compare'
 import Link from '../common/external-link'
@@ -136,6 +136,14 @@ export default class Upgrade extends PureComponent {
         }
       )
     }
+    if (window.et.downloadUpgradeFromBrowser) {
+      const { releaseInfo } = this.props.upgradeInfo
+      const downloadUrl = getDownloadUrl(releaseInfo?.browserDownloadUrl, this.state.mirror)
+      if (downloadUrl) {
+        window.openLink(downloadUrl)
+      }
+      return
+    }
     this.changeProps({
       upgrading: true
     })

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

@@ -9,8 +9,10 @@ import { uniq, filter, pick } from 'lodash-es'
 import {
   maxBookmarkGroupTitleLength,
   defaultBookmarkGroupId,
-  settingMap
+  settingMap,
+  treeSortLsKey
 } from '../../common/constants'
+import { getItemJSON, setItemJSON } from '../../common/safe-local-storage'
 import findParentBySel from '../../common/find-parent'
 import copy from 'json-deep-copy'
 import NewButtonsGroup from './bookmark-toolbar'
@@ -45,7 +47,7 @@ export default class ItemListTree extends Component {
       categoryColor: '',
       categoryId: '',
       searchSelectedRowKey: '',
-      sort: null
+      sort: getItemJSON(treeSortLsKey, null)
     }
     this.listRef = React.createRef()
   }
@@ -111,6 +113,7 @@ export default class ItemListTree extends Component {
   }
 
   handleSortChange = sort => {
+    setItemJSON(treeSortLsKey, sort)
     this.setState({ sort })
   }
 

package/client/store/tab.js

@@ -333,7 +333,7 @@ export default Store => {
       !newTab.host &&
       !window.store.hasNodePty
     ) {
-      if (window.et.isWebApp) {
+      if (window.et.isWebApp || window.et.hideLocalTerminal) {
         return
       }
       return message.warning(

package/package.json

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