feat 前面步骤中提取的参数,需要支持在后续步骤中引用
This commit is contained in:
@@ -44,6 +44,9 @@ import org.springframework.util.CollectionUtils;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
|
public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
|
||||||
|
|
||||||
|
// 添加静态Map用于存储提取的数据
|
||||||
|
private static final Map<String, Object> extractedDataMap = new HashMap<>();
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private UiSceneStepsMapper uiSceneStepsMapper;
|
private UiSceneStepsMapper uiSceneStepsMapper;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -404,6 +407,8 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
|
|||||||
Map<String, Object> beforeData = CollectionUtils.isEmpty(beforeSettingList)
|
Map<String, Object> beforeData = CollectionUtils.isEmpty(beforeSettingList)
|
||||||
? new HashMap<>()
|
? new HashMap<>()
|
||||||
: filterBydataExtractionQOList(beforeSettingList, seleniumUtils);
|
: filterBydataExtractionQOList(beforeSettingList, seleniumUtils);
|
||||||
|
// 保存前置数据到Map中
|
||||||
|
extractedDataMap.put("beforeData", beforeData);
|
||||||
//后置操作设置
|
//后置操作设置
|
||||||
List<UiHighSettingVO> afterSettingList = extractafterSetting(uiHighSettingVOList);
|
List<UiHighSettingVO> afterSettingList = extractafterSetting(uiHighSettingVOList);
|
||||||
|
|
||||||
@@ -457,6 +462,8 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
|
|||||||
Map<String, Object> afterData = CollectionUtils.isEmpty(afterSettingList)
|
Map<String, Object> afterData = CollectionUtils.isEmpty(afterSettingList)
|
||||||
? new HashMap<>()
|
? new HashMap<>()
|
||||||
: filterBydataExtractionQOList(afterSettingList, seleniumUtils);
|
: filterBydataExtractionQOList(afterSettingList, seleniumUtils);
|
||||||
|
// 保存后置数据到Map中
|
||||||
|
extractedDataMap.put("afterData", afterData);
|
||||||
Map<String, Object> mergedData = new HashMap<>();
|
Map<String, Object> mergedData = new HashMap<>();
|
||||||
if (!beforeData.isEmpty()) {
|
if (!beforeData.isEmpty()) {
|
||||||
mergedData.put("前置数据提取", beforeData);
|
mergedData.put("前置数据提取", beforeData);
|
||||||
@@ -1538,6 +1545,27 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
|
|||||||
seleniumUtils.clearInput(locator);
|
seleniumUtils.clearInput(locator);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 检查输入值是否是变量引用格式 ${key}
|
||||||
|
if (inputValue.startsWith("${") && inputValue.endsWith("}")) {
|
||||||
|
// 从Map中获取前置和后置操作的数据集合
|
||||||
|
Map<String, Object> beforeData = (Map<String, Object>) extractedDataMap.get("beforeData");
|
||||||
|
Map<String, Object> afterData = (Map<String, Object>) extractedDataMap.get("afterData");
|
||||||
|
|
||||||
|
// 先从前置数据中查找,如果没有再从后置数据中查找
|
||||||
|
Object value = beforeData != null ? beforeData.get(inputValue) : null;
|
||||||
|
if (value == null && afterData != null) {
|
||||||
|
value = afterData.get(inputValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value != null) {
|
||||||
|
inputValue = value.toString();
|
||||||
|
log.info("变量 {} 被替换为: {}", inputValue, value);
|
||||||
|
} else {
|
||||||
|
log.warn("未找到变量 {} 的值,保持原样", inputValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 执行输入操作
|
// 执行输入操作
|
||||||
if (step.getOperate() == 1) { // 普通输入框
|
if (step.getOperate() == 1) { // 普通输入框
|
||||||
seleniumUtils.inputText(
|
seleniumUtils.inputText(
|
||||||
|
|||||||
@@ -630,7 +630,6 @@ export default {
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
name: null,
|
name: null,
|
||||||
},
|
},
|
||||||
elementList: [],
|
|
||||||
total: 0,
|
total: 0,
|
||||||
editForm: {
|
editForm: {
|
||||||
name: null, // 元素名称
|
name: null, // 元素名称
|
||||||
@@ -641,7 +640,6 @@ export default {
|
|||||||
},
|
},
|
||||||
dialogTitle: '',
|
dialogTitle: '',
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
groupList: [], // 分组
|
|
||||||
typeList: ['id', 'name', 'className', 'tagName', 'linkText', 'partialLinkText', 'css', 'xpath', 'lable', 'value', 'index'],
|
typeList: ['id', 'name', 'className', 'tagName', 'linkText', 'partialLinkText', 'css', 'xpath', 'lable', 'value', 'index'],
|
||||||
rules: {
|
rules: {
|
||||||
name: [{ required: true, message: '请输入元素名称', trigger: 'blur' }],
|
name: [{ required: true, message: '请输入元素名称', trigger: 'blur' }],
|
||||||
|
|||||||
Reference in New Issue
Block a user