元素定位逻辑修改

1 files changed, 16 insertions, 8 deletions

diff --git a/page_element/policies_element_position.py b/page_element/policies_element_position.py
index 6894d37e..1f6b5e41 100644
--- a/page_element/policies_element_position.py
+++ b/page_element/policies_element_position.py
@@ -23,7 +23,15 @@ mainPage_secondLevelMenu_Proxy_intercept_posId = "policy_Intercept"  # 二级菜
 mainPage_secondLevelMenu_Proxy_Manipulation_posId = "policy_Manipulation"  # 二级菜单Proxy_Manipulation
 mainPage_secondLevelMenu_Shaping_posId = "policy_trafficShaping"  # 二级菜单Shaping
 mainPage_secondLevelMenu_ServiceChaining_posId = "policy_ServiceChaining"  # 二级菜单Service Chaining
-mainPage_secondLevelMenu_policies_posXpath_template = '//*[@id="policy"]//a[normalize-space(text())="{}"]'  # 参数为Policy 文本，如Intercept、Shaping
+mainPage_secondLevelMenu_policies_posXpath_template = '//span[normalize-space(text())="{}"]'  # 参数为Policy 文本，如Intercept、Shaping
+
+mainPage_firstLevelMenu_Policy_posXpath = '//span[text()="Policies"]'  # 一级菜单Policies
+mainPage_secondLevelMenu_Security_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-security-policy css-1l56wwh"]'  # 二级菜单Security
+mainPage_secondLevelMenu_Statistics_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-monitor-policy css-1l56wwh"]'  # 二级菜单Statistics
+mainPage_secondLevelMenu_Proxy_intercept_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-intercept-policy css-1l56wwh"]'  # 二级菜单Proxy_intercept
+mainPage_secondLevelMenu_Proxy_Manipulation_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-manipulation-policy css-1l56wwh"]'  # 二级菜单Proxy_Manipulation
+mainPage_secondLevelMenu_Shaping_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-traffic-shaping-policy css-1l56wwh"]'  # 二级菜单Shaping
+mainPage_secondLevelMenu_ServiceChaining_posXpath = '//div[@class="MuiListItem-root MuiListItem-gutters menu-service-chaining-policy css-1l56wwh"]'  # 二级菜单Service Chaining
 # Policies 列表页===================#Policies 列表页===================#Policies 列表页===================#Policies 列表页===================#Policies 列表页===================
 # Policies 列表页===================#Policies 列表页===================#Policies 列表页===================#Policies 列表页===================#Policies 列表页===================
 # Policies 查询栏===================Policies 查询栏=====================Policies 查询栏=================Policies 查询栏=======================Policies 查询栏=================Policies 查询栏
@@ -91,12 +99,12 @@ detailPage_subObjectGroup_toggleDraw_closedExcludeSwitchutton_posXpath = '//div[
 detailPage_subObjectGroup_toggleDraw_subordinateOrExcludeDrawer_posXpath = '//div[@class="right-menu-content"]//div[@class="rm-top" and contains(text(),"List")]'
 # Security================================Security===================================Security================================Security==================================Security========================Security
 # Create element
-security_policy_add_condition_button_by_xpath = '//span[contains(text(),"Add Condition")]'  # Add Condition按钮
+security_policy_add_condition_button_by_xpath = '//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-1g5snt5"]'  # Add Condition按钮
 security_policy_add_device_button_by_xpath = '//div[(normalize-space(text())="Device")]'  # 选择Device
-security_policy_add_button_by_xpath = '(//*[@class="MultipleSelect SourceSelect"])[2]'  # 添加Device
+security_policy_add_button_by_xpath = '//label[(normalize-space(text())="Device")]/ancestor::div[@class="security-policy-list"]//i[@class="iconfont icon-Create1 font-[700]"]'  # 添加Device
 # security_policy_add_apn_by_xpath='//div[(normalize-space(text())="APN")]'#选择apn
 security_create_Button_posXpath = '//button[@id="app_create-_OperateBtns_ElRow_Objects_ProxyInterception_Home_App_anonymousComponent"]/span'  # 安全创建按钮
-security_create_Name_input_frame_PosXpath = '//div/div/div[1]/div[2]/form/div[1]/div/div[1]/div[1]/input'  # 创建输入Name框
+security_create_Name_input_frame_PosXpath = '//input[@class="MuiInput-input css-fqt4w4"]'  # 创建输入Name框
 security_create_add_source_button_click_PosXpath = '//div/div/div/div[1]/div[2]/form/div[4]/div/div/div/i'  # 创建添加source按钮
 security_create_add_tunnel_button_click_PosXpath = '(//div[(normalize-space(text())="Tunnel")])[2]'  # 选择tunnel按钮
 security_add_tunnel_button = '(//*[@class="iconfont icon-Create1 cursor"])[1]'
@@ -106,14 +114,14 @@ security_first_add_App_Group_right_top_click_PosXpath = '//*[@id="tab-group"]'
 security_first_app_group_inlist_click_PosXpath = '//div/div/div/div[3]/div[1]/div/div[2]/ul/li[1]/div[2]/span/div[2]/div/span'  # App Group列表页的第一个元素
 security_create_add_source_button_right_click_PosXpath = '//div[2]/div/div[1]/div/div/div/div[2]/div/div/div[1]/div/span[2]/i'  # 右划选择框
 security_create_add_source_button_select_IMSI_PosXpath = '//div[@id="tab-imsi"]'  # 选择imsi
-security_create_add_source_button_select_APN_PosXpath = '//*[@id="tab-apn"]'  # 选择apn
+security_create_add_source_button_select_APN_PosXpath = '//button[@class="MuiTab-root MuiTab-horizontal Mui-selected MuiTab-variantPlain MuiTab-colorNeutral css-1etvey5"]'  # 选择apn
 security_create_add_source_button_select_Phone_Number_PosXpath = '//div[@id="tab-phone_number"]'  # 选择phone_number
 security_create_add_source_button_select_IMEI_PosXpath = '//div[@id="tab-imei"]'  # 选择imei
-security_create_add_source_button_IMSI_search_frame_PosXpath = '(//*[@id="object_ip_search"])[2]'  # IMSI搜索框
+security_create_add_source_button_IMSI_search_frame_PosXpath = '//input[@class="MuiInput-input css-za5rna"]'  # IMSI搜索框
 security_create_add_source_button_Phone_Number_search_frame_PosXpath = '//div/div/div/div[2]/div/div[1]/div/div/div/div[3]/div[1]/div/div[1]/div[1]/div/div/input'  # Phone_number 搜索框
 security_create_add_source_button_IMEI_search_frame_PosXpath = '//div/div/div/div[2]/div/div[1]/div/div/div/div[3]/div[1]/div/div[1]/div[1]/div/div/input'  # IMEI搜索框
-security_create_add_source_button_select_first_object_PosXpath = '//*[@class="ellipsis list-popover-click"]'  # 选择第一个元素
-security_create_ok_click_posXpath = '//button[@id="OK-_SecurityAdd_Home_App_anonymousComponent"]/span'  # 点击OK
+security_create_add_source_button_select_first_object_PosXpath = '(//li[@class="MuiListItem-root MuiListItem-colorNeutral MuiListItem-variantPlain css-1linw58"])[1]'  # 选择第一个元素
+security_create_ok_click_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"]'  # 点击OK
 security_create_Warn_ok_click_posXpath = '//div[@role="dialog"]/div/div[3]/button[2]/span'  # Warn OK
 # List element
 list_security_select_frame_click_posXpath = '//input[@id="select-label"]'  # 点击搜索框