blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

元素对象添加row_text属性

Browse Source
This commit is contained in:
g1879 2021-01-08 12:48:38 +08:00
parent 94ab5975a9
commit 78554f8145
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DrissionPage/driver_element.py
View File

@ -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:

10
DrissionPage/session_element.py
View File

@ -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'<br */?>', '\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: