元素定位调整

1 files changed, 19 insertions, 17 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 9a4dbb2c..4d2b1a41 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -104,17 +104,19 @@ mainPage_secondLevelMenu_Intervals_posXpath = "//div[@class='MuiListItem-root Mu
 
 
 # =====================================================================System界面==========System界面=======================================================================
-mainPage_firstLevelMenu_System_posId = "System"  # 一级菜单System
-mainPage_secondLevelMenu_auditLogs_posId = "system_PolicyConfigurationLog"  # 二级菜单AuditLog
-listPage_auditlogSearch_select_TagrgetID_posXpath = '//li[@id="1-_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'  # TagrgetID
-listPage_auditlogSearch_select_Operation_posXpath = '//li[@id="7-_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'  # operation选择
-listPage_auditlogSearch_select_UserName_posXpath = '//li[@id="3-_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'  # username选择
-listPage_auditlogSearch_select_TargetType_posXpath = '//li[@id="30-_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'  # target type选择
+mainPage_firstLevelMenu_System_posXpath = "//li[@class='MuiListItem-root MuiListItem-gutters menu-system css-1cpzmuh']"  # 一级菜单System
+mainPage_secondLevelMenu_auditLogs_posXpath = "//div[contains(@class,'menu-audit-log')]"  # 二级菜单AuditLog
+listPage_auditlogSearch_select_TagrgetID_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//*[normalize-space(text())='Target ID']"  # TagrgetID
+listPage_auditlogSearch_select_Operation_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//*[normalize-space(text())='Operation']"   # operation选择
+listPage_auditlogSearch_select_UserName_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//*[normalize-space(text())='User Name']"  # username选择
+listPage_auditlogSearch_select_TargetType_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//*[normalize-space(text())='Target Type']"   # target type选择
 listPage_auditlogSearch_select_Operation_Create_posXpath = '//li[@id="create-_v-select_ListItem_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'
 listPage_auditlogSearch_select_Operation_Edite_posXpath = '//li[@id="edit-_v-select_ListItem_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'
 listPage_auditlogSearch_select_Operation_Delete_posXpath = '//li[@id="delete-_v-select_ListItem_FilteredSearch_ElRow_system_PolicyConfigurationLog_Home_App_anonymousComponent"]'
 listPage_auditlogSearch_targetid_text_posXpath = "//div[@class='rel-input v-input input el-input el-input--mini']/input"
 listPage_auditlogSearch_username_text_posXpath = "//div[@class='el-input el-input--mini el-input--suffix is-focus']//input"
+listPage_auditlogSearch_input_posXpath = "//span[@class='action-search inline-flex mr-[8px] flex-1']//input"
+listPage_auditlogSearch_buttonSearch_posXpath = "//i[@class='iconfont icon-sousuo text-[19px]']"
 # Object 查询栏===================Object 查询栏=====================Object 查询栏=================Object 查询栏=======================Object 查询栏=================Object 查询栏
 ##Object模块查询栏
 
@@ -238,7 +240,7 @@ ObjectDetailPage_audit_log_compare_time_posXpath = "//div[@class='compare-code-b
 ObjectDetailPage_audit_log_compare_user_posXpath = '//div[contains(text(),"User")]/following-sibling::div'
 ObjectDetailPage_audit_log_cancel_posXpath = "//div[@class='paper-right-content']//span[normalize-space(text())='Close']"
 # Group Object详情页通用元素
-groupObjectDetailPage_addSubObjecDrawer_searchInput_posXpath = '//div[@class="css-dob60y"]//input[@class="MuiInput-input css-za5rna"]'  # Group 详情页添加sub Object的侧滑页面中的搜索框
+groupObjectDetailPage_addSubObjecDrawer_searchInput_posXpath = '(//div[@class="css-dob60y"]//input)[1]'  # Group 详情页添加sub Object的侧滑页面中的搜索框
 groupObjectDetailPage_addSubObjecDrawer_totalText_posXpath = '//div[@class="px-[12px] pb-[4px] pt-[2px] text-[--color-text-disabled]"]'  # Group 详情页添加sub Object的侧滑页面中的Total文本
 groupObjectDetailPage_addSubObjecDrawer_firstSubObject_posXpath = '//ul[@class="MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3"]/li[1]'  # Group 详情页添加sub Object的侧滑页面中第一个sub object
 
@@ -287,8 +289,7 @@ listPage_object_group_include_add_button_posXpath = "//div[@class='ip-object-inc
 
 # Object Mobile Identities===================Object Mobile Identities====================Object Mobile Identities=================Object Mobile Identities=======================Object Mobile Identities=================Object Mobile Identities
 # 导入导出文件设置
-main_ObjectPage_Input_Import_files_button_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-epitc3']/i[@class='iconfont icon-export']"  # main导出文件按钮
+main_ObjectPage_Input_Import_files_button_posXpath = "//i[@class='iconfont icon-export']"  # main导出文件按钮
 mobileIdentitiesObjectPage_Button_Import_Mobile_Identity_files_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']"  # Create Import Mobile Identity Button
 mobileIdentitiesObjectPage_Input_path_Import_Mobile_Identity_files_posXpath = main_ObjectPage_Input_path_Import_files_posXpath  # Create Import Mobile Identity path
 main_ObjectPage_Import_Mobile_Identity_files_OK_Button_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[text()='OK']"  # 导入文件OK
@@ -296,7 +297,7 @@ mobileIdentitiesObjectPage_Import_Mobile_Identity_files_OK_Button_posXpath = mai
 mobileIdentitiesObjectPage_Import_Mobile_Identity_files_Cancel_Button_posXpath = "//div[5]/div/div[1]/div/div/div[2]/div[2]/button[2]/span"  # 导入文件Cancel
 mobileIdentitiesObjectPage_Import_Mobile_Identity_files_IMSI_Group_Cancel_Button_posXpath = '//div[2]/div/div[1]/div/div/div[2]/div[2]/button[2]/span'
 main_item_error_format_posXpath = "//div[@class='subscriber-id-object-expression']/div[2]"  # 错误格式提示语
-main_Import_files_error_format_posXpath = '//ul/li/div[@class="valid-column import-line"]/span'  # 导入文件格式错误提示语
+main_Import_files_error_format_posXpath = "//i[@class='iconfont icon-Dashboarddisablepolicy text-[var(--color-error)] pr-[4px]']//parent::div"  # 导入文件格式错误提示语
 main_Item_length_error_posXpath = "//div[@class='subscriber-id-object-expression']/div[2]"  # item 长度校验错误
 mobileIdentitiesObjectPage_Import_Mobile_Identity_files_error_format_posXpath = main_Import_files_error_format_posXpath  # mobile identities 导入文件格式错误提示语
 main_Import_Mobile_Identity_files_error_type_posXpath = "//div[@class='MuiFormHelperText-root css-koslx8']"  # 错误类型提示语
@@ -540,7 +541,7 @@ url_ObjectDetailPage_auditLogsDrawer_compareButton_posXpath = '//div[@class="Loc
 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='items']//div[@class='flex flex-row justify-between mt-[4px]']/div[2]/span[2]" # 详情页Items Total Xpath
 url_ObjectDetailPage_importFromFile_posXpath = '//button[contains(text(),"import from file")]'  # 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_importFromFile_button_posXpath = "//div[@class='flex flex-row justify-between mt-[4px]']//button[text()='import from file']"  # Import From File 按钮Xpath
 # url_ObjectDetailPage_pleaseUpload_posXpath = '//span[contains(text(),"Please Upload")]/../../input'  # Please Upload input标签Xpath
 url_ObjectDetailPage_pleaseUpload_posXpath = "//div[@class='flex flex-col justify-start flex-1 MuiBox-root css-0']//input[@type='file']"  # Please Upload input标签Xpath
 url_ObjectDetailPage_importUrlOk_posXpath = "//div[@class='relative w-[100%] h-[100%] pt-[46px] pb-[56px] flex overflow-hidden']//button[text()='OK']"  # Import URL 下的OK按钮Xpath
@@ -610,13 +611,14 @@ ip_address_listPage_first_row_checkBox_posXpath = '//div[@data-id="039114ae-34b2
 listPage_object_ip_address_viewButton_posXpath = "//button[@id='appEdit-_OperateBtns_ElRow_Objects_ip_Home_App_anonymousComponent']//p[normalize-space(text()) = 'View']"
 
 # 查询框输入并选择
-listPage_objectSearch_ip_address_select_Id_posXpath = '//li[@id="1-_FilteredSearch_ElRow_Objects_ip_Home_App_anonymousComponent"]'  # 查询ID
+listPage_objectSearch_ip_address_select_Id_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='UUID']" # 查询ID
 listPage_objectSearch_ip_address_select_Name_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Name']"  # 查询Name
 listPage_objectSearch_ip_address_select_Details_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Detail']"  # 查询Details
 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_CreateBy_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Create By']"  # 查询CreateBy
 listPage_objectSearch_ip_address_select_IP_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='IP']"
+listPage_objectSearch_ip_address_select_Search_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//li[1]"
 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']"
@@ -677,11 +679,11 @@ ip_addressObjectPage_IP_learning_inputItem_posXpath = "//div[@class='ip-object-f
 
 ip_addressObjectPage_button_Save_Item_posXpath = '//i[@class="operate-icon iconfont icon-save"]'  # 保存item按钮
 ip_address_Geography_list_first_ele_posXpath = '//div[@role="group"][@aria-expanded="true"]/div[1]/div/label/span'  # Geography所选列表下第一个元素
-ip_addressObjectPage_button_IP_learn_from_protocols_posXpath = "//div[@class='MuiSelect-root MuiSelect-variantOutlined MuiSelect-colorNeutral MuiSelect-sizeMd css-n6bil4']/button[@class='MuiSelect-button css-1qmzz5g']"  # Learn From Protocols选择框
+ip_addressObjectPage_button_IP_learn_from_protocols_posXpath = "//div[@class='ip-object-from_protocol']//button[@title='Open']"  # Learn From Protocols选择框
 ip_addressObjectPage_button_IP_learn_from_protocols_up_posXpath = "//div[@class='MuiSelect-root Mui-expanded MuiSelect-variantOutlined MuiSelect-colorNeutral MuiSelect-sizeMd css-n6bil4']"  # Learn From Protocols_up选择框
-ip_addressObjectPage_button_IP_learn_from_protocols_Select_HTTP_posXpath = "//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-icfck1']/li[text()='HTTP']"  # Learn From Protocols选择HTTP
-ip_addressObjectPage_button_IP_learn_from_protocols_Select_SSL_posXpath = "//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-icfck1']/li[text()='SSL']"  # Learn From Protocols选择SSL
-ip_addressObjectPage_button_IP_learn_from_protocols_Select_DNS_posXpath ="//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-icfck1']/li[text()='DNS']"
+ip_addressObjectPage_button_IP_learn_from_protocols_Select_HTTP_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-19hxmvv']/li[text()='HTTP']"  # Learn From Protocols选择HTTP
+ip_addressObjectPage_button_IP_learn_from_protocols_Select_SSL_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-19hxmvv']/li[text()='SSL']"  # Learn From Protocols选择SSL
+ip_addressObjectPage_button_IP_learn_from_protocols_Select_DNS_posXpath ="//ul[@class='base-Popper-root MuiAutocomplete-listbox css-19hxmvv']/li[text()='DNS']"
 ip_addressObjectPage_button_Input_Aging_Times_posXpath = "//div[@class='ip-object-aging_time']/div/input"  # Aging Times输入框
 ip_addressObjectPage_button_Input_Vote_Clients_Number_posXpath = "//div[@class='ip-object-vote_client_num']/div/input"  # Vote Clients Number输入框
 ip_addressObjectPage_button_Input_Learned_IP_Limits_posXpath = "//div[@class='ip-object-goal_upper_limit']/div/input"  # Learned IP Limits 输入框