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

1 files changed, 15 insertions, 12 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 1e0cf761..fd26f8f0 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -15,6 +15,7 @@ listpage_first_row_name_posXpath = '(//span[@class="truncate"])[1]' #第一行na
 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_no_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-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_UUID_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='UUID']"
 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
 listPage_objectSearch_select_Description_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Description']" #查询Description
@@ -460,8 +461,8 @@ listPage_object_urls_importButton_posXpath = '//div[@class="ly-tablecontrol-1 el
 listPage_object_urls_exportButton_posXpath = "//i[@class='iconfont icon-export']"  # 导出文件按钮 Xpath
 listPage_object_urls_exportPopYes_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[contains(text(),'Yes')]"  # 导出数据选择确认弹窗 yes Xpath
 listPage_object_urls_exportPopNo_posXpath = "//div[@class='MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm css-xguxzj']//button[contains(text(),'No')]"  # 导出数据选择确认弹窗 no Xpath
-listPage_object_urls_exportPopSelectAll_posXpath = '//div[@class="el-table__header-wrapper"]//span[@class="el-checkbox__inner"]'  # 导出数据选择确认弹窗全选CheckBox Xpath
-listPage_object_urls_exportPopCheckbox_posXpaths = '//div[@class="el-dialog__body"]//div[@class="el-table__body-wrapper is-scrolling-none"]//span[@class="el-checkbox__inner"]'  # 导出数据选择确认弹窗CheckBox(多个)
+listPage_object_urls_exportPopSelectAll_posXpath = '(//div[@role="dialog"]//input[@type="checkbox"])[1]'  # 导出数据选择确认弹窗全选CheckBox Xpath
+listPage_object_urls_exportPopCheckbox_posXpaths = '//div[@role="dialog"]//div[@role="rowgroup"]//input[@type="checkbox"]'  # 导出数据选择确认弹窗CheckBox(多个)
 listPage_object_urls_exportPopCheckbox_posXpaths_template = '(//div[@class="el-dialog__body"]//div[@class="el-table__body-wrapper is-scrolling-none"]//span[@class="el-checkbox__inner"])[{}]'  # 导出数据选择确认弹窗CheckBox(多个)
 listPage_object_urls_clearCounterPopYes_posXpath = '//*[contains(text(),"Confirm to Clear Counter")]/../..//span[contains(text(),"Yes")]'  # Clear Counter 选择确认弹窗中的Yes确认按钮
 # listPage_object_urls_tableCheckbox_posXpaths = '//table[@class="el-table__body"]//span[@class="el-checkbox__inner"]'  # 列表页CheckBox（50）
@@ -489,7 +490,7 @@ listPage_object_urls_tableDetails_firstSingleObject_posXpath = \
 # listPage_object_urls_tableDetails_firstObjectGroup_posXpath = '(//i[contains(@class,"group")]/ancestor::tr//span[@class="el-checkbox__inner"][1])'  # 列表页中第一个Object Group 的CheckBox
 listPage_object_urls_tableDetails_firstObjectGroup_posXpath = \
     '(//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//*[contains(@class,"name-fontFamily")]/preceding-sibling::i[(contains(@class,"group"))]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个Object Group 的CheckBox(不包含single Object和锁定对象)
-listPage_object_urls_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = '(//div[@class="table-status-box"]/div[2]//*[contains(@class,"icon-lock")]/ancestor::tr//span[@class="el-checkbox__inner"])[1]'  # 列表页中第一个不是本Vsys的对象或对象组的CheckBox
+listPage_object_urls_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = '(//i[@class="iconfont icon-lock text-[18px] text-[--color-text-decoration]"]/ancestor::div[@class="css-16m40q9 MuiDataGrid-cell MuiDataGrid-cell--textLeft"]/preceding-sibling::div[@data-field="__check__"]//input)[1]'  # 列表页中第一个不是本Vsys的对象或对象组的CheckBox
 
 listPage_object_urls_tableCheckbox_localVsys_objectOrGroup_posXpaths = '//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）
 # listPage_object_tableCheckbox_localVsysAndReferenceEqualO_objectOrGroup_posXpaths = '//*[contains(@class,"table-status-item-id")]/preceding-sibling::div[2][not(*)]/ancestor::tr//div[(contains(@id,"Count-_Objects") or contains(@id,"objectReferenceData") or contains(@id,"ReferenceData-")) and number(text())=0]/ancestor::tr//span[@class="el-checkbox__inner"]'  # 列表页中本Vsys的Object 或Group（不包含其他Vsys）且Reference Count==0
@@ -1473,8 +1474,8 @@ port_ObjectDetailPage_itemValueInput_poXpath = '//div[@class="MuiInput-root MuiI
 port_ObjectDetailPage_itemSaveButton_poXpath = '//i[@class="operate-icon iconfont icon-save"]'  # item 下value保存按钮Xpath!!!!!
 port_ObjectDetailPage_item_search_posId = acc_ObjectDetailPage_item_search_posXpath  # item 下搜索框id
 port_ObjectDetailPage_item_search_posXpath = '//input[@class="MuiInput-input css-za5rna"]'   # item 下搜索框xpath!!!!!
-port_ObjectDetailPage_importFromFile_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!!!!!
-port_ObjectDetailPage_pleaseUpload_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"]'  # Please Upload input标签Xpath!!!!!
+port_ObjectDetailPage_importFromFile_posXpath = "//button[contains(text(),'import from file')]"  # Import From File 按钮Xpath!!!!!
+port_ObjectDetailPage_pleaseUpload_posXpath = '//input[@type="file"]'  # Please Upload input标签Xpath!!!!!
 port_ObjectDetailPage_importUrlOk_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-k5thc0"]'  # Import 页面 下的OK按钮Xpath
 port_ObjectDetailPage_description_posXpath = '//textarea[@placeholder="Please enter the content"]'  # 对象详情页面下Description input Xpath!!!!!
 port_ObjectDetailPage_auditLogs_posXpath = acc_ObjectDetailPage_auditLogs_posXpath  # Audit Logs Xpath
@@ -1524,7 +1525,7 @@ port_listPage_object_tableCheckbox_firstSingleObject_posXpath = listPage_object_
 port_listPage_object_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath = listPage_object_urls_tableCheckbox_firstNotLocalVsys_objectOrGroup_posXpath  # 列表页中第一个不是本Vsys的对象或对象组的CheckBox
 port_listPage_object_tableCheckbox_notLocalVsys_objectOrGroup_posXpaths = listPage_object_urls_tableCheckbox_notLocalVsys_objectOrGroup_posXpaths  # 列表页中不是本Vsys的对象或对象组的CheckBox
 port_listPage_object_clearCounterPopYes_posXpath = listPage_object_urls_clearCounterPopYes_posXpath  # Clear Counter 选择确认弹窗中的Yes确认按钮
-port_listPage_object_first_row_id_posXpath = "//div[contains(@class,'el-table__body-wrapper')]//tr[1]//td[count(//div[@class='el-table__header-wrapper']//span[text()='ID']/../../../preceding-sibling::th)+1]//div[@class='table-status-item-id']//span"
+port_listPage_object_first_row_uuid_posXpath = '//div[@aria-rowindex="2"]//div[@data-field="uuid"]'
 # link页
 port_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_port_Home_App_anonymousComponent"  # link按钮ID
 port_listpage_linkSave_posXpath = '//*[@id="clusterSave-_ClusterTable_ElDialog_copyComponents_Objects_port_Home_App_anonymousComponent"]'  # Cluster和Vsys保存按钮ID
@@ -1546,8 +1547,10 @@ port_ObjectDetailPage_mainOkButton_posXpath = '//button[@class="MuiButtonBase-ro
 port_ObjectDetailPage_okButton_yes_posXpath = acc_ObjectDetailPage_okButton_yes_posXpath  # 确认弹窗的“Yes”按钮
 
 # 对象组详情页
-port_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]//i[@class="iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer"]'  # Subordinate Objects 下有数据新增时"+"按钮Xpath
-port_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]//button'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
+port_groupObjectDetailPage_excludeObjects_search_posXpath = '//div[@class="port-object-excluded_sub_object_uuids"]//input'
+port_groupObjectDetailPage_subordinateObjects_search_posXpath = '//div[@class="port-object-included_sub_object_uuids"]//input'
+port_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]//button'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
+port_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]//i[@class="iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer"]'  # Subordinate Objects 下有数据新增时"+"按钮Xpath
 port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = '//div[@class="px-[12px] py-[4px] flex"]/button'  # Ports侧滑窗口的"+"按钮
 port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_port_posXpath = objectPage_group_sub_object_add_new_select_button_posXpath  # Ports侧滑窗口的"+"按钮下的Port
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_nameInput_posXpath = '(//input[@class="MuiInput-input css-fqt4w4"])[2]'  # 侧滑子Create Ports页面Name input Xpath
@@ -1558,12 +1561,12 @@ port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_descriptionTextarea_po
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_okButton_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"])[2]'  # 侧滑子Create Account页面中OK按钮
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_okButton_yes_posXpath = acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_yes_posXpath  # 侧滑子Create Account页面确认弹窗的“Yes”按钮
 port_ObjectDetailPage_firstPortObject = acc_ObjectDetailPage_firstAccObject  ## 侧滑Objects列表中第一个acc object Xpath
-portGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath = accGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath  # Exclude Objects Switch Xpath
-portGroup_ObjectDetailPage_excludeObjects_itemsArea_posXpath = accGroup_ObjectDetailPage_excludeObjects_itemsArea_posXpath  # Exclude Objects下的item区域div Xpath
-portGroup_ObjectDetailPage_excludeObjectsSwitch_newAdd_posXpath = accGroup_ObjectDetailPage_excludeObjectsSwitch_newAdd_posXpath  # Exclude Objects无数据时新增按钮Xpath
+portGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath = "//div[@class='port-object-']//span[@class='MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary css-y2jqxi']"  # Exclude Objects Switch Xpath
+portGroup_ObjectDetailPage_excludeObjects_itemsArea_posXpath = "//div[@class='port-object-excluded_sub_object_uuids']"  # Exclude Objects下的item区域div Xpath
+portGroup_ObjectDetailPage_excludeObjectsSwitch_newAdd_posXpath = '//div[@class="port-object-excluded_sub_object_uuids"]'  # Exclude Objects无数据时新增按钮Xpath
 port_ObjectDetailPage_firstObject = acc_ObjectDetailPage_firstObject  # 侧滑acc Object中第一个url Xpath
 port_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath = acc_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath  # Accounts侧滑窗口的Close按钮
-portGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath = accGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath  # Exclude Objects有数据时新增按钮Xpath
+portGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath = '//div[@class="port-object-excluded_sub_object_uuids"]//i[@class="iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer"]'  # Exclude Objects有数据时新增按钮Xpath
 port_ObjectDetailPage_secondObject = acc_ObjectDetailPage_secondObject  # 侧滑acc Object中第二个url Xpath
 port_object_group_subobject_close_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'
 ## listPage->Tips dialog  列表页 tips对话框