From c693fdccc5d7373c0ab3299f50e02439b78cf4aa Mon Sep 17 00:00:00 2001
From: junhong <junhong.zhou@fit2cloud.com>
Date: Thu, 17 Feb 2022 14:17:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=89=8D/=E5=90=8E=E7=BD=AE=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2-=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95-=E6=98=BE=E7=A4=BA=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=AD=97=E6=AE=B5=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010296 --user=周骏弘 全局前/后置脚本配置页面-变更记录-显示变更字段-与需求不符 https://www.tapd.cn/55049933/s/1104974
---
 .../java/io/metersphere/log/utils/ReflexObjectUtil.java    | 2 +-
 frontend/src/business/components/history/ChangeHistory.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java b/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
index 71ed4698a6..c1997cbaf8 100644
--- a/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
+++ b/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
@@ -176,7 +176,7 @@ public class ReflexObjectUtil {
                             column.setDiffValue(diffValue);
                         }
                         // 深度对比
-                        else if (StringUtils.equals(module, "api_definition")) {
+                        else if (StringUtils.equals(module, "API_DEFINITION")) {
                             if (originalColumns.get(i).getColumnName().equals("request")) {
                                 String newValue = newColumns.get(i).getOriginalValue().toString();
                                 String oldValue = column.getOriginalValue().toString();
diff --git a/frontend/src/business/components/history/ChangeHistory.vue b/frontend/src/business/components/history/ChangeHistory.vue
index 72c9067022..0e84ddaef7 100644
--- a/frontend/src/business/components/history/ChangeHistory.vue
+++ b/frontend/src/business/components/history/ChangeHistory.vue
@@ -9,7 +9,7 @@
         </template>
       </el-table-column>
       <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">
           <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>
@@ -71,6 +71,7 @@ export default {
       details: [],
       linkDatas: ["prerequisite", "steps", "remark", "request", "config",
         "response", "scenarioDefinition", "tags", "loadConfiguration", "advancedConfiguration"],
+      showChangeField: true,
     }
   },
   methods: {
@@ -84,6 +85,8 @@ export default {
         if (data) {
           // 过滤非全局脚本历史变更数据
           if(modules.length > 0 && modules[0] === '项目-环境设置'){
+            // 环境设置不显示变更字段
+            this.showChangeField = false;
             // 不显示的节点 id
             let ids = [];
             for(let i=0; i<data.length; i++){
@@ -98,6 +101,8 @@ export default {
                 data.splice(index, 1);
               });
             }
+          }else {
+            this.showChangeField = true;
           }
           this.details = data;
         }