元素定位逻辑修改

1 files changed, 9 insertions, 3 deletions

diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 37c49261..012baa50 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -1281,9 +1281,9 @@ acc_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = "//button[@
 acc_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath = url_ObjectGroupDetailPage_subObjects_toggleDraw_closeButton_posXpath  # Accounts侧滑窗口的Close按钮
 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_itemsAddButton_posXpath =  "//div[@class='items']//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
-acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_itemsValueSaveButton_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//i[@class='operate-icon iconfont icon-save']"  # 侧滑子Create Account页面中Items下的保存按钮 Xpath
+acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_itemsValueSaveButton_posXpath = "//i[@class='operate-icon iconfont icon-save']"  # 侧滑子Create Account页面中Items下的保存按钮 Xpath
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_descriptionTextarea_posXpath = '(//textarea[@placeholder="Please enter the content"])[2]'  # 侧滑子Create Account页面中的Description textarea Xpath
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_posXpath = "//div[@class='MuiBox-root css-1krxo6z']//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']"  # 侧滑子Create Account页面中OK按钮
 acc_ObjectGroupDetailPage_subObjects_subCreateAccountDrawer_okButton_yes_posXpath = url_ObjectDetailPage_okButton_yes_posXpath  # 侧滑子Create Account页面确认弹窗的“Yes”按钮
@@ -1345,11 +1345,17 @@ int_ObjectDetailPage_item_search_posId = url_ObjectDetailPage_object_ip_search_p
 int_ObjectDetailPage_description_posXpath = "//div[@class='interval-object-description']//textarea[1]"  # 对象详情页面下Description input Xpath
 
 # 对象组详情页
+intGroupDetailPage_excludeObjects_addButton_newAdd_posXpath = '//div[@class="interval-object-excluded_sub_object_uuids"]//i[@class="iconfont icon-Create1 font-[700]"]'
+intGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath = '//div[@class="interval-object-"]//input'
+intGroup_ObjectDetailPage_excludeObjectsSwitch_enableStatus_posXpath = "//div[@class='interval-object-']//span[@class='MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary Mui-checked PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary Mui-checked Mui-checked css-y2jqxi']"  # Exclude Objects Switch Xpath开启状态
+intGroupDetailPage_excludeObjects_addButton_normalAdd_posXpath = "//div[@class='interval-object-excluded_sub_object_uuids']//i[@class='iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer']"  # Exclude Objects 下有数据新增时"+"按钮Xpath
+intGroup_ObjectDetailPage_subObjectSearchButton_posXpath = "//div[@class='interval-object-included_sub_object_uuids']//input"
+intGroup_ObjectDetailPage_excludeObjectSearchButton_posXpath = "//div[@class='interval-object-excluded_sub_object_uuids']//input"  # Exclude Objects中的Object搜索框
 intGroup_ObjectDetailPage_includeObjectsSwitch_normalAdd_posXpath = "//div[@class='interval-object-included_sub_object_uuids']//i[@class='iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer']"
 intGroup_ObjectDetailPage_excludeObjectsSwitch_normalAdd_posXpath = "//div[@class='interval-object-excluded_sub_object_uuids']//i[@class='iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer']"  # Exclude Objects有数据时新增按钮Xpath
 intGroup_ObjectDetailPage_excludeObjectsSwitch_newAdd_posXpath = "//div[@class='interval-object-excluded_sub_object_uuids']//i[@class='iconfont icon-Create1 font-[700]']"  # Exclude Objects无数据时新增按钮Xpath
 intGroup_ObjectDetailPage_excludeObjects_itemsArea_posXpath = "//div[@class='interval-object-excluded_sub_object_uuids']"  # Exclude Objects下的item区域div Xpath
-intGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath = "//div[@class='interval-object-']//span[@class='MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary css-y2jqxi']"  # Exclude Objects Switch Xpath
+intGroup_ObjectDetailPage_excludeObjectsSwitch_posXpath1 = "//div[@class='interval-object-']//span[@class='MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary css-y2jqxi']"  # Exclude Objects Switch Xpath
 int_ObjectGroupDetailPage_subObjects_addButton_newAdd_posXpath = '//div[@class="interval-object-included_sub_object_uuids"]'  # Subordinate Objects 下有数据新增时"+"按钮Xpath
 int_ObjectGroupDetailPage_subObjects_addButton_normalAdd_posXpath = '//div[@class="interval-object-included_sub_object_uuids"]//i[@class="iconfont icon-Create1 text-[18px] font-[700] text-[--color-primary] cursor-pointer"]'  # Subordinate Objects 下无数据新增时"+"按钮Xpath
 int_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath = acc_ObjectGroupDetailPage_subObjects_toggleDraw_addButton_posXpath  # Object侧滑窗口的"+"按钮