Browse Source

操作台右下角关闭按钮

NaiboWang-Alienware 2 years ago
parent
commit
f453dce9fd

BIN
ElectronJS/EasySpider_en.crx


BIN
ElectronJS/EasySpider_zh.crx


File diff suppressed because it is too large
+ 0 - 0
ElectronJS/tasks/187.json


+ 1 - 1
ExecuteStage/.vscode/launch.json

@@ -12,7 +12,7 @@
             "justMyCode": false,
             //  "args": ["--id", "[7]", "--read_type", "remote", "--headless", "0"]
             // "args": ["--id", "[9]", "--read_type", "remote", "--headless", "0", "--saved_file_name", "YOUTUBE"]
-            "args": ["--id", "[63]", "--headless", "0", "--user_data", "1", "--keyboard", "0"]
+            "args": ["--id", "[68]", "--headless", "0", "--user_data", "1", "--keyboard", "0"]
         }
     ]
 }

+ 14 - 10
Extension/manifest_v3/src/content-scripts/main.js

@@ -32,9 +32,9 @@ global.tdiv.style.width = "3000px";
 global.tdiv.style.height = "3000px";
 global.tdiv.style.pointerEvents = "none";
 
-var mousemovebind = false; //如果出现元素默认绑定了mousemove事件导致匹配不到元素的时候,开启第二种模式获得元素
+let mousemovebind = false; //如果出现元素默认绑定了mousemove事件导致匹配不到元素的时候,开启第二种模式获得元素
 
-var toolkit = document.createElement("div");
+let toolkit = document.createElement("div");
 toolkit.classList = "tooltips"; //添加样式
 // @ts-ignore
 // if(isInIframe()){
@@ -44,7 +44,7 @@ toolkit.setAttribute("id", "wrapperToolkit");
 // }
 
 
-var tooltips = false; //标记鼠标是否在提示框上
+let tooltips = false; //标记鼠标是否在提示框上
 
 //右键菜单屏蔽
 document.oncontextmenu = () => false;
@@ -54,12 +54,12 @@ document.addEventListener("mousemove", function() {
     }
 
     //如果鼠标在元素框内则点击和选中失效
-    var x = event.clientX;
-    var y = event.clientY;
-    var divx1 = toolkit.offsetLeft;
-    var divy1 = toolkit.offsetTop;
-    var divx2 = toolkit.offsetLeft + toolkit.offsetWidth;
-    var divy2 = toolkit.offsetTop + toolkit.offsetHeight;
+    let x = event.clientX;
+    let y = event.clientY;
+    let divx1 = toolkit.offsetLeft;
+    let divy1 = toolkit.offsetTop;
+    let divx2 = toolkit.offsetLeft + toolkit.offsetWidth;
+    let divy2 = toolkit.offsetTop + toolkit.offsetHeight;
     if (x >= divx1 && x <= divx2 && y >= divy1 && y <= divy2) {
         tooltips = true;
         return;
@@ -174,7 +174,7 @@ toolkit.addEventListener("mousedown", function(e) { e.stopPropagation(); }); //
 document.body.append(global.div); //默认如果toolkit不存在则div和tdiv也不存在
 document.body.append(global.tdiv);
 document.body.append(toolkit);
-var timer;
+let timer;
 
 
 
@@ -299,3 +299,7 @@ function generateToolkit() {
 //Vue元素
 generateToolkit();
 
+let closeButton = document.getElementById("closeButton");
+closeButton.addEventListener("click", function() {
+    toolkit.style.display = "none"; // 隐藏元素
+});

+ 1 - 0
Extension/manifest_v3/src/content-scripts/toolkit.vue

@@ -2,6 +2,7 @@
   <div id="realcontent">
 <!--    <div id="EasySpiderResizer" style="width: 10px; height: 10px; background-color: black; position: absolute; left: 0; bottom: 0; cursor: ne-resize;"></div>-->
     <div id="EasySpiderResizer" style="width: 10px; height: 10px; position: absolute; left: 0; top: 0; cursor: nw-resize;"></div>
+    <span id="closeButton">&#x2716;</span>
     <div v-if="lang == 'zh'">
       <div class="tooldrag">✍操作台(点此拖动,左上角调整大小)</div>
       <div class="realcontent">

+ 1 - 2
Extension/manifest_v3/src/manifest.json

@@ -4,7 +4,6 @@
     "description": "EasySpider's chrome extension",
     "author": "Naibo Wang",
     "manifest_version": 3,
-    "persistent": true,
     "action": {
         "default_icon": {
             "16": "assets/icon-16.png",
@@ -55,4 +54,4 @@
         "tabs",
         "scripting"
     ]
-}
+}

+ 13 - 1
Extension/manifest_v3/src/style/toolkit.css

@@ -170,4 +170,16 @@
 
 .toolkitcontain .toolkittb4 {
     position: absolute;
-}
+}
+
+#closeButton {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    cursor: pointer;
+    padding: 5px;
+    opacity: 0.05;
+}
+#closeButton:hover {
+  opacity: 1.0;
+}

Some files were not shown because too many files changed in this diff