fix: 修正在「我的投資」不會正確顯示下單輔助巨集的問題

aqzhyi · May 15, 2020 · 382c873 · 382c873
1 parent e2196b0
commit 382c873
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/src/components/ExecutionDialog/index.tsx b/src/components/ExecutionDialog/index.tsx
@@ -16,7 +16,7 @@ const com = {
         ?.trim() ||
         $('[data-etoro-automation-id="execution-deposit-button"]')
           .html()
-          .trim())
+          ?.trim())
     )
   },
   get isConstructed() {

diff --git a/src/etoro.tsx b/src/etoro.tsx
@@ -43,39 +43,40 @@ const readyIntervalId = globalThis.setInterval(async () => {
 emitter.on(Events.ready, () => {
   ExecutionDialog.log(`安排好按鈕`)
 
-  $('body').delegate(
-    `
-      .trade-button-title
-      , [automation-id="buy-sell-button-rate-value"]
-      , [automation-id="trade-button"]
-      , .etoro-trade-button
-    `,
-    'click',
-    () => {
-      if (!storage.findConfig().executionMacroEnabled) {
-        ExecutionDialog.log(`功能未開啟`)
-        return
-      }
+  let watchId
 
-      ExecutionDialog.log(`開始偵測`)
+  const construct = () => {
+    ExecutionDialog.log('偵測中...', ExecutionDialog)
 
-      const watchId = globalThis.setInterval(() => {
-        ExecutionDialog.log('偵測中...', ExecutionDialog)
+    if (ExecutionDialog.isParentConstructed && !ExecutionDialog.isConstructed) {
+      ExecutionDialog.construct()
+    }
 
-        if (
-          ExecutionDialog.isParentConstructed &&
-          !ExecutionDialog.isConstructed
-        ) {
-          ExecutionDialog.construct()
-        }
+    if (ExecutionDialog.isConstructed) {
+      globalThis.clearInterval(watchId)
+      ExecutionDialog.log(`結束偵測`)
+    }
+  }
 
-        if (ExecutionDialog.isConstructed) {
-          globalThis.clearInterval(watchId)
-          ExecutionDialog.log(`結束偵測`)
-        }
-      }, 250)
-    },
-  )
+  $('body').delegate(`.uidialog-content`, 'mouseover', () => {
+    if (!storage.findConfig().executionMacroEnabled) {
+      ExecutionDialog.log(`功能未開啟`)
+      return
+    }
+
+    ExecutionDialog.log(`開始偵測`)
+
+    globalThis.clearInterval(watchId)
+    construct()
+    watchId = globalThis.setInterval(construct, 250)
+  })
+
+  $('body').delegate(`.uidialog-content`, 'mouseout', () => {
+    globalThis.setTimeout(() => {
+      ExecutionDialog.log(`結束偵測`)
+      globalThis.clearInterval(watchId)
+    }, 300)
+  })
 })
 
 /**

diff --git a/src_dist/etoro.bundle.js b/src_dist/etoro.bundle.js