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

1 files changed, 32 insertions, 13 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 12dbce51..a388dae4 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -1,3 +1,19 @@
+# Object列表页通用元素
+listpage_create_button_posXpath = '//span[@class="action-create inline-flex mr-[8px] "]/button' #create按钮Xpath!!!!!
+listpage_edit_button_posXpath = '//span[@class="action-edit inline-flex mr-[8px] "]/button'        #edit按钮xpath!!!!!
+listpage_delete_button_posXpath = '//span[@class="action-delete inline-flex mr-[8px] "]/button'  #delete按钮Xpath!!!!!
+listpage_export_button_posXpath = '//span[@class="action-export inline-flex mr-[8px] "]/button' #export按钮Xpath!!!!!
+listpage_delete_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"]'  # delete按钮xpath!!!!!
+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_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!!!!!
+
+
 # login page 登录页面
 loginPage_userName_posName = "username"
 loginPage_passwd_posName = "password"
@@ -1441,22 +1457,25 @@ port_ObjectDetailPage_leaveThisPage_yesButton_posXpath = '//button[contains(@cla
 port_ObjectDetailPage_clearCounter_posXpath = acc_ObjectDetailPage_clearCounter_posXpath  # Clear Counter 按钮
 port_ObjectDetailPage_dupAlert_posXpath = '//div[@title="Duplicate data exists"]'  # item重复提示
 port_ObjectDetailPage_dupAlert_duplicateListTotal_posXpath = '//div[@class="DuplicateList list-box"]//p[contains(@class,"total")]'  # duplicateList中的“Total：xx”
-port_ObjectPage_button_cancel_posXpath = '//*[@id="Cancel-_PortDetail_Home_App_anonymousComponent"]'
-port_ObjectPage_importTipsValue_posXpath_template = '//div[@class="drawer-box"]//div[@class="importTips"]//td[count(//div[@class="drawer-box"]//div[@class="importTips"]//th[@title="{}"]/preceding-sibling::th)+1]'
+port_ObjectPage_button_cancel_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 form-action-cancel css-5vcc8t"]'  # 详情页cancel按钮xpath!!!!!
+port_ObjectPage_importTipsValue_posXpath_template = '//th[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-11hk28a"]' # 导入后valid值!!!!!
 port_ObjectPage_importTipsValue_error_item_posXpath = '//div[@class="importTable"]//*[@class="{}"]'
 # 列表页
 port_listPage_createButton_posId = 'objectCreate-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent'  # 列表页create 按钮ID
+port_listPage_createButton_posXpath = '//span[@class="action-create inline-flex mr-[8px] "]/button'  #create按钮Xpath!!!!!
 port_listPage_createButton_port_posId = 'object0-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent'  # 列表页create下account ID
 port_listPage_createButton_portGroup_posId = 'object1-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent'  # 列表页create下account group ID
 port_listPage_editButton_posId = 'appEdit-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent'  # 列表页 Edit 按钮ID
-port_listPage_noDataText_posXpath = url_listPage_noDataText_posXpath  # 列表页无数据时的no data文本 Xpath
-port_listPage_first_row_checkBox_posXpath = '(//td[@rowspan="1"and @colspan="1"]//span[@class="el-checkbox__inner"])[1]'  # 列表页第一行对象多选框Xpath
+port_listPage_editButton_posXpath = '//span[@class="action-edit inline-flex mr-[8px] "]/button'  #edit按钮xpath!!!!!
+port_listPage_noDataText_posXpath = '//div[@class="MuiDataGrid-overlay css-14349d1"]' #列表页No Data!!!!!
+port_listPage_first_row_checkBox_posXpath = '(//span[@class="MuiCheckbox-root MuiCheckbox-variantOutlined MuiCheckbox-colorNeutral MuiCheckbox-sizeMd MuiDataGrid-checkboxInput css-q3lb41"]//input)[1]'  #列表中第一行数据前的复选框!!!!!
 port_listPage_deleteButton_posId = 'appDel-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent'  # 列表页 Delete 按钮ID
-port_listPage_deleteYes_posXpath = listPage_object_ip_address_del_yes_Button_posXpath
-port_object_columnSetting_descriptionOption_posXpath = listPage_object_urls_columnSetting_descriptionOption_posXpath  # 列设置中的description选项元素Xpath
-port_listPage_object_exportButton_posXpath = listPage_object_urls_exportButton_posXpath  # 导出文件按钮 Xpath
-port_listPage_object_exportPopYes_posXpath = listPage_object_urls_exportPopYes_posXpath  # 导出数据选择确认弹窗 yes Xpath
-port_listPage_object_tableCheckbox_singleObject_posXpaths = listPage_object_urls_tableCheckbox_singleObject_posXpaths  # 列表页CheckBox（50）
+port_listPage_deleteButton_posXpath = '//span[@class="action-delete inline-flex mr-[8px] "]/button' # delete按钮Xpath!!!!!
+port_listPage_deleteYes_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"]'  # delete yes按钮xpath!!!!!
+port_object_columnSetting_descriptionOption_posXpath = '//span[normalize-space(text())="Description"]'  # 列设置中的description选项元素Xpath!!!!!
+port_listPage_object_exportButton_posXpath = '//span[@class="action-export inline-flex mr-[8px] "]/button'  # 导出文件按钮 Xpath
+port_listPage_object_exportPopYes_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"]'  # 导出数据选择确认弹窗 yes Xpath!!!!!
+port_listPage_object_tableCheckbox_singleObject_posXpaths = '//input[@class="MuiCheckbox-input css-1jj0cvj"]'  # 列表页CheckBox（50）
 port_listPage_object_tableCheckbox_objectGroup_posXpaths = listPage_object_urls_tableCheckbox_objectGroup_posXpaths  # 列表页对象组的CheckBox（多个）
 port_listPage_object_tableCheckbox_posXpaths = listPage_object_urls_tableCheckbox_posXpaths  # 列表页CheckBox（50）
 port_listPage_object_tableDetails_singleObject_posXpaths = listPage_object_urls_tableDetails_singleObject_posXpaths  # 列表页中所有对象（不包含对象组）的DetailsXpath
@@ -1483,10 +1502,10 @@ port_listPage_linkTips_input_vsysSelect_posXpath = "//*[@id='clusterVsysId']/par
 port_listPage_linkTips_dropitem_vsysSelect_posXpath = "//body/div[contains(@class, 'el-select-dropdown')]//li//span[normalize-space(text())='{replaceName}']"  # vsys id 下拉列表 选择按钮
 port_listPage_objectTable_tableTbody_posXpath = "//div[contains(@class,'ly-table1')]//tbody"  # 列表tabel body
 
-object_page_ln_select_statistics_input_posXpath = '//*[@id="statistics_select"]'
-object_page_ln_select_statistics_brief_posXpath = "//*[contains(text(), 'Brief')]"
-object_page_ln_select_statistics_elaborate_posXpath = "//*[contains(text(), 'Elaborate')]"
-object_page_ln_select_statistics_none_posXpath = "//*[contains(text(), 'None')]"
+object_page_ln_select_statistics_input_posXpath = '//button[@class="MuiSelect-button css-1qmzz5g"]'  #详情页statistics!!!!!
+object_page_ln_select_statistics_brief_posXpath = '//li[@class="MuiOption-root css-rabwri"]//p[@class="MuiTypography-root MuiTypography-title-sm css-kfmwsi"]'  #elaboreate!!!!!
+object_page_ln_select_statistics_elaborate_posXpath = '//li[@class="MuiOption-root css-171tq0k"]//p[@class="MuiTypography-root MuiTypography-title-sm css-kfmwsi"]'  #brief!!!!!
+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"]'