🐛 更换交互element方式 #334

Author: CodFrm

packages/message/custom_event_message.ts

@@ -25,7 +25,7 @@ export class CustomEventMessage implements Message {
   ) {
     window.addEventListener((isContent ? "ct" : "fd") + flag, (event) => {
       if (event instanceof MouseEvent) {
-        this.relatedTarget.set(event.clientX, event.relatedTarget!);
+        this.relatedTarget.set(event.movementX, event.relatedTarget!);
         return;
       } else if (event instanceof CustomEvent) {
         this.messageHandle(event.detail, new CustomEventPostMessage(this));
@@ -142,7 +142,7 @@ export class CustomEventMessage implements Message {
     const id = ++this.relateId;
     // 可以使用此种方式交互element
     const ev = new MouseEvent((this.isContent ? "fd" : "ct") + this.flag, {
-      clientX: id,
+      movementX: id,
       relatedTarget: target,
     });
     window.dispatchEvent(ev);

src/app/service/offscreen/index.ts

@@ -10,8 +10,6 @@ import { MessageQueue } from "@Packages/message/message_queue";
 
 // offscreen环境的管理器
 export class OffscreenManager {
-  private extensionMessage: MessageSend = new ExtensionMessageSend();
-
   private windowMessage = new WindowMessage(window, sandbox, true);
 
   private windowServer: Server = new Server("offscreen", this.windowMessage);
@@ -20,9 +18,7 @@ export class OffscreenManager {
 
   private serviceWorker = new ServiceWorkerClient(this.extensionMessage);
 
-  constructor(private extensionMessage:MessageSend) {
-
-  }
+  constructor(private extensionMessage: MessageSend) {}
 
   logger(data: Logger) {
     const dao = new LoggerDAO();

src/app/service/offscreen/script.ts

@@ -47,6 +47,10 @@ export class ScriptService {
       }
     });
     subscribeScriptInstall(this.messageQueue, async (data) => {
+      // 普通脚本不处理
+      if (data.script.type === SCRIPT_TYPE_NORMAL) {
+        return;
+      }
       // 判断是开启还是关闭
       if (data.script.status === SCRIPT_STATUS_ENABLE) {
         // 构造脚本运行资源,发送给沙盒运行