From d62a772faa0f003ebe75dc798d8b000b3538e1a7 Mon Sep 17 00:00:00 2001 From: break27 Date: Fri, 10 Jul 2026 18:31:45 +0800 Subject: [PATCH] fix: 'common' version --- index.html | 2 +- main.py | 14 +++++++------- requirements.txt | Bin 1018 -> 1018 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 1c35ac8..15014d8 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ name = name.charAt(0).toLocaleUpperCase() + name.slice(1); document.title += ` (${name})`; while (await new Promise(o => setTimeout(o, 1000, true))) { - let result = await Rpc2.invoke('history').catch(() => []); + let result = await Rpc2.invoke('logs').catch(() => []); let logs = Array.from(result); for (let record of logs) { diff --git a/main.py b/main.py index adc8e78..dba3165 100644 --- a/main.py +++ b/main.py @@ -33,7 +33,7 @@ WEBURL = "https://crm.xiaoman.cn/business/export" APIURL = "https://crm.xiaoman.cn/api/opportunityRead/export" def main(driver: WebDriver, logger = logging.getLogger('main')): - identity = short() + unique = identity() parameters = vars(args) http = PoolManager() sp = ServiceProvider.default() @@ -82,7 +82,7 @@ def main(driver: WebDriver, logger = logging.getLogger('main')): while True: try: if not (buttons := driver.find_elements(By.CSS_SELECTOR, ".export-actions .okki-btn-primary")): raise ValueError() - for button in buttons: driver.execute_script("arguments[0].addEventListener('click', () => arguments[0].parentElement.setAttribute(arguments[1], '1'));", button, identity) + for button in buttons: driver.execute_script("arguments[0].addEventListener('click', () => arguments[0].parentElement.setAttribute(arguments[1], '1'));", button, unique) break except: sleep(1) @@ -90,9 +90,9 @@ def main(driver: WebDriver, logger = logging.getLogger('main')): try: verified = False button = locate(".filter-actions .okki-btn-primary") - driver.execute_script("window.__%s__ = () => arguments[0].click();" % identity, buttons[1]) - driver.execute_script("arguments[0].addEventListener('click', __%s__);" % identity, button) - driver.execute_script("__%s__();" % identity) + driver.execute_script("window.__%s__ = () => arguments[0].click();" % unique, buttons[1]) + driver.execute_script("arguments[0].addEventListener('click', __%s__);" % unique, button) + driver.execute_script("__%s__();" % unique) except Exception as e: logger.critical("Error while setting up button listeners", exc_info=e) return 4 @@ -100,8 +100,8 @@ def main(driver: WebDriver, logger = logging.getLogger('main')): while True: try: for index in count(0): - if (driver.execute_script("return arguments[0].parentElement.getAttribute(arguments[1]);", buttons[index], identity)): - driver.execute_script("arguments[0].parentElement.removeAttribute(arguments[1]);", buttons[index], identity) + if (driver.execute_script("return arguments[0].parentElement.getAttribute(arguments[1]);", buttons[index], unique)): + driver.execute_script("arguments[0].parentElement.removeAttribute(arguments[1]);", buttons[index], unique) raise ValueError() except StaleElementReferenceException: logger.critical('Error while listening to button events') diff --git a/requirements.txt b/requirements.txt index 2a5b60b759af4b28b2485f2f888dcf306086afc7..edecd2f7cce0b6e5bfc613f8c2045742668e9e8a 100644 GIT binary patch delta 91 zcmeyx{)>IWH-B@66b2)PM20j5Lk0sNG+{7iuw*a;VpAa75J;OdB!kshFjxTjMnEzV asLmKjngC%6P~HeEZwM4K*zC%IWH-A$GV+Iojb0D-}NM(Rl8FqK3~3AoK(;Yh%or?U0F+Gy^OG4; afG`oLBM~T;3{;&66gOrt-0aG@l?ebH@em#W