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

1 files changed, 14 insertions, 10 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index b434e74a..cc4fd697 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -145,6 +145,8 @@ main_listPage_object_select_Second_object_posXpath = '//table/tbody/tr[2]/td[1]/
 main_listPage_object_total_value_posXpath = '(//div[@class="flex-1 flex items-center justify-center undefined"]/span)[1]'  # 列表页total值
 ##Object模块列设置
 mainPage_ObjectSearch_Column_settings_posXpath = "//i[@class='iconfont icon-SetNormal text-[14px] text-[var(--color-text-disabled)]']"
+mainPage_ObjectSearch_Column_settings_select_CheckBox_posXpath = "//input[@name='Show/Hide All']"
+mainPage_Object_Title_Name_posXpath = "//div[@class='MuiDataGrid-columnHeader MuiDataGrid-withBorderColor']//div[text()='Name']"
 mainPage_ObjectSearch_Column_settings_select_allCheckBox_posXpath = "//div[@class='MuiDataGrid-columnsManagementFooter css-1l93brk']//span[@class='MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-1hhkft9']"  # ALL选择框----------------
 mainPage_ObjectSearch_Column_settings_click_Cancel_Button_posXpath = '//div[@class="choose-button"][1]//span[text()="Cancel"]'  # 点击Cancel
 mainPage_ObjectSearch_Column_settings_click_OK_Button_posXpath = '//div[@class="choose-button"][1]//span[text()="OK"]'  # 点击OK
@@ -416,6 +418,7 @@ mobile_Identities_Group_sub_Object_add_new_addIMEI_item_inputName_posXpath = "//
 mobile_Identities_Group_sub_Object_add_new_add_itemIMSI_Save_Button_posXpath = "//i[@class='operate-icon iconfont icon-save']"  # 保存item按钮
 mobile_Identities_Group_sub_Object_add_new_add_item_phoneNumber_Save_Button_posXpath = "//i[@class='operate-icon iconfont icon-save']"
 mobile_Identities_Group_sub_Object_add_new_add_item_IMEI_Save_Button_posXpath = "//i[@class='operate-icon iconfont icon-save']"
+mobile_Identities_Group_sub_Object_exclude_open_posXpath = "//div[@class='mobile-identity-object-']"
 
 mobile_Identities_Group_sub_Object_add_new_one_OK1_Button_posXpath = "//button[@id='OK-_mobileIdDetail_VDraswer_EditDraw_mobileIdDetail_Home_App_anonymousComponent']"  # new mobile_Identities CreateOK1
 mobile_Identities_Group_sub_Object_add_new_one_OK1_Warning_Yes_Button_posXpath = "//div[@class='el-message-box__btns']//span[normalize-space(text())='Yes']"  # 再次确认创建new mobile_Identities
@@ -770,18 +773,17 @@ FQDNsObjectPage_button_cancel_posCss = "//button[@id='Cancle-_FqdnDetail_Home_Ap
 # Create FQDNs Group Object 和 Edit CreateFQDNs Group   新增和编辑页
 FQDNs_Group_sub_Object_addButton_posXpath = "//div[@class='fqdn-object-included_sub_object_uuids']"  # FQDNs_Group添加sub Object按钮
 FQDNs_Group_sub_Object_add_new_Button_posXpath = "//i[@class='iconfont icon-Create1']"  # 新建sub_FQDNs按钮
-FQDNs_Group_sub_Object_add_new_Select_one_Button_posXpath = "//ul[@x-placement='bottom-start']/li[1]"  # 新建选择FQDNs按钮
-FQDNs_Group_sub_Object_add_new_Select_Group_Button_posXpath = "//ul[@x-placement='bottom-start']/li[2]"  # 新建选择FQDNs_Group按钮
+FQDNs_Group_sub_Object_add_new_Select_one_Button_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh']//li[1]"  # 新建选择FQDNs按钮
+FQDNs_Group_sub_Object_add_new_Select_Group_Button_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh']//li[2]"  # 新建选择FQDNs_Group按钮
 FQDNs_Group_sub_Object_add_new_one_inputName_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//div[@class='fqdn-object-name']//input"  # new FQDNs input Name
 FQDNs_Group_sub_Object_add_new_add_item_Button_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//i[@class='iconfont icon-Create1 font-[700]']"  # new FQDNs add items Button
 FQDNs_Group_sub_Object_add_new_addIP_item_inputName_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//div[@class='fqdn-object-expression']//input"  # new FQDNs Item input
 FQDNs_Group_sub_Object_add_new_add_itemIP_Save_Button_posXpath = "//i[@class='operate-icon iconfont icon-save']"  # new FQDNs 保存item按钮
-FQDNs_Group_sub_Object_add_new_one_OK1_Button_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//button[@class='MuiButtonBase-root MuiButton-root MuiLoadingButton-root \
-MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmallw MuiButton-colorPrimary MuiButton-root MuiLoadingButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeSmall MuiButton-textSizeSmall MuiButton-colorPrimary form-action-submit css-1djnbgz']"  # new FQDNs CreateOK1
+FQDNs_Group_sub_Object_add_new_one_OK1_Button_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//button[text()='OK']"  # new FQDNs CreateOK1
 FQDNs_Group_sub_Object_add_new_one_OK1_Warning_Yes_Button_posXpath = "//div[@class='el-message-box__btns']//span[normalize-space(text())='Yes']"  # 再次确认创建new FQDNs
 FQDNs_Group_sub_Object_add_new_one_OK1_Warning_Cancel_Button_posXpath = "//div[@class='el-message-box__btns']//span[normalize-space(text())='Cancel']"  # 再次确认取消new FQDNs
 FQDNs_Group_sub_Object_add_new_one_Cancel2_Button_posXpath = '//div/div/div[2]/div/div/div[1]/div/div/div[1]/div[3]/button[2]/span'  # new FQDNs CreateCancel2
-
+FQDNs_Group_sub_Object_group_exclude_open_posXpath = "//div[@class='fqdn-object-']"
 # link页
 FQDNs_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_fqdn_Home_App_anonymousComponent"  # link按钮ID
 FQDNs_listpage_linkSave_posXpath = '//*[@id="clusterSave-_ClusterTable_ElDialog_copyComponents_Objects_fqdn_Home_App_anonymousComponent"]'  # Cluster和Vsys保存按钮ID
@@ -856,8 +858,8 @@ Subscriber_IDsObjectPage_button_cancel_posCss = "//button[@id='Cancle-_Subscribe
 Subscriber_IDs_Group_sub_Object_include_addButton_posXpath = "//div[@class='subscriber-id-object-included_sub_object_uuids']//i[@class='iconfont icon-Create1 font-[700]']"  # Subscriber_IDs_Group添加sub Object按钮
 Subscriber_IDs_Group_sub_Object_exclude_addButton_posXpath = "//div[@class='subscriber-id-object-excluded_sub_object_uuids']//i[@class='iconfont icon-Create1 font-[700]']"
 Subscriber_IDs_Group_sub_Object_add_new_Button_posXpath = "//button[@class='MuiIconButton-root MuiIconButton-variantPlain MuiIconButton-colorNeutral MuiIconButton-sizeMd MuiMenuButton-root MuiMenuButton-variantOutlined MuiMenuButton-colorNeutral MuiMenuButton-sizeMd css-83p2rh']//i[@class='iconfont icon-Create1']"  # 新建sub_Subscriber_IDs按钮
-Subscriber_IDs_Group_sub_Object_add_new_Select_one_Button_posXpath = "//ul[@x-placement='bottom-start']/li[1]"  # 新建选择Subscriber_IDs按钮
-Subscriber_IDs_Group_sub_Object_add_new_Select_Group_Button_posXpath = "//ul[@x-placement='bottom-start']/li[2]"  # 新建选择Subscriber_IDs_Group按钮
+Subscriber_IDs_Group_sub_Object_add_new_Select_one_Button_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh']//li[1]"  # 新建选择Subscriber_IDs按钮
+Subscriber_IDs_Group_sub_Object_add_new_Select_Group_Button_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh']//li[2]"  # 新建选择Subscriber_IDs_Group按钮
 Subscriber_IDs_Group_sub_Object_export_files_Button_posXpath = "//i[@class='iconfont icon-export']"  # 导出文件按钮
 Subscriber_IDs_Group_sub_Object_import_files_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-bc4t0x']"  # object导入文件按钮
@@ -876,6 +878,7 @@ Subscriber_IDs_Group_sub_Object_add_new_one_OK1_Button_posXpath = "//div[@class=
 Subscriber_IDs_Group_sub_Object_add_new_one_OK1_Warning_Yes_Button_posXpath = "//div[@class='el-message-box__btns']//span[normalize-space(text())='Yes']"  # 再次确认创建new Subscriber_IDs
 Subscriber_IDs_Group_sub_Object_add_new_one_OK1_Warning_Cancel_Button_posXpath = "//div[@class='el-message-box__btns']//span[normalize-space(text())='Cancel']"  # 再次确认取消new Subscriber_IDs
 Subscriber_IDs_Group_sub_Object_add_new_one_Cancel2_Button_posXpath = '//div/div/div[2]/div/div/div[1]/div/div/div[1]/div[3]/button[2]/span'  # new Subscriber_IDs CreateCancel2
+Subscriber_IDs_Group_sub_object_group_exclude_open_posXpath = "//div[@class='subscriber-id-object-']"
 # link页
 Subscriber_IDs_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_subscriberid_Home_App_anonymousComponent"  # link按钮ID
 Subscriber_IDs_listpage_linkSave_posXpath = '//*[@id="clusterSave-_ClusterTable_ElDialog_copyComponents_Objects_subscriberid_Home_App_anonymousComponent"]'  # Cluster和Vsys保存按钮ID
@@ -1073,6 +1076,7 @@ Keywords_Group_sub_Object_add_new_one_OK1_Warning_Yes_Button_posXpath = "//div[@
 Keywords_Group_sub_Object_add_new_one_OK1_Warning_Cancel_Button_posXpath = '//div[@class="el-message-box__wrapper"]/div/div[3]/button[1]/span'  # 再次确认取消new Keywords
 Keywords_Group_sub_Object_add_new_one_Cancel2_Button_posXpath = '//div/div/div[2]/div/div/div[1]/div/div/div[1]/div[3]/button[2]/span'  # new Keywords CreateCancel2
 keywords_ObjectPage_button_OK_posXpath = "//*[@id='OK-_keywordsDetail_Home_App_anonymousComponent']"  # 详情页ok按钮Xpath
+Keywords_Group_sub_Object_exclude_open_posXpath = "//div[@class='keyword-object-']"
 # link页
 keywords_listpage_linkButton_posId = "btnCopy-_OperateBtns_ElRow_Objects_keywords_Home_App_anonymousComponent"  # link按钮ID
 keywords_listpage_linkSave_posXpath = '//*[@id="clusterSave-_ClusterTable_ElDialog_copyComponents_Objects_keywords_Home_App_anonymousComponent"]'  # Cluster和Vsys保存按钮ID
@@ -1235,9 +1239,9 @@ acc_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath = url_
 acc_ObjectDetailPage_itemsTotal_posXpath = url_ObjectDetailPage_itemsTotal_posXpath  # Items Total Xpath
 acc_ObjectDetailPage_clearCounter_posXpath = url_ObjectDetailPage_clearCounter_posXpath  # Clear Counter 按钮
 acc_ObjectDetailPage_objectStatistics_dropDown_posXpath = "//div[@class='MuiSelect-root MuiSelect-variantOutlined MuiSelect-colorNeutral MuiSelect-sizeMd css-1lceg5i']"  # Statistics type下拉框
-acc_ObjectDetailPage_objectStatistics_elaborate_posXpath = '//div[contains(@x-placement,"start")]//div[text()="Elaborate"]'  # object_statistics下的Elaborate选项
-acc_ObjectDetailPage_objectStatistics_brief_posXpath = '//div[contains(@x-placement,"start")]//div[text()="Brief"]'  # object_statistics下的 Brief 选项
-acc_ObjectDetailPage_objectStatistics_none_posXpath = '//div[contains(@x-placement,"start")]//div[text()="None"]'  # object_statistics下的 None 选项
+acc_ObjectDetailPage_objectStatistics_elaborate_posXpath = "//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-1ufo3gk']//*[text()='Elaborate']"  # object_statistics下的Elaborate选项
+acc_ObjectDetailPage_objectStatistics_brief_posXpath = "//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-1ufo3gk']//*[text()='Brief']"  # object_statistics下的 Brief 选项
+acc_ObjectDetailPage_objectStatistics_none_posXpath = "//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-1ufo3gk']//*[text()=’None‘]"  # object_statistics下的 None 选项
 acc_ObjectDetailPage_dupAlert_posXpath = "//i[@class='iconfont icon-jinggao1 text-[var(--color-btn-warning)] px-[4px] text-[18px]']"  # item重复提示
 acc_ObjectDetailPage_dupAlert_duplicateListTotal_posXpath = '//div[@class="DuplicateList list-box"]//p[contains(@class,"total")]'  # duplicateList中的“Total：xx”
 acc_ObjectDetailPage_importedFile_posXpath = url_ObjectDetailPage_importedFile_posXpath  # 导入文件元素位置（Import From File 按钮旁）