@electerm/electerm-react 1.37.20 → 1.37.36

package/client/common/resolve.js

@@ -6,7 +6,7 @@
  */
 
 export default (basePath, nameOrDot) => {
-  const sep = basePath.includes('\\') || basePath.includes(':\\')
+  const sep = basePath.includes('\\') || basePath.includes(':\\') || /^[a-z]+:$/i.test(basePath)
     ? '\\'
     : '/'
   if (nameOrDot === '..') {

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/components/tabs/app-drag.jsx

@@ -6,7 +6,7 @@ export default function AppDrag (props) {
     if (
       target instanceof window.SVGElement ||
       target.classList.contains('tab-title') ||
-      target.classList.contains('tab-title')
+      target.classList.contains('ant-tooltip-inner')
     ) {
       window.pre.runSync('windowMove', false)
       return false

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

@@ -17,7 +17,12 @@ export default function TermInteractive () {
   const [opts, setter] = useState(null)
   const [form] = Form.useForm()
   function onMsg (e) {
-    if (e.data.includes('session-interactive')) {
+    if (
+      e &&
+      e.data &&
+      typeof e.data === 'string' &&
+      e.data.includes('session-interactive')
+    ) {
       setter(JSON.parse(e.data))
     }
   }

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