From 9a24eaa325cdcd8d3337b4cf470d0c8094885ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 13 Feb 2025 10:53:58 +0800 Subject: [PATCH 001/373] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/gui/src/bridge/file-selector/backend.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/gui/src/bridge/file-selector/backend.js b/packages/gui/src/bridge/file-selector/backend.js index 2e7c27fea9..d08e6dc04b 100644 --- a/packages/gui/src/bridge/file-selector/backend.js +++ b/packages/gui/src/bridge/file-selector/backend.js @@ -3,6 +3,9 @@ export default { const { ipcMain, dialog, log } = context ipcMain.on('file-selector', (event, message) => { if (message.key === 'open') { + /** + * @type {Electron.OpenDialogOptions} + */ const options = message.options || {} if (options.properties == null || options.properties.length === 0) { options.properties = ['openFile'] From 862663dd37af5a5b336e07b68b99d552b8d53204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 17 Feb 2025 18:03:40 +0800 Subject: [PATCH 002/373] =?UTF-8?q?feature:=20unVerifySsl=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20`{=20ssl:=20false=20}`=20=E8=BF=9B=E8=A1=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=9B=B4=E5=AE=B9=E6=98=93=E7=90=86=E8=A7=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js b/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js index e50f7bc789..e5d2308acf 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js @@ -16,6 +16,6 @@ module.exports = { return true }, is (interceptOpt) { - return interceptOpt.unVerifySsl === true + return interceptOpt.unVerifySsl === true || interceptOpt.ssl === false }, } From 28bf0c29d1e60e84634a8bffdd56301baead4568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 18 Feb 2025 14:10:32 +0800 Subject: [PATCH 003/373] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/mitmproxy/src/utils/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mitmproxy/src/utils/util.js b/packages/mitmproxy/src/utils/util.js index ea4682c67f..0d44b01294 100644 --- a/packages/mitmproxy/src/utils/util.js +++ b/packages/mitmproxy/src/utils/util.js @@ -1,5 +1,5 @@ // const os = require('os') -const log = require('packages/mitmproxy/src/utils/util.log.server') +const log = require('./util.log.server') const util = { getNodeVersion () { From c1d681c9e449a2c0da44d0b2942c69bdb2df3034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 18 Feb 2025 15:01:06 +0800 Subject: [PATCH 004/373] =?UTF-8?q?github-actions:=20num-run-electron.yml?= =?UTF-8?q?=20=E4=B8=8D=E5=9C=A8tag=E5=88=9B=E5=BB=BA=E6=97=B6=E8=A7=A6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/npm-run-electron.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/npm-run-electron.yml b/.github/workflows/npm-run-electron.yml index 8d71d6a9dd..ae4c0d14a7 100644 --- a/.github/workflows/npm-run-electron.yml +++ b/.github/workflows/npm-run-electron.yml @@ -8,8 +8,6 @@ on: - release* - v1* - v2* - tags: - - '*' jobs: npm-run-electron: From 5cd7792beedead607f085a4cf580066e2c77a9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 18 Feb 2025 15:17:56 +0800 Subject: [PATCH 005/373] =?UTF-8?q?bugfix:=20=E5=BD=93=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8=EF=BC=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=85=B3=E9=97=AD=E6=97=B6=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=20`=E5=BD=93=E5=89=8D=E6=9C=AA=E5=90=AF=E5=8A=A8`=20=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/gui/src/view/pages/server.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue index bcfb04d689..25e1a43716 100644 --- a/packages/gui/src/view/pages/server.vue +++ b/packages/gui/src/view/pages/server.vue @@ -192,7 +192,7 @@ export default { 随应用启动 - + 当前已启动 From 3f5049ad91f209299ed06179683c86b3e8b53323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 19 Feb 2025 00:39:07 +0800 Subject: [PATCH 006/373] =?UTF-8?q?feature:=20=E5=9F=9F=E5=90=8D=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=A4=A7=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=BB=A3=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=B8=AA=E5=88=AB=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BB=A3=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/src/view/pages/plugin/overwall.vue | 6 +-- packages/gui/src/view/pages/server.vue | 41 +++++++++++++------ packages/mitmproxy/src/options.js | 2 +- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/packages/gui/src/view/pages/plugin/overwall.vue b/packages/gui/src/view/pages/plugin/overwall.vue index 283d5aef91..519fdb074f 100644 --- a/packages/gui/src/view/pages/plugin/overwall.vue +++ b/packages/gui/src/view/pages/plugin/overwall.vue @@ -54,12 +54,12 @@ export default { }) } }, - deleteTarget (item, index) { - this.targets.splice(index, 1) - }, addTarget () { this.targets.unshift({ key: '', value: 'true' }) }, + deleteTarget (item, index) { + this.targets.splice(index, 1) + }, saveTarget () { const map = {} for (const item of this.targets) { diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue index 25e1a43716..a627fd3a81 100644 --- a/packages/gui/src/view/pages/server.vue +++ b/packages/gui/src/view/pages/server.vue @@ -15,6 +15,16 @@ export default { dnsMappings: [], speedTestList: [], whiteList: [], + whiteListOptions: [ + { + label: '不代理', + value: 'true', + }, + { + label: '代理', + value: 'false', + }, + ], } }, computed: { @@ -102,26 +112,26 @@ export default { for (const key in this.config.server.whiteList) { const value = this.config.server.whiteList[key] this.whiteList.push({ - key, - value, + key: key || '', + value: value === true ? 'true' : 'false', }) } }, + addWhiteList () { + this.whiteList.unshift({ key: '', value: 'true' }) + }, + deleteWhiteList (item, index) { + this.whiteList.splice(index, 1) + }, submitWhiteList () { const whiteList = {} for (const item of this.whiteList) { if (item.key) { - whiteList[item.key] = item.value + whiteList[item.key] = item.value === 'true' } } this.config.server.whiteList = whiteList }, - deleteWhiteList (item, index) { - this.whiteList.splice(index, 1) - }, - addWhiteList () { - this.whiteList.unshift({ key: '', value: true }) - }, getSpeedTestConfig () { return this.config.server.dns.speedTest }, @@ -289,11 +299,18 @@ export default { - - + + + + + + + {{ item2.label }} + + - + diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js index e3b3b89fb8..6504dee6a7 100644 --- a/packages/mitmproxy/src/options.js +++ b/packages/mitmproxy/src/options.js @@ -108,7 +108,7 @@ module.exports = (serverConfig) => { const hostname = req.url.split(':')[0] // 配置了白名单的域名,将跳过代理 - const inWhiteList = matchUtil.matchHostname(whiteList, hostname, 'in whiteList') != null + const inWhiteList = !!matchUtil.matchHostname(whiteList, hostname, 'in whiteList') if (inWhiteList) { log.info(`为白名单域名,不拦截: ${hostname}, headers:`, jsonApi.stringify2(req.headers)) return false // 不拦截 From 759bfe8029a9e7f3371e987f8e206a932a58853c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 20 Feb 2025 09:39:31 +0800 Subject: [PATCH 007/373] =?UTF-8?q?feature:=20=E6=96=B0=E5=A2=9E=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=EF=BC=9A`Ctrl=20+=20F`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/gui/package.json | 1 + packages/gui/src/background.js | 36 ++++++++----- packages/gui/src/main.js | 2 + packages/gui/src/view/App.vue | 57 +++++++++++++++++++-- packages/gui/src/view/api.js | 3 ++ packages/gui/src/view/pages/server.vue | 27 ++++++---- packages/gui/src/view/pages/setting.vue | 44 ++++++---------- packages/gui/src/view/style/theme/dark.scss | 9 ++++ pnpm-lock.yaml | 12 +++++ 9 files changed, 136 insertions(+), 55 deletions(-) diff --git a/packages/gui/package.json b/packages/gui/package.json index e5fe7cda1d..24af9982fc 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -34,6 +34,7 @@ "request-progress": "^3.0.0", "sass": "^1.81.0", "sass-loader": "^16.0.3", + "search-bar-vue2": "^1.0.0", "vue": "^2.7.16", "vue-json-editor-fix-cn": "^1.4.3", "vue-router": "^3.6.5" diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js index 0b2763c1b8..b5b4e36875 100644 --- a/packages/gui/src/background.js +++ b/packages/gui/src/background.js @@ -298,28 +298,38 @@ function createWindow (startHideWindow, autoQuitIfError = true) { }) const shortcut = (event, input) => { - // 按 F12,打开/关闭 开发者工具 - if (input.key === 'F12') { - // 阻止默认的按键事件行为 + if (input.key === 'F12' && input.type === 'keyUp' && !input.control && !input.shift && !input.alt && !input.meta) { + // 按 F12,打开/关闭 开发者工具 event.preventDefault() - // 切换开发者工具显示状态 switchDevTools() - // eslint-disable-next-line style/brace-style - } - // 按 F5,刷新页面 - else if (input.key === 'F5') { - // 阻止默认的按键事件行为 + } else if (input.key === 'F5' && input.type === 'keyUp' && !input.control && !input.shift && !input.alt && !input.meta) { + // 按 F5,刷新页面 event.preventDefault() - // 刷新页面 win.webContents.reload() + } else { + // 全文检索框(SearchBar)相关快捷键 + if ((input.key === 'F' || input.key === 'f') && input.type === 'keyDown' && input.control && !input.shift && !input.alt && !input.meta) { + // 按 Ctrl + F,显示或隐藏全文检索框(SearchBar) + event.preventDefault() + win.webContents.send('search-bar', { key: 'show-hide' }) + } else if (input.key === 'Escape' && input.type === 'keyUp' && !input.control && !input.shift && !input.alt && !input.meta) { + // 按 ESC,隐藏全文检索框(SearchBar) + event.preventDefault() + win.webContents.send('search-bar', { key: 'show-hide', hideSearchBar: true }) + } else if (input.key === 'F3' && input.type === 'keyDown' && !input.control && !input.shift && !input.alt && !input.meta) { + // 按 F3,全文检索框(SearchBar)定位到下一个 + event.preventDefault() + win.webContents.send('search-bar', { key: 'next' }) + } else if (input.key === 'F3' && input.type === 'keyDown' && !input.control && input.shift && !input.alt && !input.meta) { + // 按 Shift + F3,全文检索框(SearchBar)定位到上一个 + event.preventDefault() + win.webContents.send('search-bar', { key: 'previous' }) + } } } // 监听键盘事件 win.webContents.on('before-input-event', (event, input) => { - if (input.type !== 'keyUp' || input.control || input.alt || input.shift || input.meta) { - return - } win.webContents.executeJavaScript('config') .then((value) => { console.info('window.config:', value, ', key:', input.key) diff --git a/packages/gui/src/main.js b/packages/gui/src/main.js index 198abb9bf0..e89daaa062 100644 --- a/packages/gui/src/main.js +++ b/packages/gui/src/main.js @@ -1,6 +1,7 @@ import antd from 'ant-design-vue' import Vue from 'vue' import VueRouter from 'vue-router' +import SearchBar from 'search-bar-vue2' import { ipcRenderer } from 'electron' import view from './view' import App from './view/App.vue' @@ -25,6 +26,7 @@ try { Vue.config.productionTip = false Vue.use(antd) Vue.use(VueRouter) + Vue.use(SearchBar) Vue.component(DsContainer) // 3. 创建 router 实例,然后传 `routes` 配置 // 你还可以传别的配置参数, 不过先这么简单着吧。 diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue index 4ce294d5f5..5f02614d98 100644 --- a/packages/gui/src/view/App.vue +++ b/packages/gui/src/view/App.vue @@ -1,4 +1,6 @@ + + + + diff --git a/packages/gui/src/view/mixins/plugin.js b/packages/gui/src/view/mixins/plugin.js index afd685e5dc..7142dd094c 100644 --- a/packages/gui/src/view/mixins/plugin.js +++ b/packages/gui/src/view/mixins/plugin.js @@ -142,5 +142,17 @@ export default { const dir = await this.$api.info.getLogDir() this.$api.ipc.openPath(dir) }, + handleHostname (hostname) { + if (this.isNotHostname(hostname)) { + return '' + } + + // 移除所有空白符 + return hostname.replaceAll(/\s+/g, '') + }, + isNotHostname (hostname) { + // 暂时只判断数字 + return !hostname || /^[\d\s]+$/.test(hostname) + }, }, } diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue index 307c39552c..c972e7d73c 100644 --- a/packages/gui/src/view/pages/index.vue +++ b/packages/gui/src/view/pages/index.vue @@ -319,7 +319,7 @@ export default {
- + import Plugin from '../../mixins/plugin' +import MockInput from '@/view/components/mock-input.vue' export default { name: 'Git', + components: { MockInput }, mixins: [Plugin], data () { return { @@ -45,7 +47,7 @@ export default { } }, addNoProxyUrl () { - this.noProxyUrls.unshift({ key: '', value: true }) + this.noProxyUrls.unshift({ key: '' }) }, delNoProxyUrl (item, index) { this.noProxyUrls.splice(index, 1) @@ -54,7 +56,10 @@ export default { const noProxyUrls = {} for (const item of this.noProxyUrls) { if (item.key) { - noProxyUrls[item.key] = item.value + const hostname = this.handleHostname(item.key) + if (hostname) { + noProxyUrls[hostname] = true + } } } this.config.plugin.git.setting.noProxyUrls = noProxyUrls @@ -103,7 +108,7 @@ export default { - + diff --git a/packages/gui/src/view/pages/plugin/overwall.vue b/packages/gui/src/view/pages/plugin/overwall.vue index 519fdb074f..5a84e0d33e 100644 --- a/packages/gui/src/view/pages/plugin/overwall.vue +++ b/packages/gui/src/view/pages/plugin/overwall.vue @@ -1,8 +1,10 @@ @@ -175,7 +178,7 @@ export default { From f5b4dbc01c6a8bed8bdae5f8ac3726807bcaa880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 27 Feb 2025 14:40:36 +0800 Subject: [PATCH 019/373] =?UTF-8?q?optimize:=20=E5=85=B3=E9=97=AD=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=20`=E6=8B=BC?= =?UTF-8?q?=E5=86=99=E6=A3=80=E6=9F=A5`=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/src/view/components/mock-input.vue | 4 ++-- packages/gui/src/view/pages/plugin/node.vue | 6 ++--- .../gui/src/view/pages/plugin/overwall.vue | 22 ++++++++++++++----- packages/gui/src/view/pages/plugin/pip.vue | 4 ++-- packages/gui/src/view/pages/proxy.vue | 4 ++-- packages/gui/src/view/pages/server.vue | 16 +++++++------- packages/gui/src/view/pages/setting.vue | 16 +++++++------- 7 files changed, 41 insertions(+), 31 deletions(-) diff --git a/packages/gui/src/view/components/mock-input.vue b/packages/gui/src/view/components/mock-input.vue index 87a191aea5..5558fe35ba 100644 --- a/packages/gui/src/view/components/mock-input.vue +++ b/packages/gui/src/view/components/mock-input.vue @@ -19,7 +19,7 @@ export default { event.preventDefault() } }, - onChange () { + onBlur () { if (this.$refs.input.textContent !== this.value) { this.$emit('input', this.$refs.input.textContent) } @@ -29,7 +29,7 @@ export default { diff --git a/packages/gui/src/view/pages/plugin/pip.vue b/packages/gui/src/view/pages/plugin/pip.vue index 1ea0537269..6250a95749 100644 --- a/packages/gui/src/view/pages/plugin/pip.vue +++ b/packages/gui/src/view/pages/plugin/pip.vue @@ -63,7 +63,7 @@ export default { - +
如果你的pip命令改成了其他名字(如pip3),或想设置绿色版pip程序路径,可在此处修改
@@ -112,7 +112,7 @@ export default {
- +
使用以上域名安装包时,不会进行SSL证书验证,多个域名用空格隔开
注意:切换仓库镜像同时会修改pip.ini中的trusted-host配置,即使关闭 ds 也会继续保持 diff --git a/packages/gui/src/view/pages/proxy.vue b/packages/gui/src/view/pages/proxy.vue index 00aa93abec..1142079e60 100644 --- a/packages/gui/src/view/pages/proxy.vue +++ b/packages/gui/src/view/pages/proxy.vue @@ -151,7 +151,7 @@ export default {
- +
远程国内域名白名单文件内容可以是base64编码格式,也可以是未经过编码的
@@ -222,6 +222,6 @@ export default { diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue index 44ce560c7a..bbe00053a9 100644 --- a/packages/gui/src/view/pages/server.vue +++ b/packages/gui/src/view/pages/server.vue @@ -225,13 +225,13 @@ export default {
- +
你可以设置为0.0.0.0,让其他电脑可以使用此代理服务
- +
修改后需要重启应用
@@ -256,12 +256,12 @@ export default { @@ -295,8 +295,8 @@ export default {
- 请求: ms,对应timeout配置
- 连接: ms,对应keepAliveTimeout配置 + 请求: ms,对应timeout配置
+ 连接: ms,对应keepAliveTimeout配置

这里指定域名的超时时间:(域名配置可使用通配符或正则)
@@ -400,10 +400,10 @@ export default { - ms + ms
使用以下DNS获取IP进行测速
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue index 598a0709bd..8c1e49b9f1 100644 --- a/packages/gui/src/view/pages/setting.vue +++ b/packages/gui/src/view/pages/setting.vue @@ -373,10 +373,10 @@ export default {
- + - + @@ -432,7 +432,7 @@ export default {
- +
部分快捷键已被占用:F5F12Ctrl+FF3Shift+F3
@@ -451,8 +451,8 @@ export default {
-  × - +  × +
@@ -485,7 +485,7 @@ export default {
@@ -494,7 +494,7 @@ export default {
- + {{ item.label }} @@ -506,7 +506,7 @@ export default { - +
修改后,重启DS才生效,隔天达到日志文件大小限制时,才会触发清理程序!
From 593611f467d6a1f8bf33ee0a10d76a180dfcdff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 27 Feb 2025 15:07:43 +0800 Subject: [PATCH 020/373] =?UTF-8?q?optimize:=20MockInput=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/gui/src/view/App.vue | 9 ---- .../gui/src/view/components/mock-input.vue | 37 +------------ packages/gui/src/view/pages/help.vue | 4 +- packages/gui/src/view/pages/plugin/git.vue | 6 +-- packages/gui/src/view/pages/plugin/node.vue | 2 +- .../gui/src/view/pages/plugin/overwall.vue | 6 +-- packages/gui/src/view/pages/plugin/pip.vue | 2 +- packages/gui/src/view/pages/proxy.vue | 4 +- packages/gui/src/view/pages/server.vue | 6 +-- packages/gui/src/view/pages/setting.vue | 8 +-- packages/gui/src/view/style/index.scss | 53 +++++-------------- packages/gui/src/view/style/theme/dark.scss | 2 +- 12 files changed, 35 insertions(+), 104 deletions(-) diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue index d8b58b8c95..eb04152228 100644 --- a/packages/gui/src/view/App.vue +++ b/packages/gui/src/view/App.vue @@ -191,15 +191,6 @@ export default { body { height: 100%; } -.mt10 { - margin-top: 10px; -} -.mt5 { - margin-top: 5px; -} -.mt20 { - margin-top: 20px; -} .ds_layout { font-family: Avenir, Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; diff --git a/packages/gui/src/view/components/mock-input.vue b/packages/gui/src/view/components/mock-input.vue index 5558fe35ba..6535f4fdfe 100644 --- a/packages/gui/src/view/components/mock-input.vue +++ b/packages/gui/src/view/components/mock-input.vue @@ -29,40 +29,5 @@ export default { - - diff --git a/packages/gui/src/view/pages/help.vue b/packages/gui/src/view/pages/help.vue index 487fe3d10b..1e332e6741 100644 --- a/packages/gui/src/view/pages/help.vue +++ b/packages/gui/src/view/pages/help.vue @@ -27,8 +27,8 @@ export default { 帮助中心
diff --git a/packages/gui/src/view/pages/plugin/git.vue b/packages/gui/src/view/pages/plugin/git.vue index fcaad6ac0b..9f65ba31ee 100644 --- a/packages/gui/src/view/pages/plugin/git.vue +++ b/packages/gui/src/view/pages/plugin/git.vue @@ -109,8 +109,8 @@ export default { - - + + @@ -122,7 +122,7 @@ export default {