Merge branch 'develop' of https://git.mesalab.cn/zhaokun/tsg_ui_script into develop

3 files changed, 49 insertions, 47 deletions

diff --git a/page_element/ln_objects_element_position.py b/page_element/ln_objects_element_position.py
index 4c3a5755..09d2134b 100644
--- a/page_element/ln_objects_element_position.py
+++ b/page_element/ln_objects_element_position.py
@@ -94,7 +94,7 @@ listPage_object_Tunnels_editButton_posXPATH='//span[@class="action-edit inline-f
 listPage_object_Tunnels_exportButton_posXPATH='//*[@class="el-button importAndExport el-button--default el-button--small"]' #export按钮
 listPage_object_Tunnels_delButton_posXpath = '//span[@class="action-delete inline-flex mr-[8px] "]/button'      #del按钮id
 listPage_object_Tunnels_delButton_posXPATH='//*[@id="appDel-_OperateBtns_ElRow_Objects_tunnel_Home_App_anonymousComponent"]'
-listPage_object_Tunnels_del_yes_Button_posXpath = '//button[@class="el-button delComponents-ok role-disconnect-btn el-button--default el-button--small"]//span[contains(text(),"Yes")]'   #del_yes按钮
+listPage_object_Tunnels_del_yes_Button_posXpath = '//div[@class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj"]//button[contains(text(),"Yes")]'   #del_yes按钮
 
 listPage_objectSearch_Tunnels_selectLabel_posId="select-label" #查询框id
 listPage_objectSearch_Tunnels_buttonSearch_posId = "searchQuery"   #查询按钮id
@@ -113,14 +113,14 @@ tunnel_export_pop_no= "//button[@class='MuiButtonBase-root MuiButton-root MuiBut
 
 #Tunnel Create&Edit页
 Tunnel_ObjectPage_InputName_posXpath="//div[@class='tunnel-object-name']//input"#输入名字#
-Tunnel_ObjectPage_NameLength_posXpath='//*[(normalize-space(text())="128/128")]'#name超过32后，只截取32个字母，name输入框尾部为32/32
+Tunnel_ObjectPage_NameLength_posXpath="//div[@class='MuiInput-endDecorator css-tob0ta']/span" #name超过32后，只截取32个字母，name输入框尾部为32/32
 Tunnel_ObjectPage_ChangeColor_posid="swatches_btn-_Swatches_ElFormItem_ElForm_VPanel_VEditPanel_tunnelAdd_Home_App_anonymousComponent" # Color Change button
 Tunnel_ObjectPage_YellowColor_posid="switchColor#FFC425" #switch color button
 Tunnel_ObjectPage_inputItem_posXpath = "//div[@class='tunnel-object-endpointA']//i[@class='iconfont icon-Create1 font-[700]']"   #输入item内容
 Tunnel_Edit_Page_Type="tunnelType"
 Tunnel_Edit_Page_Type_posXpath="//div[@class='tunnel-object-type']//button[@class='MuiSelect-button css-1qmzz5g']"
-Tunnel_Type_GRE='//span[contains(text(),"GRE")]'
-Tunnel_Type_IP='//span[contains(text(),"IPv4/IPv6")]'
+Tunnel_Type_GRE="//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-icfck1']//*[normalize-space(text())='GRE']"
+Tunnel_Type_IP="//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-icfck1']//*[normalize-space(text())='IPv4/IPv6']"
 Tunnel_add_item_button="//div[@class='tunnel-object-endpointA']//i[@class='iconfont icon-Create1 font-[700]']"
 tunnel_ip_list_first = "//div[@class='pt-[2px] overflow-hidden flex-1']//ul/li[1]//div[@class='flex h-[22px] leading-[22px] MuiBox-root css-14di81r']"
 tunnel_add_endpoint_b= "//div[@class='tunnel-object-endpointB']"
@@ -155,8 +155,8 @@ TunnelsObjectPage_button_warningSaveYes_posSelector = 'body > div.el-message-box
 #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_Id_posId = "1-_FilteredSearch_ElRow_Objects_tunnel_Home_App_anonymousComponent"      #查询ID
-listPage_objectSearch_Tunnels_select_Name_posId = "2-_FilteredSearch_ElRow_Objects_tunnel_Home_App_anonymousComponent"    #查询Name
-listPage_objectSearch_Tunnels_select_IP_posId = "100-_FilteredSearch_ElRow_Objects_tunnel_Home_App_anonymousComponent" #查询IP
+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
 
 
 #Object Attributes===================Attributes====================Attributes=================Attributes=======================Attributes=================Attributes================
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 3a22f74f..c9377d95 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -79,7 +79,7 @@ mainPage_secondLevelMenu_Geolocation_posId = "Advanced/IP_Libraries"  # 二级�
 mainPage_secondLevelMenu_Asns_posId = 'Objects_asn'  # 二级菜单ASNs
 
 mainPage_firstLevelMenu_Objects_posXpath = '//li[@class="MuiListItem-root MuiListItem-gutters menu-object css-1cpzmuh"]'
-mainPage_secondLevelMenu_ipAddress_posXpath = "//div[@class='MuiListItem-root MuiListItem-gutters Mui-selected menu-ip-object css-1l56wwh']" # 二级菜单IP Addresses
+mainPage_secondLevelMenu_ipAddress_posXpath = "//div[@class='MuiListItem-root MuiListItem-gutters menu-ip-object css-1l56wwh']" # 二级菜单IP Addresses
 mainPage_secondLevelMenu_Ports_posXpath = "//div[@class='MuiListItem-root MuiListItem-gutters menu-port-object css-1l56wwh']"
 mainPage_secondLevelMenu_FQDNs_posXpath = "//div[@class='MuiListItem-root MuiListItem-gutters menu-fqdn-object css-1l56wwh']"
 mainPage_secondLevelMenu_Subscriber_ids_posXpath = "//div[@class='MuiListItem-root MuiListItem-gutters menu-subscriber-id-object css-1l56wwh']"
@@ -130,11 +130,11 @@ main_Group_sub_Object_input_frame_select_one_posXpath = "//ul[@class='MuiList-ro
 # 列表页
 main_listPage_object_reference_count_posXpath = "//table/tbody/tr[2]/td[7]/div/div/div/div"  # 提取reference的数量《断言》
 main_listPage_object_statistics_view_postXpath = "(//div[@id='ly-table1-listcontent']//span[text()='View'])[1]"
-main_listPage_object_bottomTotal_postXpath = '//div[@class="page-box-containcheck"]//*[@class="el-pagination__total"]'  # 列表页底部Total元素
+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 = "//label[@class='MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButton-root \
 MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary css-1b1h392']/input[@type='file']"
-main_ObjectPage_No_data_text_posXpath = "//span[@class='el-table__empty-text']"
+main_ObjectPage_No_data_text_posXpath = "//DIV[@class='MuiDataGrid-overlay css-14349d1']"
 
 # 列表中元素
 main_listPage_object_select_First_object_posXpath = '//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]'
@@ -157,13 +157,13 @@ listPage_viewButton_posXpath = '//button[contains(@id,"appEdit-_OperateBtns")]//
 listPage_object_delete_yesButton_posCss = 'body>.el-dialog__wrapper .delComponents-ok span'  # 列表页下 删除提示的Tips的yes按钮Xpath
 listPage_object_delete_noButton_posCss = 'body>.el-dialog__wrapper .delComponents-close span'  # 列表页下 删除提示的Tips的No按钮Xpath
 ##Object模块查询栏
-list_first_row_first_column_posXpath = '//div[@id="ly-table1-listcontent"]//span[text()="ID"]'  # 第一行、第一列--ID
-list_second_row_first_column_posXpath = '//div[@id="ly-table1-listcontent"]//div[@class="table-status-item-id"]/span'  # 第二行、第一列--Object对应ID号
+list_first_row_first_column_posXpath = "//div[@class='MuiDataGrid-virtualScrollerContent css-0']/div/div[2]//div[@data-field='name']//span"  # 第一行、第一列--ID
+list_second_row_first_column_posXpath = "//div[@class='MuiDataGrid-virtualScrollerContent css-0']/div/div[3]//div[@data-field='name']//span"  # 第二行、第一列--Object对应ID号
 
 list_first_row_second_column_posXpath = '//div[@id="ly-table1-listcontent"]//span[text()="Vsys ID"]'  # 第一行、第二列
 list_second_row_second_column_posXpath = '//table/tbody/tr[1]/td[2]/div//span'  # 第二行、第二列
 
-list_first_row_third_column_posXpath = '//table/thead/tr/th[3]/div/div/span'  # 第一行、第三列
+list_first_row_third_column_posXpath = "(//div[@class='MuiDataGrid-columnHeaderTitle css-mh3zap'])[2]"  # 第一行、第三列
 list_second_row_third_column_posXpath = '//table/tbody/tr[1]/td[3]/div/div/div/span'  # 第二行、第三列
 list_second_row_third_column_posXpath_IMSI = '//table/tbody/tr[1]/td[4]/div/div/div/div/div/div[1]/span'  # IMSI
 list_second_row_third_column_posXpath_IMSI_Group = '//table/tbody/tr/td[4]/div/div/div/div/div/div/div/span/div/div/div'  # IMSI Group
@@ -244,12 +244,12 @@ groupObjectDetailPage_excludeObjects_total_value_posXpath = "//div[@data-desc='e
 # Object Mobile Identities===================Object Mobile Identities====================Object Mobile Identities=================Object Mobile Identities=======================Object Mobile Identities=================Object Mobile Identities
 # Mobile_Identities list page 列表页
 listPage_object_mobileIdentities_allButton_posId = '//*[@id="router-view-container"]/div/div[1]/div[4]/label/span[2]'  # all按钮
-listPage_object_mobileIdentities_createButton_posId = "objectCreate-_OperateBtns_ElRow_Objects_mobile_identity_Home_App_anonymousComponent"  # create按钮id
-listPage_object_mobileIdentities_editButton_posId = "appEdit-_OperateBtns_ElRow_Objects_mobile_identity_Home_App_anonymousComponent"  # edit按钮id
+listPage_object_mobileIdentities_createButton_posXpath = listpage_create_button_posXpath  # create按钮id
+listPage_object_mobileIdentities_editButton_posXpath = listpage_edit_button_posXpath  # edit按钮id
 listPage_object_mobileIdentities_viewButton_posId = "//button[@id='appEdit-_OperateBtns_ElRow_Objects_mobile_identity_Home_App_anonymousComponent']//p[normalize-space(text()) = 'View']"
 listPage_object_mobileIdentities_editButton_content_posXpath = '//button[@id="appEdit-_OperateBtns_ElRow_Objects_mobile_identity_Home_App_anonymousComponent"]/span/div/div[2]/p[1]'
 listPage_object_mobileIdentities_delButton_posXpath = '//span[@class="action-delete inline-flex mr-[8px] "]/button'  # del按钮id
-listPage_object_mobileIdentities_del_yes_Button_posXpath = '//div[@class="el-dialog__wrapper"]/div/div[3]/span/button[1]/span'  # del_yes按钮
+listPage_object_mobileIdentities_del_yes_Button_posXpath = '//button[@class="MuiButtonBase-root MuiButton-root MuiLoadingButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary css-1aub58j"]'  # del_yes按钮
 listPage_objectSearch_mobileIdentities_selectLabel_posXpath = listpage_search_box_posXpath  # 查询框id
 listPage_objectSearch_mobileIdentities_add_watch_posXpath = '//div[@id="router-view-container"]/div/div[1]/div/div[4]/span/span[text() = "Watch"]'  # 添加watch列表页
 listPage_objectSearch_mobileIdentities_right_list_watch_posXpath = '//div[@id="fixed-right"]/ul/div/div[1]/li/div/i'  # 右侧watch列表
@@ -368,7 +368,7 @@ mobileIdentitiesObjectPage_IMSI_button_Edit_Save_Item_posXpath = '//div[@class="
 mobileIdentitiesObjectPage_IMSI_button_Edit_assert_first_Item_content_posXpath = "//div[@class='object-item-box']//div[@class='item-box']/div/div[1]/span/span"  ## <断言>第一个item的内容
 mobileIdentitiesObjectPage_IMSI_button_Edit_assert_first_Item_count_posXpath = "//div[@class='item-container']//div[@class='total']"  ## <断言>新增item的个数
 
-mobileIdentitiesObjectPage_sub_Phone_Number_button_Edit_assert_first_Item_count_posXpath = "//div[@class='CommonSubObjects']/div[2]/div[2]"  # sub Phone_Number<断言>新增item的个数
+mobileIdentitiesObjectPage_sub_Phone_Number_button_Edit_assert_first_Item_count_posXpath = "//div[@class='CommonSubObjects']/div[2]/div[2]"  # sub Phone_Numbeurl_ObjectDetailPage_itemsTotal_posXpathr<断言>新增item的个数
 
 mobileIdentitiesObjectPage_radioButton_phone_number_posId = "Phone Numberphone_number"  # Phone Number单选按钮id
 mobileIdentitiesObjectPage_radioButton_phone_number_posXpath = "//div[@class='mobile-identity-object-sub_type']//button[text()='Phone Number']"
@@ -434,8 +434,8 @@ mobile_Identities_listpage_linkOk_posXpath = '//*[@id="copyOk-_copyComponents_Ob
 mainPage_rightTopTips_closeButton_posXpath = '(//i[@class="iconfont icon-Delete_X"])[last()]'  # 全局右上提示窗关闭按钮（最新的一个）
 ##URLs列表页
 listPage_object_urls_createButton_posXpath = listpage_create_button_posXpath  # Create按钮id
-listPage_object_urls_createButton_url_posId = 'object0-_OperateBtns_ElRow_Objects_url_Home_App_anonymousComponent'  # Create下的URL选项id
-listPage_object_urls_createButton_urlGroup_posId = 'object1-_OperateBtns_ElRow_Objects_url_Home_App_anonymousComponent'  # Create下的URL Group选项id
+listPage_object_urls_createButton_url_posId = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[1]"  # Create下的URL选项id
+listPage_object_urls_createButton_urlGroup_posId = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[2]"  # Create下的URL Group选项id
 listPage_object_urls_editButton_posXpath = listpage_edit_button_posXpath  # Edit 按钮id
 listPage_object_urls_delButton_posXpath = listpage_delete_button_posXpath  # Delete 按钮id
 url_listPage_deleteButton_posId = 'appDel-_OperateBtns_ElRow_Objects_url_Home_App_anonymousComponent'  # Delete 按钮id
@@ -451,9 +451,9 @@ listPage_object_urls_tableDetails_selected_checkBox_posXpaths = '//div[@class="l
 listPage_object_urls_tableDetails_firstRowValues_span_posXpaths = '//li[@class="row el-dropdown-menu__item"]//span[@class="ellipsis list-popover"]'  # list页点击Details后展示的数据Xpaths_span
 listPage_object_urls_tableDetails_firstRowValues_div_posXpaths = '//li[@class="row el-dropdown-menu__item"]//div[@class="row-content-cell"]'  # list页点击Details后展示的数据Xpaths_div
 listPage_object_urls_importButton_posXpath = '//div[@class="ly-tablecontrol-1 el-row"]//div[@class="functional"]//i[@class="iconfont icon-Import"]'  # 导入文件按钮 Xpath
-listPage_object_urls_exportButton_posXpath = '//button[contains(@class,"importAndExport")]'  # 导出文件按钮 Xpath
-listPage_object_urls_exportPopYes_posXpath = '//div[@class="el-dialog__wrapper"]/div[@aria-label="Export"]//span[contains(text(),"Yes")]'  # 导出数据选择确认弹窗 yes Xpath
-listPage_object_urls_exportPopNo_posXpath = '//div[@class="el-dialog__wrapper"]/div[@aria-label="Export"]//span[contains(text(),"No")]'  # 导出数据选择确认弹窗 no Xpath
+listPage_object_urls_exportButton_posXpath = "//i[@class='iconfont icon-export']"  # 导出文件按钮 Xpath
+listPage_object_urls_exportPopYes_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[contains(text(),'Yes')]"  # 导出数据选择确认弹窗 yes Xpath
+listPage_object_urls_exportPopNo_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[contains(text(),'No')]"  # 导出数据选择确认弹窗 no Xpath
 listPage_object_urls_exportPopSelectAll_posXpath = '//div[@class="el-table__header-wrapper"]//span[@class="el-checkbox__inner"]'  # 导出数据选择确认弹窗全选CheckBox Xpath
 listPage_object_urls_exportPopCheckbox_posXpaths = '//div[@class="el-dialog__body"]//div[@class="el-table__body-wrapper is-scrolling-none"]//span[@class="el-checkbox__inner"]'  # 导出数据选择确认弹窗CheckBox(多个)
 listPage_object_urls_exportPopCheckbox_posXpaths_template = '(//div[@class="el-dialog__body"]//div[@class="el-table__body-wrapper is-scrolling-none"]//span[@class="el-checkbox__inner"])[{}]'  # 导出数据选择确认弹窗CheckBox(多个)
@@ -487,7 +487,8 @@ listPage_object_urls_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = '(
 
 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）
 # listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths = '//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//div[(contains(@id,"Count-_Objects") or contains(@id,"objectReferenceData") or contains(@id,"ReferenceData-")) and number(text())=0]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）且Reference Count==0
-listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths = '((//*[contains(@class, "table-status-item-id")][preceding-sibling::div[position() = 1 and not(*)] and preceding-sibling::div[position() = 2 and not(*)]] | //*[@class="checkBox" and not(*)])/ancestor::tr//div[contains(@class,"obj-charts-btn") and text()=0])/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）且Reference Count==0
+# listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths = '((//*[contains(@class, "table-status-item-id")][preceding-sibling::div[position() = 1 and not(*)] and preceding-sibling::div[position() = 2 and not(*)]] | //*[@class="checkBox" and not(*)])/ancestor::tr//div[contains(@class,"obj-charts-btn") and text()=0])/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）且Reference Count==0
+listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[1]//span[@class='MuiCheckbox-action css-kit57i']"
 listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths_template = '(((//*[contains(@class, "table-status-item-id")][preceding-sibling::div[position() = 1 and not(*)] and preceding-sibling::div[position() = 2 and not(*)]] | //*[@class="checkBox" and not(*)])/ancestor::tr//div[contains(@class,"obj-charts-btn") and text()=0])/ancestor::tr//span[@class="el-checkbox__inner"])[{}]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）且Reference Count==0
 
 listPage_object_urls_tableCheckbox_localVsys_firstObjectOrGroup_posXpath = '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个本Vsys的Object 或Group（不包含其他Vsys）
@@ -496,8 +497,8 @@ url_listPage_usage_policies_elems_posXpaths = "//div[contains(@class,'Localation
 url_listPage_noDataText_posXpath = '//div[@class="ly-table1"]//span[@class="el-table__empty-text"]'  # 列表页无数据时的no data文本 Xpath
 # listPage->Tips dialog  列表页 tips对话框
 listPage_object_urls_button_yes_posCss = 'body>.el-dialog__wrapper .delComponents-ok span'  # 删除提示的Tips的yes按钮Xpath
-url_listPage_object_delete_yesButton_posCss = 'body>.el-dialog__wrapper .delComponents-ok span'  # 删除提示的Tips的yes按钮Xpath
-url_listPage_object_urls_delete_noButton_posCss = 'body>.el-dialog__wrapper .delComponents-close span'  # 删除提示的Tips的No按钮Xpath
+url_listPage_object_delete_yesButton_posCss = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[text()='Yes']"  # 删除提示的Tips的yes按钮Xpath
+url_listPage_object_urls_delete_noButton_posCss = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[text()='No']"  # 删除提示的Tips的No按钮Xpath
 listPage_object_urls_button_no_posCss = 'body>.el-dialog__wrapper .delComponents-close span'  # 删除提示的Tips的No按钮Xpath
 
 # 列表页搜索选项
@@ -510,16 +511,16 @@ listPage_object_urls_searchCreatedBy_posId = '5-_FilteredSearch_ElRow_Objects_ur
 
 # URLs对象详情页
 url_ObjectDetailPage_nameInput_posXpath = '//input[@class="MuiInput-input css-fqt4w4"]'  # Name输入框Xpath
-url_ObjectDetailPage_nameLenthNumber_posXpath = '//*[@class="VEditPanel"]//*[@class="biFangNameLength-length"]'  # Name输入框中字符长度数值Xpath
+url_ObjectDetailPage_nameLenthNumber_posXpath = "//div[@class='MuiInput-endDecorator css-tob0ta']/span"  # Name输入框中字符长度数值Xpath
 url_ObjectDetailPage_addButton_posXpath = "//i[@class='iconfont icon-Create1 font-[700]']"  # “+”按钮id
 url_ObjectDetailPage_itemsText_posXpath = '//div[@class="ItemRow infinite-list-item" and  not(@style)]//div[@class="item-box"]//span[not(@class)]'  # Items 列表下所有Item的文本元素
-url_ObjectDetailPage_item_subAddButton_poXpath = "//div[@class='account-object-expression']//i[@class='iconfont icon-Create1 font-[700]']"  # 单个Item中新增多条数据的"+"按钮
+url_ObjectDetailPage_item_subAddButton_poXpath = "//div[@class='url-object-expression']//i[@class='iconfont icon-Create1 font-[700]']"  # 单个Item中新增多条数据的"+"按钮
 # url_ObjectDetailPage_itemValue_posXpath = '//*[@id="router-view-container"]/div/div[1]/div[1]/div/div/div/div[1]/div[2]/form/div[3]/div/div/div[1]/div[1]/div[1]/div[2]/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div[1]/div/input'  # Item value输入框Xpath
 url_ObjectDetailPage_itemValue_posXpath = "//input[@class='MuiInput-input css-1u0jcuo']"  # Item value输入框Xpath
 # url_ObjectDetailPage_itemSaveButton_posXpath = '//div[@class="row-header"]/div[2]'  # 保存按钮Xpath
 url_ObjectDetailPage_itemSaveButton_posXpath = "//i[@class='operate-icon iconfont icon-save']"  # item 下value保存按钮Xpath
-url_ObjectDetailPage_subObjectAddButton_posXpath = '//div[@class="AddButton"]/div/i'  # Subordinate Objects + 按钮Xpath
-url_ObjectDetailPage_subObjectAddButtonWhenHadData_posXpath = '//*[@data-desc="subObject"]//*[@class="operate-icon iconfont icon-Create1"]'  # 有数据时Subordinate Objects + 按钮Xpath
+url_ObjectDetailPage_subObjectAddButton_posXpath = "//div[@class='url-object-included_sub_object_uuids']"  # Subordinate Objects + 按钮Xpath
+url_ObjectDetailPage_subObjectAddButtonWhenHadData_posXpath = "//div[@class='url-object-included_sub_object_uuids']//i[@class='iconfont icon-Create1 text-[18px] text-weight-700] text-[--color-primary] cursor-pointer']"  # 有数据时Subordinate Objects + 按钮Xpath
 url_ObjectDetailPage_firstUrlObject = "//ul[@class='MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3']//li[1]//span"  # URL Object中第一个url Xpath
 url_ObjectDetailPage_secondUrlObject = "//ul[@class='MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3']//li[2]//span"  # URL Object中第二个url Xpath
 url_ObjectDetailPage_description_posXpath = "//div[@class='url-object-description']//textarea[1]"  # Description textarea Xpath
@@ -530,7 +531,7 @@ url_ObjectDetailPage_auditLogs_posXpath = '//div[@class="audit_log"]/span'  # Au
 url_ObjectDetailPage_auditLogsDrawer_firstRowLog_checkBox_posXpath = '(//div[@class="LocalationDraswer lstsub right-show-edit right-show-edit-other"]//table[@class="el-table__body"]//span[@class="el-checkbox__input"])[1]'  # Audit Logs 侧滑页第一条日志CheckBox Xpath
 url_ObjectDetailPage_auditLogsDrawer_compareButton_posXpath = '//div[@class="LocalationDraswer lstsub right-show-edit right-show-edit-other"]//button[contains(@id,"test-compare-_")]'  # Audit Logs 侧滑页Compare 按钮Xpath
 url_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath = '//div[contains(text(),"Operation")]/following-sibling::div'  # Audit Logs 侧滑页点击Compare后的 operation text Xpath
-url_ObjectDetailPage_itemsTotal_posXpath = '(//div[@class="panel-content"]//div[contains(@class,"total")])[1]'  # 详情页Items Total Xpath
+url_ObjectDetailPage_itemsTotal_posXpath = "//div[@class='items']//div[@class='flex flex-row justify-between mt-[4px]']/div[2]/span[2]" # 详情页Items Total Xpath
 url_ObjectDetailPage_importFromFile_posXpath = "//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-bc4t0x']"  # Import From File 按钮Xpath
 url_ObjectDetailPage_importFromFile_button_posXpath = "//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-bc4t0x']"  # Import From File 按钮Xpath
 # url_ObjectDetailPage_pleaseUpload_posXpath = '//span[contains(text(),"Please Upload")]/../../input'  # Please Upload input标签Xpath
@@ -543,11 +544,11 @@ url_ObjectDetailPage_importedFile_download_posXpath = '//i[@class="iconfont icon
 
 # Create URL Group对象详情页
 urlGroup_ObjectDetailPage_addButton_posId = 'temporary_form'  # Subordinate Objects下 “+”按钮id
-urlGroup_ObjectDetailPage_addButton_posXpath = "//div[@class='url-object-included_sub_object_uuids']"
+urlGroup_ObjectDetailPage_addButton_posXpath = "//div[@class='url-object-included_sub_object_uuids']//i[@class='iconfont icon-Create1 text-[18px] text-weight-700] text-[--color-primary] cursor-pointer']"
 urlGroup_ObjectDetailPage_description_posXpath = "//div[@class='MuiTextarea-root MuiTextarea-variantOutlined MuiTextarea-colorNeutral MuiTextarea-sizeMd MuiTextarea-formControl css-v35t8h']//textarea[1]"  # Description textarea Xpath
 urlGroup_ObjectDetailPage_subAddButton_posXpath = "//i[@class='iconfont icon-Create1']"  # Subordinate Objects下点击 “+”按钮后，新建url项目中的“+”元素Xpath
 url_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@data-desc="subObject"]//div[@class="AddButton"]'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
-urlGroup_ObjectDetailPage_subUrl_posXpath = "(//ul[starts-with(@id ,'dropdown-menu')]//li[1])[last()]"  # 子+下的Url选项
+urlGroup_ObjectDetailPage_subUrl_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh']//li[1]"  # 子+下的Url选项
 urlGroup_ObjectDetailPage_subNameInput_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//div[@class='url-object-name']//input"  # 子Name输入框Xpath
 urlGroup_ObjectDetailPage_subSubAddButton_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//i[@class='iconfont icon-Create1 font-[700]']"  # 子“+”按钮Xpath
 urlGroup_ObjectDetailPage_subItemSearch_posXpath = "//input[@class='MuiInput-input css-za5rna']"  # 侧滑Item栏搜索框Xpath
@@ -608,7 +609,7 @@ listPage_objectSearch_ip_address_select_Details_posXpath = "//ul[@class='base-Po
 listPage_objectSearch_ip_address_select_subType_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Sub Type']"  # 查询SubType
 listPage_objectSearch_ip_address_select_Description_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Description']"  # 查询Description
 listPage_objectSearch_ip_address_select_CreateBy_posXpath = '//*[@id="5-_FilteredSearch_ElRow_Objects_ip_Home_App_anonymousComponent"]'  # 查询CreateBy
-listPage_objectSearch_ip_address_select_IP_posXpath = "//*[@id='100-_FilteredSearch_ElRow_Objects_ip_Home_App_anonymousComponent']"
+listPage_objectSearch_ip_address_select_IP_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='IP']"
 listPage_objectSearch_geo_select_IP_posXpath = "//li[@id='100-_FilteredSearch_ElRow_Geography_List_Home_App_anonymousComponent']"
 listPage_objectSearch_geo_select_GeoNameID_posXpath = "//li[@id='56-_FilteredSearch_ElRow_Geography_List_Home_App_anonymousComponent']"
 listPage_objectSearch_geo_select_CountryAbbreviation_posXpath = "//li[@id='156-_FilteredSearch_ElRow_Geography_List_Home_App_anonymousComponent']"
@@ -849,7 +850,8 @@ Subscriber_IDsObjectPage_button_warningSaveCancel_posCss = '//div[@class="el-mes
 Subscriber_IDsObjectPage_button_cancel_posCss = "//button[@id='Cancle-_SubscriberidDetail_Home_App_anonymousComponent']/span"  # Cancel按钮
 
 # Create Subscriber_IDs Group Object 和 Edit CreateSubscriber_IDs Group   新增和编辑页
-Subscriber_IDs_Group_sub_Object_addButton_posXpath = "//button[@class='MuiButtonBase-root MuiButton-root MuiLoadingButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary css-1d67a6h']//i[@class='iconfont icon-Create1 font-[700]']"  # Subscriber_IDs_Group添加sub Object按钮
+Subscriber_IDs_Group_sub_Object_include_addButton_posXpath = "//div[@class='subscriber-id-object-included_sub_object_uuids']//i[@class='iconfont icon-Create1 font-[700]']"  # Subscriber_IDs_Group添加sub Object按钮
+Subscriber_IDs_Group_sub_Object_exclude_addButton_posXpath = "//div[@class='subscriber-id-object-excluded_sub_object_uuids']//i[@class='iconfont icon-Create1 font-[700]']"
 Subscriber_IDs_Group_sub_Object_add_new_Button_posXpath = "//button[@class='MuiIconButton-root MuiIconButton-variantPlain MuiIconButton-colorNeutral MuiIconButton-sizeMd MuiMenuButton-root MuiMenuButton-variantOutlined MuiMenuButton-colorNeutral MuiMenuButton-sizeMd css-83p2rh']//i[@class='iconfont icon-Create1']"  # 新建sub_Subscriber_IDs按钮
 Subscriber_IDs_Group_sub_Object_add_new_Select_one_Button_posXpath = "//ul[@x-placement='bottom-start']/li[1]"  # 新建选择Subscriber_IDs按钮
 Subscriber_IDs_Group_sub_Object_add_new_Select_Group_Button_posXpath = "//ul[@x-placement='bottom-start']/li[2]"  # 新建选择Subscriber_IDs_Group按钮
@@ -1170,10 +1172,10 @@ cate_ObjectDetailPage_okButton_yes_posXpath = url_ObjectDetailPage_okButton_yes_
 acc_listPage_createButton_posXpath = listPage_object_ip_address_createButton_posXpath  # 列表页create 按钮ID
 acc_listPage_createButton_account_posId = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[1]"  # 列表页create下account ID
 acc_listPage_createButton_accountGroup_posId = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[2]"  # 列表页create下account group ID
-acc_listPage_editButton_posXpath = listPage_object_ip_address_editButton_posId  # 列表页 Edit 按钮ID
+acc_listPage_editButton_posXpath = listPage_object_ip_address_editButton_posXpath  # 列表页 Edit 按钮ID
 acc_listPage_deleteButton_posXpath = listPage_object_ip_address_delButton_posXpath  # 列表页 Delete 按钮ID
 acc_object_columnSetting_descriptionOption_posXpath = listPage_object_urls_columnSetting_descriptionOption_posXpath  # 列设置中的description选项元素Xpath
-acc_listPage_first_row_checkBox_posXpath = '(//td[@rowspan="1"and @colspan="1"]//span[@class="el-checkbox__inner"])[1]'  # 列表页第一行对象多选框Xpath
+acc_listPage_first_row_checkBox_posXpath = listPage_object_ip_address_select_First_object_posXpath  # 列表页第一行对象多选框Xpath
 acc_listPage_noDataText_posXpath = url_listPage_noDataText_posXpath  # 列表页无数据时的no data文本 Xpath
 acc_listPage_object_importButton_posXpath = listPage_object_urls_importButton_posXpath  # 导入文件按钮 Xpath
 acc_listPage_object_exportButton_posXpath = listPage_object_urls_exportButton_posXpath  # 导出文件按钮 Xpath
@@ -1194,8 +1196,8 @@ acc_listPage_object_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = lis
 acc_listPage_object_tableDetails_singleObject_posXpaths = listPage_object_urls_tableDetails_singleObject_posXpaths  # 列表页中所有对象（不包含对象组）的DetailsXpath
 acc_listPage_object_tableCheckbox_selectedCheckBox_posXpaths = listPage_object_urls_tableDetails_selected_checkBox_posXpaths  # list页被选中的对象 CheckBox Xpath
 ## listPage->Tips dialog  列表页 tips对话框
-acc_listPage_object_delete_yesButton_posCss = 'body>.el-dialog__wrapper .delComponents-ok span'  # 删除提示的Tips的yes按钮Xpath
-acc_listPage_object_urls_delete_noButton_posCss = 'body>.el-dialog__wrapper .delComponents-close span'  # 删除提示的Tips的No按钮Xpath
+acc_listPage_object_delete_yesButton_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[text()='Yes']"  # 删除提示的Tips的yes按钮Xpath
+acc_listPage_object_urls_delete_noButton_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[text()='No']"  # 删除提示的Tips的No按钮Xpath
 
 # link页
 acc_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_account_Home_App_anonymousComponent"  # link按钮ID
@@ -1216,7 +1218,7 @@ acc_listPage_object_tableDetails_detailsRow_firstDetailValue_posXpaths = listPag
 acc_ObjectDetailPage_nameInput_posXpath = url_ObjectDetailPage_nameInput_posXpath  # Name输入框Xpath
 acc_ObjectDetailPage_nameLenthNumber_posXpath = url_ObjectDetailPage_nameLenthNumber_posXpath  # Name输入框中字符长度数值Xpath
 acc_ObjectDetailPage_item_addButton_poXpath = url_ObjectDetailPage_addButton_posXpath  # item下"+"按钮
-acc_ObjectDetailPage_item_subAddButton_poId = url_ObjectDetailPage_item_subAddButton_poXpath  # 单个Item中新增多条数据的"+"按钮
+acc_ObjectDetailPage_item_subAddButton_poId = "//div[@class='account-object-expression']//i[@class='iconfont icon-Create1 font-[700]']"  # 单个Item中新增多条数据的"+"按钮
 # acc_ObjectDetailPage_item_subAddButton_poId = '//*[@class="item-box"]//*[contains(@class,"addobject")]'  # 单个Item中新增多条数据的"+"按钮
 acc_ObjectDetailPage_itemValueInput_poXpath = "//input[@class='MuiInput-input css-1u0jcuo']"  # item 下value输入框Xpath
 acc_ObjectDetailPage_itemSaveButton_poXpath = url_ObjectDetailPage_itemSaveButton_posXpath  # item 下value保存按钮Xpath
@@ -1303,8 +1305,8 @@ int_listpage_linkAdd_posXpath = '//*[@id="temporary_form-_ClusterTable_ElDialog_
 int_listpage_linkOk_posXpath = '//*[@id="copyOk-_copyComponents_Objects_interval_Home_App_anonymousComponent"]'
 
 ## listPage->Tips dialog  列表页 tips对话框
-int_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posCss  # 删除提示的Tips的yes按钮Xpath
-int_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posCss  # 删除提示的Tips的No按钮Xpath
+int_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posXpath  # 删除提示的Tips的yes按钮Xpath
+int_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posXpath  # 删除提示的Tips的No按钮Xpath
 
 # 对象详情页
 int_ObjectDetailPage_nameInput_posXpath = url_ObjectDetailPage_nameInput_posXpath  # Name输入框Xpath
@@ -1388,8 +1390,8 @@ flag_listPage_object_searchCreatedBy_posId = '5-_FilteredSearch_ElRow_Objects_fl
 flag_listPage_object_tableDetails_detailsRow_firstDetailValue_posXpaths = listPage_object_urls_tableDetails_detailsRow_firstDetailValue_posXpaths  # 列表页某行第一个details值 Xpath
 
 ## listPage->Tips dialog  列表页 tips对话框
-flag_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posCss  # 删除提示的Tips的yes按钮Xpath
-flag_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posCss  # 删除提示的Tips的No按钮Xpath
+flag_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posXpath  # 删除提示的Tips的yes按钮Xpath
+flag_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posXpath  # 删除提示的Tips的No按钮Xpath
 flag_listPage_object_delete_yesButton_posXpath = '//button[@class="MuiButtonBase-root MuiButton-root MuiLoadingButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary css-1aub58j"]'  # 删除提示的Tips的yes按钮Xpath!!!!!
 flag_listPage_object_urls_delete_noButton_posXpath = '//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-ki6aok"]'  # 删除提示的Tips的No按钮Xpath!!!!!
 
@@ -1636,8 +1638,8 @@ asn_listPage_object_tableCheckbox_localVsys_firstObjectOrGroup_posXpaths = listP
 
 asn_listPage_object_tableDetails_firstASNValue_posXpaths = '(//span[contains(text(),"AS ")])[1]'  # 列表页第一行的ASN 数值
 ## listPage->Tips dialog  列表页 tips对话框
-asn_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posCss  # 删除提示的Tips的yes按钮Xpath
-asn_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posCss  # 删除提示的Tips的No按钮Xpath
+asn_listPage_object_delete_yesButton_posCss = acc_listPage_object_delete_yesButton_posXpath  # 删除提示的Tips的yes按钮Xpath
+asn_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delete_noButton_posXpath  # 删除提示的Tips的No按钮Xpath
 
 # link页
 asn_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_asn_Home_App_anonymousComponent"  # link按钮ID
diff --git a/page_element/profiles_element_position.py b/page_element/profiles_element_position.py
index 5dd6573b..4a26c2c1 100644
--- a/page_element/profiles_element_position.py
+++ b/page_element/profiles_element_position.py
@@ -1,7 +1,7 @@
 # login page 登录页面
-loginPage_userName_posName = "username"
-loginPage_passwd_posName = "password"
-loginPage_signIn_posId = "login"
+loginPage_userName_posXpath = "//input[@placeholder='User name']"
+loginPage_passwd_posXpath = "//input[@placeholder='Password']"
+loginPage_signIn_posId = ":r0:"
 loginPage_error_posXpath = "//p[@class='el-message__content']"
 
 # 全局Leave this page?确认弹窗