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

# Conflicts:
#	page_element/objects_element_position.py

1 files changed, 48 insertions, 41 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 01d7ba62..c197762e 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -12,7 +12,13 @@ listpage_select_second_object_posXpath = '(//span[@class="MuiCheckbox-root MuiCh
 listpage_no_data_posXpath = '//div[@class="MuiDataGrid-overlay css-14349d1"]' #列表页No Data按钮!!!!!
 listpage_reference_count_posXpath = '(//button[@class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-18studs"])[1]' #列表中第一个元素的reference count!!!!!
 listpage_first_row_name_posXpath = '(//span[@class="truncate"])[1]' #第一行nameXpath!!!!!
-
+listpage_delete_no_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"]'
+listpage_export_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-1k1ho7l"]'
+listPage_objectSearch_select_Name_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Name']"    #查询Name
+listPage_objectSearch_select_Details_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Detail']" #查询Details
+listPage_objectSearch_select_Description_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Description']" #查询Description
+listPage_object_Select_createButton_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[1]"
+listPage_objectGroup_Select_createButton_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[2]"
 
 # login page 登录页面
 loginPage_userName_posName = "username"
@@ -72,8 +78,8 @@ mainPage_secondLevelMenu_Intervals_posId = "Objects_interval"  # 二级菜单Int
 mainPage_secondLevelMenu_Geolocation_posId = "Advanced/IP_Libraries"  # 二级菜单Geolocation
 mainPage_secondLevelMenu_Asns_posId = 'Objects_asn'  # 二级菜单ASNs
 
-mainPage_firstLevelMenu_Objects_posXpath = "//ul[@class='MuiList-root MuiList-padding css-1ontqvh']//span[text()='Objects']"
-mainPage_secondLevelMenu_ipAddress_posXpath = "//span[text()='IP Addresses']" # 二级菜单IP Addresses
+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_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']"
@@ -114,7 +120,7 @@ mainPage_ObjectSearch_buttonClear_posId = "searchClear"  # 清空查询按钮id
 mainPage_ObjectSearch_buttonClear_posXpath = "//button[@class='MuiAutocomplete-clearIndicator css-25qtv2']" # 清空查询按钮xpath
 mainPage_ObjectSearch_buttonSearch_Item_posId = "object_ip_search"  # 查询item输入框id
 mainPage_ObjectSearch_buttonSearch_Item_first_content_posXpath = "//div[@class='view-row']//span[@class='el-tooltip content-show']"  # item搜索框第一个元素
-mainPage_ObjectSearch_buttonSearch_Item_posXpath = '//input[@placeholder="Search For"]'  # 查询item输入框Xpath
+mainPage_ObjectSearch_buttonSearch_Item_posXpath = "//input[@placeholder='Search For']"  # 查询item输入框Xpath
 mainPage_ObjectSearch_buttonAddItem_posId = "temporary_form"  # 添加item_id
 mainPage_ObjectSearch_buttonAddItem_posXpath = "//i[@class='iconfont icon-Create1 font-[700]']"
 mainPage_ObjectSearch_input_Item_posId = "onlyMarvel"  # 输入item_id
@@ -124,16 +130,16 @@ 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="flex  items-center justify-between"]//*[@class="text-textColor"])[1]'  # 列表页底部Total元素
+main_listPage_object_bottomTotal_postXpath = '//div[@class="page-box-containcheck"]//*[@class="el-pagination__total"]'  # 列表页底部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 = "//div[@class='MuiDataGrid-overlay css-14349d1']"
+main_ObjectPage_No_data_text_posXpath = "//span[@class='el-table__empty-text']"
 
 # 列表中元素
-main_listPage_object_select_First_object_posXpath = listPage_select_first_object_posXpath
-main_listPage_object_select_Second_object_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[2]//span[@class='MuiCheckbox-action css-kit57i']"  # 选择列表中第二个对象
-main_listPage_object_total_value_posXpath = "//div[@class='el-pagination is-background']/span[@class='el-pagination__total']"  # 列表页total值
+main_listPage_object_select_First_object_posXpath = '//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]'
+main_listPage_object_select_Second_object_posXpath = '//table/tbody/tr[2]/td[1]/div/div/div[1]/div/label/span[1]/span'  # 选择列表中第二个对象
+main_listPage_object_total_value_posXpath = '(//div[@class="flex-1 flex items-center justify-center undefined"]/span)[1]'  # 列表页total值
 ##Object模块列设置
 mainPage_ObjectSearch_Column_settings_posXpath = "//i[@class='iconfont icon-SetNormal text-[14px] text-[var(--color-text-disabled)]']"
 mainPage_ObjectSearch_Column_settings_select_allCheckBox_posXpath = "//div[@class='MuiDataGrid-columnsManagementFooter css-1l93brk']//span[@class='MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-1hhkft9']"  # ALL选择框----------------
@@ -151,18 +157,18 @@ 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[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[1]//div[@data-field='name']//span"  # 第一行、第一列--ID
-list_second_row_first_column_posXpath = "//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']/div[2]//div[@data-field='name']//span"  # 第二行、第一列--Object对应ID号
+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_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_second_row_third_column_posXpath = '//table/tbody/tr[1]/td[3]/div/div/div/span'  # 第二行、第三列
-list_second_row_third_column_posXpath_IMSI = "(//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']//div[@class='flex flex-col w-[100%] text-textColor'])[1]/div[1]"  # IMSI
-list_second_row_third_column_posXpath_IMSI_Group = "(//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']//div[@class='flex flex-col w-[100%] text-textColor'])[1]/div[1]"  # IMSI Group
-list_second_row_third_column_posXpath_Phone_Number_IMEI_Group = "(//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']//div[@class='flex flex-col w-[100%] text-textColor'])[1]/div[1]"  # Phone Number/IMEI Group
-list_second_row_third_column_posXpath_Phone_Number_IMEI = "(//div[@class='MuiDataGrid-virtualScrollerRenderZone css-1inm7gi']//div[@class='flex flex-col w-[100%] text-textColor'])[1]/div[1]"  # Phone Number/IMEI
+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
+list_second_row_third_column_posXpath_Phone_Number_IMEI_Group = '//table/tbody/tr/td[4]/div/div/div/div/div/div/div/span/div/div/div'  # Phone Number/IMEI Group
+list_second_row_third_column_posXpath_Phone_Number_IMEI = '//table/tbody/tr/td[4]/div/div/div/div/div/div/span'  # Phone Number/IMEI
 
 list_first_row_fourth_column_posXpath = '//table/thead/tr/th[4]/div/div/span'  # 第一行、第四列
 list_second_row_fourth_column_posXpath = '//table/tbody/tr[1]/td[4]/div/div/div/div/div/div/div/span'  # 第二行、第四列
@@ -174,13 +180,13 @@ list_first_row_sixth_column_posXpath = '//table/thead/tr/th[6]/div/div/span'  #
 list_second_row_sixth_column_posXpath = '//table/tbody/tr[1]/td[6]/div//p'  # 第二行、第六列
 
 # 列表页翻页元素
-listPage_object_pages_maxPageNumber_posXpath = '(//div[@class="page-box-containcheck"]//li[contains(@class,"number")])[last()]'  # 列表页最大页码
+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_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_nextPage_button_poxXpath = '//div[@class="page-box-containcheck"]//button[@class="btn-next"]'  # 后翻页按钮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_quickPreviousPage_button_poxXpath = '//li[contains(@class,"el-icon more btn-quickprev")]'  # 快速前翻页按钮Xpath
@@ -204,8 +210,8 @@ listPage_object_pages_clearCounter_button_poxXpath = '//div[@class="page-box-con
 listPage_object_pages_first_quoted_object_elem_posXpath = '(//div[contains(@class,"cursorPointer textCenter") and number(text()>=1)])[1]/ancestor::tr//*[@class="el-checkbox__inner"]'  # 列表页中Reference Count大于等于1的第一个Object的CheckBox
 listPage_first_row_checkBox_posXpath = '(//td[@rowspan="1"and @colspan="1"]//span[@class="el-checkbox__inner"])[1]'  # 列表页 第一行的checkBox
 listPage_second_row_checkBox_posXpat = '(//td[@rowspan="1"and @colspan="1"]//span[@class="el-checkbox__inner"])[2]'  # 列表页 第二行的checkBox
-listPage_item_search_text_posXpath = "//input[@placeholder='Search for']"
-listPage_item_search_total_text_posXpath = "//div[@class='LocalationDraswer lstsub policy-right-show-edit v-draswer']//p[@class='total']"
+listPage_item_search_text_posXpath = '//input[@placeholder="Search"]'
+listPage_item_search_total_text_posXpath = '//div[@class="text-[--color-text-disabled] h-[18px] mt-[6px] mb-[4px]"]'
 listPage_referenceCount_drawerList_ruleOrObject_posXpaths = '//div[@class="box-content"]//div[contains(@class,"el-dropdown-menu__item")]'  # 列表页referenceCount侧滑页面中的所有rule或Object
 listPage_referenceCount_drawerList_disabledRuleOrObject_posXpaths = '//div[@class="box-content"]//div[contains(@class,"el-dropdown-menu__item") and contains(@class,"showNamePointer")]'# 列表页referenceCount侧滑页面中的所有不可点击的rule或Object
 listPage_referenceCount_drawerList_ruleOrObject_posXpaths_template = '(//div[@class="box-content"]//div[contains(@class,"el-dropdown-menu__item")])[{}]'  # 列表页referenceCount侧滑页面中的所有rule或Object
@@ -215,7 +221,7 @@ listPage_localVsys_referenceCount_posXpaths ='//div[@class="table-status-box"]/d
 # 详情页通用元素
 ObjectDetailPage_mainOkButton_poXpath = '//div[contains(@class,"prox-fixed-footer")]//button[contains(@id,"OK-_")]'  # 详情页底部的OK按钮
 ObjectDetailPage_mainCancelButton_poXpath = '//div[contains(@class,"prox-fixed-footer")]//button[contains(@id,"Canc")]'  # 详情页底部的OK按钮
-ObjectDetailPage_input_Name_posXpath = "//div[@class='biFangName']//input"  # 详情页输入框Xpath
+ObjectDetailPage_input_Name_posXpath = '//input[@class="MuiInput-input css-fqt4w4"]'  # 详情页输入框Xpath!!!!!
 ObjectDetailPage_okButton_yes_posXpath = '//div[@class="el-message-box__btns"]//button[contains(@class,"operation-confirm")]'  # 确认弹窗的“Yes”按钮
 ObjectDetailPage_search_frame = '//*[@id="object_ip_search"]'
 objectDetailPage_total_value = '//*[@id="router-view-container"]//div[@class="total"]'
@@ -231,19 +237,19 @@ groupObjectDetailPage_addSubObjecDrawer_searchInput_posXpath = '//div[@class="ri
 groupObjectDetailPage_addSubObjecDrawer_totalText_posXpath = '//div[@class="right-menu-content"]//div[contains(@class,"list-box")]//*[contains(@class,"total positionAbsolute")]'  # Group 详情页添加sub Object的侧滑页面中的Total文本
 groupObjectDetailPage_addSubObjecDrawer_firstSubObject_posXpath = '(//div[@class="right-menu-content"]//div[contains(@class,"list-box")]//ul[@class="row-container tableList"]/li)[1]'  # Group 详情页添加sub Object的侧滑页面中第一个sub object
 
-groupObjectDetailPage_subordinateObjects_search_posXpath = "//div[@data-desc='subObject']//input[@id='object_ip_search']"
-groupObjectDetailPage_excludeObjects_search_posXpath = "//div[@data-desc='exclude subObject']//input[@id='object_ip_search']"
+groupObjectDetailPage_subordinateObjects_search_posXpath = '//div[@class="apn-object-included_sub_object_uuids"]//input'
+groupObjectDetailPage_excludeObjects_search_posXpath = '//div[@class="apn-object-excluded_sub_object_uuids"]//input'
 groupObjectDetailPage_subordinateObjects_total_value_posXpath = "//div[@data-desc='subObject']//div[@class='total textRight']"
 groupObjectDetailPage_excludeObjects_total_value_posXpath = "//div[@data-desc='exclude subObject']//div[@class='total textRight']"
 # 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_posXpath = '//span[@class="action-create inline-flex mr-[8px] "]/button'  # create按钮id
-listPage_object_mobileIdentities_editButton_posXpath = '//span[@class="action-edit inline-flex mr-[8px] "]/button'  # edit按钮id
+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_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 = '//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_object_mobileIdentities_del_yes_Button_posXpath = '//div[@class="el-dialog__wrapper"]/div/div[3]/span/button[1]/span'  # 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列表
@@ -258,15 +264,14 @@ listPage_object_clear_count_Yes_posXpath = "//div[@class='el-message-box__btns']
 
 listPage_object_mobileIdentities_reference_posXpath = '//div[@id="router-view-container"]/div/div[2]/div[1]/div/div/div[2]/div[2]/div[1]/div/div[3]/div'  # 侧滑引用界面
 listPage_object_mobileIdentities_reference_close_posXpath = "//button[@id='interceptionadd_allcancelobject1']"  # 侧滑关闭按钮
-listPage_object_reprtition_check_postXpath = "//i[@class='operate-icon iconfont icon-jinggao1']"
+listPage_object_reprtition_check_postXpath = '//i[@class="iconfont icon-jinggao1 text-[var(--color-btn-warning)] px-[4px] text-[18px]"]'
 listPage_current_object_reprtition_tips_posXpath = '//*[@id="router-view-container"]//div[@title="There are duplicates in the current object"]'
 listPage_other_object_reprtition_tips_posXpath = '//*[@id="router-view-container"]//div[@title="Duplicate data exists"]'
 # '//table/tbody/tr[1]/td[4]/div/div/div/div/div/div[1]/span'  # IMSI提取Details
 listPage_object_group_exclude_open_posXpath = "//div[@class='ip-object-']"
 listPage_object_group_subobject_fist_posXpath = "//div[@class='tab-content floatleft height100 width100 margin-top40']//ul[@class='row-container tableList']/li[1]//div[@class='row-content-cell']"
 listPage_object_group_subobject_second_posXpath = "//div[@class='tab-content floatleft height100 width100 margin-top40']//ul[@class='row-container tableList']/li[2]//div[@class='row-content-cell']/span"
-ip_object_group_subobject_close_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-5vcc8t']"
+ip_object_group_subobject_close_posXpath = "//div[@class='KeywordsList list-box']//span[normalize-space(text())='Close']"
 fqdn_object_group_subobject_close_posXpath = "//div[@class='FqdnList list-box']//span[normalize-space(text())='Close']"
 http_signature_object_group_close_posXpath = "//div[@class='HttpSignatureList list-box']//span[normalize-space(text())='Close']"
 subscriber_id_object_group_close_posXpath = "//div[@class='SubscriberidList list-box']//span[normalize-space(text())='Close']"
@@ -1305,9 +1310,10 @@ int_listPage_object_urls_delete_noButton_posCss = acc_listPage_object_urls_delet
 int_ObjectDetailPage_nameInput_posXpath = url_ObjectDetailPage_nameInput_posXpath  # Name输入框Xpath
 int_ObjectDetailPage_nameLenthNumber_posXpath = url_ObjectDetailPage_nameLenthNumber_posXpath  # Name输入框中字符长度数值Xpath
 int_ObjectDetailPage_item_addButton_poId = url_ObjectDetailPage_addButton_posXpath  # item下"+"按钮
-int_ObjectDetailPage_itemsText_posXpath = '//div[@class="ItemRow infinite-list-item" and  not(@style)]//div[@class="item-box"]//div[@title]'  # Items 列表下所有Item的文本元素
-int_ObjectDetailPage_itemValueInput_lowBoundary_poXpath = '(//div[@class="v-panel-content"]//div[@class="CommonItems"]//div[@class="list-container"]//input)[1]'  # item 下low_boundary value输入框Xpath
-int_ObjectDetailPage_itemValueInput_upBoundary_poXpath = '(//div[@class="v-panel-content"]//div[@class="CommonItems"]//div[@class="list-container"]//input)[last()]'  # item 下 up_boundary value输入框Xpath
+# item下"+"按钮
+int_ObjectDetailPage_itemsText_posXpath = '//div[@class="leading-[24px]"]'  # Items 列表下所有Item的文本元素
+int_ObjectDetailPage_itemValueInput_lowBoundary_poXpath = '(//input[@class="MuiInput-input css-1u0jcuo"])[1]'  # item 下low_boundary value输入框Xpath
+int_ObjectDetailPage_itemValueInput_upBoundary_poXpath = '(//input[@class="MuiInput-input css-1u0jcuo"])[2]'  # item 下 up_boundary value输入框Xpath
 int_ObjectDetailPage_itemSaveButton_poXpath = url_ObjectDetailPage_itemSaveButton_posXpath  # item 下value保存按钮Xpath
 int_ObjectDetailPage_item_search_posId = url_ObjectDetailPage_object_ip_search_posId  # item 下搜索框id
 int_ObjectDetailPage_description_posXpath = url_ObjectDetailPage_description_posXpath  # 对象详情页面下Description input Xpath
@@ -1328,6 +1334,7 @@ int_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_yes_posXpat
 int_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_cancel_posXpath = url_ObjectDetailPage_okButton_cancel_posXpath  # 侧滑子Create Account页面确认弹窗的“Cancel”按钮
 # 详情页通用元素
 int_ObjectDetailPage_mainOkButton_poId = 'OK-_IntervalsDetail_Home_App_anonymousComponent'  # OK按钮ID
+int_ObjectDetailPage_mainOkButton_poXpath = '//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"]'
 int_ObjectDetailPage_okButton_yes_posXpath = url_ObjectDetailPage_okButton_yes_posXpath  # 确认弹窗的“Yes”按钮
 # Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================
 # Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================Object Intervals elements area bottom===================
@@ -1509,20 +1516,20 @@ object_page_ln_select_statistics_elaborate_posXpath = '//li[@class="MuiOption-ro
 object_page_ln_select_statistics_none_posXpath = '//li[@class="MuiOption-root MuiOption-highlighted Mui-selected css-171tq0k"]//p[@class="MuiTypography-root MuiTypography-title-sm css-kfmwsi"]'    # none!!!!!
 # 详情页通用元素
 port_ObjectDetailPage_mainOkButton_poId = 'OK-_PortDetail_Home_App_anonymousComponent'  # OK按钮ID
-port_ObjectDetailPage_mainOkButton_posXpath = '//*[@id="OK-_PortDetail_Home_App_anonymousComponent"]'
+port_ObjectDetailPage_mainOkButton_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"]'
 port_ObjectDetailPage_okButton_yes_posXpath = acc_ObjectDetailPage_okButton_yes_posXpath  # 确认弹窗的“Yes”按钮
 
 # 对象组详情页
 port_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath = '//div[@data-desc="subObject"]//i[@class="operate-icon iconfont icon-Create1"]'  # Subordinate Objects 下有数据新增时"+"按钮Xpath
-port_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@data-desc="subObject"]//div[@class="AddButton"]'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
-port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = '//div[@class="ToggleDraw"]//div[contains(@class,"search-box")]//button'  # Ports侧滑窗口的"+"按钮
+port_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
+port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = '//div[@class="px-[12px] py-[4px] flex"]/button'  # Ports侧滑窗口的"+"按钮
 port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_port_posXpath = '(//ul[@class="el-dropdown-menu el-popper el-dropdown-menu--small"]/li[not(contains(text(),"Group"))])[last()]'  # Ports侧滑窗口的"+"按钮下的Port
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_nameInput_posXpath = '//*[@id="router-view-container"]//div[@class="drawer-box"]//div[@data-label="Name"]//input'  # 侧滑子Create Ports页面Name input Xpath
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsAddButton_posXpath = '//div[@class="drawer-box"]//div[@class="CommonItems"]//div[@class="object-item-add"]/div[@class="IconBtn"]'  # 侧滑子Create Ports页面中Items下的"+"按钮 Xpath
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsValueInput_posXpath = '//*[@id="router-view-container"]//div[@class="item-box"]//input'  # 侧滑子Create Ports页面中Items下的item value输入框 Xpath
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsValueSaveButton_posXpath = '//div[@class="drawer-box"]//div[@class="CommonItems"]//i[contains(@class,"icon-save")]'  # 侧滑子Create Ports页面中Items下的保存按钮 Xpath
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_descriptionTextarea_posXpath = '//div[@class="drawer-box"]//label[text()="Description"]/..//textarea'  # 侧滑子Create Ports页面中的Description textarea Xpath
-port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_okButton_posXpath = '//*[@id="OK-_PortDetail_VDraswer_EditDraw_PortDetail_Home_App_anonymousComponent"]'  # 侧滑子Create Account页面中OK按钮
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_nameInput_posXpath = '(//input[@class="MuiInput-input css-fqt4w4"])[2]'  # 侧滑子Create Ports页面Name input Xpath
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsAddButton_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-list-action-add css-h4tbqb"]'  # 侧滑子Create Ports页面中Items下的"+"按钮 Xpath
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsValueInput_posXpath = '//input[@class="MuiInput-input css-1u0jcuo"]'  # 侧滑子Create Ports页面中Items下的item value输入框 Xpath
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsValueSaveButton_posXpath = '//i[@class="operate-icon iconfont icon-save"]'  # 侧滑子Create Ports页面中Items下的保存按钮 Xpath
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_descriptionTextarea_posXpath = '(//textarea[@placeholder="Please enter the content"])[2]'  # 侧滑子Create Ports页面中的Description textarea Xpath
+port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_okButton_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"])[2]'  # 侧滑子Create Account页面中OK按钮
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_okButton_yes_posXpath = acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_yes_posXpath  # 侧滑子Create Account页面确认弹窗的“Yes”按钮
 port_ObjectDetailPage_firstPortObject = acc_ObjectDetailPage_firstAccObject  ## 侧滑Objects列表中第一个acc object Xpath
 portGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath = accGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath  # Exclude Objects Switch Xpath
@@ -1532,7 +1539,7 @@ port_ObjectDetailPage_firstObject = acc_ObjectDetailPage_firstObject  # 侧滑ac
 port_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath = acc_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath  # Accounts侧滑窗口的Close按钮
 portGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath = accGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath  # Exclude Objects有数据时新增按钮Xpath
 port_ObjectDetailPage_secondObject = acc_ObjectDetailPage_secondObject  # 侧滑acc Object中第二个url Xpath
-port_object_group_subobject_close_posXpath = '//*[@id="router-view-container"]//div[@class="PortList list-box"]/div[3]/button'
+port_object_group_subobject_close_posXpath = '//div[@class="absolute bottom-0 h-[40px] w-[100%] overflow-hidden text-[16px] truncate bg-[--color-background-secondary] flex  justify-center items-center pl-[12px] pr-[38px]"]/button'
 ## listPage->Tips dialog  列表页 tips对话框
 port_listPage_object_delete_yesButton_posCss = 'body>.el-dialog__wrapper .delComponents-ok span'  # 删除提示的Tips的yes按钮Xpath
 port_listPage_object_urls_delete_noButton_posCss = 'body>.el-dialog__wrapper .delComponents-close span'  # 删除提示的Tips的No按钮Xpath