test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 全局前/后置脚本配置页面-变更记录-显示变更字段去除 

--bug=1010296 --user=周骏弘 全局前/后置脚本配置页面-变更记录-显示变更字段-与需求不符 https://www.tapd.cn/55049933/s/1104974
This commit is contained in:
junhong 2022-02-17 14:17:27 +08:00 committed by fit2-zhao
parent 341c7b5c67
commit c693fdccc5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
View File

@ -176,7 +176,7 @@ public class ReflexObjectUtil {
column.setDiffValue(diffValue); column.setDiffValue(diffValue);
} }
// 深度对比 // 深度对比
else if (StringUtils.equals(module, "api_definition")) { else if (StringUtils.equals(module, "API_DEFINITION")) {
if (originalColumns.get(i).getColumnName().equals("request")) { if (originalColumns.get(i).getColumnName().equals("request")) {
String newValue = newColumns.get(i).getOriginalValue().toString(); String newValue = newColumns.get(i).getOriginalValue().toString();
String oldValue = column.getOriginalValue().toString(); String oldValue = column.getOriginalValue().toString();

7
frontend/src/business/components/history/ChangeHistory.vue
View File

@ -9,7 +9,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userName" :label="$t('operating_log.user')"/> <el-table-column prop="userName" :label="$t('operating_log.user')"/>
<el-table-column prop="columnTitle" :label="$t('operating_log.change_field')"> <el-table-column prop="columnTitle" :label="$t('operating_log.change_field')" v-if="showChangeField">
<template v-slot:default="scope"> <template v-slot:default="scope">
<div v-if="scope.row.details && scope.row.details.columns"> <div v-if="scope.row.details && scope.row.details.columns">
<div v-for="detail in scope.row.details.columns" :key="detail.id">{{ detail.columnTitle }}</div> <div v-for="detail in scope.row.details.columns" :key="detail.id">{{ detail.columnTitle }}</div>
@ -71,6 +71,7 @@ export default {
details: [], details: [],
linkDatas: ["prerequisite", "steps", "remark", "request", "config", linkDatas: ["prerequisite", "steps", "remark", "request", "config",
"response", "scenarioDefinition", "tags", "loadConfiguration", "advancedConfiguration"], "response", "scenarioDefinition", "tags", "loadConfiguration", "advancedConfiguration"],
showChangeField: true,
} }
}, },
methods: { methods: {
@ -84,6 +85,8 @@ export default {
if (data) { if (data) {
// 过滤非全局脚本历史变更数据 // 过滤非全局脚本历史变更数据
if(modules.length > 0 && modules[0] === '项目-环境设置'){ if(modules.length > 0 && modules[0] === '项目-环境设置'){
// 环境设置不显示变更字段
this.showChangeField = false;
// 不显示的节点 id // 不显示的节点 id
let ids = []; let ids = [];
for(let i=0; i<data.length; i++){ for(let i=0; i<data.length; i++){
@ -98,6 +101,8 @@ export default {
data.splice(index, 1); data.splice(index, 1);
}); });
} }
}else {
this.showChangeField = true;
} }
this.details = data; this.details = data;
} }