diff --git a/test-test/src/main/java/com/test/test/domain/qo/AssertionQO.java b/test-test/src/main/java/com/test/test/domain/qo/AssertionQO.java index c174f55..1e415ec 100644 --- a/test-test/src/main/java/com/test/test/domain/qo/AssertionQO.java +++ b/test-test/src/main/java/com/test/test/domain/qo/AssertionQO.java @@ -52,5 +52,5 @@ public class AssertionQO { private String isFailedAbort; /**是否禁用 0否 1是*/ - private String isDisabled; + private Integer isDisabled; } diff --git a/test-test/src/main/java/com/test/test/domain/qo/DataExtractionQO.java b/test-test/src/main/java/com/test/test/domain/qo/DataExtractionQO.java index 04efe68..2aae209 100644 --- a/test-test/src/main/java/com/test/test/domain/qo/DataExtractionQO.java +++ b/test-test/src/main/java/com/test/test/domain/qo/DataExtractionQO.java @@ -41,7 +41,7 @@ public class DataExtractionQO { private String elementAttribute; /**是否禁用 0否 1是 */ - private String isDisabled; + private Integer isDisabled; } diff --git a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java index 1eef6de..16621ed 100644 --- a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java @@ -1006,7 +1006,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService { */ private List extractafterSetting(List settings) { return settings.stream() - .filter(e -> "2".equals(e.getSettingType()) &&0 == e.getIsDisabled()) + .filter(e -> "2".equals(e.getSettingType()) && 1 == e.getIsDisabled()) .collect(Collectors.toList()); // 返回默认设置 } diff --git a/test-ui/src/views/test/uiTest/advancedSetting.vue b/test-ui/src/views/test/uiTest/advancedSetting.vue index bfb0b9b..1d12569 100644 --- a/test-ui/src/views/test/uiTest/advancedSetting.vue +++ b/test-ui/src/views/test/uiTest/advancedSetting.vue @@ -73,10 +73,8 @@
- - - + +
@@ -91,10 +89,8 @@
- - + +
@@ -137,10 +133,8 @@
- - + +
@@ -167,10 +161,8 @@
- - + +
@@ -184,26 +176,30 @@ -
- - +
+ + - - + +
- - - - - + + + + + + + + + + + + +
@@ -232,10 +228,8 @@
- - - + +
@@ -250,10 +244,8 @@
- - + +
@@ -296,10 +288,8 @@
- - + +
@@ -326,10 +316,8 @@
- - + +
@@ -343,26 +331,30 @@ -
- - +
+ + - - + +
- - - - - + + + + + + + + + + + + +
@@ -383,10 +375,8 @@
- - + +
@@ -401,7 +391,7 @@ 添加 -
+
弹窗文本
@@ -412,17 +402,15 @@
- - + +
-
+
元素断言
-
+
@@ -430,117 +418,117 @@ -
- - +
+ + - - + +
- - - - - + + + + + + + + + + + + +
- - + +
- - - - - - - - - - - + + + + + + + + + + + - +
-
+
下拉框
-
-
-
-
- - - +
+
+
+ + + + + +
+ + - -
- - - - - - -
- -
- - - - - - -
+ + + +
+ +
+ + + + + + + + + + + + + +
-
- - -
+
+
+ +
- - - + + + - +
-
+
网页标题
-
+
- - + +
@@ -848,6 +836,21 @@ export default { }, // 断言 addAfterAssionQOList(index) { + if (!this.saveForm.assertionType) { + this.$modal.msgError("请选择断言类型"); + return; + } + + // 确保assertionQOList对象存在 + if (!this.saveForm.afterList[index].assertionQOList) { + this.$set(this.saveForm.afterList[index], 'assertionQOList', { + popupTexts: [], + elementAssertions: [], + dropdownBoxes: [], + webTitles: [] + }); + } + var param = { assertionType: this.saveForm.assertionType, operateObject: null, // 操作对象 @@ -856,12 +859,11 @@ export default { operateLocType: null, // 元素定位 operateLocValue: null, // 元素定位 isDisabled: '1', - expectations: null, // 网页标题 expectations: null, // 期望值 assertionMode: null, // 断言方式 isPopText: null, - } + switch (this.saveForm.assertionType) { case '1': // 弹窗文本 @@ -902,23 +904,59 @@ export default { break } }, - // 元素对象 - getOperateGroup() { - this.getElementListData(this.saveForm.operateGroupId) - }, - // 元素定位 - getOperateLoc() { - this.getElementListData(this.saveForm.operateLocType) - }, // 获取元素列表 - getElementListData(id) { - getElementList({ groupId: id }).then(res => { + getElementListData(groupId, target) { + getElementList({ groupId: groupId }).then(res => { if (res.code === 200) { - this.elementList = res.rows + this.elementList = res.rows; + + // 检查当前选中的operateElementId是否在新的列表中存在 + if (target && target.operateElementId) { + const elementExists = this.elementList.some(item => item.id === target.operateElementId); + if (!elementExists) { + // 如果不存在,清空选择 + target.operateElementId = null; + } + } } }) }, - + // 元素组变化时触发 - 前置操作中的数据提取 + handleBeforeDataExtractionGroupChange(row) { + if (row.operateGroupId) { + this.getElementListData(row.operateGroupId, row); + } else { + this.elementList = []; + row.operateElementId = null; + } + }, + // 元素组变化时触发 - 后置操作中的数据提取 + handleAfterDataExtractionGroupChange(row) { + if (row.operateGroupId) { + this.getElementListData(row.operateGroupId, row); + } else { + this.elementList = []; + row.operateElementId = null; + } + }, + // 元素组变化时触发 - 元素断言 + handleElementAssertionGroupChange(content) { + if (content.operateGroupId) { + this.getElementListData(content.operateGroupId, content); + } else { + this.elementList = []; + content.operateElementId = null; + } + }, + // 元素组变化时触发 - 下拉框断言 + handleDropdownBoxGroupChange(content) { + if (content.operateGroupId) { + this.getElementListData(content.operateGroupId, content); + } else { + this.elementList = []; + content.operateElementId = null; + } + }, }, watch: { detail(newVal, oldVal) {