@electerm/electerm-react 1.38.11 → 1.38.19

package/client/components/setting-panel/keywords-form.jsx

@@ -71,6 +71,7 @@ export default function KeywordForm (props) {
 
   function renderBefore (name) {
     const colors = ['red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white']
+    const { themeConfig } = props
     return (
       <FormItem name={[name, 'color']} noStyle>
         <Select>
@@ -79,7 +80,7 @@ export default function KeywordForm (props) {
               const ps = {
                 className: 'color-picker-choose iblock',
                 style: {
-                  backgroundColor: color
+                  backgroundColor: themeConfig[color]
                 }
               }
               return (

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

@@ -408,13 +408,15 @@ export default class SettingTerminal extends Component {
       keywords = [{ color: 'red' }]
     } = this.props.config
     const {
-      appPath
+      appPath,
+      getThemeConfig
     } = this.props.store
     const ps = {
       formData: {
         keywords
       },
-      submit: this.handleSubmitKeywords
+      submit: this.handleSubmitKeywords,
+      themeConfig: getThemeConfig()
     }
     const terminalLogPath = appPath
       ? osResolve(appPath, 'electerm', 'session_logs')

package/client/components/setting-sync/setting-sync-form.jsx

@@ -45,9 +45,7 @@ export default function SyncForm (props) {
     if (res.gistId) {
       up[syncType + 'GistId'] = res.gistId
     }
-    if (res.syncPassword) {
-      up[syncType + 'SyncPassword'] = res.syncPassword
-    }
+    up[syncType + 'SyncPassword'] = res.syncPassword || ''
     if (res.apiUrl) {
       up[syncType + 'ApiUrl'] = res.apiUrl
     }

package/client/components/terminal/index.jsx

@@ -613,7 +613,7 @@ class Term extends Component {
       title: 'Choose some files to send',
       message: 'Choose some files to send',
       properties
-    })
+    }).catch(() => false)
     if (!files || !files.length) {
       return this.onZmodemEnd()
     }
@@ -637,7 +637,7 @@ class Term extends Component {
         'treatPackageAsDirectory',
         'dontAddToRecent'
       ]
-    })
+    }).catch(() => false)
     if (!savePaths || !savePaths.length) {
       return false
     }

package/client/components/terminal/xterm-zmodem.js

@@ -1,5 +1,5 @@
-import zmodem from 'zmodem.js/src/zmodem_browser'
-
+// import zmodem from 'zmodem-ts/dist/zmodem.mjs'
+import Sentry from 'zmodem-ts/dist/zsentry.js'
 export class AddonZmodem {
   _disposables = []
 
@@ -20,7 +20,7 @@ export class AddonZmodem {
     this.socket = ctx.socket
     this.term = ctx.term
     this.ctx = ctx
-    this.zsentry = new zmodem.Sentry({
+    this.zsentry = new Sentry({
       to_terminal: (octets) => {
         if (ctx.onZmodem) {
           this.term.write(String.fromCharCode.apply(String, octets))

package/package.json

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