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

2 files changed, 8 insertions, 7 deletions

diff --git a/page_element/ln_objects_element_position.py b/page_element/ln_objects_element_position.py
index b0d942bf..be052f29 100644
--- a/page_element/ln_objects_element_position.py
+++ b/page_element/ln_objects_element_position.py
@@ -191,6 +191,7 @@ Attributes_ObjectPage_InputName_posId = "application_name1"
 Attributes_ObjectPage_inputParentAttribute_posId = 'attr_parentadd-_Attribute_Home_App_anonymousComponent'  # 选择Parent Attribute +
 Attributes_ObjectPage_inputParentAttribute_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-gdcbst"]/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"]'  # 上传文件!!!!!
+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" #选择类型为布尔值
 AttributeValueType_Bool_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 btn-active MuiButtonGroup-firstButton css-5ve3fi"]'   #bool!!!!!
@@ -217,8 +218,8 @@ Userdefined_second_row_first_column_posXpath = '//tr[1]/td[1]/div//div[4]/span'
 Userdefined_first_row_second_column_posXpath = '//th[2]//*[normalize-space(text())="Vsys ID"]'                                            # 第一行、第二列
 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 = '//tr/th[3]//span[normalize-space(text())="Attribute Name" or normalize-space(text())="Name"]'               # 第一行、第三列
-Userdefined_second_row_third_column_posXpath = '//*[@id="app-table"]/div[3]/table/tbody/tr[1]/td[3]/div/div | //div[3]/table/tbody/tr[1]/td[3]/div/div/div | //div[3]/table/tbody/tr[1]/td[3]/div/div/span/span/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]'                                   # 第二行、第三列
 #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
@@ -368,7 +369,7 @@ application_description_input_xpath = '//textarea[@placeholder="Please enter the
 application_select_category_dropwmn_id = "application_eventkeying1"  # Category select
 application_select_category_dropwmn_posXpath = '//div[@class="application-object-category"]'
 application_select_subcategory_dropwmn_id =  "application_eventkeying2" # Subcategory select
-application_select_subcategory_dropwmn_posXpath = '//div[@class="application-object-subcategroy"]'
+application_select_subcategory_dropwmn_posXpath = '//div[@class="application-object-subcategory"]'
 application_select_content_dropwmn_id = "application_eventkeying3" # Content select
 application_select_content_dropwmn_posXpath = '//div[@class="application-object-content"]'
 application_select_risk_dropwmn_id = "application_eventkeying4"  # Risk select
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index a7a7d278..a51b3b56 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -12,7 +12,7 @@ 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_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-1hoe4y0"]'
 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
@@ -1307,17 +1307,17 @@ int_listpage_linkOk_posXpath = '//*[@id="copyOk-_copyComponents_Objects_interval
 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
 
-# 对象详情页a
+# 对象详情页
 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_item_addButton_poXpath = url_ObjectDetailPage_addButton_posXpath  # item下"+"按钮
 # 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
+int_ObjectDetailPage_description_posXpath = "//div[@class='interval-object-description']//textarea[1]"  # 对象详情页面下Description input Xpath
 
 # 对象组详情页
 int_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath = acc_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath  # Subordinate Objects 下有数据新增时"+"按钮Xpath