diff --git a/doc/linux.md b/doc/linux.md index 89f0ad14..4237afed 100644 --- a/doc/linux.md +++ b/doc/linux.md @@ -1,6 +1,8 @@ # linux 支持 `linux`使用说明,目前仅支持`ubuntu_x64(GNOME)`,其他`linux`未测试 +> 注意:需要开启[sudo免密支持](https://www.jianshu.com/p/5d02428f313d) + ## 安装 ### 1. ubuntu diff --git a/lerna.json b/lerna.json index ab64e87d..56f2c6fe 100644 --- a/lerna.json +++ b/lerna.json @@ -14,5 +14,5 @@ "ignore": [] } }, - "version": "1.7.1" + "version": "1.7.2" } diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 1db4ca62..4a1209a7 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar", - "version": "1.7.1", + "version": "1.7.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 751a5b57..55a8ae47 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar", - "version": "1.7.1", + "version": "1.7.2", "description": "给开发者的加速代理工具", "main": "src/index.js", "keywords": [ @@ -17,7 +17,7 @@ "test": "mocha" }, "dependencies": { - "@docmirror/mitmproxy": "^1.7.1", + "@docmirror/mitmproxy": "^1.7.2", "agentkeepalive": "^2.1.1", "babel-preset-es2020": "^1.0.2", "charset": "^1.0.0", @@ -78,5 +78,5 @@ "last 2 versions", "not dead" ], - "gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc" + "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" } diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js index 65bfb903..dc98b56c 100644 --- a/packages/core/src/config/index.js +++ b/packages/core/src/config/index.js @@ -22,7 +22,8 @@ module.exports = { dock: { hideWhenWinClose: false }, - closeStrategy: 0 + closeStrategy: 0, + showShutdownTip: true }, server: { enabled: true, diff --git a/packages/gui/build/installer.nsh b/packages/gui/build/installer.nsh index 305d465a..a4de807b 100644 --- a/packages/gui/build/installer.nsh +++ b/packages/gui/build/installer.nsh @@ -1,4 +1,4 @@ !macro customUnInit - MessageBox MB_OK "卸载前请务必手动右下角小图标退出DevSidecar之后,再进行下一步(如果已经退出请忽略)↘↘↘↘↘↘↘↘↘" + MessageBox MB_OK "卸载前请务必手动退出DevSidecar之后,再进行下一步(如果已经退出请忽略)" ExecWait '"$INSTDIR\resources\extra\sysproxy.exe" set 1' !macroend diff --git a/packages/gui/package.json b/packages/gui/package.json index 3bdf9813..5ef9b3f0 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "1.7.1", + "version": "1.7.2", "private": false, "license": "MPL-2.0", "main": "background.js", @@ -21,8 +21,8 @@ "name": "Greper" }, "dependencies": { - "@docmirror/dev-sidecar": "^1.7.1", - "@docmirror/mitmproxy": "^1.7.1", + "@docmirror/dev-sidecar": "^1.7.2", + "@docmirror/mitmproxy": "^1.7.2", "adm-zip": "^0.5.5", "ant-design-vue": "^1.6.5", "compressing": "^1.5.1", @@ -84,5 +84,5 @@ "not dead" ], "__npminstall_done": false, - "gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc" + "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" } diff --git a/packages/gui/pkg/after-all-artifact-build.js b/packages/gui/pkg/after-all-artifact-build.js index f52bab4f..e821c4c6 100644 --- a/packages/gui/pkg/after-all-artifact-build.js +++ b/packages/gui/pkg/after-all-artifact-build.js @@ -10,6 +10,7 @@ function appendIntro (context, systemType, latest) { const latestFilePath = path.join(context.outDir, latest) fs.appendFile(latestFilePath, `partPackage: ${partUpdateUrl} +partMiniVersion: 1.7.0 releaseNotes: - 升级日志 - https://download.fastgit.org/docmirror/dev-sidecar/releases/download/v${version}/DevSidecar-${version}.exe diff --git a/packages/gui/src/bridge/on-close/front.js b/packages/gui/src/bridge/on-close/front.js index 789c6f76..416aa17d 100644 --- a/packages/gui/src/bridge/on-close/front.js +++ b/packages/gui/src/bridge/on-close/front.js @@ -14,7 +14,7 @@ function install (app, api) { app.$confirm({ title: '关闭策略', content: h =>
-
+
直接关闭 @@ -24,7 +24,7 @@ function install (app, api) {
-
+
记住本次选择,不再提示 < /a-checkbox> diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js index ad0254e2..8e7ebf7c 100644 --- a/packages/gui/src/bridge/update/front.js +++ b/packages/gui/src/bridge/update/front.js @@ -76,6 +76,23 @@ function install (app, api) { } }) } + + /** + * 是否小版本升级 + * @param version1 + * @param version2 + */ + async function isSupportPartUpdate (value) { + const info = await api.info.get() + console.log('升级版本:', value.version) + console.log('增量更新最小版本:', value.partMiniVersion) + console.log('当前版本:', info.version) + if (!value.partPackage) { + return false + } + return !!(value.partMiniVersion && value.partMiniVersion < info.version) + } + async function downloadNewVersion (value) { const platform = await api.shell.getSystemPlatform() console.log('download new version platform', platform) @@ -83,7 +100,8 @@ function install (app, api) { goManualUpdate(app, value) return } - if (value.partPackage) { + const partUpdate = await isSupportPartUpdate(value) + if (partUpdate) { // 有增量更新 api.update.downloadPart(value) } else { diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue index 3b8f74b4..0d9fe6de 100644 --- a/packages/gui/src/view/App.vue +++ b/packages/gui/src/view/App.vue @@ -1,4 +1,5 @@