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/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" diff --git a/src/inject/css.js b/src/inject/css.js index 6a1f12f4..c98cd82e 100644 --- a/src/inject/css.js +++ b/src/inject/css.js @@ -45,12 +45,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 { 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(); }