元素定位逻辑修改

2 files changed, 13 insertions, 13 deletions

diff --git a/page_element/ln_objects_element_position.py b/page_element/ln_objects_element_position.py
index 1ba0c9df..3a8faa97 100644
--- a/page_element/ln_objects_element_position.py
+++ b/page_element/ln_objects_element_position.py
@@ -194,7 +194,7 @@ Attributes_ObjectPage_InputName_posXpath = '//input[@class="MuiInput-input css-f
 Attributes_ObjectPage_InputName_posId = "application_name1"
 Attributes_ObjectPage_inputParentAttribute_posId = 'attr_parentadd-_Attribute_Home_App_anonymousComponent'  # 选择Parent Attribute +
 Attributes_ObjectPage_inputParentAttribute_posXpath = '//div[@class="traffic-attribute-object-fast_pattern"]//i' # 选择Parent Attribute!!!!!
-AttributesObjectPage_UploadedFile_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"]'  # 上传文件!!!!!
+AttributesObjectPage_UploadedFile_posXpath = '//input[@type="file"]'  # 上传文件!!!!!
 Attributes_Max_Packets_posXpath = '//div[@class="traffic-attribute-object-max_packets_per_session"]//input'
 Attributes_ExecutionTime_posXpath = '//input[@class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedEnd css-f8h3ui"]'  # 最大执行时间!!!!!
 AttributeValueType_Bool="radio_method0-_Attribute_Home_App_anonymousComponent" #选择类型为布尔值
@@ -202,7 +202,7 @@ AttributeValueType_Bool_posXpath = '//button[@class="MuiButtonBase-root MuiButto
 AttributeValueType_Numerical="radio_method1-_Attribute_Home_App_anonymousComponent" #选择类型Numerical
 AttributeValueType_Numerical_posXpath = '//button[@class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedOutlined MuiButtonGroup-groupedOutlinedHorizontal MuiButtonGroup-groupedOutlinedPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButtonGroup-middleButton css-5ve3fi"]'     # numerical!!!!!
 AttributeValueType_String="radio_method2-_Attribute_Home_App_anonymousComponent" #选择类型为String
-AttributeValueType_String_posXpath = '//button[@class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedOutlined MuiButtonGroup-groupedOutlinedHorizontal MuiButtonGroup-groupedOutlinedPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outlinedSizeSmall MuiButton-colorPrimary MuiButtonGroup-lastButton css-5ve3fi"]'   #string!!!!!
+AttributeValueType_String_posXpath = '//button[text()="String"]'   #string!!!!!
 Attributes_Select_inputParentAttribute_tcppayload='//li[@id=":ru8:-ATTR_TCP_PAYLOAD"]/div'#ATTR_TCP_PAYLOAD!!!!!
 Attributes_Select_ParentAttribute_tcp='//div[normalize-space(text())="tcp"]' #定位方式
 Attributes_Select_ParentAttribute_tcp_payload_c2s_first_data_xpath='//li[@id=":ru8:-ATTR_TCP_PAYLOAD_C2S_FIRST_DATA"]/div' #!!!!!
@@ -223,7 +223,7 @@ Userdefined_first_row_second_column_posXpath = '//th[2]//*[normalize-space(text(
 Userdefined_second_row_second_column_posXpath = '//*[@id="app-table"]/div[3]/table/tbody/tr[1]/td[2]/div | //div[3]/table/tbody/tr[1]/td[2]/div/div/span'                                              # 第二行、第二列
 
 Userdefined_first_row_third_column_posXpath = '//div[normalize-space(text())="Attribute Name" or normalize-space(text())="Name"]'               # 第一行、第三列
-Userdefined_second_row_third_column_posXpath = '(//div[@data-field="name" and @aria-colindex="3"])[2]'                                   # 第二行、第三列
+Userdefined_second_row_third_column_posXpath = '//div[@aria-rowindex="2"]//div[@data-field="name"]'                                   # 第二行、第三列
 #Object Signatures===================Signatures====================Signatures=================Signatures=======================Signatures=================Signatures================
 #Signatures列表页的公共元素和Attribute相同，可以复用。
 listPage_object_signature_createButton_posId = "app_create-_OperateBtns_ElCol_ElRow_Application_appSignatures_Home_App_anonymousComponent"  # create按钮id
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 5cd9c9a0..d8451b5a 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -7,8 +7,8 @@ listpage_delete_yes_button_posXpath = '//button[@class="MuiButtonBase-root MuiBu
 listpage_search_box_posXpath = '//div[@class="MuiAutocomplete-wrapper MuiAutocomplete-multiple css-1h1ala5"]/input' # 查询框Xpath!!!!!
 listpage_search_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-1afa66w"]'  #查询按钮Xapth!!!!!
 listpage_search_input_posXpath = '//input[@class="MuiAutocomplete-input css-qdyksh"]' #查询输入Xpath!!!!!
-listPage_select_first_object_posXpath = '(//span[@class="MuiCheckbox-root MuiCheckbox-variantOutlined MuiCheckbox-colorNeutral MuiCheckbox-sizeMd MuiDataGrid-checkboxInput css-q3lb41"]//input)[1]' #列表中第一行数据前的复选框!!!!!
-listpage_select_second_object_posXpath = '(//span[@class="MuiCheckbox-root MuiCheckbox-variantOutlined MuiCheckbox-colorNeutral MuiCheckbox-sizeMd MuiDataGrid-checkboxInput css-q3lb41"]//input)[2]'#列表中第二行数据前的复选框!!!!!
+listPage_select_first_object_posXpath = '(//div[@aria-colindex="1"]//input)[1]' #列表中第一行数据前的复选框!!!!!
+listpage_select_second_object_posXpath = '(//div[@aria-colindex="1"]//input)[2]'#列表中第二行数据前的复选框!!!!!
 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!!!!!
@@ -1734,16 +1734,16 @@ geoObjectPage_button_editItem_text_posXpath = "//div[@class='object-item-box']//
 
 # policy页面元素======================================================
 # =================================================================================policy页面通用元素================================
-policy_button_add_contions_posXpath = "//div[@class='MultipleSelect ConditionModuleSelect']//span[text()='Add Condition']"
-policy_button_type_add_contions_posXpath = "//p[normalize-space(text())='{replaceValue}']/ancestor::label[@class='el-form-item__label']/following-sibling::div/div[@class='MultipleSelect SourceSelect']"
-policy_button_add_filter_psXpath = "//p[normalize-space(text())='{replaceValue}']/ancestor::label[@class='el-form-item__label']/following-sibling::div/div[@class='MultipleSelect FilterSelect']"
+policy_button_add_contions_posXpath = '//button[text()="Add Condition"]'
+policy_button_type_add_contions_posXpath = '//label[text()="{replaceValue}"]/ancestor::div[@class="flex flex-row group"]//button/i'
+policy_button_add_filter_psXpath = "//label[normalize-space(text())='{replaceValue}']/ancestor::div[@class='flex flex-row group']/div[@class='flex flex-col items-center select-picker']//i"
 policy_button_add_application_posXpath = "//p[normalize-space(text())='Application']/ancestor::label[@class='el-form-item__label']/following-sibling::div//div[@class='MultipleSelect AppSelect']"
-policy_list_add_contions_posXpath = "//div[@class='slider-container']//div[normalize-space(text())='{replaceValue}']"
-statistics_policy_template_add_button_posXpath = "//div[text()='Statistics Template']/following-sibling::div[@class='MultipleSelect FlagSelect']//div[@class='addobject width300px addobject-long-list obj-content-null cursorPointer borderColor']"
-statistics_policy_template_first_template_posXpath = "//div[@class='FlagList list-box']//ul[@class='row-container tableList']/li[1]"
+policy_list_add_contions_posXpath = "//div[normalize-space(text())='{replaceValue}']"
+statistics_policy_template_add_button_posXpath = '//div[@class="statistics-policy-template_profile"]//i'
+statistics_policy_template_first_template_posXpath = '//ul[@class="MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3"]/li[1]'
 intercept_policy_application_add_button_posID = "policy_app_add-_AppSelect_ElFormItem_ElForm_VPanel_VEditPanel_policy_Intercept_edit_Home_App_anonymousComponent"
-shaping_policy_profile_add_button_posXpath = "//label[text()='Shaping Profile']//parent::*//div[@class='MultipleSelect FlagSelect']//div[@class='addobject width300px addobject-long-list obj-content-null cursorPointer borderColor']"
+shaping_policy_profile_add_button_posXpath = '//label[normalize-space(text())="Shaping Profile"]/following-sibling::div//button/i'
 shaping_policy_profile_first = "//ul[@cLass='row-container tableList profile-table floatleft margin-top20 overflow-y-auto overflow-x-hidden width100']/li[1]"
-service_chaining_policy_ssf_add_button_posID = "policy_sff_add-_SFFSelect_ElFormItem_ElForm_VPanel_VEditPanel_policy_service_chaining_write_Home_App_anonymousComponent"
+service_chaining_policy_ssf_add_button_posID = '//label[normalize-space(text())="SFF Profile"]/following-sibling::div//button/i'
 service_chaining_policy_ssf_first = "//div[@class='slider-container positionRelative height100']//ul[@class='row-container tableList profile-table floatleft margin-top20 overflow-y-auto overflow-x-hidden width100']/li[1]"
 policy_button_add_port_filter_psXpath = "//p[normalize-space(text())='{replaceValue}']/ancestor::label[@class='el-form-item__label']/following-sibling::div/div[@class='MultipleSelect SourceSelect']"
\ No newline at end of file