解决鼠标按键无法忽略的bug

pattazl · Jan 10, 2024 · bd8e933 · bd8e933
1 parent 0a8865f
commit bd8e933
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/build/showKeyBoard(node).nsi b/build/showKeyBoard(node).nsi
@@ -3,7 +3,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME $(ToolLang)
-!define PRODUCT_VERSION "v1.29"
+!define PRODUCT_VERSION "v1.30"
 !define /date DATESTR "%y%m%d"
 !define ExeName "showKeyBoard.exe"
 !define PRODUCT_PUBLISHER "Austin.Young"

diff --git a/build/showKeyBoard.nsi b/build/showKeyBoard.nsi
@@ -3,7 +3,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME $(ToolLang)
-!define PRODUCT_VERSION "v1.29"
+!define PRODUCT_VERSION "v1.30"
 !define /date DATESTR "%y%m%d"
 !define ExeName "showKeyBoard.exe"
 !define PRODUCT_PUBLISHER "Austin.Young"

diff --git a/showKeyBoard.ahk b/showKeyBoard.ahk
@@ -1,14 +1,14 @@
 ;编译信息
 ;@Ahk2Exe-SetName ShowKeyBoard
 ;@Ahk2Exe-SetDescription Show and Analyse Mouse/KeyBoard
-;@Ahk2Exe-SetProductVersion 1.29.0.0
-;@Ahk2Exe-SetFileVersion 1.29.0.0
+;@Ahk2Exe-SetProductVersion 1.30.0.0
+;@Ahk2Exe-SetFileVersion 1.30.0.0
 ;@Ahk2Exe-SetCopyright Austing.Young (2023 - )
 ;@Ahk2Exe-SetMainIcon res\keyboard.ico
 ;@Ahk2Exe-ExeName build/release/ShowKeyBoard.exe
 #Requires AutoHotkey v2
 #SingleInstance Ignore
-global APPName:="ShowKeyBoard", ver:="1.29" 
+global APPName:="ShowKeyBoard", ver:="1.30" 
 #include common.ahk
 #include langVars.ahk
 #Include events.ahk
@@ -60,11 +60,21 @@ SendCtrlKey()
     }
 }
 ; 鼠标事件
+#HotIf   InStr(skipKeys,"{WheelUp}") = 0
 ~WheelUp::SendMouse
+
+#HotIf   InStr(skipKeys,"{WheelDown}") = 0
 ~WheelDown::SendMouse
+
+ #HotIf   InStr(skipKeys,"{LButton}") = 0
 ~LButton::SendMouse
+
+ #HotIf   InStr(skipKeys,"{MButton}") = 0
 ~MButton::SendMouse
+
+ #HotIf   InStr(skipKeys,"{RButton}") = 0
 ~RButton::SendMouse
+
 SendMouse()
 {
 	if(showMouseEvent > 0){

diff --git a/ui-helper/src/version.ts b/ui-helper/src/version.ts
@@ -2,9 +2,9 @@
 * @version 配置显示在登录页面的前端版本，格式为 v.主版本号.次版本号.日期.小版本序号 v1.0.190827.1
 */
 // 对于发布版 YYMMDD 和 verNo 会在Webpack中自动替换为真实的日期和版本序号,如下格式不能随便改，参考vue.config.js的代码
-const replaceYYMMDD = '231215';
+const replaceYYMMDD = '240110';
 const replaceVerNo = '1';
-const mainVersion = ' v1.28';
+const mainVersion = ' v1.30';
 const strVersion = mainVersion+'.'+replaceYYMMDD+'.'+replaceVerNo;   // 可以支持旧版浏览器
 //export default strVersion
 export {strVersion};