diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue index 0d9fe6de..da84f476 100644 --- a/packages/gui/src/view/App.vue +++ b/packages/gui/src/view/App.vue @@ -14,7 +14,7 @@ > - {{item.title}} + {{item.title}} {{ sub.title }} @@ -24,11 +24,8 @@ {{ item.title }} - - - diff --git a/packages/gui/src/view/components/settings.vue b/packages/gui/src/view/components/settings.vue index 54a47b67..34e3b1f8 100644 --- a/packages/gui/src/view/components/settings.vue +++ b/packages/gui/src/view/components/settings.vue @@ -17,32 +17,31 @@ :style="{ height: '100%' }" > - + 某些域名有时候需要通过其他DNS服务器获取到的IP才可以访问 - + - + - + USA DNS Aliyun DNS - - + + - @@ -51,8 +50,8 @@ - - + + 启动后自动检查设置 @@ -61,14 +60,14 @@ - + - + - - + + @@ -79,15 +78,15 @@ - - + + - - + + @@ -144,8 +143,6 @@ export default { this.npmVariables = ret }) }, - onJsonChange (config) { - }, afterVisibleChange (val) { console.log('visible', val) if (val === true) { @@ -200,7 +197,7 @@ export default { }, addDnsMapping () { - this.dnsMappings.unshift({ key: '', value: 'usa' }) + this.dnsMappings.unshift({ key: '', value: 'quad9' }) }, doSetNpmVariablesNow () { this.syncTargetConfig() @@ -211,7 +208,7 @@ export default { this.npmVariables = ret }) }).then(() => { - this.$message.info('设置成功') + this.$message.success('设置成功') }) }, addNpmVariable () { diff --git a/packages/gui/src/view/components/setup-ca.vue b/packages/gui/src/view/components/setup-ca.vue index 981cb63c..580ac8e1 100644 --- a/packages/gui/src/view/components/setup-ca.vue +++ b/packages/gui/src/view/components/setup-ca.vue @@ -33,7 +33,7 @@ 2、然后按如下图步骤将根证书添加到信任的根证书颁发机构 - + diff --git a/packages/gui/src/view/mixins/plugin.js b/packages/gui/src/view/mixins/plugin.js index 357b1c74..f3a65a43 100644 --- a/packages/gui/src/view/mixins/plugin.js +++ b/packages/gui/src/view/mixins/plugin.js @@ -12,6 +12,7 @@ export default { status: {}, labelCol: { span: 4 }, wrapperCol: { span: 20 }, + resetDefaultLoading: false, applyLoading: false, systemPlatform: '' } @@ -43,7 +44,7 @@ export default { }, async apply () { if (this.applyLoading === true) { - return + return // 防重复提交 } this.applyLoading = true await this.applyBefore() @@ -65,20 +66,22 @@ export default { cancelText: '取消', okText: '确定', onOk: async () => { + this.resetDefaultLoading = true this.config = await this.$api.config.resetDefault(key) if (this.ready) { await this.ready(this.config) } await this.apply() + this.resetDefaultLoading = false }, onCancel () {} }) }, saveConfig () { return this.$api.config.save(this.config).then((ret) => { - this.$message.info('设置已保存') + this.$message.success('设置已保存') this.setConfig(ret.allConfig) - this.printConfig('after saveConfig(), ') + this.printConfig('After saveConfig(), ') return ret }) }, diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue index d53872df..1d00d53d 100644 --- a/packages/gui/src/view/pages/index.vue +++ b/packages/gui/src/view/pages/index.vue @@ -3,9 +3,8 @@ 给开发者的辅助工具 - - 安装根证书 + 安装根证书 {{ update.progress }}%{{ update.downloading ? '新版本下载中' : '检查更新' }} - @@ -108,7 +106,6 @@ - @@ -205,7 +202,7 @@ export default { this.config.plugin.overwall.enabled = true } this.$api.config.save(this.config).then(() => { - this.$message.info('设置已保存') + this.$message.success('设置已保存') }) if (this.status.server.enabled) { return this.$api.server.restart() @@ -231,7 +228,7 @@ export default { this.$confirm({ title: '第一次使用,请先安装CA根证书', content: '本应用正常使用,必须安装和信任CA根证书', - cancelText: '下次', + cancelText: '下次安装', okText: '去安装', onOk: () => { this.openSetupCa() @@ -252,6 +249,8 @@ export default { await this.$api.shell.setupCa({ certPath: this.config.server.setting.rootCaFile.certPath }) this.setting.rootCa = this.setting.rootCa || {} const rootCa = this.setting.rootCa + + // 根证书已安装 rootCa.setuped = true this.$set(this, 'setting', this.setting) this.$api.setting.save(this.setting) diff --git a/packages/gui/src/view/pages/plugin/git.vue b/packages/gui/src/view/pages/plugin/git.vue index bf4837b2..e3f9552f 100644 --- a/packages/gui/src/view/pages/plugin/git.vue +++ b/packages/gui/src/view/pages/plugin/git.vue @@ -30,7 +30,7 @@ diff --git a/packages/gui/src/view/pages/plugin/node.vue b/packages/gui/src/view/pages/plugin/node.vue index ad10a5b7..ca903255 100644 --- a/packages/gui/src/view/pages/plugin/node.vue +++ b/packages/gui/src/view/pages/plugin/node.vue @@ -58,10 +58,10 @@ 某些库需要自己设置镜像变量,才能下载,比如:electron - + - + @@ -73,7 +73,7 @@ diff --git a/packages/gui/src/view/pages/plugin/overwall.vue b/packages/gui/src/view/pages/plugin/overwall.vue index 2ae9db77..4b6ecea2 100644 --- a/packages/gui/src/view/pages/plugin/overwall.vue +++ b/packages/gui/src/view/pages/plugin/overwall.vue @@ -30,7 +30,7 @@ PAC没有拦截到的域名,可以在此处定义 - + @@ -38,7 +38,7 @@ - + @@ -50,7 +50,7 @@ Nginx二层代理服务端配置 - + @@ -67,7 +67,7 @@ - + 您可以在此处配置你自己的服务器地址 @@ -78,7 +78,7 @@ diff --git a/packages/gui/src/view/pages/plugin/pip.vue b/packages/gui/src/view/pages/plugin/pip.vue index a3791b0c..ccf6cdc6 100644 --- a/packages/gui/src/view/pages/plugin/pip.vue +++ b/packages/gui/src/view/pages/plugin/pip.vue @@ -43,7 +43,7 @@ diff --git a/packages/gui/src/view/pages/proxy.vue b/packages/gui/src/view/pages/proxy.vue index ec52b0ac..d8ecaf70 100644 --- a/packages/gui/src/view/pages/proxy.vue +++ b/packages/gui/src/view/pages/proxy.vue @@ -55,7 +55,7 @@ diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue index 480a7274..32b62ea8 100644 --- a/packages/gui/src/view/pages/server.vue +++ b/packages/gui/src/view/pages/server.vue @@ -69,7 +69,7 @@ + :show-btns="false" :expandedOnStart="true"> @@ -82,10 +82,10 @@ - + - + @@ -101,18 +101,18 @@ - + - + {{ item.value }} - - + @@ -206,12 +206,11 @@ -