修改登录切换vsys、默认语言逻辑

2 files changed, 13 insertions, 13 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 4d2b1a41..46981cd3 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -135,7 +135,7 @@ main_Group_sub_Object_input_frame_posXpath = "//input[@class='MuiInput-input css
 main_Group_sub_Object_input_frame_select_one_posXpath = "//ul[@class='MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3']/li[1]//div[@class='flex h-[22px] leading-[22px] MuiBox-root css-14di81r']"  # 搜索框第一个元素
 # 列表页
 main_listPage_object_reference_count_posXpath = "//div[@class='MuiDataGrid-virtualScrollerContent css-0']/div/div[2]//div[@data-field='reference_count']/button"  # 提取reference的数量《断言》
-main_listPage_object_statistics_view_postXpath = "(//div[@id='ly-table1-listcontent']//span[text()='View'])[1]"
+main_listPage_object_statistics_view_postXpath = "(//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='statistics'])[2]"
 main_listPage_object_bottomTotal_postXpath = "//div[@class='flex-1 flex items-center justify-center undefined']/span[1]"  # 列表页底部Total元素
 # object导入文件Xpath路径
 main_ObjectPage_Input_path_Import_files_posXpath = "//div[@class='flex flex-col justify-start flex-1 MuiBox-root css-0']//input[@type='file']"
@@ -188,14 +188,14 @@ list_second_row_sixth_column_posXpath = '//table/tbody/tr[1]/td[6]/div//p'  # �
 
 # 列表页翻页元素
 listPage_object_pages_maxPageNumber_posXpath = '(//button[@class="MuiButtonBase-root MuiPaginationItem-root MuiPaginationItem-sizeMedium MuiPaginationItem-text MuiPaginationItem-rounded MuiPaginationItem-colorPrimary MuiPaginationItem-textPrimary MuiPaginationItem-page css-x4rueb"])[last()]'  # 列表页最大页码
-listPage_object_pages_currentPageNumber_posXpath = '//div[@class="page-box-containcheck"]//li[@class="number active"]'  # 列表页当前页码元素Xpath
+listPage_object_pages_currentPageNumber_posXpath = "//button[@aria-current='true']"  # 列表页当前页码元素Xpath
 listPage_object_pages_currentPageAreaMinNumber_posXpath = '//li[@class="el-icon more btn-quickprev el-icon-more"]/following-sibling::li[1]'  # 列表页当前页码所属区域最小页码元素Xpath
 listPage_object_pages_currentPageAreaMaxNumber_posXpath = '(//li[@class="el-icon more btn-quicknext el-icon-more"]/preceding-sibling::li)[last()]'  # 列表页当前页码所属区域最大页码元素Xpath
 listPage_object_pages_currentPageArea_MaxNumber_posXpath = '(//li[@class="number"])[last()]'
-listPage_object_pages_previousPage_button_poxXpath = '//div[@class="page-box-containcheck"]//button[@class="btn-prev"]/i'  # 前翻页按钮Xpath
+listPage_object_pages_previousPage_button_poxXpath = "//button[@aria-label='Go to previous page']"  # 前翻页按钮Xpath
 listPage_object_pages_nextPage_button_poxXpath = '//button[@aria-label="Go to next page"]'  # 后翻页按钮Xpath
 listPage_object_pages_next_2_Page_button_poxXpath = '//div[1]/ul/li[text()="2"]'  # 翻页至第二页
-listPage_object_pages_goTo_input_poxXpath = '//div[@class="page-box-containcheck"]//input[@class="el-input__inner"]'  # 页码Go to输入框Xpath
+listPage_object_pages_goTo_input_poxXpath = "//div[@class='MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-sizeSmall ml-[5px] h-[24px] w-[48px] css-1q6u993']/input"  # 页码Go to输入框Xpath
 listPage_object_pages_quickPreviousPage_button_poxXpath = '//li[contains(@class,"el-icon more btn-quickprev")]'  # 快速前翻页按钮Xpath
 listPage_object_pages_quickNextPage_button_poxXpath = '//li[contains(@class,"el-icon more btn-quicknext")]'  # 快速后翻页按钮Xpath
 listPage_fist_object_id_poxXpath = '//div[contains(@class,"el-table__body-wrapper")]//tr[1]//td[count(//div[@class="el-table__header-wrapper"]//span[text()="ID"]/../../../preceding-sibling::th)+1]//div[@class="table-status-item-id"]//span'
@@ -473,24 +473,24 @@ listPage_object_urls_tableCheckbox_posXpaths = '//table[@class="el-table__body"]
 # listPage_object_urls_tableCheckbox_objectGroup_posXpaths = '//i[contains(@class,"icon-URLgroup")]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页对象组的CheckBox（多个）
 # listPage_object_urls_tableCheckbox_objectGroup_posXpaths = '//i[contains(@class,"group")]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页对象组的CheckBox（多个）
 listPage_object_urls_tableCheckbox_objectGroup_posXpaths = \
-    '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])'  # 列表页Object Group 的CheckBoxs(不包含single Object和锁定对象)
+    "(//i[@class='iconfont color-ip icon-IPgroup  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input)"  # 列表页Object Group 的CheckBoxs(不包含single Object和锁定对象)
 listPage_object_urls_tableCheckbox_objectGroup_posXpaths_template = \
-    '((//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"]))[{}]'  # 列表页Object Group 的CheckBoxs(不包含single Object和锁定对象)
+    "((//i[@class='iconfont color-ip icon-IPgroup  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input))[{}]"  # 列表页Object Group 的CheckBoxs(不包含single Object和锁定对象)
 
 listPage_object_urls_tableCheckbox_notLocalVsys_objectOrGroup_posXpaths = '//div[@class="table-status-box"]/div[2]//*[contains(@class,"icon-lock")]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中不是本Vsys的对象或对象组的CheckBox
 listPage_object_urls_tableCheckbox_notLocalVsys_objectOrGroup_posXpaths_template = '(//div[@class="table-status-box"]/div[2]//*[contains(@class,"icon-lock")]/ancestor::tr//span[@class="el-checkbox__inner"])[{}]'  # 列表页中不是本Vsys的对象或对象组的CheckBox
 listPage_object_urls_tableDetails_singleObject_posXpaths = '//span[contains(@class,"name-fontFamily")]/preceding-sibling::i[not(contains(@class,"icon-URLgroup"))]/ancestor::tr//div[@class="itemDetails cursor"]/..'  # 列表页中所有对象（不包含对象组）的DetailsXpath
 # listPage_object_urls_tableDetails_firstSingleObject_posXpath = '(//span[contains(@class,"name-fontFamily")]/preceding-sibling::i[not(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个Object 的CheckBox
 listPage_object_urls_tableCheckbox_singleObject_posXpaths = \
-    '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[not(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])'  # 列表页中Object 的CheckBoxs(不包含Group和锁定对象)
+    "(//i[@class='iconfont color-ip icon-ip  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input)"  # 列表页中Object 的CheckBoxs(不包含Group和锁定对象)
 listPage_object_urls_tableCheckbox_singleObject_posXpaths_template = \
-    '((//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[not(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"]))[{}]'  # 列表页中Object 的CheckBoxs(不包含Group和锁定对象)
+    "((//i[@class='iconfont color-ip icon-ip  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input))[{}]"  # 列表页中Object 的CheckBoxs(不包含Group和锁定对象)
 listPage_object_urls_tableDetails_firstSingleObject_posXpath = \
-    '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[not(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个Object 的CheckBox(不包含Group和锁定对象)
+    "(//i[@class='iconfont color-ip icon-ip  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input)[1]"  # 列表页中第一个Object 的CheckBox(不包含Group和锁定对象)
 
 # listPage_object_urls_tableDetails_firstObjectGroup_posXpath = '(//i[contains(@class,"group")]/ancestor::tr//span[@class="el-checkbox__inner"][1])'  # 列表页中第一个Object Group 的CheckBox
 listPage_object_urls_tableDetails_firstObjectGroup_posXpath = \
-    '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个Object Group 的CheckBox(不包含single Object和锁定对象)
+    "(//i[@class='iconfont color-ip icon-IPgroup  css-lp3td5']//parent::*//parent::*//preceding-sibling::div[@data-field='__check__']//input)[1]"  # 列表页中第一个Object Group 的CheckBox(不包含single Object和锁定对象)
 listPage_object_urls_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = '(//i[@class="iconfont icon-lock text-[18px] text-[--color-text-decoration]"]/ancestor::div[@class="css-16m40q9 MuiDataGrid-cell MuiDataGrid-cell--textLeft"]/preceding-sibling::div[@data-field="__check__"]//input)[1]'  # 列表页中第一个不是本Vsys的对象或对象组的CheckBox
 
 listPage_object_urls_tableCheckbox_localVsys_objectOrGroup_posXpaths = '//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）
diff --git a/page_element/profiles_element_position.py b/page_element/profiles_element_position.py
index 4a26c2c1..c73581a3 100644
--- a/page_element/profiles_element_position.py
+++ b/page_element/profiles_element_position.py
@@ -13,11 +13,11 @@ leave_this_page_ok_elem_Xpath = '//div[@class="el-message-box tsg-message"]//but
 # main页面
 ##上导航栏及语言切换按钮
 mainPage_navigationBar_logo_posCss = ".tsg-img-logo"
-mainPage_input_language_posXpath = "//input[@id='anonymousComponent_Home_App_anonymousComponent_language']"
-mainPage_language_change_posXpath = "//span[@class='el-input__prefix']//i"
+mainPage_input_language_posXpath = "//div[@class='flex  mr-[20px]']/div//i"
+mainPage_language_change_posXpath = "//div[@class='flex  mr-[20px]']/div/button"
 mainPage_language_chinese_posXpath = "//div/ul/li/span[contains(text(),'简体中文')]"
 mainPage_language_russian_posXpath = "//div/ul/li/span[contains(text(),'Pусский')]" # Pусский
-mainPage_language_english_posXpath = "//div/ul/li/span[contains(text(),'English')]"
+mainPage_language_english_posXpath = "//ul[@class='MuiList-root MuiList-padding MuiMenu-list css-r8u8y9']//span[text()='English']"
 mainPage_button_menu_posXCss = ".menu-btn span"  # menu按钮定位
 mainPage_button_menu_posXpath = '//button[@class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit MuiIconButton-edgeStart MuiIconButton-sizeLarge ml-[20px!important] font-bold cursor-pointer css-134pika"]'
 mainPage_currentPage_vsysName_posXpath = '//*[@id="root"]/div/div/div/div/div[1]/div'  # 当前页面中vsys name