feat(版本对比): 增加版本名称操作人时间

--user=郭雨琦增加版本名称操作人时间
2022-01-18 19:39:52 +08:00 · 2022-01-18 19:39:52 +08:00 · f9a7fd8a42
parent 0d77113760
commit f9a7fd8a42
7 changed files with 975 additions and 912 deletions
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@ -354,6 +354,7 @@
        :new-scenario-definition="newScenarioDefinition"
        :project-env-map="projectEnvMap"
        :new-project-env-map="newProjectEnvMap"
+        :project-list="projectList"
        :type ="type"
      ></scenario-diff>
    </el-dialog>
@ -1749,12 +1750,16 @@ export default {
                  if(obj.hashTree){
                    for (let i = 0; i < obj.hashTree.length; i++) {
                      obj.hashTree[i].disabled = true;
+                      if (!obj.hashTree[i].requestResult) {
+                        obj.hashTree[i].requestResult = [{responseResult: {}}];
+                      }
                    }
                  }
                  for (let i = 0; i < this.scenarioDefinition.length; i++) {
                    this.scenarioDefinition[i].disabled = true;
                  }
                  this.newScenarioDefinition = obj.hashTree;
+
                  if (response.data.environmentJson) {
                    this.newProjectEnvMap = objToStrMap(JSON.parse(response.data.environmentJson));
                  } else {
@ -1763,6 +1768,7 @@ export default {
                  }
                }
              }
+              res.data.userName = response.data.userName
              this.newData = res.data;
              this.dialogVisible = true;
            }
--- a/frontend/src/business/components/api/automation/version/ScenarioDiff.vue
+++ b/frontend/src/business/components/api/automation/version/ScenarioDiff.vue
@ -1,6 +1,15 @@
 <template>
-  <div class="compare-class">
-    <el-card ref="old">
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+      <el-col :span="12">
+        <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+    </el-row>
+    <div class="compare-class" v-loading="isReloadData">
+      <el-card ref="old" style="width: 50%">
        <el-card>
          <div class="card-content">
            <div class="ms-main-div" @click="showAll" >
@ -151,6 +160,7 @@
                         :scenario="data"
                         :node="node"
                         :env-map="projectEnvMap"
+                         :project-list="projectList"
                         :show-version="false"
                       />
                    </span>
@ -163,7 +173,7 @@
          </div>
        </el-card>
      </el-card>
-    <el-card  ref="new">
+      <el-card  ref="new" style="width: 50%">
        <el-card>
          <div class="card-content">
            <div class="ms-main-div" @click="showAll" v-if="type!=='detail'">
@ -314,6 +324,7 @@
                         :scenario="data"
                         :node="node"
                         :env-map="newProjectEnvMap"
+                         :project-list="projectList"
                         :show-version="false"
                       />
                    </span>
@ -345,6 +356,7 @@
        ></scenario-child-diff>
      </el-dialog>
    </div>
+  </div>
 </template>
 <script>

@ -399,7 +411,10 @@ export default{
    newOnSampleError:{},
    projectEnvMap: {},
    newProjectEnvMap: {},
-    type:{}
+    type:{},
+    projectList:{
+      type: Array,
+    },
  },
  components:{
    ScenarioChildDiff,
@ -427,6 +442,7 @@ export default{
     options: API_STATUS,
     levels: PRIORITY,
     loading: false,
+     isReloadData:true,
     moduleObj: {
       id: 'id',
       label: 'name',
@ -439,7 +455,6 @@ export default{
     },
     showHideTree: true,
     environmentType: ENV_TYPE.JSON,
-     projectList:[],
     props: {
       label: "label",
       children: "hashTree"
@ -455,7 +470,7 @@ export default{
     rightChildNode:{},
     leftChildVnode:{},
     rightChildVnode:{},
-     dialogVisible:false
+     dialogVisible:false,
   }
  },
  methods:{
@ -466,6 +481,7 @@ export default{
      console.log(this.$refs.old)
      console.log(this.$refs.new)
      diff(oldVnode,vnode);
+      this.isReloadData = false
    },
    showAll() {
      // 控制当有弹出页面操作时禁止刷新按钮列表
@ -493,11 +509,6 @@ export default{
        this.newEnvResult.loading = false;
      })
    },
-    getWsProjects() {
-      this.$get("/project/listAll", res => {
-        this.projectList = res.data;
-      })
-    },
    changeNodeStatus(nodes,source) {
      for (let i in nodes) {
        if (nodes[i]) {
@ -622,7 +633,7 @@ export default{

  },
  created() {
-    this.getWsProjects();
+
  },
  mounted() {
    this.$nextTick(function () {
--- a/frontend/src/business/components/api/definition/components/complete/version/DubboApiVersionDiff.vue
+++ b/frontend/src/business/components/api/definition/components/complete/version/DubboApiVersionDiff.vue
@ -1,4 +1,13 @@
 <template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+      <el-col :span="12">
+        <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+    </el-row>
    <div class="compare-class" v-loading="isReloadData">
      <el-card style="width: 50%;" ref="old">
        <div style="background-color: white;">
@ -103,6 +112,7 @@
        </div>
      </el-card>
    </div>
+  </div>
 </template>
 <script>

--- a/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue
+++ b/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue
@ -1,4 +1,13 @@
 <template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+      <el-col :span="12">
+        <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+    </el-row>
    <div class="compare-class" v-loading="isReloadData">
      <el-card style="width: 50%;" ref="old">
        <el-form :model="oldData" :rules="rule" ref="httpForm" label-width="80px" label-position="right" :disabled="true">
@ -264,6 +273,7 @@
        </api-info-container>
      </el-card>
    </div>
+  </div>
 </template>
 <script>
 import {API_STATUS, REQ_METHOD} from "../../../model/JsonData";
--- a/frontend/src/business/components/api/definition/components/complete/version/SQLApiVersionDiff.vue
+++ b/frontend/src/business/components/api/definition/components/complete/version/SQLApiVersionDiff.vue
@ -1,4 +1,13 @@
 <template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+      <el-col :span="12">
+        <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+    </el-row>
    <div class="compare-class" v-loading="isReloadData">
      <el-card style="width: 50%;" ref="old">
        <div style="background-color: white;">
@ -102,6 +111,7 @@
        </div>
      </el-card>
    </div>
+  </div>
 </template>
 <script>

--- a/frontend/src/business/components/api/definition/components/complete/version/TCPApiVersionDiff.vue
+++ b/frontend/src/business/components/api/definition/components/complete/version/TCPApiVersionDiff.vue
@ -1,4 +1,13 @@
 <template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+      <el-col :span="12">
+        <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+      </el-col>
+    </el-row>
    <div class="compare-class" v-loading="isReloadData">
      <el-card style="width: 50%;" ref="old">
        <div style="background-color: white;">
@ -158,6 +167,7 @@
        </div>
      </el-card>
    </div>
+  </div>
 </template>
 <script>

--- a/frontend/src/business/components/performance/test/DiffVersion.vue
+++ b/frontend/src/business/components/performance/test/DiffVersion.vue
@ -1,9 +1,15 @@
 <template>

 <div v-loading="isReloadData">
-  <div class="caall">
-
-  </div>
+  <div class="caall"></div>
+  <el-row>
+    <el-col :span="12">
+      <el-tag>当前{{oldData.versionName }}</el-tag><span style="margin-left: 10px">{{oldData.userName}}</span><span style="margin-left: 10px">{{oldData.updateTime | timestampFormatDate }}</span>
+    </el-col>
+    <el-col :span="12">
+      <el-tag>{{ newData.versionName }}</el-tag><span style="margin-left: 10px">{{newData.userName}}</span><span style="margin-left: 10px">{{newData.updateTime | timestampFormatDate }}</span>
+    </el-col>
+  </el-row>
  <div  class="compare-class" id="vdiff" ref="all" >
    <el-card style="width: 50%;" ref="old" id="old" >
      <ms-form-divider :title="$t('test_track.plan_view.base_info')"/>