From 231cd0724bf92685e962cf8252d13597f669f6e4 Mon Sep 17 00:00:00 2001 From: g1879 Date: Wed, 3 Jul 2024 16:44:19 +0800 Subject: [PATCH] =?UTF-8?q?4.1.0.0b1=E4=BC=98=E5=8C=96input()=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=9B=E4=BF=AE=E5=A4=8DFrame?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=BB=9A=E5=8A=A8=E5=A1=AB=E5=85=A5tuple?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=AC=A6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/_base/base.py | 2 + DrissionPage/_elements/chromium_element.py | 6 +- DrissionPage/_functions/cookies.py | 2 + DrissionPage/_functions/keys.py | 276 ++++++++++----------- DrissionPage/_functions/keys.pyi | 12 +- DrissionPage/_units/actions.py | 49 ++-- DrissionPage/_units/actions.pyi | 20 +- DrissionPage/_units/scroller.py | 2 +- 8 files changed, 170 insertions(+), 199 deletions(-) diff --git a/DrissionPage/_base/base.py b/DrissionPage/_base/base.py index ccd0e5b..d4f8d78 100644 --- a/DrissionPage/_base/base.py +++ b/DrissionPage/_base/base.py @@ -80,6 +80,8 @@ class BaseElement(BaseParser): :param method: 调用的方法名 :return: 元素对象或它们组成的列表 """ + if hasattr(locator, '_type'): + return locator r = self._find_elements(locator, timeout=timeout, index=index, relative=relative, raise_err=raise_err) if r or isinstance(r, list): return r diff --git a/DrissionPage/_elements/chromium_element.py b/DrissionPage/_elements/chromium_element.py index 9c0b5cd..7326e75 100644 --- a/DrissionPage/_elements/chromium_element.py +++ b/DrissionPage/_elements/chromium_element.py @@ -748,7 +748,11 @@ class ChromiumElement(DrissionElement): else: self._input_focus() - input_text_or_keys(self.owner, vals) + if isinstance(vals, str) and vals not in ('\ue003', '\ue017', '\ue010', '\ue011', + '\ue012', '\ue013', '\ue014', '\ue015',): + input_text_or_keys(self.owner, vals) + else: + self.owner.actions.type(vals) def clear(self, by_js=False): """清空元素文本 diff --git a/DrissionPage/_functions/cookies.py b/DrissionPage/_functions/cookies.py index 722a52f..be9d374 100644 --- a/DrissionPage/_functions/cookies.py +++ b/DrissionPage/_functions/cookies.py @@ -127,6 +127,8 @@ def set_tab_cookies(page, cookies): if cookie.get('domain', None): try: page._run_cdp_loaded('Network.setCookie', **cookie) + if not is_cookie_in_driver(page, cookie): + page.browser.set.cookies(cookie) continue except Exception: pass diff --git a/DrissionPage/_functions/keys.py b/DrissionPage/_functions/keys.py index edde4d9..2e9313a 100644 --- a/DrissionPage/_functions/keys.py +++ b/DrissionPage/_functions/keys.py @@ -5,6 +5,8 @@ @Copyright: (c) 2024 by g1879, Inc. All Rights Reserved. @License : BSD 3-Clause. """ +from platform import system + from ..errors import AlertExistsError @@ -21,18 +23,14 @@ class Keys: CANCEL = '\ue001' # ^break HELP = '\ue002' BACKSPACE = '\ue003' - BACK_SPACE = BACKSPACE TAB = '\ue004' CLEAR = '\ue005' RETURN = '\ue006' ENTER = '\ue007' SHIFT = '\ue008' - LEFT_SHIFT = SHIFT CONTROL = '\ue009' CTRL = '\ue009' - LEFT_CONTROL = CONTROL ALT = '\ue00a' - LEFT_ALT = ALT PAUSE = '\ue00b' ESCAPE = '\ue00c' SPACE = '\ue00d' @@ -41,13 +39,9 @@ class Keys: END = '\ue010' HOME = '\ue011' LEFT = '\ue012' - ARROW_LEFT = LEFT UP = '\ue013' - ARROW_UP = UP RIGHT = '\ue014' - ARROW_RIGHT = RIGHT DOWN = '\ue015' - ARROW_DOWN = DOWN INSERT = '\ue016' DELETE = '\ue017' DEL = '\ue017' @@ -219,15 +213,15 @@ keyDefinitions = { '\ue005': {'keyCode': 12, 'shiftKeyCode': 101, 'key': 'Clear', 'code': 'Numpad5', 'shiftKey': '5', 'location': 3}, '\ue006': {'keyCode': 13, 'code': 'NumpadEnter', 'key': 'Enter', 'text': '\r', 'location': 3}, '\ue00b': {'keyCode': 19, 'code': 'Pause', 'key': 'Pause'}, - 'CapsLock': {'keyCode': 20, 'code': 'CapsLock', 'key': 'CapsLock'}, + # 'CapsLock': {'keyCode': 20, 'code': 'CapsLock', 'key': 'CapsLock'}, '\ue00c': {'keyCode': 27, 'code': 'Escape', 'key': 'Escape'}, - 'Convert': {'keyCode': 28, 'code': 'Convert', 'key': 'Convert'}, - 'NonConvert': {'keyCode': 29, 'code': 'NonConvert', 'key': 'NonConvert'}, + # 'Convert': {'keyCode': 28, 'code': 'Convert', 'key': 'Convert'}, + # 'NonConvert': {'keyCode': 29, 'code': 'NonConvert', 'key': 'NonConvert'}, '\ue010': {'keyCode': 35, 'code': 'End', 'key': 'End'}, # 'Numpad1': {'keyCode': 35, 'shiftKeyCode': 97, 'key': 'End', 'code': 'Numpad1', 'shiftKey': '1', 'location': 3}, - 'Select': {'keyCode': 41, 'code': 'Select', 'key': 'Select'}, - 'Open': {'keyCode': 43, 'code': 'Open', 'key': 'Execute'}, - 'PrintScreen': {'keyCode': 44, 'code': 'PrintScreen', 'key': 'PrintScreen'}, + # 'Select': {'keyCode': 41, 'code': 'Select', 'key': 'Select'}, + # 'Open': {'keyCode': 43, 'code': 'Open', 'key': 'Execute'}, + # 'PrintScreen': {'keyCode': 44, 'code': 'PrintScreen', 'key': 'PrintScreen'}, '\ue016': {'keyCode': 45, 'code': 'Insert', 'key': 'Insert'}, # 'Numpad0': {'keyCode': 45, 'shiftKeyCode': 96, 'key': 'Insert', 'code': 'Numpad0', 'shiftKey': '0', 'location': 3}, '\ue017': {'keyCode': 46, 'code': 'Delete', 'key': 'Delete'}, @@ -243,35 +237,6 @@ keyDefinitions = { '\ue021': {'keyCode': 55, 'code': 'Digit7', 'shiftKey': '&', 'key': '7'}, '\ue022': {'keyCode': 56, 'code': 'Digit8', 'shiftKey': '*', 'key': '8'}, '\ue023': {'keyCode': 57, 'code': 'Digit9', 'shiftKey': '\(', 'key': '9'}, - 'KeyA': {'keyCode': 65, 'code': 'KeyA', 'shiftKey': 'A', 'key': 'a'}, - 'KeyB': {'keyCode': 66, 'code': 'KeyB', 'shiftKey': 'B', 'key': 'b'}, - 'KeyC': {'keyCode': 67, 'code': 'KeyC', 'shiftKey': 'C', 'key': 'c'}, - 'KeyD': {'keyCode': 68, 'code': 'KeyD', 'shiftKey': 'D', 'key': 'd'}, - 'KeyE': {'keyCode': 69, 'code': 'KeyE', 'shiftKey': 'E', 'key': 'e'}, - 'KeyF': {'keyCode': 70, 'code': 'KeyF', 'shiftKey': 'F', 'key': 'f'}, - 'KeyG': {'keyCode': 71, 'code': 'KeyG', 'shiftKey': 'G', 'key': 'g'}, - 'KeyH': {'keyCode': 72, 'code': 'KeyH', 'shiftKey': 'H', 'key': 'h'}, - 'KeyI': {'keyCode': 73, 'code': 'KeyI', 'shiftKey': 'I', 'key': 'i'}, - 'KeyJ': {'keyCode': 74, 'code': 'KeyJ', 'shiftKey': 'J', 'key': 'j'}, - 'KeyK': {'keyCode': 75, 'code': 'KeyK', 'shiftKey': 'K', 'key': 'k'}, - 'KeyL': {'keyCode': 76, 'code': 'KeyL', 'shiftKey': 'L', 'key': 'l'}, - 'KeyM': {'keyCode': 77, 'code': 'KeyM', 'shiftKey': 'M', 'key': 'm'}, - 'KeyN': {'keyCode': 78, 'code': 'KeyN', 'shiftKey': 'N', 'key': 'n'}, - 'KeyO': {'keyCode': 79, 'code': 'KeyO', 'shiftKey': 'O', 'key': 'o'}, - 'KeyP': {'keyCode': 80, 'code': 'KeyP', 'shiftKey': 'P', 'key': 'p'}, - 'KeyQ': {'keyCode': 81, 'code': 'KeyQ', 'shiftKey': 'Q', 'key': 'q'}, - 'KeyR': {'keyCode': 82, 'code': 'KeyR', 'shiftKey': 'R', 'key': 'r'}, - 'KeyS': {'keyCode': 83, 'code': 'KeyS', 'shiftKey': 'S', 'key': 's'}, - 'KeyT': {'keyCode': 84, 'code': 'KeyT', 'shiftKey': 'T', 'key': 't'}, - 'KeyU': {'keyCode': 85, 'code': 'KeyU', 'shiftKey': 'U', 'key': 'u'}, - 'KeyV': {'keyCode': 86, 'code': 'KeyV', 'shiftKey': 'V', 'key': 'v'}, - 'KeyW': {'keyCode': 87, 'code': 'KeyW', 'shiftKey': 'W', 'key': 'w'}, - 'KeyX': {'keyCode': 88, 'code': 'KeyX', 'shiftKey': 'X', 'key': 'x'}, - 'KeyY': {'keyCode': 89, 'code': 'KeyY', 'shiftKey': 'Y', 'key': 'y'}, - 'KeyZ': {'keyCode': 90, 'code': 'KeyZ', 'shiftKey': 'Z', 'key': 'z'}, - 'MetaLeft': {'keyCode': 91, 'code': 'MetaLeft', 'key': 'Meta'}, - 'MetaRight': {'keyCode': 92, 'code': 'MetaRight', 'key': 'Meta'}, - 'ContextMenu': {'keyCode': 93, 'code': 'ContextMenu', 'key': 'ContextMenu'}, '\ue024': {'keyCode': 106, 'code': 'NumpadMultiply', 'key': '*', 'location': 3}, '\ue025': {'keyCode': 107, 'code': 'NumpadAdd', 'key': '+', 'location': 3}, '\ue027': {'keyCode': 109, 'code': 'NumpadSubtract', 'key': '-', 'location': 3}, @@ -288,64 +253,91 @@ keyDefinitions = { '\ue03a': {'keyCode': 121, 'code': 'F10', 'key': 'F10'}, '\ue03b': {'keyCode': 122, 'code': 'F11', 'key': 'F11'}, '\ue03c': {'keyCode': 123, 'code': 'F12', 'key': 'F12'}, - 'F13': {'keyCode': 124, 'code': 'F13', 'key': 'F13'}, - 'F14': {'keyCode': 125, 'code': 'F14', 'key': 'F14'}, - 'F15': {'keyCode': 126, 'code': 'F15', 'key': 'F15'}, - 'F16': {'keyCode': 127, 'code': 'F16', 'key': 'F16'}, - 'F17': {'keyCode': 128, 'code': 'F17', 'key': 'F17'}, - 'F18': {'keyCode': 129, 'code': 'F18', 'key': 'F18'}, - 'F19': {'keyCode': 130, 'code': 'F19', 'key': 'F19'}, - 'F20': {'keyCode': 131, 'code': 'F20', 'key': 'F20'}, - 'F21': {'keyCode': 132, 'code': 'F21', 'key': 'F21'}, - 'F22': {'keyCode': 133, 'code': 'F22', 'key': 'F22'}, - 'F23': {'keyCode': 134, 'code': 'F23', 'key': 'F23'}, - 'F24': {'keyCode': 135, 'code': 'F24', 'key': 'F24'}, - 'NumLock': {'keyCode': 144, 'code': 'NumLock', 'key': 'NumLock'}, - 'ScrollLock': {'keyCode': 145, 'code': 'ScrollLock', 'key': 'ScrollLock'}, - 'AudioVolumeMute': {'keyCode': 173, 'code': 'AudioVolumeMute', 'key': 'AudioVolumeMute'}, - 'AudioVolumeDown': {'keyCode': 174, 'code': 'AudioVolumeDown', 'key': 'AudioVolumeDown'}, - 'AudioVolumeUp': {'keyCode': 175, 'code': 'AudioVolumeUp', 'key': 'AudioVolumeUp'}, - 'MediaTrackNext': {'keyCode': 176, 'code': 'MediaTrackNext', 'key': 'MediaTrackNext'}, - 'MediaTrackPrevious': {'keyCode': 177, 'code': 'MediaTrackPrevious', 'key': 'MediaTrackPrevious'}, - 'MediaStop': {'keyCode': 178, 'code': 'MediaStop', 'key': 'MediaStop'}, - 'MediaPlayPause': {'keyCode': 179, 'code': 'MediaPlayPause', 'key': 'MediaPlayPause'}, '\ue018': {'keyCode': 186, 'code': 'Semicolon', 'shiftKey': ':', 'key': ';'}, - 'Equal': {'keyCode': 187, 'code': 'Equal', 'shiftKey': '+', 'key': '='}, '\ue019': {'keyCode': 187, 'code': 'NumpadEqual', 'key': '=', 'location': 3}, - 'Comma': {'keyCode': 188, 'code': 'Comma', 'shiftKey': '<', 'key': ','}, - 'Minus': {'keyCode': 189, 'code': 'Minus', 'shiftKey': '_', 'key': '-'}, - 'Period': {'keyCode': 190, 'code': 'Period', 'shiftKey': '>', 'key': '.'}, - 'Slash': {'keyCode': 191, 'code': 'Slash', 'shiftKey': '?', 'key': '/'}, - 'Backquote': {'keyCode': 192, 'code': 'Backquote', 'shiftKey': '~', 'key': '`'}, - 'BracketLeft': {'keyCode': 219, 'code': 'BracketLeft', 'shiftKey': '{', 'key': '['}, - 'Backslash': {'keyCode': 220, 'code': 'Backslash', 'shiftKey': '|', 'key': '\\'}, - 'BracketRight': {'keyCode': 221, 'code': 'BracketRight', 'shiftKey': '}', 'key': ']'}, - 'Quote': {'keyCode': 222, 'code': 'Quote', 'shiftKey': '"', 'key': '\''}, - 'AltGraph': {'keyCode': 225, 'code': 'AltGraph', 'key': 'AltGraph'}, - 'Props': {'keyCode': 247, 'code': 'Props', 'key': 'CrSel'}, - 'Cancel': {'keyCode': 3, 'key': 'Cancel', 'code': 'Abort'}, - 'Clear': {'keyCode': 12, 'key': 'Clear', 'code': 'Numpad5', 'location': 3}, - 'Shift': {'keyCode': 16, 'key': 'Shift', 'code': 'ShiftLeft'}, - 'Control': {'keyCode': 17, 'key': 'Control', 'code': 'ControlLeft'}, - 'Alt': {'keyCode': 18, 'key': 'Alt', 'code': 'AltLeft'}, - 'Accept': {'keyCode': 30, 'key': 'Accept'}, - 'ModeChange': {'keyCode': 31, 'key': 'ModeChange'}, - 'Print': {'keyCode': 42, 'key': 'Print'}, - 'Execute': {'keyCode': 43, 'key': 'Execute', 'code': 'Open'}, '\u0000': {'keyCode': 46, 'key': '\u0000', 'code': 'NumpadDecimal', 'location': 3}, - 'Attn': {'keyCode': 246, 'key': 'Attn'}, - 'CrSel': {'keyCode': 247, 'key': 'CrSel', 'code': 'Props'}, - 'ExSel': {'keyCode': 248, 'key': 'ExSel'}, - 'EraseEof': {'keyCode': 249, 'key': 'EraseEof'}, - 'Play': {'keyCode': 250, 'key': 'Play'}, - 'ZoomOut': {'keyCode': 251, 'key': 'ZoomOut'}, - 'Power': {'key': 'Power', 'code': 'Power'}, - 'Eject': {'key': 'Eject', 'code': 'Eject'}, + # 'KeyA': {'keyCode': 65, 'code': 'KeyA', 'shiftKey': 'A', 'key': 'a'}, + # 'KeyB': {'keyCode': 66, 'code': 'KeyB', 'shiftKey': 'B', 'key': 'b'}, + # 'KeyC': {'keyCode': 67, 'code': 'KeyC', 'shiftKey': 'C', 'key': 'c'}, + # 'KeyD': {'keyCode': 68, 'code': 'KeyD', 'shiftKey': 'D', 'key': 'd'}, + # 'KeyE': {'keyCode': 69, 'code': 'KeyE', 'shiftKey': 'E', 'key': 'e'}, + # 'KeyF': {'keyCode': 70, 'code': 'KeyF', 'shiftKey': 'F', 'key': 'f'}, + # 'KeyG': {'keyCode': 71, 'code': 'KeyG', 'shiftKey': 'G', 'key': 'g'}, + # 'KeyH': {'keyCode': 72, 'code': 'KeyH', 'shiftKey': 'H', 'key': 'h'}, + # 'KeyI': {'keyCode': 73, 'code': 'KeyI', 'shiftKey': 'I', 'key': 'i'}, + # 'KeyJ': {'keyCode': 74, 'code': 'KeyJ', 'shiftKey': 'J', 'key': 'j'}, + # 'KeyK': {'keyCode': 75, 'code': 'KeyK', 'shiftKey': 'K', 'key': 'k'}, + # 'KeyL': {'keyCode': 76, 'code': 'KeyL', 'shiftKey': 'L', 'key': 'l'}, + # 'KeyM': {'keyCode': 77, 'code': 'KeyM', 'shiftKey': 'M', 'key': 'm'}, + # 'KeyN': {'keyCode': 78, 'code': 'KeyN', 'shiftKey': 'N', 'key': 'n'}, + # 'KeyO': {'keyCode': 79, 'code': 'KeyO', 'shiftKey': 'O', 'key': 'o'}, + # 'KeyP': {'keyCode': 80, 'code': 'KeyP', 'shiftKey': 'P', 'key': 'p'}, + # 'KeyQ': {'keyCode': 81, 'code': 'KeyQ', 'shiftKey': 'Q', 'key': 'q'}, + # 'KeyR': {'keyCode': 82, 'code': 'KeyR', 'shiftKey': 'R', 'key': 'r'}, + # 'KeyS': {'keyCode': 83, 'code': 'KeyS', 'shiftKey': 'S', 'key': 's'}, + # 'KeyT': {'keyCode': 84, 'code': 'KeyT', 'shiftKey': 'T', 'key': 't'}, + # 'KeyU': {'keyCode': 85, 'code': 'KeyU', 'shiftKey': 'U', 'key': 'u'}, + # 'KeyV': {'keyCode': 86, 'code': 'KeyV', 'shiftKey': 'V', 'key': 'v'}, + # 'KeyW': {'keyCode': 87, 'code': 'KeyW', 'shiftKey': 'W', 'key': 'w'}, + # 'KeyX': {'keyCode': 88, 'code': 'KeyX', 'shiftKey': 'X', 'key': 'x'}, + # 'KeyY': {'keyCode': 89, 'code': 'KeyY', 'shiftKey': 'Y', 'key': 'y'}, + # 'KeyZ': {'keyCode': 90, 'code': 'KeyZ', 'shiftKey': 'Z', 'key': 'z'}, + # 'MetaLeft': {'keyCode': 91, 'code': 'MetaLeft', 'key': 'Meta'}, + # 'MetaRight': {'keyCode': 92, 'code': 'MetaRight', 'key': 'Meta'}, + # 'ContextMenu': {'keyCode': 93, 'code': 'ContextMenu', 'key': 'ContextMenu'}, + # 'F13': {'keyCode': 124, 'code': 'F13', 'key': 'F13'}, + # 'F14': {'keyCode': 125, 'code': 'F14', 'key': 'F14'}, + # 'F15': {'keyCode': 126, 'code': 'F15', 'key': 'F15'}, + # 'F16': {'keyCode': 127, 'code': 'F16', 'key': 'F16'}, + # 'F17': {'keyCode': 128, 'code': 'F17', 'key': 'F17'}, + # 'F18': {'keyCode': 129, 'code': 'F18', 'key': 'F18'}, + # 'F19': {'keyCode': 130, 'code': 'F19', 'key': 'F19'}, + # 'F20': {'keyCode': 131, 'code': 'F20', 'key': 'F20'}, + # 'F21': {'keyCode': 132, 'code': 'F21', 'key': 'F21'}, + # 'F22': {'keyCode': 133, 'code': 'F22', 'key': 'F22'}, + # 'F23': {'keyCode': 134, 'code': 'F23', 'key': 'F23'}, + # 'F24': {'keyCode': 135, 'code': 'F24', 'key': 'F24'}, + # 'NumLock': {'keyCode': 144, 'code': 'NumLock', 'key': 'NumLock'}, + # 'ScrollLock': {'keyCode': 145, 'code': 'ScrollLock', 'key': 'ScrollLock'}, + # 'AudioVolumeMute': {'keyCode': 173, 'code': 'AudioVolumeMute', 'key': 'AudioVolumeMute'}, + # 'AudioVolumeDown': {'keyCode': 174, 'code': 'AudioVolumeDown', 'key': 'AudioVolumeDown'}, + # 'AudioVolumeUp': {'keyCode': 175, 'code': 'AudioVolumeUp', 'key': 'AudioVolumeUp'}, + # 'MediaTrackNext': {'keyCode': 176, 'code': 'MediaTrackNext', 'key': 'MediaTrackNext'}, + # 'MediaTrackPrevious': {'keyCode': 177, 'code': 'MediaTrackPrevious', 'key': 'MediaTrackPrevious'}, + # 'MediaStop': {'keyCode': 178, 'code': 'MediaStop', 'key': 'MediaStop'}, + # 'MediaPlayPause': {'keyCode': 179, 'code': 'MediaPlayPause', 'key': 'MediaPlayPause'}, + # 'Equal': {'keyCode': 187, 'code': 'Equal', 'shiftKey': '+', 'key': '='}, + # 'Comma': {'keyCode': 188, 'code': 'Comma', 'shiftKey': '<', 'key': ','}, + # 'Minus': {'keyCode': 189, 'code': 'Minus', 'shiftKey': '_', 'key': '-'}, + # 'Period': {'keyCode': 190, 'code': 'Period', 'shiftKey': '>', 'key': '.'}, + # 'Slash': {'keyCode': 191, 'code': 'Slash', 'shiftKey': '?', 'key': '/'}, + # 'Backquote': {'keyCode': 192, 'code': 'Backquote', 'shiftKey': '~', 'key': '`'}, + # 'BracketLeft': {'keyCode': 219, 'code': 'BracketLeft', 'shiftKey': '{', 'key': '['}, + # 'Backslash': {'keyCode': 220, 'code': 'Backslash', 'shiftKey': '|', 'key': '\\'}, + # 'BracketRight': {'keyCode': 221, 'code': 'BracketRight', 'shiftKey': '}', 'key': ']'}, + # 'Quote': {'keyCode': 222, 'code': 'Quote', 'shiftKey': '"', 'key': '\''}, + # 'AltGraph': {'keyCode': 225, 'code': 'AltGraph', 'key': 'AltGraph'}, + # 'Props': {'keyCode': 247, 'code': 'Props', 'key': 'CrSel'}, + # 'Cancel': {'keyCode': 3, 'key': 'Cancel', 'code': 'Abort'}, + # 'Clear': {'keyCode': 12, 'key': 'Clear', 'code': 'Numpad5', 'location': 3}, + # 'Shift': {'keyCode': 16, 'key': 'Shift', 'code': 'ShiftLeft'}, + # 'Control': {'keyCode': 17, 'key': 'Control', 'code': 'ControlLeft'}, + # 'Alt': {'keyCode': 18, 'key': 'Alt', 'code': 'AltLeft'}, + # 'Accept': {'keyCode': 30, 'key': 'Accept'}, + # 'ModeChange': {'keyCode': 31, 'key': 'ModeChange'}, + # 'Print': {'keyCode': 42, 'key': 'Print'}, + # 'Execute': {'keyCode': 43, 'key': 'Execute', 'code': 'Open'}, + # 'Attn': {'keyCode': 246, 'key': 'Attn'}, + # 'CrSel': {'keyCode': 247, 'key': 'CrSel', 'code': 'Props'}, + # 'ExSel': {'keyCode': 248, 'key': 'ExSel'}, + # 'EraseEof': {'keyCode': 249, 'key': 'EraseEof'}, + # 'Play': {'keyCode': 250, 'key': 'Play'}, + # 'ZoomOut': {'keyCode': 251, 'key': 'ZoomOut'}, + # 'Power': {'key': 'Power', 'code': 'Power'}, + # 'Eject': {'key': 'Eject', 'code': 'Eject'}, } -modifierBit = {'\ue00a': 1, - '\ue009': 2, - '\ue03d': 4, - '\ue008': 8} +modifierBit = {'\ue00a': 1, '\ue009': 2, '\ue03d': 4, '\ue008': 8} +sys = system().lower() def keys_to_typing(value): @@ -368,65 +360,63 @@ def keys_to_typing(value): return modifier, ''.join(typing) -def keyDescriptionForString(_modifiers, keyString): # noqa: C901 - shift = _modifiers & 8 - description = {'key': '', - 'keyCode': 0, - 'code': '', - 'text': '', - 'location': 0} +def make_input_data(modifiers, key, key_up=False): + """ + :param modifiers: 功能键设置 + :param key: 按键字符 + :param key_up: 是否提起 + :return: None + """ + data = keyDefinitions.get(key) + if not data: + return None - definition = keyDefinitions.get(keyString) # type: ignore - if not definition: - raise ValueError(f'未知按键：{keyString}') + result = {'modifiers': modifiers, 'autoRepeat': False, '_ignore': AlertExistsError} + shift = modifiers & 8 - if 'key' in definition: - description['key'] = definition['key'] - if shift and definition.get('shiftKey'): - description['key'] = definition['shiftKey'] + if shift and data.get('shiftKey'): + result['key'] = data['shiftKey'] + result['text'] = data['shiftKey'] + elif 'key' in data: + result['key'] = data['key'] - if 'keyCode' in definition: - description['keyCode'] = definition['keyCode'] - if shift and definition.get('shiftKeyCode'): - description['keyCode'] = definition['shiftKeyCode'] + if len(result.get('key', '')) == 1: # type: ignore + result['text'] = data['key'] - if 'code' in definition: - description['code'] = definition['code'] + sys_text = 'windowsVirtualKeyCode' if sys == 'windows' else 'nativeVirtualKeyCode' + if shift and data.get('shiftKeyCode'): + result[sys_text] = data['shiftKeyCode'] + elif 'keyCode' in data: + result[sys_text] = data['keyCode'] - if 'location' in definition: - description['location'] = definition['location'] + if 'code' in data: + result['code'] = data['code'] - if len(description['key']) == 1: # type: ignore - description['text'] = description['key'] + if 'location' in data: + result['location'] = data['location'] + result['isKeypad'] = data['location'] == 3 + else: + result['location'] = 0 + result['isKeypad'] = False - if 'text' in definition: - description['text'] = definition['text'] - if shift and definition.get('shiftText'): - description['text'] = definition['shiftText'] + if shift and data.get('shiftText'): + result['text'] = data['shiftText'] + result['unmodifiedText'] = data['shiftText'] + elif 'text' in data: + result['text'] = data['text'] + result['unmodifiedText'] = data['text'] - if _modifiers & ~8: - description['text'] = '' + if modifiers & ~8: + result['text'] = '' - return description + result['type'] = 'keyUp' if key_up else ('keyDown' if result.get('text') else 'rawKeyDown') + return result def send_key(page, modifier, key): """发送一个字，在键盘中的字符触发按键，其它直接发送文本""" - if key in keyDefinitions: - description = keyDescriptionForString(modifier, key) - text = description['text'] - data = {'type': 'keyDown' if text else 'rawKeyDown', - 'modifiers': modifier, - 'windowsVirtualKeyCode': description['keyCode'], - 'code': description['code'], - 'key': description['key'], - 'text': text, - 'autoRepeat': False, - 'unmodifiedText': text, - 'location': description['location'], - 'isKeypad': description['location'] == 3, - '_ignore': AlertExistsError} - + data = make_input_data(modifier, key) + if data: page._run_cdp('Input.dispatchKeyEvent', **data) data['type'] = 'keyUp' page._run_cdp('Input.dispatchKeyEvent', **data) diff --git a/DrissionPage/_functions/keys.pyi b/DrissionPage/_functions/keys.pyi index a06c8be..c9254d1 100644 --- a/DrissionPage/_functions/keys.pyi +++ b/DrissionPage/_functions/keys.pyi @@ -5,7 +5,7 @@ @Copyright: (c) 2024 by g1879, Inc. All Rights Reserved. @License : BSD 3-Clause. """ -from typing import Tuple, Dict, Union, Any +from typing import Tuple, Union, Any from .._pages.chromium_base import ChromiumBase @@ -23,18 +23,14 @@ class Keys: CANCEL: str HELP: str BACKSPACE: str - BACK_SPACE: str TAB: str CLEAR: str RETURN: str ENTER: str SHIFT: str - LEFT_SHIFT: str CONTROL: str CTRL: str - LEFT_CONTROL: str ALT: str - LEFT_ALT: str PAUSE: str ESCAPE: str SPACE: str @@ -43,13 +39,9 @@ class Keys: END: str HOME: str LEFT: str - ARROW_LEFT: str UP: str - ARROW_UP: str RIGHT: str - ARROW_RIGHT: str DOWN: str - ARROW_DOWN: str INSERT: str DELETE: str DEL: str @@ -96,7 +88,7 @@ modifierBit: dict = ... def keys_to_typing(value: Union[str, int, list, tuple]) -> Tuple[int, str]: ... -def keyDescriptionForString(_modifiers: int, keyString: str) -> Dict: ... +def make_input_data(modifiers: int, key: str, key_up: bool = False) -> dict: ... def send_key(page: ChromiumBase, modifier: int, key: str) -> None: ... diff --git a/DrissionPage/_units/actions.py b/DrissionPage/_units/actions.py index 6942cde..5f3ef99 100644 --- a/DrissionPage/_units/actions.py +++ b/DrissionPage/_units/actions.py @@ -7,9 +7,8 @@ """ from time import sleep, perf_counter -from .._functions.keys import modifierBit, keyDescriptionForString, input_text_or_keys, Keys, keyDefinitions +from .._functions.keys import modifierBit, make_input_data, input_text_or_keys, Keys from .._functions.web import location_in_viewport -from ..errors import AlertExistsError class Actions: @@ -256,8 +255,9 @@ class Actions: self.modifier |= modifierBit.get(key, 0) return self - data = self._get_key_data(key, 'keyDown') - data['_ignore'] = AlertExistsError + data = make_input_data(self.modifier, key, False) + if not data: + raise ValueError(f'没有这个按键：{key}') self.owner._run_cdp('Input.dispatchKeyEvent', **data) return self @@ -271,8 +271,9 @@ class Actions: self.modifier ^= modifierBit.get(key, 0) return self - data = self._get_key_data(key, 'keyUp') - data['_ignore'] = AlertExistsError + data = make_input_data(self.modifier, key, True) + if not data: + raise ValueError(f'没有这个按键：{key}') self.owner._run_cdp('Input.dispatchKeyEvent', **data) return self @@ -284,12 +285,15 @@ class Actions: modifiers = [] for i in keys: for character in i: - if character in keyDefinitions: - self.key_down(character) - if character in ('\ue009', '\ue008', '\ue00a', '\ue03d'): - modifiers.append(character) - else: - self.key_up(character) + if character in ('\ue009', '\ue008', '\ue00a', '\ue03d'): + self.modifier |= modifierBit.get(character, 0) + modifiers.append(character) + data = make_input_data(self.modifier, character, False) + if data: + self.owner._run_cdp('Input.dispatchKeyEvent', **data) + if character not in ('\ue009', '\ue008', '\ue00a', '\ue03d'): + data['type'] = 'keyUp' + self.owner._run_cdp('Input.dispatchKeyEvent', **data) else: self.owner._run_cdp('Input.dispatchKeyEvent', type='char', text=character) @@ -315,27 +319,6 @@ class Actions: self.owner.wait(second=second, scope=scope) return self - def _get_key_data(self, key, action): - """获取用于发送的按键信息 - :param key: 按键 - :param action: 'keyDown' 或 'keyUp' - :return: 按键信息 - """ - description = keyDescriptionForString(self.modifier, key) - text = description['text'] - if action != 'keyUp': - action = 'keyDown' if text else 'rawKeyDown' - return {'type': action, - 'modifiers': self.modifier, - 'windowsVirtualKeyCode': description['keyCode'], - 'code': description['code'], - 'key': description['key'], - 'text': text, - 'autoRepeat': False, - 'unmodifiedText': text, - 'location': description['location'], - 'isKeypad': description['location'] == 3} - def location_to_client(page, lx, ly): """绝对坐标转换为视口坐标""" diff --git a/DrissionPage/_units/actions.pyi b/DrissionPage/_units/actions.pyi index bc610eb..ba07789 100644 --- a/DrissionPage/_units/actions.pyi +++ b/DrissionPage/_units/actions.pyi @@ -11,19 +11,19 @@ from .._base.driver import Driver from .._elements.chromium_element import ChromiumElement from .._pages.chromium_base import ChromiumBase -KEYS = Literal['NULL', 'CANCEL', 'HELP', 'BACKSPACE', 'BACK_SPACE', 'meta', -'TAB', 'CLEAR', 'RETURN', 'ENTER', 'SHIFT', 'LEFT_SHIFT', 'CONTROL', 'command ', -'CTRL', 'LEFT_CONTROL', 'ALT', 'LEFT_ALT', 'PAUSE', 'ESCAPE', 'SPACE', -'PAGE_UP', 'PAGE_DOWN', 'END', 'HOME', 'LEFT', 'ARROW_LEFT', 'UP', -'ARROW_UP', 'RIGHT', 'ARROW_RIGHT', 'DOWN', 'ARROW_DOWN', 'INSERT', +KEYS = Literal['NULL', 'CANCEL', 'HELP', 'BACKSPACE', 'meta', +'TAB', 'CLEAR', 'RETURN', 'ENTER', 'SHIFT', 'CONTROL', 'command ', +'CTRL', 'ALT', 'PAUSE', 'ESCAPE', 'SPACE', +'PAGE_UP', 'PAGE_DOWN', 'END', 'HOME', 'LEFT', 'UP', +'RIGHT', 'DOWN', 'INSERT', 'DELETE', 'DEL', 'SEMICOLON', 'EQUALS', 'NUMPAD0', 'NUMPAD1', 'NUMPAD2', 'NUMPAD3', 'NUMPAD4', 'NUMPAD5', 'NUMPAD6', 'NUMPAD7', 'NUMPAD8', 'NUMPAD9', 'MULTIPLY', 'ADD', 'SUBTRACT', 'DECIMAL', 'DIVIDE', 'F1', 'F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12', 'META', 'COMMAND ', -'null', 'cancel', 'help', 'backspace', 'back_space', 'tab', 'clear', 'return', 'enter', -'shift', 'left_shift', 'control', 'ctrl', 'left_control', 'alt', 'left_alt', 'pause', -'escape', 'space', 'page_up', 'page_down', 'end', 'home', 'left', 'arrow_left', 'up', -'arrow_up', 'right', 'arrow_right', 'down', 'arrow_down', 'insert', 'delete', 'del', +'null', 'cancel', 'help', 'backspace', 'tab', 'clear', 'return', 'enter', +'shift', 'control', 'ctrl', 'alt', 'pause', +'escape', 'space', 'page_up', 'page_down', 'end', 'home', 'left', 'up', +'right', 'down', 'insert', 'delete', 'del', 'semicolon', 'equals', 'numpad0', 'numpad1', 'numpad2', 'numpad3', 'numpad4', 'numpad5', 'numpad6', 'numpad7', 'numpad8', 'numpad9', 'multiply', 'add', 'subtract', 'decimal', 'divide', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10', 'f11', 'f12', @@ -103,7 +103,5 @@ class Actions: def wait(self, second: float, scope: float = None) -> Actions: ... - def _get_key_data(self, key: str, action: str) -> dict: ... - def location_to_client(page, lx: int, ly: int) -> tuple: ... diff --git a/DrissionPage/_units/scroller.py b/DrissionPage/_units/scroller.py index 6ec48c4..edf0e82 100644 --- a/DrissionPage/_units/scroller.py +++ b/DrissionPage/_units/scroller.py @@ -173,5 +173,5 @@ class FrameScroller(PageScroller): :param center: 是否尽量滚动到页面正中，为None时如果被遮挡，则滚动到页面正中 :return: None """ - ele = loc_or_ele if loc_or_ele._type == 'ChromiumElement' else self._driver._ele(loc_or_ele) + ele = self._driver._ele(loc_or_ele) self._to_see(ele, center)