mirrors/dev-sidecar
1
0
Fork 0
mirror of https://github.com/docmirror/dev-sidecar.git synced 2025-11-26 14:10:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize: 所有 loading 效果，在功能出现异常时也能恢复

Browse Source
This commit is contained in:
王良
2024-10-16 16:55:24 +08:00
parent 0859439f0a
commit 01bf014cc2
3 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
packages/gui/src/view/pages/setting.vue
View File

@@ -360,11 +360,14 @@ export default {
await this.saveConfig()
if (this.config.app.remoteConfig.enabled === true) {
this.reloadLoading = true
this.$message.info('开始下载远程配置')
await this.$api.config.downloadRemoteConfig()
this.$message.info('下载远程配置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
this.reloadLoading = false
try {
this.$message.info('开始下载远程配置')
await this.$api.config.downloadRemoteConfig()
this.$message.info('下载远程配置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
} finally {
this.reloadLoading = false
}
} else {
this.$message.info('远程配置已关闭，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
@@ -374,25 +377,27 @@ export default {
if (this.config.app.remoteConfig.enabled === false) {
return
}
this.reloadLoading = true
try {
const remoteConfig = {}
const remoteConfig = {}
await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.old1 = ret })
await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.old2 = ret })
await this.$api.config.downloadRemoteConfig()
await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.new1 = ret })
await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.new2 = ret })
await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.old1 = ret })
await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.old2 = ret })
await this.$api.config.downloadRemoteConfig()
await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.new1 = ret })
await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.new2 = ret })
if (remoteConfig.old1 === remoteConfig.new1 && remoteConfig.old2 === remoteConfig.new2) {
this.$message.info('远程配置没有变化，不做任何处理。')
this.$message.warn('如果您确实修改了远程配置，请稍等片刻再重试！')
} else {
this.$message.success('获取到了最新的远程配置，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
if (remoteConfig.old1 === remoteConfig.new1 && remoteConfig.old2 === remoteConfig.new2) {
this.$message.info('远程配置没有变化，不做任何处理。')
this.$message.warn('如果您确实修改了远程配置，请稍等片刻再重试！')
} else {
this.$message.success('获取到了最新的远程配置，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
}
} finally {
this.reloadLoading = false
}
this.reloadLoading = false
},
async restoreFactorySettings () {
this.$confirm({
@@ -420,15 +425,18 @@ export default {
okText: '确定',
onOk: async () => {
this.removeUserConfigLoading = true
const result = await this.$api.config.removeUserConfig()
if (result) {
this.config = await this.$api.config.get()
this.$message.success('恢复出厂设置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
} else {
this.$message.info('已是出厂设置，无需恢复')
try {
const result = await this.$api.config.removeUserConfig()
if (result) {
this.config = await this.$api.config.get()
this.$message.success('恢复出厂设置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
} else {
this.$message.info('已是出厂设置，无需恢复')
}
} finally {
this.removeUserConfigLoading = false
}
this.removeUserConfigLoading = false
},
onCancel () {}
})