元素定位调整

2 files changed, 8 insertions, 8 deletions

diff --git a/page_element/ln_objects_element_position.py b/page_element/ln_objects_element_position.py
index 69fd1b88..48e3d277 100644
--- a/page_element/ln_objects_element_position.py
+++ b/page_element/ln_objects_element_position.py
@@ -130,7 +130,7 @@ tunnel_add_item_2="//div[@class='tunnel-object-endpointB']//i[@class='iconfont i
 tunnel_ip_list_fourth="//div[@class='pt-[2px] overflow-hidden flex-1']//ul/li[9]//div[@class='flex h-[22px] leading-[22px] MuiBox-root css-14di81r']"
 tunnel_page_description="//div[@class='tunnel-object-description']//textarea[1]"
 tunnel_ip_list_close="//button[@class='MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary css-zcc2bs']"
-
+tunnel_ip_list_close2 = "(//button[@class='MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary css-zcc2bs'])[2]"
 tunnel_ip_list_add_button='//i[@class="iconfont icon-Create1"]'
 tunnel_ip_list_select_ip='//li[normalize-space(text())="Address"]'
 tunnel_ip_list_select_ip_group='//li[normalize-space(text())="Address Group"]'
@@ -141,9 +141,9 @@ tunnel_slide_ip_item_input="//div[@class='MuiBox-root css-1krxo6z']//input[@clas
 tunnel_slide_ip_item_save="//div[@class='MuiBox-root css-1krxo6z']//i[@class='operate-icon iconfont icon-save']"
 tunnel_slide_ip_ok="//div[@class='MuiBox-root css-1krxo6z']//button[@class='MuiButtonBase-root MuiButton-root MuiLoadingButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary form-action-submit css-1djnbgz']"
 tunnel_slide_ip_confirm_ok='//*[@class="el-button el-button--default el-button--small el-button--primary operation-confirm"]'
-tunnel_item_search_frame = "//div[@class='tunnel-object-endpointA']//input[@class='MuiInput-input css-za5rna']"
-tunnel_first_row_item="//div[@class='flex flex-col items-center px-[4px]']//ul//li[1]//span"
-tunnel_ip_group_first_row="//div[@class='MuiBox-root css-1krxo6z']//div[@class='ip-object-included_sub_object_uuids']//ul/li[1]//span"
+tunnel_item_search_frame = "//div[@class='tunnel-object-endpointA']//input[@placeholder='Search For']"
+tunnel_first_row_item="//div[@class='flex flex-col items-center px-[4px] select-picker']//ul/li[1]//span"
+tunnel_ip_group_first_row="(//div[@class='pt-[2px] overflow-hidden flex-1'])[2]//ul//li[1]"
 tunnel_edit_endpointa_posXpath = '//*[@id="tunnelOperateItem-_EndpointAList_ElFormItem_ElForm_VPanel_VEditPanel_tunnelAdd_Home_App_anonymousComponent"]/i'
 tunnel_edit_endpointa_item_posXpath ='//*[@id="router-view-container"]//div[@class="IconBtn"]/i[@class="operate-icon iconfont icon-Edit"]'
 tunnel_item_input_posXpath = '//*[@id="router-view-container"]//input[@popperclass="ip-expr-popper"]'
@@ -151,11 +151,11 @@ tunnel_item_save_posXath = '//*[@id="router-view-container"]//i[@class="operate-
 
 TunnelsObjectPage_button_SaveYes_posId = "OK-_tunnelAdd_Home_App_anonymousComponent"# OK按钮
 TunnelsObjectPage_button_SaveYes_posXpath = "//button[@class='MuiButtonBase-root MuiButton-root MuiLoadingButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary form-action-submit css-1djnbgz']"
-TunnelsObjectPage_button_cancel_posId = "userBack-_tunnelAdd_Home_App_anonymousComponent"      #Cancel按钮#todo 改为id
+TunnelsObjectPage_button_cancel_posXpath = "//div[@class=' tunnel-object-page MuiBox-root css-o7xelj']//button[text()='Cancel']"
 TunnelsObjectPage_button_warningSaveYes_posSelector = 'body > div.el-message-box__wrapper > div > div.el-message-box__btns > button.el-button.el-button--default.el-button--small.el-button--primary.operation-confirm > span'   #提示保存Yes按钮警告框
 
 #Tunnel查询页面,Object类似
-listPage_objectSearch_Tunnels_select_all_xpath='//*[@id="1-_FilteredSearch_ElRow_Objects_tunnel_Home_App_anonymousComponent" ]/preceding-sibling::li[1]'
+listPage_objectSearch_Tunnels_select_all_xpath= "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//li[1]"
 listPage_objectSearch_Tunnels_select_Id_posId = "1-_FilteredSearch_ElRow_Objects_tunnel_Home_App_anonymousComponent"      #查询ID
 listPage_objectSearch_Tunnels_select_Name_posId ="//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Name']"    #查询Name
 listPage_objectSearch_Tunnels_select_IP_posId = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='ip']" #查询IP
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index fd26f8f0..84baafe1 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -648,8 +648,8 @@ listPage_object_ip_address_del_after_ele_posXpath = '//div[@id="ly-table1-listco
 listPage_object_ip_address_select_First_object_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[1]//span[@class='MuiCheckbox-action css-kit57i']"  # 选择列表中第一个对象
 listPage_object_ip_address_select_Second_object_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[2]//span[@class='MuiCheckbox-action css-kit57i']"  # 选择列表中第二个对象
 listPage_First_object_ID_posXpath = "(//*[@id='ly-table1-listcontent']//div[@class='table-status-item-id'])[1]"
-listPage_First_object_Name_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[2]//div[@data-field='name']//span[@class='truncate']"
-listPage_First_object_Description_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[2]//div[@data-field='description']"
+listPage_First_object_Name_posXpath = "(//div[@data-field='name'])[2]//span"
+listPage_First_object_Description_posXpath = "(//div[@data-field='description'])[2]"
 listPage_Second_object_ID_posXpath = "(//*[@id='ly-table1-listcontent']//div[@class='table-status-item-id'])[2]"
 # Create IP Address Object 和 Edit IP Address Object   新增和编辑页
 ip_addressObjectPage_input_Name_posXpath = "//div[@class='ip-object-name']//input"  # name输入框Xpath