feat: 0.1.10 fix sizeDetector in zoom mode

helper/version.en.md

@@ -67,4 +67,7 @@
 3. Modify the event model
 
 ## 0.1.9
-1. Fix the bug of accidental injury in IFrame
+1. Fix the bug of accidental injury in IFrame
+
+## 0.1.10
+3. Fix the problem that sizeDetector is accidentally injured in browser zoom mode

helper/version.md

@@ -67,4 +67,7 @@
 3. 修改事件模型
    
 ## 0.1.9
-1. 修复IFrame中误伤的bug
+1. 修复IFrame中误伤的bug
+
+## 0.1.10
+1. 修复sizeDetector在浏览器缩放模式下误伤的问题

index.html

@@ -182,7 +182,7 @@ declare type DETECTOR_TYPE = -1 | 0 | 1 | 2 | 3;</code></p>
     <script 
         disable-devtool-auto 
         md5='1aabac6d068eef6a7bad3fdf50a05cc8' 
-        src='https://cdn.jsdelivr.net/npm/disable-devtool@0.1.9/disable-devtool.min.js#use'
+        src='https://cdn.jsdelivr.net/npm/disable-devtool@0.1.10/disable-devtool.min.js#use'
     ></script>
     <!-- <script disable-devtool-auto md5='1aabac6d068eef6a7bad3fdf50a05cc8' src='./npm/disable-devtool.min.js'></script> -->
     <script>

npm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disable-devtool",
-    "version": "0.1.9",
+    "version": "0.1.10",
     "description": "Disable web developer tools from the f12 button, right-click and browser ",
     "main": "disable-devtool.min.js",
     "unpkg": "disable-devtool.min.js",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "disable-devtool",
-    "version": "0.1.9",
+    "version": "0.1.10",
     "description": "Disable web developer tools from the f12 button, right-click and browser ",
     "main": "disable-devtool.min.js",
     "unpkg": "disable-devtool.min.js",

public/main.js

@@ -8,7 +8,8 @@ disableDevtool({
     // url: 'https://www.qq.com',
     ondevtoolopen: (type) => {
         // window.location.href = 'https://www.qq.com';
-        document.body.innerHTML = '1111' + type;
+        document.body.innerHTML = 'devtool opened!; type =' + type;
+        history.back();
     },
     interval: 1000,
     // tkName: 'ddtk',

src/detector/size.js

@@ -2,7 +2,7 @@
  * @Author: theajack
  * @Date: 2021-07-24 23:15:54
  * @LastEditor: theajack
- * @LastEditTime: 2021-11-17 12:02:49
+ * @LastEditTime: 2021-11-26 11:08:33
  * @Description: Coding something
  * @FilePath: \disable-devtool\src\detector\size.js
  */
@@ -11,8 +11,12 @@ import {isInIframe} from '../util';
 import {DETECTOR_TYPE, triggerOnDevOpen} from './detector';
 
 function checkWindowSizeUneven () {
-    const widthUneven = window.outerWidth - window.innerWidth > 100;
-    const heightUneven = window.outerHeight - window.innerHeight > 300; // 调大一点防止误伤
+    const screenRatio = countScreenZoomRatio();
+    if (screenRatio === false) { // 如果获取不到屏幕缩放尺寸 则不启用sizeDetector
+        return true;
+    }
+    const widthUneven = window.outerWidth - window.innerWidth * screenRatio > 200; // 调大一点防止误伤
+    const heightUneven = window.outerHeight - window.innerHeight * screenRatio > 300; // 调大一点防止误伤
     if (widthUneven || heightUneven) {
         triggerOnDevOpen(DETECTOR_TYPE.SIZE);
         return false;
@@ -20,6 +24,20 @@ function checkWindowSizeUneven () {
     return true;
 }
 
+function countScreenZoomRatio () {
+    if (checkExist(window.devicePixelRatio)) {
+        return window.devicePixelRatio;
+    }
+    const screen = window.screen;
+    if (checkExist(screen)) {
+        return false;
+    }
+    if (screen.deviceXDPI && screen.logicalXDPI) {
+        return screen.deviceXDPI / screen.logicalXDPI;
+    }
+    return false;
+};
+
 export default function detector () {
     if (isInIframe()) {
         console.warn('SizeDetector is disabled in IFrame');
@@ -29,4 +47,8 @@ export default function detector () {
     window.addEventListener('resize', () => {
         setTimeout(checkWindowSizeUneven, 100);
     }, true);
+}
+
+function checkExist (v) {
+    return typeof v !== 'undefined' && v !== null;
 }

src/version.js

@@ -1 +1 @@
-export default '0.1.9';
+export default '0.1.10';