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

2 files changed, 16 insertions, 12 deletions

diff --git a/page_element/ln_objects_element_position.py b/page_element/ln_objects_element_position.py
index 09d2134b..e4cbdb19 100644
--- a/page_element/ln_objects_element_position.py
+++ b/page_element/ln_objects_element_position.py
@@ -28,7 +28,7 @@ listPage_object_APNs_select_Second_object_posXpath ='(//span[@class="MuiCheckbox
 listPage_object_APNs_No_Data_posXpath = '//div[@class="MuiDataGrid-overlay css-14349d1"]' #列表页No Data按钮!!!!!
 listPage_object_APNs_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_object_APNs_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"
-
+listpage_object_APNs_select_first_group_posXpath = '(//i[@class="iconfont color-ip icon-APNgroup  css-lp3td5"]/ancestor::div[@class="css-16m40q9 MuiDataGrid-cell MuiDataGrid-cell--textLeft"]/preceding-sibling::div[2]//input)[1]'
 #APN Create&Edit页
 apn_Objectpage_ln_select_statistics_input_posXpath = "//div[@class='apn-object-statistics_option']"
 apn_ObjectPage_InputName_posXpath='//input[@class="MuiInput-input css-fqt4w4"]'#输入名字!!!!!
@@ -48,6 +48,8 @@ APNsObjectPage_button_cancel_posCss = ""      #Cancel按钮
 APNsObjectPage_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]' #!!!!!!!!!!
 apn_reference_count_list_xpath ='//*[@class="policy-item el-dropdown-menu__item"]' #usage quantity of APN #!!!!!!!!!!
 APNsObjectPage_importTipsValue_error_item_posXpath = '//div[@class="importTable"]//*[@class="{}"]'#!!!!!!!!!!
+apn_ObjectDetailPage_pleaseUpload_ok_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-k5thc0"]'
+apn_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-154nz5n"]'
  #APNs Group Object Create&Edit页
 apn_Group_InputName_posXpath='//div[@class="MuiInput-root MuiInput-variantOutlined MuiInput-colorNeutral MuiInput-sizeMd MuiInput-formControl css-uzf287"]/input' # apn group input输入框Xpath!!!!!
 APNs_Group_InputDescripton_posXpath='//textarea[@placeholder="Please enter the content"]' #apn group description输入框xpath!!!!!
@@ -71,10 +73,10 @@ APNs_Group_sub_Object_add_new_one_OK1_Warning_Cancel_Button_posXpath = '/html/bo
 APNs_Group_sub_Object_add_new_one_Cancel2_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 form-action-cancel css-5vcc8t"])[2]' # new APNs CreateCancel 右下角!!!!!
 
 APNs_Group_sub_Object_edit_Button_posXpath='//*[@id="OperateBtn-_OperateBtn_MemberItem_SubObjectsList_ElFormItem_ElForm_VPanel_VEditPanel_apnDetail_Home_App_anonymousComponent"]/i'  #sub object中编辑第一个Object的图标
-APNs_Group_sub_Object_edit_add_Button_posXpath =   '(//*[@id="temporary_form"]/i)[last()]' #apn编辑页面的添加按钮
+APNs_Group_sub_Object_edit_add_Button_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-list-action-add css-h4tbqb"]' #apn编辑页面的添加按钮
 APNs_Group_sub_Object_edit_input_Button_posXpath =  APNs_Group_sub_Object_add_new_addAPN_item_posXpath #input
-APNs_Group_sub_Object_edit_save_Button_posXpath =   '//*[@id="router-view-container"]//i[@class="operate-icon iconfont icon-save check color31739C"]'#save
-APNs_Group_sub_Object_edit_ok_Button_posid ="OK-_apnDetail_VDraswer_EditDraw_apnDetail_Home_App_anonymousComponent" #OK
+APNs_Group_sub_Object_edit_save_Button_posXpath =   '//i[@class="operate-icon iconfont icon-save"]'#save
+APNs_Group_sub_Object_edit_ok_Button_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]' #OK
 #APN查询页面,Object类似
 listPage_objectSearch_APNs_select_Id_posXpath = '//li[@id="1-_FilteredSearch_ElRow_Objects_apn_Home_App_anonymousComponent"]'      #查询ID
 listPage_objectSearch_APNs_select_Name_posXpath = "//ul[@class='base-Popper-root MuiAutocomplete-listbox css-18r31z0']//span[text()='Name']"    #查询Name
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 808dd23c..554b202b 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -13,13 +13,15 @@ listpage_no_data_posXpath = '//div[@class="MuiDataGrid-overlay css-14349d1"]' #�
 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-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_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
 listPage_object_Select_createButton_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[1]"
 listPage_objectGroup_Select_createButton_posXpath = "//ul[@class='base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-1iuehdr']//li[2]"
-
+objectPage_group_sub_object_add_new_select_button_posXpath = '//ul[@class="base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh"]/li[1]'
+objectPage_group_sub_objectGroup_add_new_select_button_posXpath = '//ul[@class="base-Popper-root MuiMenu-root Mui-expanded MuiMenu-variantOutlined MuiMenu-colorNeutral MuiMenu-sizeMd css-131n2dh"]/li[2]'
 # login page 登录页面
 loginPage_userName_posName = "username"
 loginPage_passwd_posName = "password"
@@ -137,7 +139,7 @@ MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeSmall MuiButton-outli
 main_ObjectPage_No_data_text_posXpath = "//DIV[@class='MuiDataGrid-overlay css-14349d1']"
 
 # 列表中元素
-main_listPage_object_select_First_object_posXpath = '//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]'
+main_listPage_object_select_First_object_posXpath = '//div[@data-rowindex="0"]'
 main_listPage_object_select_Second_object_posXpath = '//table/tbody/tr[2]/td[1]/div/div/div[1]/div/label/span[1]/span'  # 选择列表中第二个对象
 main_listPage_object_total_value_posXpath = '(//div[@class="flex-1 flex items-center justify-center undefined"]/span)[1]'  # 列表页total值
 ##Object模块列设置
@@ -271,8 +273,8 @@ listPage_current_object_reprtition_tips_posXpath = '//*[@id="router-view-contain
 listPage_other_object_reprtition_tips_posXpath = '//*[@id="router-view-container"]//div[@title="Duplicate data exists"]'
 # '//table/tbody/tr[1]/td[4]/div/div/div/div/div/div[1]/span'  # IMSI提取Details
 listPage_object_group_exclude_open_posXpath = "//div[@class='ip-object-']"
-listPage_object_group_subobject_fist_posXpath = "//div[@class='tab-content floatleft height100 width100 margin-top40']//ul[@class='row-container tableList']/li[1]//div[@class='row-content-cell']"
-listPage_object_group_subobject_second_posXpath = "//div[@class='tab-content floatleft height100 width100 margin-top40']//ul[@class='row-container tableList']/li[2]//div[@class='row-content-cell']/span"
+listPage_object_group_subobject_fist_posXpath = '//ul[@class="MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3"]/li[1]//span[@class="truncate"]'
+listPage_object_group_subobject_second_posXpath = '//ul[@class="MuiList-root MuiList-vertical MuiList-variantPlain MuiList-colorNeutral MuiList-sizeMd css-1cklc3"]/li[2]//span[@class="truncate"]'
 ip_object_group_subobject_close_posXpath = "//div[@class='KeywordsList list-box']//span[normalize-space(text())='Close']"
 fqdn_object_group_subobject_close_posXpath = "//div[@class='FqdnList list-box']//span[normalize-space(text())='Close']"
 http_signature_object_group_close_posXpath = "//div[@class='HttpSignatureList list-box']//span[normalize-space(text())='Close']"
@@ -1260,7 +1262,7 @@ acc_ObjectDetailPage_firstAccObject = url_ObjectDetailPage_firstUrlObject  ## �
 acc_ObjectGroupDetailPage_subObjects_search_posId = url_ObjectDetailPage_object_ip_search_posId  # Subordinate Objects 下搜索框id
 acc_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = "//button[@class='MuiIconButton-root MuiIconButton-variantPlain MuiIconButton-colorNeutral MuiIconButton-sizeMd MuiMenuButton-root MuiMenuButton-variantOutlined MuiMenuButton-colorNeutral MuiMenuButton-sizeMd css-83p2rh']"  # Accounts侧滑窗口的"+"按钮
 acc_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath = url_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath  # Accounts侧滑窗口的Close按钮
-acc_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_account_posXpath = '(//ul[@class="el-dropdown-menu el-popper el-dropdown-menu--small"]/li[not(contains(text(),"Group"))])[last()]'  # Accounts侧滑窗口的"+"按钮下的Account
+acc_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_account_posXpath = objectPage_group_sub_object_add_new_select_button_posXpath  # Accounts侧滑窗口的"+"按钮下的Account
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_nameInput_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//input[@class='MuiInput-input css-fqt4w4']"  # 侧滑子Create Account页面Name input Xpath
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_itemsAddButton_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//i[@class='iconfont icon-Create1 font-[700]']"  # 侧滑子Create Account页面中Items下的"+"按钮 Xpath
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_itemsValueInput_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//input[@class='MuiInput-input css-1u0jcuo']"  # 侧滑子Create Account页面中Items下的item value输入框 Xpath
@@ -1526,10 +1528,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[@data-desc="subObject"]//i[@class="operate-icon iconfont icon-Create1"]'  # Subordinate Objects 下有数据新增时"+"按钮Xpath
-port_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@class="port-object-included_sub_object_uuids"]'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
+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_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = '//div[@class="px-[12px] py-[4px] flex"]/button'  # Ports侧滑窗口的"+"按钮
-port_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_port_posXpath = '(//ul[@class="el-dropdown-menu el-popper el-dropdown-menu--small"]/li[not(contains(text(),"Group"))])[last()]'  # Ports侧滑窗口的"+"按钮下的Port
+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
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsAddButton_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-list-action-add css-h4tbqb"]'  # 侧滑子Create Ports页面中Items下的"+"按钮 Xpath
 port_ObjectGroupDetailPage_subObjects_subCreatePortDrawer_itemsValueInput_posXpath = '//input[@class="MuiInput-input css-1u0jcuo"]'  # 侧滑子Create Ports页面中Items下的item value输入框 Xpath