From 8310806d258ab2f53212fdf5a9baeb26a0dee96d Mon Sep 17 00:00:00 2001 From: ChenYarong Date: Wed, 23 Oct 2019 15:47:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?electron=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 0fa3ccd7..9396d5a6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -27,7 +27,7 @@ fi ignore_list="dist|scripts|\.idea|.*\.md|.*\.yml|node_modules/nodejieba" -electron-packager . "${APP_NAME}" --platform=$PLATFORM --arch=$ARCH --electronVersion=1.4.15 --app-version=1.4.0 --asar --icon=assets/icon.icns --overwrite --out=./dist --ignore=${ignore_list} +electron-packager . "${APP_NAME}" --platform=$PLATFORM --arch=$ARCH --electronVersion=7.0.0 --app-version=1.4.0 --asar --icon=assets/icon.icns --overwrite --out=./dist --ignore=${ignore_list} if [ $? -eq 0 ]; then echo -e "$(tput setaf 2)Packaging for $PLATFORM $ARCH succeeded.$(tput sgr0)\n" From c85bc1973d8ef062e71893aec4fba751f9268c5e Mon Sep 17 00:00:00 2001 From: ChenYarong Date: Wed, 23 Oct 2019 17:16:35 +0800 Subject: [PATCH 2/3] builder --- package.json | 7 ++++++- src/windows/controllers/wechat.js | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 69dba2c4..dcd9ef49 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,12 @@ "build:linux64": "./scripts/build.sh linux x64", "build:win": ".\\scripts\\build-win32.bat win32 ia32", "build:win32": ".\\scripts\\build-win32.bat win32 ia32", - "build:win64": ".\\scripts\\build-win32.bat win32 x64" + "build:win64": ".\\scripts\\build-win32.bat win32 x64", + "pack": "electron-builder -l --x64", + "postinstall": "electron-builder install-app-deps" + }, + "build": { + "appId": "electron-wechat" }, "repository": { "type": "git", diff --git a/src/windows/controllers/wechat.js b/src/windows/controllers/wechat.js index 744e169d..e97b3020 100644 --- a/src/windows/controllers/wechat.js +++ b/src/windows/controllers/wechat.js @@ -79,7 +79,9 @@ class WeChatWindow { } loadURL(url) { - this.wechatWindow.loadURL(url); + this.wechatWindow.loadURL(url, { + userAgent: Common.USER_AGENT[process.platform] + }); } show() { @@ -112,7 +114,7 @@ class WeChatWindow { } initWindowWebContent() { - this.wechatWindow.webContents.setUserAgent(Common.USER_AGENT[process.platform]); + // this.wechatWindow.webContents.setUserAgent(Common.USER_AGENT[process.platform]); if (Common.DEBUG_MODE) { this.wechatWindow.webContents.openDevTools(); } From b8e235d3924ff9f83f1e33513267c74d7fe98d68 Mon Sep 17 00:00:00 2001 From: ChenYarong Date: Wed, 23 Oct 2019 17:43:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8css=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E6=96=87=E6=9C=AC=E5=8F=AF=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/inject/css.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inject/css.js b/src/inject/css.js index eb482dac..0dfa7a54 100644 --- a/src/inject/css.js +++ b/src/inject/css.js @@ -39,12 +39,12 @@ CSSInjector.commonCSS = ` display: none !important; } * { - -webkit-user-select: none; + -webkit-user-select: text; cursor: default !important; -webkit-user-drag: none; } pre, input { - -webkit-user-select: initial; + -webkit-user-select: text; cursor: initial !important; } html, body {