From 43d0a742d1e4ecc9c8aae6eb2ed644f32a8efee7 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Tue, 7 Feb 2023 18:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0@|=E6=9F=A5=E6=89=BE=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95=EF=BC=9Bini=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4--no-s?=
 =?UTF-8?q?andbox=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/configs/configs.ini  |  2 +-
 DrissionPage/functions/locator.py | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/DrissionPage/configs/configs.ini b/DrissionPage/configs/configs.ini
index bc9afba..935c6ba 100644
--- a/DrissionPage/configs/configs.ini
+++ b/DrissionPage/configs/configs.ini
@@ -5,7 +5,7 @@ download_path =
 [chrome_options]
 debugger_address = 127.0.0.1:9222
 binary_location = chrome
-arguments = ['--no-first-run', '--no-sandbox', '--disable-gpu', '--ignore-certificate-errors', '--disable-infobars', '--disable-popup-blocking']
+arguments = ['--no-first-run', '--disable-gpu', '--ignore-certificate-errors', '--disable-infobars', '--disable-popup-blocking']
 extensions = []
 experimental_options = {'prefs': {'profile.default_content_settings.popups': 0, 'profile.default_content_setting_values': {'notifications': 2}, 'plugins.plugins_list': [{'enabled': False, 'name': 'Chrome PDF Viewer'}]}, 'useAutomationExtension': False, 'excludeSwitches': ['enable-automation']}
 page_load_strategy = normal
diff --git a/DrissionPage/functions/locator.py b/DrissionPage/functions/locator.py
index e60ae81..bc8a936 100644
--- a/DrissionPage/functions/locator.py
+++ b/DrissionPage/functions/locator.py
@@ -63,6 +63,9 @@ def str_to_loc(loc):
     if loc.startswith('@@') and loc != '@@':
         loc_str = _make_multi_xpath_str('*', loc)
 
+    elif loc.startswith('@|') and loc != '@|':
+        loc_str = _make_multi_xpath_str('*', loc, False)
+
     # 单属性查找
     elif loc.startswith('@') and loc != '@':
         loc_str = _make_single_xpath_str('*', loc)
@@ -75,6 +78,8 @@ def str_to_loc(loc):
         else:
             if loc[at_ind:].startswith('@@'):
                 loc_str = _make_multi_xpath_str(loc[4:at_ind], loc[at_ind:])
+            elif loc[at_ind:].startswith('@|'):
+                loc_str = _make_multi_xpath_str(loc[4:at_ind], loc[at_ind:], False)
             else:
                 loc_str = _make_single_xpath_str(loc[4:at_ind], loc[at_ind:])
 
@@ -144,14 +149,15 @@ def _make_single_xpath_str(tag: str, text: str) -> str:
     return f'//*[{arg_str}]{txt_str}' if arg_str else f'//*{txt_str}'
 
 
-def _make_multi_xpath_str(tag: str, text: str) -> str:
+def _make_multi_xpath_str(tag: str, text: str, _and: bool = True) -> str:
     """生成多属性查找的xpath语句
     :param tag: 标签名
     :param text: 待处理的字符串
+    :param _and: 是否与方式
     :return: xpath字符串
     """
-    arg_list = [] if tag == '*' else [f'name()="{tag}"']
-    args = text.split('@@')
+    arg_list = []
+    args = text.split('@@') if _and else text.split('@|')
 
     for arg in args[1:]:
         r = split(r'([:=])', arg, maxsplit=1)
@@ -180,7 +186,11 @@ def _make_multi_xpath_str(tag: str, text: str) -> str:
         if arg_str:
             arg_list.append(arg_str)
 
-    arg_str = ' and '.join(arg_list)
+    arg_str = ' and '.join(arg_list) if _and else ' or '.join(arg_list)
+    if tag != '*':
+        condition = f' and ({arg_str})' if arg_str else ''
+        arg_str = f'name()="{tag}"{condition}'
+
     return f'//*[{arg_str}]' if arg_str else f'//*'