@electerm/electerm-react 1.37.28 → 1.37.38

package/client/common/resolve.js

@@ -6,7 +6,11 @@
  */
 
 export default (basePath, nameOrDot) => {
-  const sep = basePath.includes('\\') || basePath.includes(':\\') || /^[a-z]+:$/i.test(basePath)
+  const sep = (basePath.includes('\\') ||
+  basePath.includes(':\\') ||
+  /^[a-z]+:$/i.test(basePath) ||
+  /^[a-z]+:$/i.test(nameOrDot)
+  )
     ? '\\'
     : '/'
   if (nameOrDot === '..') {
@@ -18,12 +22,15 @@ export default (basePath, nameOrDot) => {
     const res = arr.slice(0, length - 1).join(sep)
     return res || '/'
   }
-  const pre = nameOrDot.includes(':\\') && basePath === '/'
+  const pre = (nameOrDot.includes(':\\') || /^[a-z]+:$/i.test(nameOrDot)) && basePath === '/'
     ? ''
     : basePath
-  return pre +
-    (basePath.endsWith(sep) ? '' : sep) +
-    nameOrDot
+  const mid = (basePath.endsWith(sep) ? '' : sep)
+  let ff = pre + mid + nameOrDot
+  if (/^\\[a-z]+:$/i.test(ff)) {
+    ff = ff.slice(1)
+  }
+  return ff
 }
 
 export const osResolve = (...args) => {

package/client/components/main/upgrade.jsx

@@ -60,7 +60,7 @@ export default class Upgrade extends PureComponent {
           showCount: old.showCount + 1
         }
       })
-      this.getLatestRelease(true)
+      this.getLatestRelease(e.data.noSkip)
     }
   }
 
@@ -90,7 +90,7 @@ export default class Upgrade extends PureComponent {
     clearTimeout(this.downloadTimer)
     if (upgradePercent >= 100) {
       this.update && this.update.destroy()
-      return this.close()
+      return this.handleClose()
     }
     this.changeProps({
       upgradePercent
@@ -126,7 +126,7 @@ export default class Upgrade extends PureComponent {
   }
 
   onEnd = () => {
-    this.close()
+    this.handleClose()
   }
 
   doUpgrade = async () => {
@@ -154,8 +154,10 @@ export default class Upgrade extends PureComponent {
   }
 
   handleSkipVersion = () => {
-    window.store.config.skipVersion = this.props.upgradeInfo.remoteVersion
-    this.close()
+    window.store.setConfig({
+      skipVersion: this.props.upgradeInfo.remoteVersion
+    })
+    this.handleClose()
   }
 
   getLatestRelease = async (noSkipVersion = false) => {

package/client/store/app-upgrade.js

@@ -5,9 +5,10 @@
 import { commonActions } from '../common/constants'
 
 export default Store => {
-  Store.prototype.onCheckUpdate = () => {
+  Store.prototype.onCheckUpdate = (noSkip = true) => {
     window.postMessage({
-      action: commonActions.appUpdateCheck
+      action: commonActions.appUpdateCheck,
+      noSkip
     }, '*')
   }
   Store.prototype.getProxySetting = function () {

package/client/store/load-data.js

@@ -185,7 +185,7 @@ export default (Store) => {
     }
     store.initCommandLine().catch(store.onError)
     if (store.config.checkUpdateOnStart) {
-      store.onCheckUpdate()
+      store.onCheckUpdate(false)
     }
   }
   Store.prototype.initCommandLine = async function () {

package/package.json

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