diff --git a/DrissionPage/driver_element.py b/DrissionPage/driver_element.py index 266b635..9a66a5c 100644 --- a/DrissionPage/driver_element.py +++ b/DrissionPage/driver_element.py @@ -4,6 +4,7 @@ @Contact : g1879@qq.com @File : driver_element.py """ +import re from pathlib import Path from typing import Union, List, Any, Tuple @@ -78,13 +79,17 @@ class DriverElement(DrissionElement): @property def text(self) -> str: """返回元素内所有文本""" - return format_html(self.inner_ele.get_attribute('innerText'), False) - # return self.inner_ele.get_attribute('innerText') - # re_str = self.inner_ele.get_attribute('innerText') - # re_str = re.sub(r'\n{2,}', '\n', re_str) - # re_str = re.sub(r' {2,}', ' ', re_str) - # - # return format_html(re_str.strip('\n ')) + # return format_html(self.inner_ele.get_attribute('innerText'), False) + re_str = self.inner_ele.get_attribute('innerText') + re_str = re.sub(r'\n{2,}', '\n', re_str) + re_str = re.sub(r' {2,}', ' ', re_str) + + return format_html(re_str.strip('\n '), False) + + @property + def row_text(self) -> str: + """返回未格式化处理的元素内文本""" + return self.inner_ele.get_attribute('innerText') @property def link(self) -> str: diff --git a/DrissionPage/session_element.py b/DrissionPage/session_element.py index c76d9e3..5df2769 100644 --- a/DrissionPage/session_element.py +++ b/DrissionPage/session_element.py @@ -82,12 +82,10 @@ class SessionElement(DrissionElement): re_str = re.sub(r' {2,}', ' ', re_str) return format_html(re_str, False) - # re_str = str(self._inner_ele.text_content()) - # # re_str = re.sub(r'
', '\n', re_str) - # re_str = re.sub(r'\n{2,}', '\n', re_str) - # re_str = re.sub(r' {2,}', ' ', re_str) - # return format_html(re_str.strip('\n ')) - # # return format_html(re_str) + @property + def row_text(self) -> str: + """返回未格式化处理的元素内文本""" + return str(self._inner_ele.text_content()) @property def tag(self) -> str: