From a522b472e0ab01e5dcdb98eba48f2ab3a27dcfba Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Tue, 11 Aug 2020 10:16:54 +0800
Subject: [PATCH] =?UTF-8?q?DrissionElement=E6=B7=BB=E5=8A=A0xpath=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/common.py | 24 +++++++++++++++---------
 README.en.md           |  8 ++++++++
 README.zh-cn.md        |  8 ++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/DrissionPage/common.py b/DrissionPage/common.py
index e73c0f2..2e423ae 100644
--- a/DrissionPage/common.py
+++ b/DrissionPage/common.py
@@ -19,6 +19,7 @@ class DrissionElement(object):
 
     def __init__(self, ele: Union[Element, WebElement]):
         self._inner_ele = ele
+        self._xpath = None
 
     @property
     def inner_ele(self) -> Union[WebElement, Element]:
@@ -54,20 +55,25 @@ class DrissionElement(object):
 
     @property
     def xpath(self):
-        def get_xpath(ele: DrissionElement, xpath_str=''):
+        self._xpath = self._xpath or self._get_xpath()
+        return self._xpath
+
+    def _get_xpath(self):
+        """获取当前元素xpath字符串"""
+        xpath_str = ''
+        ele = self
+        while ele:
             ele_id = ele.attr('id')
             if ele_id:
-                return None, f'//*[@id="{ele_id}"]{xpath_str}'
+                return f'//{ele.tag}[@id="{ele_id}"]{xpath_str}'
             else:
-                brothers = len(ele.eles(f'xpath:./preceding-sibling::{ele.tag}', timeout=0.001))  # FIXME: 修改这里
+                if 'SessionElement' in str(type(self)):
+                    brothers = len(ele.eles(f'xpath:./preceding-sibling::{ele.tag}'))
+                else:
+                    brothers = len(ele.eles(f'xpath:./preceding-sibling::{ele.tag}', timeout=0.001))
                 xpath_str = f'/{ele.tag}[{brothers + 1}]{xpath_str}' if brothers > 0 else f'/{ele.tag}{xpath_str}'
                 ele = ele.parent
-            print(xpath_str)
-            while ele:
-                ele, xpath_str = get_xpath(ele, xpath_str)
-            return ele, xpath_str
-
-        return get_xpath(self)[1]
+        return xpath_str
 
     @abstractmethod
     def ele(self, loc: Union[tuple, str], mode: str = None, show_errmsg: bool = True):
diff --git a/README.en.md b/README.en.md
index a66f29c..9c8f476 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1064,6 +1064,10 @@ Parameter Description:
 
 ​	Returns the element label name text.
 
+### xpath
+
+​	Return the xpath path of the element.
+
 ### parent
 
 ​	Returns the parent element object.
@@ -1311,6 +1315,10 @@ Parameter Description:
 
 ​	Returns the element label name text.
 
+### xpath
+
+​	Return the xpath path of the element.
+
 ### parent
 
 ​	Returns the parent element object.
diff --git a/README.zh-cn.md b/README.zh-cn.md
index 57ac8d1..b46c59e 100644
--- a/README.zh-cn.md
+++ b/README.zh-cn.md
@@ -1063,6 +1063,10 @@ driver模式的元素对象，包装了一个WebElement对象，并封装了常
 
 ​	返回元素标签名文本。
 
+### xpath
+
+​	返回元素xpath路径。
+
 ### parent
 
 ​	返回父级元素对象。
@@ -1310,6 +1314,10 @@ session模式的元素对象，包装了一个Element对象，并封装了常用
 
 ​	返回元素标签名文本。
 
+### xpath
+
+​	返回元素xpath路径。
+
 ### parent
 
 ​	返回父级元素对象。