@electerm/electerm-react 1.34.58 → 1.34.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -34,7 +34,7 @@ export default {
|
|
|
34
34
|
useSystemTitleBar: false,
|
|
35
35
|
opacity: 1,
|
|
36
36
|
defaultEditor: '',
|
|
37
|
-
terminalWordSeparator: './\\()"\'-:,.;<>~!@#$%^&*|+=[]{}
|
|
37
|
+
terminalWordSeparator: './\\()"\'-:,.;<>~!@#$%^&*|+=[]{}`~ ?',
|
|
38
38
|
confirmBeforeExit: false,
|
|
39
39
|
initDefaultTabOnStart: true,
|
|
40
40
|
screenReaderMode: false,
|
|
@@ -35,6 +35,7 @@ import mapper from '../../common/auto-complete-data-mapper'
|
|
|
35
35
|
import StartSession from './start-session-select'
|
|
36
36
|
import HelpIcon from '../common/help-icon'
|
|
37
37
|
import fs from '../../common/fs'
|
|
38
|
+
import delay from '../../common/wait.js'
|
|
38
39
|
import './setting.styl'
|
|
39
40
|
|
|
40
41
|
const { Option } = Select
|
|
@@ -86,15 +87,16 @@ export default class Setting extends Component {
|
|
|
86
87
|
if (this.submitting) {
|
|
87
88
|
return
|
|
88
89
|
}
|
|
90
|
+
this.submitting = true
|
|
89
91
|
this.setState({
|
|
90
92
|
submittingPass: true
|
|
91
93
|
})
|
|
92
|
-
this.submitting = true
|
|
93
94
|
const pass = this.state.loginPass
|
|
94
95
|
const r = await window.pre.runGlobalAsync(
|
|
95
96
|
'setPassword',
|
|
96
97
|
pass
|
|
97
98
|
)
|
|
99
|
+
await delay(600)
|
|
98
100
|
if (r === true) {
|
|
99
101
|
window.pre.requireAuth = !!pass
|
|
100
102
|
this.setState({
|
|
@@ -102,14 +104,17 @@ export default class Setting extends Component {
|
|
|
102
104
|
submittingPass: false,
|
|
103
105
|
passwordChanged: true,
|
|
104
106
|
placeholderLogin: pass ? '********' : f('notSet')
|
|
107
|
+
}, () => {
|
|
108
|
+
this.submitting = false
|
|
105
109
|
})
|
|
106
110
|
message.success('OK')
|
|
107
111
|
} else {
|
|
108
112
|
this.setState({
|
|
109
113
|
submittingPass: false
|
|
114
|
+
}, () => {
|
|
115
|
+
this.submitting = false
|
|
110
116
|
})
|
|
111
117
|
}
|
|
112
|
-
this.submitting = false
|
|
113
118
|
}
|
|
114
119
|
|
|
115
120
|
handleLoginPassFocus = () => {
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import { Modal } from 'antd'
|
|
6
6
|
import delay from '../common/wait'
|
|
7
|
+
import initWatch from './watch'
|
|
7
8
|
|
|
8
9
|
export default (Store) => {
|
|
9
10
|
Store.prototype.checkForDbUpgrade = async function () {
|
|
@@ -13,6 +14,7 @@ export default (Store) => {
|
|
|
13
14
|
}
|
|
14
15
|
const shouldUpgrade = await window.pre.runGlobalAsync('checkDbUpgrade')
|
|
15
16
|
if (!shouldUpgrade) {
|
|
17
|
+
initWatch(store)
|
|
16
18
|
return false
|
|
17
19
|
}
|
|
18
20
|
const {
|
|
@@ -35,7 +37,7 @@ export default (Store) => {
|
|
|
35
37
|
content: 'Database Upgraded',
|
|
36
38
|
okButtonProps: {}
|
|
37
39
|
})
|
|
38
|
-
await delay(
|
|
40
|
+
await delay(2000)
|
|
39
41
|
mod.destroy()
|
|
40
42
|
await store.restart()
|
|
41
43
|
return true
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
import { dbNames, update, getData, fetchInitData, insert, remove } from '../common/db'
|
|
6
|
-
import initWatch from './watch'
|
|
7
6
|
import parseInt10 from '../common/parse-int10'
|
|
8
7
|
import { infoTabs, statusMap, defaultEnvLang } from '../common/constants'
|
|
9
8
|
import fs from '../common/fs'
|
|
@@ -182,7 +181,6 @@ export default (Store) => {
|
|
|
182
181
|
store.fetchItermThemes()
|
|
183
182
|
store.openInitSessions()
|
|
184
183
|
store.fetchSshConfigItems()
|
|
185
|
-
initWatch(store)
|
|
186
184
|
store.initCommandLine().catch(store.onError)
|
|
187
185
|
if (store.config.checkUpdateOnStart) {
|
|
188
186
|
store.onCheckUpdate()
|